From 367078178f2cdfb3f21eeae00bd0ef3a946a7a2d Mon Sep 17 00:00:00 2001
From: Aaron Webster <AaronWebster@users.noreply.github.com>
Date: Wed, 16 Sep 2020 18:14:09 -0700
Subject: [PATCH 001/460] Change BlockType from struct to class

Fixes the -Wmismatched-tags compilation warning.
---
 src/Resource/BlockType.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Resource/BlockType.hpp b/src/Resource/BlockType.hpp
index 24a46c3..a551830 100644
--- a/src/Resource/BlockType.hpp
+++ b/src/Resource/BlockType.hpp
@@ -40,7 +40,7 @@ namespace Resource {
 #define BLOCK_SPRUCE	(1u << 4)
 #define BLOCK_WATER	(1u << 5)
 
-struct BlockType {
+class BlockType {
 private:
 	static const std::unordered_map<std::string, BlockType> Types;
 

From 07e039d442c18bf21dff9c45a5b5bd307d9a11bb Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 13 Feb 2021 10:19:29 +0100
Subject: [PATCH 002/460] CMakeLists.txt: update CMake version requirement to
 remove future compat warning

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2cc6467..362fa58 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.4)
+cmake_minimum_required(VERSION 2.8.12)
 project(MINEDMAP CXX)
 
 

From 0ebc895ec068e9b5de7226e7bd87138fe5748567 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 12 Feb 2021 23:05:07 +0100
Subject: [PATCH 003/460] Info: print concise JSON

Reduce size by removing pretty-printing
---
 src/Info.cpp | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/Info.cpp b/src/Info.cpp
index eef2b0e..a40dd56 100644
--- a/src/Info.cpp
+++ b/src/Info.cpp
@@ -43,52 +43,52 @@ void Info::writeJSON(const char *filename) const {
 		return;
 	}
 
-	std::fprintf(f, "{\n");
-	std::fprintf(f, "  \"mipmaps\" : [\n");
+	std::fprintf(f, "{");
+	std::fprintf(f, "\"mipmaps\":[");
 
 	for (size_t level = 0; level < regions.size(); level++) {
 		int minX, maxX, minZ, maxZ;
 		std::tie(minX, maxX, minZ, maxZ) = getBounds(level);
 
-		std::fprintf(f, "    {\n");
-		std::fprintf(f, "      \"info\" : {\n");
-		std::fprintf(f, "        \"minX\" : %i,\n", minX);
-		std::fprintf(f, "        \"maxX\" : %i,\n", maxX);
-		std::fprintf(f, "        \"minZ\" : %i,\n", minZ);
-		std::fprintf(f, "        \"maxZ\" : %i\n", maxZ);
-		std::fprintf(f, "      },\n");
-		std::fprintf(f, "      \"regions\" : [\n");
+		std::fprintf(f, "{");
+		std::fprintf(f, "\"info\":{");
+		std::fprintf(f, "\"minX\":%i,", minX);
+		std::fprintf(f, "\"maxX\":%i,", maxX);
+		std::fprintf(f, "\"minZ\":%i,", minZ);
+		std::fprintf(f, "\"maxZ\":%i", maxZ);
+		std::fprintf(f, "},");
+		std::fprintf(f, "\"regions\":[");
 
 		for (int z = minZ; z <= maxZ; z++) {
-			std::fprintf(f, "        [");
+			std::fprintf(f, "[");
 
 			for (int x = minX; x <= maxX; x++) {
 				std::fprintf(f, "%s", regions[level].count(std::make_pair(x, z)) ? "true" : "false");
 
 				if (x < maxX)
-					std::fprintf(f, ", ");
+					std::fprintf(f, ",");
 			}
 
 			if (z < maxZ)
-				std::fprintf(f, "],\n");
+				std::fprintf(f, "],");
 			else
-				std::fprintf(f, "]\n");
+				std::fprintf(f, "]");
 		}
 
-		std::fprintf(f, "      ]\n");
+		std::fprintf(f, "]");
 
 		if (level < regions.size() - 1)
-			std::fprintf(f, "    },\n");
+			std::fprintf(f, "},");
 		else
-			std::fprintf(f, "    }\n");
+			std::fprintf(f, "}");
 	}
 
-	std::fprintf(f, "  ],\n");
-	std::fprintf(f, "  \"spawn\" : {\n");
-	std::fprintf(f, "    \"x\" : %li,\n", (long)spawnX);
-	std::fprintf(f, "    \"z\" : %li\n", (long)spawnZ);
-	std::fprintf(f, "  }\n");
-	std::fprintf(f, "}\n");
+	std::fprintf(f, "],");
+	std::fprintf(f, "\"spawn\":{");
+	std::fprintf(f, "\"x\":%li,", (long)spawnX);
+	std::fprintf(f, "\"z\":%li", (long)spawnZ);
+	std::fprintf(f, "}");
+	std::fprintf(f, "}");
 
 	std::fclose(f);
 

From d2802b73f5eff825a4873d3b4577f14364cba856 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 12 Feb 2021 23:40:24 +0100
Subject: [PATCH 004/460] Info: make tile existence map mor efficient for
 sparse worlds

Explicitly list the coordinates where tiles exist instead of including a
full array with the size of the bounding box.
---
 src/Info.cpp       | 38 ++++++++++++++++++++++----------------
 src/Info.hpp       | 10 ++++++++--
 viewer/MinedMap.js | 21 ++++++++++++++++++++-
 3 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/src/Info.cpp b/src/Info.cpp
index a40dd56..913c0f2 100644
--- a/src/Info.cpp
+++ b/src/Info.cpp
@@ -47,6 +47,9 @@ void Info::writeJSON(const char *filename) const {
 	std::fprintf(f, "\"mipmaps\":[");
 
 	for (size_t level = 0; level < regions.size(); level++) {
+		if (level != 0)
+			std::fprintf(f, ",");
+
 		int minX, maxX, minZ, maxZ;
 		std::tie(minX, maxX, minZ, maxZ) = getBounds(level);
 
@@ -57,30 +60,33 @@ void Info::writeJSON(const char *filename) const {
 		std::fprintf(f, "\"minZ\":%i,", minZ);
 		std::fprintf(f, "\"maxZ\":%i", maxZ);
 		std::fprintf(f, "},");
-		std::fprintf(f, "\"regions\":[");
+		std::fprintf(f, "\"regions\":{");
 
-		for (int z = minZ; z <= maxZ; z++) {
-			std::fprintf(f, "[");
+		bool first_z = true;
+		for (const auto &item : regions[level]) {
+			if (!first_z)
+				std::fprintf(f, ",");
+			first_z = false;
 
-			for (int x = minX; x <= maxX; x++) {
-				std::fprintf(f, "%s", regions[level].count(std::make_pair(x, z)) ? "true" : "false");
+			int z = item.first;
+			const std::set<int> &z_regions = item.second;
 
-				if (x < maxX)
+			std::fprintf(f, "\"%d\":[", z);
+
+			bool first_x = true;
+			for (int x : z_regions) {
+				if (!first_x)
 					std::fprintf(f, ",");
+				first_x = false;
+
+
+				std::fprintf(f, "%d", x);
 			}
 
-			if (z < maxZ)
-				std::fprintf(f, "],");
-			else
-				std::fprintf(f, "]");
+			std::fprintf(f, "]");
 		}
 
-		std::fprintf(f, "]");
-
-		if (level < regions.size() - 1)
-			std::fprintf(f, "},");
-		else
-			std::fprintf(f, "}");
+		std::fprintf(f, "}}");
 	}
 
 	std::fprintf(f, "],");
diff --git a/src/Info.hpp b/src/Info.hpp
index 4bc1222..bccabdb 100644
--- a/src/Info.hpp
+++ b/src/Info.hpp
@@ -29,6 +29,7 @@
 #include <climits>
 #include <cstddef>
 #include <cstdint>
+#include <map>
 #include <set>
 #include <tuple>
 #include <utility>
@@ -39,7 +40,7 @@ namespace MinedMap {
 
 class Info {
 private:
-	std::vector<std::set<std::pair<int, int>>> regions;
+	std::vector<std::map<int, std::set<int>>> regions;
 	std::vector<std::tuple<int, int, int, int>> bounds;
 
 	int32_t spawnX, spawnZ;
@@ -54,7 +55,12 @@ public:
 	}
 
 	void addRegion(int x, int z, size_t level) {
-		regions[level].insert(std::make_pair(x, z));
+		auto &level_r = regions[level];
+		auto z_regions = level_r.emplace(
+			std::piecewise_construct,
+			std::make_tuple(z),
+			std::make_tuple()).first;
+		z_regions->second.insert(x);
 
 		std::tuple<int, int, int, int> &b = bounds[level];
 
diff --git a/viewer/MinedMap.js b/viewer/MinedMap.js
index f6f444e..8eb4b1f 100644
--- a/viewer/MinedMap.js
+++ b/viewer/MinedMap.js
@@ -1,3 +1,22 @@
+// bsearch-based array element check
+function contains(array, elem) {
+	var min = 0, max = array.length, i, cur;
+
+	while (min < max) {
+		i = min + Math.floor((max-min)/2);
+		cur = array[i];
+
+		if (cur === elem)
+			return true;
+		else if (cur < elem)
+			min = i + 1;
+		else
+			max = i;
+	}
+
+	return false;
+}
+
 var MinedMapLayer = L.GridLayer.extend({
 	initialize: function (mipmaps, layer) {
 		this.mipmaps = mipmaps;
@@ -43,7 +62,7 @@ var MinedMapLayer = L.GridLayer.extend({
 
 		if (coords.x >= mipmap.info.minX && coords.x <= mipmap.info.maxX &&
 		    coords.y >= mipmap.info.minZ && coords.y <= mipmap.info.maxZ &&
-		    mipmap.regions[coords.y-mipmap.info.minZ][coords.x-mipmap.info.minX])
+		    contains(mipmap.regions[coords.y] || [], coords.x))
 			tile.src = 'data/'+this.layer+'/'+z+'/r.'+coords.x+'.'+coords.y+'.png';
 
 		if (z === 0)

From cbc4a946c63bc04fcb920f866f858013a87c1c8b Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 12 Feb 2021 23:43:20 +0100
Subject: [PATCH 005/460] Info: rename mipmap "info" key to "bounds"

---
 src/Info.cpp       | 2 +-
 viewer/MinedMap.js | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Info.cpp b/src/Info.cpp
index 913c0f2..55c1156 100644
--- a/src/Info.cpp
+++ b/src/Info.cpp
@@ -54,7 +54,7 @@ void Info::writeJSON(const char *filename) const {
 		std::tie(minX, maxX, minZ, maxZ) = getBounds(level);
 
 		std::fprintf(f, "{");
-		std::fprintf(f, "\"info\":{");
+		std::fprintf(f, "\"bounds\":{");
 		std::fprintf(f, "\"minX\":%i,", minX);
 		std::fprintf(f, "\"maxX\":%i,", maxX);
 		std::fprintf(f, "\"minZ\":%i,", minZ);
diff --git a/viewer/MinedMap.js b/viewer/MinedMap.js
index 8eb4b1f..0ced720 100644
--- a/viewer/MinedMap.js
+++ b/viewer/MinedMap.js
@@ -60,8 +60,8 @@ var MinedMapLayer = L.GridLayer.extend({
 
 		var mipmap = this.mipmaps[z];
 
-		if (coords.x >= mipmap.info.minX && coords.x <= mipmap.info.maxX &&
-		    coords.y >= mipmap.info.minZ && coords.y <= mipmap.info.maxZ &&
+		if (coords.x >= mipmap.bounds.minX && coords.x <= mipmap.bounds.maxX &&
+		    coords.y >= mipmap.bounds.minZ && coords.y <= mipmap.bounds.maxZ &&
 		    contains(mipmap.regions[coords.y] || [], coords.x))
 			tile.src = 'data/'+this.layer+'/'+z+'/r.'+coords.x+'.'+coords.y+'.png';
 
@@ -190,8 +190,8 @@ window.createMap = function () {
 			maxZoom: 3,
 			crs: L.CRS.Simple,
 			maxBounds: [
-				[-512*(mipmaps[0].info.maxZ+1), 512*mipmaps[0].info.minX],
-				[-512*mipmaps[0].info.minZ, 512*(mipmaps[0].info.maxX+1)],
+				[-512*(mipmaps[0].bounds.maxZ+1), 512*mipmaps[0].bounds.minX],
+				[-512*mipmaps[0].bounds.minZ, 512*(mipmaps[0].bounds.maxX+1)],
 			],
 		});
 

From c06af49068ec0f4d3ac5702b8c6a74626d68ddd2 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 13 Feb 2021 00:34:33 +0100
Subject: [PATCH 006/460] Info: restructure mipmap level data structure

---
 src/Info.cpp | 10 ++++++----
 src/Info.hpp | 25 ++++++++++++++++---------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/Info.cpp b/src/Info.cpp
index 55c1156..9d9d751 100644
--- a/src/Info.cpp
+++ b/src/Info.cpp
@@ -46,12 +46,14 @@ void Info::writeJSON(const char *filename) const {
 	std::fprintf(f, "{");
 	std::fprintf(f, "\"mipmaps\":[");
 
-	for (size_t level = 0; level < regions.size(); level++) {
-		if (level != 0)
+	bool first_level = true;
+	for (const auto &level : levels) {
+		if (!first_level)
 			std::fprintf(f, ",");
+		first_level = false;
 
 		int minX, maxX, minZ, maxZ;
-		std::tie(minX, maxX, minZ, maxZ) = getBounds(level);
+		std::tie(minX, maxX, minZ, maxZ) = level.bounds;
 
 		std::fprintf(f, "{");
 		std::fprintf(f, "\"bounds\":{");
@@ -63,7 +65,7 @@ void Info::writeJSON(const char *filename) const {
 		std::fprintf(f, "\"regions\":{");
 
 		bool first_z = true;
-		for (const auto &item : regions[level]) {
+		for (const auto &item : level.regions) {
 			if (!first_z)
 				std::fprintf(f, ",");
 			first_z = false;
diff --git a/src/Info.hpp b/src/Info.hpp
index bccabdb..fe4950a 100644
--- a/src/Info.hpp
+++ b/src/Info.hpp
@@ -39,9 +39,14 @@
 namespace MinedMap {
 
 class Info {
+public:
+	struct Level {
+		std::map<int, std::set<int>> regions;
+		std::tuple<int, int, int, int> bounds;
+	};
+
 private:
-	std::vector<std::map<int, std::set<int>>> regions;
-	std::vector<std::tuple<int, int, int, int>> bounds;
+	std::vector<Level> levels;
 
 	int32_t spawnX, spawnZ;
 
@@ -51,18 +56,18 @@ public:
 	}
 
 	std::tuple<int, int, int, int> getBounds(size_t level) const {
-		return bounds[level];
+		return levels[level].bounds;
 	}
 
 	void addRegion(int x, int z, size_t level) {
-		auto &level_r = regions[level];
-		auto z_regions = level_r.emplace(
+		auto &the_level = levels[level];
+		auto z_regions = the_level.regions.emplace(
 			std::piecewise_construct,
 			std::make_tuple(z),
 			std::make_tuple()).first;
 		z_regions->second.insert(x);
 
-		std::tuple<int, int, int, int> &b = bounds[level];
+		std::tuple<int, int, int, int> &b = the_level.bounds;
 
 		if (x < std::get<0>(b)) std::get<0>(b) = x;
 		if (x > std::get<1>(b)) std::get<1>(b) = x;
@@ -71,12 +76,14 @@ public:
 	}
 
 	void addMipmapLevel() {
-		regions.emplace_back();
-		bounds.emplace_back(INT_MAX, INT_MIN, INT_MAX, INT_MIN);
+		levels.emplace_back(Level {
+			.regions = {},
+			.bounds = {INT_MAX, INT_MIN, INT_MAX, INT_MIN},
+		});
 	}
 
 	size_t getMipmapLevel() const {
-		return regions.size()-1;
+		return levels.size()-1;
 	}
 
 	void setSpawn(const std::pair<int32_t, int32_t> &v) {

From 9ac3b00b6e25d3a47208e8410c55b4545beb76a3 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 13 Feb 2021 09:57:45 +0100
Subject: [PATCH 007/460] Make region iteration more efficient for sparse
 worlds

Do not iterate over each region coordinate in the bounding box.

Closes #12
---
 src/Info.hpp     | 11 ++++++++--
 src/MinedMap.cpp | 57 ++++++++++++++++++++++--------------------------
 2 files changed, 35 insertions(+), 33 deletions(-)

diff --git a/src/Info.hpp b/src/Info.hpp
index fe4950a..24f0c0e 100644
--- a/src/Info.hpp
+++ b/src/Info.hpp
@@ -29,6 +29,7 @@
 #include <climits>
 #include <cstddef>
 #include <cstdint>
+#include <functional>
 #include <map>
 #include <set>
 #include <tuple>
@@ -40,6 +41,8 @@ namespace MinedMap {
 
 class Info {
 public:
+	typedef std::function<void (int, int)> RegionVisitor;
+
 	struct Level {
 		std::map<int, std::set<int>> regions;
 		std::tuple<int, int, int, int> bounds;
@@ -82,8 +85,12 @@ public:
 		});
 	}
 
-	size_t getMipmapLevel() const {
-		return levels.size()-1;
+	void visitRegions(size_t level, const RegionVisitor &visitor) const {
+		for (const auto &item : levels[level].regions) {
+			int z = item.first;
+			for (int x : item.second)
+				visitor(x, z);
+		}
 	}
 
 	void setSpawn(const std::pair<int32_t, int32_t> &v) {
diff --git a/src/MinedMap.cpp b/src/MinedMap.cpp
index f37b96c..4855b6f 100644
--- a/src/MinedMap.cpp
+++ b/src/MinedMap.cpp
@@ -292,13 +292,9 @@ static void makeBiome(const std::string &regiondir, const std::string &outputdir
 }
 
 static void makeBiomes(const std::string &regiondir, const std::string &outputdir, const Info *info) {
-	int minX, maxX, minZ, maxZ;
-	std::tie(minX, maxX, minZ, maxZ) = info->getBounds(0);
-
-	for (int x = minX; x <= maxX; x++) {
-		for (int z = minZ; z <= maxZ; z++)
-			makeBiome(regiondir, outputdir, x, z);
-	}
+	info->visitRegions(0, [&] (int x, int z) {
+		makeBiome(regiondir, outputdir, x, z);
+	});
 }
 
 static void makeMap(const std::string &regiondir, const std::string &outputdir, int x, int z) {
@@ -356,13 +352,9 @@ static void makeMap(const std::string &regiondir, const std::string &outputdir,
 }
 
 static void makeMaps(const std::string &regiondir, const std::string &outputdir, const Info *info) {
-	int minX, maxX, minZ, maxZ;
-	std::tie(minX, maxX, minZ, maxZ) = info->getBounds(0);
-
-	for (int x = minX; x <= maxX; x++) {
-		for (int z = minZ; z <= maxZ; z++)
-			makeMap(regiondir, outputdir, x, z);
-	}
+	info->visitRegions(0, [&] (int x, int z) {
+		makeMap(regiondir, outputdir, x, z);
+	});
 }
 
 static bool makeMipmap(const std::string &dir, size_t level, int x, int z, PNG::Format imageFormat) {
@@ -432,29 +424,32 @@ static bool makeMipmap(const std::string &dir, size_t level, int x, int z, PNG::
 	return true;
 }
 
+static int floored_half(int a) {
+	return (a - (a < 0)) / 2;
+}
+
 static void makeMipmaps(const std::string &dir, Info *info) {
-	int minX, maxX, minZ, maxZ;
-	std::tie(minX, maxX, minZ, maxZ) = info->getBounds(0);
+	for (size_t level = 0; ; level++) {
+		int minX, maxX, minZ, maxZ;
+		std::tie(minX, maxX, minZ, maxZ) = info->getBounds(level);
+
+		if (minX >= -1 && maxX <= 0 && minZ >= -1 && maxZ <= 0)
+			break;
 
-	while (minX < -1 || maxX > 0 || minZ < -1 || maxZ > 0) {
 		info->addMipmapLevel();
-		size_t level = info->getMipmapLevel();
-		makeDir(dir + "/map/" + format(level));
-		makeDir(dir + "/light/" + format(level));
+		makeDir(dir + "/map/" + format(level + 1));
+		makeDir(dir + "/light/" + format(level + 1));
 
-		minX = (minX-1)/2;
-		maxX = maxX/2;
-		minZ = (minZ-1)/2;
-		maxZ = maxZ/2;
+		info->visitRegions(level, [&] (int x, int z) {
+			info->addRegion(floored_half(x), floored_half(z), level + 1);
+		});
 
-		for (int x = minX; x <= maxX; x++) {
-			for (int z = minZ; z <= maxZ; z++) {
-				if (makeMipmap(dir + "/map", level, x, z, PNG::RGB_ALPHA))
-					info->addRegion(x, z, level);
+		info->visitRegions(level + 1, [&] (int x, int z) {
+			if (makeMipmap(dir + "/map", level + 1, x, z, PNG::RGB_ALPHA))
+				info->addRegion(x, z, level + 1);
 
-				makeMipmap(dir + "/light", level, x, z, PNG::GRAY_ALPHA);
-			}
-		}
+			makeMipmap(dir + "/light", level + 1, x, z, PNG::GRAY_ALPHA);
+		});
 	}
 }
 

From 5c55ce81407c381f9de2ff14d682aec481fa2b8d Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 22 Jun 2021 23:18:43 +0200
Subject: [PATCH 008/460] resource: add blocklist tool to list and diff the
 supported block IDs of a Minecraft version

---
 resource/blocklist.py | 69 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100755 resource/blocklist.py

diff --git a/resource/blocklist.py b/resource/blocklist.py
new file mode 100755
index 0000000..d3de297
--- /dev/null
+++ b/resource/blocklist.py
@@ -0,0 +1,69 @@
+#!/usr/bin/env python3
+
+import argparse
+import os
+import sys
+
+def blocklist(path):
+	blockpath = os.path.join(path, 'assets', 'minecraft', 'blockstates')
+	try:
+		return map(
+			lambda filename: filename[:-5],
+			filter(
+				lambda filename: filename.endswith('.json'),
+				os.listdir(blockpath),
+			),
+		)
+	except FileNotFoundError:
+		sys.exit('''
+Path '{}' not found.
+Please pass a directory containing the unpacked contents of a JAR of a recent Minecraft version.
+		'''.strip().format(blockpath))
+
+def print_blocklist(path):
+	for block in sorted(blocklist(path)):
+		print(block)
+
+def diff_blocklist(old, new, cmd):
+	blocks_old = set(blocklist(old))
+	blocks_new = set(blocklist(new))
+	diff = sorted(blocks_old.symmetric_difference(blocks_new))
+
+	for block in diff:
+		if block in blocks_old:
+			if cmd == 'removed':
+				print(block)
+			elif cmd == 'diff':
+				print('-', block)
+		else:
+			if cmd == 'added':
+				print(block)
+			elif cmd == 'diff':
+				print('+', block)
+
+
+parser = argparse.ArgumentParser(description='List block IDs of an unpacked Minecraft JAR, or diff two versions')
+
+subparsers = parser.add_subparsers(dest='cmd', metavar='COMMAND', required=True)
+
+parse_list = subparsers.add_parser('list', help='list supported blocks')
+parse_list.add_argument('DIR')
+
+parse_added = subparsers.add_parser('added', help='list added blocks')
+parse_added.add_argument('OLD')
+parse_added.add_argument('NEW')
+
+parse_removed = subparsers.add_parser('removed', help='list removed blocks')
+parse_removed.add_argument('OLD')
+parse_removed.add_argument('NEW')
+
+parse_removed = subparsers.add_parser('diff', help='diff lists of supported blocks')
+parse_removed.add_argument('OLD')
+parse_removed.add_argument('NEW')
+
+args = parser.parse_args()
+
+if args.cmd == 'list':
+	print_blocklist(args.DIR)
+else:
+	diff_blocklist(args.OLD, args.NEW, args.cmd)

From 73343dede2e24f87b86b45ed0ed771c4040413a4 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 24 Jun 2021 17:17:19 +0200
Subject: [PATCH 009/460] resource: add README.md

---
 resource/README.md | 71 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 resource/README.md

diff --git a/resource/README.md b/resource/README.md
new file mode 100644
index 0000000..ed35118
--- /dev/null
+++ b/resource/README.md
@@ -0,0 +1,71 @@
+# Resource management
+
+## Scripts
+
+The following scripts can be found in the `resource` directory of this Git
+repository. Python 3.8 should be sufficient, older versions may or may not
+work.
+
+- `blocklist.py`: Lists all supported block IDs of an unpacked Minecraft JAR, or diffs the ID lists
+  of two different versions
+- `extract.py`: Takes the block type information from `blocks.json` and texture data
+  from an unpacked Minecraft JAR, storing the result in `colors.json`
+- `generate.py`: Generates `BlockType.inc` from `colors.json`
+
+In addition to these scripts, the JSON processor *jq* is a useful tool to work
+with MinedMap's resource metadata.
+
+
+## How to add support for block IDs of a new Minecraft version
+
+1. Download the Minecraft version you want to support as well as the previous
+   version currently supported by MinedMap. You can use the Minecraft launcher
+   to do so. On Linux the downloaded JAR archive can be found at
+   `~/.minecraft/versions/`.
+2. Unpack both versions to different directories. The next part assumes that
+   the unpacked data is stored in `resource/data/old` and `resource/data/new`;
+   using the respective Minecraft version numbers instead of `old`
+   and `new` is advisable.
+3. Check the added and removed block types using `blocklist.py`:
+
+     ```sh
+     ./blocklist.py diff data/old data/new
+     ```
+
+4. Append all new block types to `blocks.json`. The following command can be
+   used to generate the basic JSON structure:
+
+     ```sh
+     ./blocklist.py added data/old data/new | jq -R -n -S --tab '[inputs] | map({key: ., value: {}}) | from_entries'
+     ```
+
+5. Edit `blocks.json` until the following command passes without errors:
+
+     ```sh
+     ./extract.py blocks.json data/new/assets/minecraft/textures/block colors.json
+     ```
+
+   If possible, the top texture of blocks should be used where different sides
+   exist. Block types that should not be visible on the map are just set to
+   `null` in the JSON.
+
+   The `water`, `grass` and `foliage` flags control biome-dependent texture color modifiers.
+
+6. When `colors.json` builds successfully, use the following command to sort
+   `blocks.json` by block ID:
+
+     ```sh
+     jq --tab -S < blocks.json > blocks.json.new && mv blocks.json.new blocks.json
+     ```
+
+   Then regenerate `colors.json` one last time, so it is sorted as well.
+
+7. Update the source code with the new block colors:
+
+     ```sh
+     ./generate.py colors.json ../src/Resource/BlockType.inc
+     ```
+
+After the update, the new version should be tested with old savegames (both
+before and after migration by the new version) as well as newly generated
+worlds. Use creative mode to add the new block types to your test world.

From 0a42605a2b3146c43a6e9812d75b68250019a5ba Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 23 Jun 2021 22:41:59 +0200
Subject: [PATCH 010/460] Add Minecraft 1.17 block types, update all color
 values

---
 resource/blocks.json       | 271 ++++++++++++++++++++++++++++++++++++-
 src/Resource/BlockType.inc | 165 ++++++++++++++++++++--
 2 files changed, 421 insertions(+), 15 deletions(-)

diff --git a/resource/blocks.json b/resource/blocks.json
index e16d69b..78c0d4c 100644
--- a/resource/blocks.json
+++ b/resource/blocks.json
@@ -37,6 +37,8 @@
 	"activator_rail": {},
 	"air": null,
 	"allium": null,
+	"amethyst_block": {},
+	"amethyst_cluster": {},
 	"ancient_debris": {
 		"texture": "ancient_debris_top"
 	},
@@ -59,6 +61,10 @@
 	"attached_pumpkin_stem": {
 		"grass": true
 	},
+	"azalea": {
+		"texture": "azalea_top"
+	},
+	"azalea_leaves": {},
 	"azure_bluet": null,
 	"bamboo": {
 		"texture": "bamboo_stalk"
@@ -85,6 +91,10 @@
 	"bell": {
 		"texture": "bell_top"
 	},
+	"big_dripleaf": {
+		"texture": "big_dripleaf_top"
+	},
+	"big_dripleaf_stem": null,
 	"birch_button": null,
 	"birch_door": {
 		"texture": "birch_door_top"
@@ -122,6 +132,10 @@
 	},
 	"black_banner": null,
 	"black_bed": null,
+	"black_candle": null,
+	"black_candle_cake": {
+		"texture": "cake_top"
+	},
 	"black_carpet": {
 		"texture": "black_wool"
 	},
@@ -153,6 +167,10 @@
 	},
 	"blue_banner": null,
 	"blue_bed": null,
+	"blue_candle": null,
+	"blue_candle_cake": {
+		"texture": "cake_top"
+	},
 	"blue_carpet": {
 		"texture": "blue_wool"
 	},
@@ -192,6 +210,10 @@
 	"bricks": {},
 	"brown_banner": null,
 	"brown_bed": null,
+	"brown_candle": null,
+	"brown_candle_cake": {
+		"texture": "cake_top"
+	},
 	"brown_carpet": {
 		"texture": "brown_wool"
 	},
@@ -216,15 +238,21 @@
 	"bubble_coral_block": {},
 	"bubble_coral_fan": null,
 	"bubble_coral_wall_fan": null,
+	"budding_amethyst": {},
 	"cactus": {
 		"texture": "cactus_top"
 	},
 	"cake": {
 		"texture": "cake_top"
 	},
+	"calcite": {},
 	"campfire": {
 		"texture": "campfire_log_lit"
 	},
+	"candle": null,
+	"candle_cake": {
+		"texture": "cake_top"
+	},
 	"carrots": {
 		"texture": "carrots_stage3"
 	},
@@ -238,6 +266,8 @@
 		"texture": "cauldron_top"
 	},
 	"cave_air": null,
+	"cave_vines": {},
+	"cave_vines_plant": {},
 	"chain": null,
 	"chain_command_block": {
 		"texture": "chain_command_block_side"
@@ -248,6 +278,7 @@
 	"chipped_anvil": {
 		"texture": "chipped_anvil_top"
 	},
+	"chiseled_deepslate": {},
 	"chiseled_nether_bricks": {},
 	"chiseled_polished_blackstone": {},
 	"chiseled_quartz_block": {},
@@ -264,6 +295,16 @@
 	"coal_block": {},
 	"coal_ore": {},
 	"coarse_dirt": {},
+	"cobbled_deepslate": {},
+	"cobbled_deepslate_slab": {
+		"texture": "cobbled_deepslate"
+	},
+	"cobbled_deepslate_stairs": {
+		"texture": "cobbled_deepslate"
+	},
+	"cobbled_deepslate_wall": {
+		"texture": "cobbled_deepslate"
+	},
 	"cobblestone": {},
 	"cobblestone_slab": {
 		"texture": "cobblestone"
@@ -286,7 +327,11 @@
 		"texture": "composter_compost"
 	},
 	"conduit": {},
+	"copper_block": {},
+	"copper_ore": {},
 	"cornflower": null,
+	"cracked_deepslate_bricks": {},
+	"cracked_deepslate_tiles": {},
 	"cracked_nether_bricks": {},
 	"cracked_polished_blackstone_bricks": {},
 	"cracked_stone_bricks": {},
@@ -330,6 +375,13 @@
 	"crimson_trapdoor": {},
 	"crimson_wall_sign": null,
 	"crying_obsidian": {},
+	"cut_copper": {},
+	"cut_copper_slab": {
+		"texture": "cut_copper"
+	},
+	"cut_copper_stairs": {
+		"texture": "cut_copper"
+	},
 	"cut_red_sandstone": {
 		"texture": "red_sandstone_top"
 	},
@@ -344,6 +396,10 @@
 	},
 	"cyan_banner": null,
 	"cyan_bed": null,
+	"cyan_candle": null,
+	"cyan_candle_cake": {
+		"texture": "cake_top"
+	},
 	"cyan_carpet": {
 		"texture": "cyan_wool"
 	},
@@ -428,6 +484,35 @@
 	"dead_tube_coral_block": {},
 	"dead_tube_coral_fan": null,
 	"dead_tube_coral_wall_fan": null,
+	"deepslate": {},
+	"deepslate_brick_slab": {
+		"texture": "deepslate_bricks"
+	},
+	"deepslate_brick_stairs": {
+		"texture": "deepslate_bricks"
+	},
+	"deepslate_brick_wall": {
+		"texture": "deepslate_bricks"
+	},
+	"deepslate_bricks": {},
+	"deepslate_coal_ore": {},
+	"deepslate_copper_ore": {},
+	"deepslate_diamond_ore": {},
+	"deepslate_emerald_ore": {},
+	"deepslate_gold_ore": {},
+	"deepslate_iron_ore": {},
+	"deepslate_lapis_ore": {},
+	"deepslate_redstone_ore": {},
+	"deepslate_tile_slab": {
+		"texture": "deepslate_tiles"
+	},
+	"deepslate_tile_stairs": {
+		"texture": "deepslate_tiles"
+	},
+	"deepslate_tile_wall": {
+		"texture": "deepslate_tiles"
+	},
+	"deepslate_tiles": {},
 	"detector_rail": {},
 	"diamond_block": {},
 	"diamond_ore": {},
@@ -442,6 +527,9 @@
 		"texture": "diorite"
 	},
 	"dirt": {},
+	"dirt_path": {
+		"texture": "dirt_path_top"
+	},
 	"dispenser": {
 		"texture": "furnace_top"
 	},
@@ -451,6 +539,7 @@
 	"dried_kelp_block": {
 		"texture": "dried_kelp_top"
 	},
+	"dripstone_block": {},
 	"dropper": {
 		"texture": "furnace_top"
 	},
@@ -483,6 +572,14 @@
 	"ender_chest": {
 		"texture": "obsidian"
 	},
+	"exposed_copper": {},
+	"exposed_cut_copper": {},
+	"exposed_cut_copper_slab": {
+		"texture": "exposed_cut_copper"
+	},
+	"exposed_cut_copper_stairs": {
+		"texture": "exposed_cut_copper"
+	},
 	"farmland": {
 		"texture": "farmland_moist"
 	},
@@ -498,6 +595,10 @@
 		"texture": "fletching_table_top"
 	},
 	"flower_pot": {},
+	"flowering_azalea": {
+		"texture": "flowering_azalea_top"
+	},
+	"flowering_azalea_leaves": {},
 	"frosted_ice": {
 		"texture": "frosted_ice_0"
 	},
@@ -509,6 +610,8 @@
 	"glass_pane": {
 		"texture": "glass_pane_top"
 	},
+	"glow_item_frame": null,
+	"glow_lichen": null,
 	"glowstone": {},
 	"gold_block": {},
 	"gold_ore": {},
@@ -528,11 +631,15 @@
 		"texture": "grass_block_top"
 	},
 	"grass_path": {
-		"texture": "grass_path_top"
+		"texture": "dirt_path_top"
 	},
 	"gravel": {},
 	"gray_banner": null,
 	"gray_bed": null,
+	"gray_candle": null,
+	"gray_candle_cake": {
+		"texture": "cake_top"
+	},
 	"gray_carpet": {
 		"texture": "gray_wool"
 	},
@@ -549,6 +656,10 @@
 	"gray_wool": {},
 	"green_banner": null,
 	"green_bed": null,
+	"green_candle": null,
+	"green_candle_cake": {
+		"texture": "cake_top"
+	},
 	"green_carpet": {
 		"texture": "green_wool"
 	},
@@ -566,6 +677,7 @@
 	"grindstone": {
 		"texture": "grindstone_round"
 	},
+	"hanging_roots": {},
 	"hay_block": {
 		"texture": "hay_block_top"
 	},
@@ -593,6 +705,9 @@
 	"infested_cracked_stone_bricks": {
 		"texture": "cracked_stone_bricks"
 	},
+	"infested_deepslate": {
+		"texture": "deepslate"
+	},
 	"infested_mossy_stone_bricks": {
 		"texture": "mossy_stone_bricks"
 	},
@@ -658,6 +773,7 @@
 	"lantern": {},
 	"lapis_block": {},
 	"lapis_ore": {},
+	"large_amethyst_bud": null,
 	"large_fern": {
 		"grass": true,
 		"texture": "large_fern_top"
@@ -665,12 +781,20 @@
 	"lava": {
 		"texture": "lava_still"
 	},
+	"lava_cauldron": {
+		"texture": "cauldron_top"
+	},
 	"lectern": {
 		"texture": "lectern_top"
 	},
 	"lever": null,
+	"light": null,
 	"light_blue_banner": null,
 	"light_blue_bed": null,
+	"light_blue_candle": null,
+	"light_blue_candle_cake": {
+		"texture": "cake_top"
+	},
 	"light_blue_carpet": {
 		"texture": "light_blue_wool"
 	},
@@ -687,6 +811,10 @@
 	"light_blue_wool": {},
 	"light_gray_banner": null,
 	"light_gray_bed": null,
+	"light_gray_candle": null,
+	"light_gray_candle_cake": {
+		"texture": "cake_top"
+	},
 	"light_gray_carpet": {
 		"texture": "light_gray_wool"
 	},
@@ -704,6 +832,7 @@
 	"light_weighted_pressure_plate": {
 		"texture": "gold_block"
 	},
+	"lightning_rod": null,
 	"lilac": {
 		"texture": "lilac_top"
 	},
@@ -713,6 +842,10 @@
 	},
 	"lime_banner": null,
 	"lime_bed": null,
+	"lime_candle": null,
+	"lime_candle_cake": {
+		"texture": "cake_top"
+	},
 	"lime_carpet": {
 		"texture": "lime_wool"
 	},
@@ -735,6 +868,10 @@
 	},
 	"magenta_banner": null,
 	"magenta_bed": null,
+	"magenta_candle": null,
+	"magenta_candle_cake": {
+		"texture": "cake_top"
+	},
 	"magenta_carpet": {
 		"texture": "magenta_wool"
 	},
@@ -752,12 +889,17 @@
 	"magma_block": {
 		"texture": "magma"
 	},
+	"medium_amethyst_bud": null,
 	"melon": {
 		"texture": "melon_top"
 	},
 	"melon_stem": {
 		"grass": true
 	},
+	"moss_block": {},
+	"moss_carpet": {
+		"texture": "moss_block"
+	},
 	"mossy_cobblestone": {},
 	"mossy_cobblestone_slab": {
 		"texture": "mossy_cobblestone"
@@ -848,6 +990,10 @@
 	"obsidian": {},
 	"orange_banner": null,
 	"orange_bed": null,
+	"orange_candle": null,
+	"orange_candle_cake": {
+		"texture": "cake_top"
+	},
 	"orange_carpet": {
 		"texture": "orange_wool"
 	},
@@ -864,6 +1010,14 @@
 	"orange_wall_banner": null,
 	"orange_wool": {},
 	"oxeye_daisy": null,
+	"oxidized_copper": {},
+	"oxidized_cut_copper": {},
+	"oxidized_cut_copper_slab": {
+		"texture": "oxidized_cut_copper"
+	},
+	"oxidized_cut_copper_stairs": {
+		"texture": "oxidized_cut_copper"
+	},
 	"packed_ice": {},
 	"peony": {
 		"texture": "peony_top"
@@ -873,6 +1027,10 @@
 	},
 	"pink_banner": null,
 	"pink_bed": null,
+	"pink_candle": null,
+	"pink_candle_cake": {
+		"texture": "cake_top"
+	},
 	"pink_carpet": {
 		"texture": "pink_wool"
 	},
@@ -899,6 +1057,9 @@
 	"podzol": {
 		"texture": "podzol_top"
 	},
+	"pointed_dripstone": {
+		"texture": "pointed_dripstone_down_base"
+	},
 	"polished_andesite": {},
 	"polished_andesite_slab": {
 		"texture": "polished_andesite"
@@ -933,6 +1094,16 @@
 	"polished_blackstone_wall": {
 		"texture": "polished_blackstone"
 	},
+	"polished_deepslate": {},
+	"polished_deepslate_slab": {
+		"texture": "polished_deepslate"
+	},
+	"polished_deepslate_stairs": {
+		"texture": "polished_deepslate"
+	},
+	"polished_deepslate_wall": {
+		"texture": "polished_deepslate"
+	},
 	"polished_diorite": {},
 	"polished_diorite_slab": {
 		"texture": "polished_diorite"
@@ -957,6 +1128,9 @@
 	"potted_allium": {
 		"texture": "allium"
 	},
+	"potted_azalea_bush": {
+		"texture": "azalea_top"
+	},
 	"potted_azure_bluet": {
 		"texture": "azure_bluet"
 	},
@@ -997,6 +1171,9 @@
 		"grass": true,
 		"texture": "fern"
 	},
+	"potted_flowering_azalea_bush": {
+		"texture": "flowering_azalea_top"
+	},
 	"potted_jungle_sapling": {
 		"texture": "jungle_sapling"
 	},
@@ -1039,6 +1216,10 @@
 	"potted_wither_rose": {
 		"texture": "wither_rose"
 	},
+	"powder_snow": {},
+	"powder_snow_cauldron": {
+		"texture": "cauldron_top"
+	},
 	"powered_rail": {},
 	"prismarine": {},
 	"prismarine_brick_slab": {
@@ -1065,6 +1246,10 @@
 	},
 	"purple_banner": null,
 	"purple_bed": null,
+	"purple_candle": null,
+	"purple_candle_cake": {
+		"texture": "cake_top"
+	},
 	"purple_carpet": {
 		"texture": "purple_wool"
 	},
@@ -1099,8 +1284,15 @@
 		"texture": "quartz_block_top"
 	},
 	"rail": {},
+	"raw_copper_block": {},
+	"raw_gold_block": {},
+	"raw_iron_block": {},
 	"red_banner": null,
 	"red_bed": null,
+	"red_candle": null,
+	"red_candle_cake": {
+		"texture": "cake_top"
+	},
 	"red_carpet": {
 		"texture": "red_wool"
 	},
@@ -1156,6 +1348,7 @@
 	"respawn_anchor": {
 		"texture": "respawn_anchor_top"
 	},
+	"rooted_dirt": {},
 	"rose_bush": {
 		"texture": "rose_bush_top"
 	},
@@ -1175,6 +1368,9 @@
 	"scaffolding": {
 		"texture": "scaffolding_top"
 	},
+	"sculk_sensor": {
+		"texture": "sculk_sensor_top"
+	},
 	"sea_lantern": {},
 	"sea_pickle": {},
 	"seagrass": null,
@@ -1186,12 +1382,15 @@
 	"skeleton_skull": null,
 	"skeleton_wall_skull": null,
 	"slime_block": {},
+	"small_amethyst_bud": null,
+	"small_dripleaf": null,
 	"smithing_table": {
 		"texture": "smithing_table_top"
 	},
 	"smoker": {
 		"texture": "smoker_top"
 	},
+	"smooth_basalt": {},
 	"smooth_quartz": {
 		"texture": "quartz_block_top"
 	},
@@ -1240,6 +1439,7 @@
 	"soul_wall_torch": null,
 	"spawner": {},
 	"sponge": {},
+	"spore_blossom": {},
 	"spruce_button": null,
 	"spruce_door": {
 		"texture": "spruce_door_top"
@@ -1370,6 +1570,7 @@
 		"texture": "target_top"
 	},
 	"terracotta": {},
+	"tinted_glass": {},
 	"tnt": {
 		"texture": "tnt_top"
 	},
@@ -1383,6 +1584,7 @@
 	"tube_coral_block": {},
 	"tube_coral_fan": null,
 	"tube_coral_wall_fan": null,
+	"tuff": {},
 	"turtle_egg": {},
 	"twisting_vines": {},
 	"twisting_vines_plant": {},
@@ -1431,6 +1633,65 @@
 		"texture": "water_still",
 		"water": true
 	},
+	"water_cauldron": {
+		"texture": "cauldron_top"
+	},
+	"waxed_copper_block": {
+		"texture": "copper_block"
+	},
+	"waxed_cut_copper": {
+		"texture": "cut_copper"
+	},
+	"waxed_cut_copper_slab": {
+		"texture": "cut_copper"
+	},
+	"waxed_cut_copper_stairs": {
+		"texture": "cut_copper"
+	},
+	"waxed_exposed_copper": {
+		"texture": "exposed_copper"
+	},
+	"waxed_exposed_cut_copper": {
+		"texture": "exposed_cut_copper"
+	},
+	"waxed_exposed_cut_copper_slab": {
+		"texture": "exposed_cut_copper"
+	},
+	"waxed_exposed_cut_copper_stairs": {
+		"texture": "exposed_cut_copper"
+	},
+	"waxed_oxidized_copper": {
+		"texture": "oxidized_copper"
+	},
+	"waxed_oxidized_cut_copper": {
+		"texture": "oxidized_cut_copper"
+	},
+	"waxed_oxidized_cut_copper_slab": {
+		"texture": "oxidized_cut_copper"
+	},
+	"waxed_oxidized_cut_copper_stairs": {
+		"texture": "oxidized_cut_copper"
+	},
+	"waxed_weathered_copper": {
+		"texture": "weathered_copper"
+	},
+	"waxed_weathered_cut_copper": {
+		"texture": "weathered_cut_copper"
+	},
+	"waxed_weathered_cut_copper_slab": {
+		"texture": "weathered_cut_copper"
+	},
+	"waxed_weathered_cut_copper_stairs": {
+		"texture": "weathered_cut_copper"
+	},
+	"weathered_copper": {},
+	"weathered_cut_copper": {},
+	"weathered_cut_copper_slab": {
+		"texture": "weathered_cut_copper"
+	},
+	"weathered_cut_copper_stairs": {
+		"texture": "weathered_cut_copper"
+	},
 	"weeping_vines": {},
 	"weeping_vines_plant": {},
 	"wet_sponge": {},
@@ -1439,6 +1700,10 @@
 	},
 	"white_banner": null,
 	"white_bed": null,
+	"white_candle": null,
+	"white_candle_cake": {
+		"texture": "cake_top"
+	},
 	"white_carpet": {
 		"texture": "white_wool"
 	},
@@ -1459,6 +1724,10 @@
 	"wither_skeleton_wall_skull": null,
 	"yellow_banner": null,
 	"yellow_bed": null,
+	"yellow_candle": null,
+	"yellow_candle_cake": {
+		"texture": "cake_top"
+	},
 	"yellow_carpet": {
 		"texture": "yellow_wool"
 	},
diff --git a/src/Resource/BlockType.inc b/src/Resource/BlockType.inc
index a76fa7a..0489fd9 100644
--- a/src/Resource/BlockType.inc
+++ b/src/Resource/BlockType.inc
@@ -16,6 +16,8 @@
 {"minecraft:activator_rail", {BLOCK_OPAQUE, {115, 87, 74}}},
 {"minecraft:air", {0, {0, 0, 0}}},
 {"minecraft:allium", {0, {0, 0, 0}}},
+{"minecraft:amethyst_block", {BLOCK_OPAQUE, {133, 97, 191}}},
+{"minecraft:amethyst_cluster", {BLOCK_OPAQUE, {163, 126, 207}}},
 {"minecraft:ancient_debris", {BLOCK_OPAQUE, {94, 66, 58}}},
 {"minecraft:andesite", {BLOCK_OPAQUE, {136, 136, 136}}},
 {"minecraft:andesite_slab", {BLOCK_OPAQUE, {136, 136, 136}}},
@@ -24,6 +26,8 @@
 {"minecraft:anvil", {BLOCK_OPAQUE, {72, 72, 72}}},
 {"minecraft:attached_melon_stem", {BLOCK_OPAQUE|BLOCK_GRASS, {141, 142, 141}}},
 {"minecraft:attached_pumpkin_stem", {BLOCK_OPAQUE|BLOCK_GRASS, {139, 139, 139}}},
+{"minecraft:azalea", {BLOCK_OPAQUE, {101, 124, 47}}},
+{"minecraft:azalea_leaves", {BLOCK_OPAQUE, {90, 114, 44}}},
 {"minecraft:azure_bluet", {0, {0, 0, 0}}},
 {"minecraft:bamboo", {BLOCK_OPAQUE, {93, 144, 19}}},
 {"minecraft:bamboo_sapling", {0, {0, 0, 0}}},
@@ -36,6 +40,8 @@
 {"minecraft:beehive", {BLOCK_OPAQUE, {180, 146, 90}}},
 {"minecraft:beetroots", {BLOCK_OPAQUE, {93, 91, 30}}},
 {"minecraft:bell", {BLOCK_OPAQUE, {253, 235, 110}}},
+{"minecraft:big_dripleaf", {BLOCK_OPAQUE, {111, 141, 51}}},
+{"minecraft:big_dripleaf_stem", {0, {0, 0, 0}}},
 {"minecraft:birch_button", {0, {0, 0, 0}}},
 {"minecraft:birch_door", {BLOCK_OPAQUE, {220, 209, 176}}},
 {"minecraft:birch_fence", {BLOCK_OPAQUE, {192, 175, 121}}},
@@ -53,6 +59,8 @@
 {"minecraft:birch_wood", {BLOCK_OPAQUE, {216, 215, 210}}},
 {"minecraft:black_banner", {0, {0, 0, 0}}},
 {"minecraft:black_bed", {0, {0, 0, 0}}},
+{"minecraft:black_candle", {0, {0, 0, 0}}},
+{"minecraft:black_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:black_carpet", {BLOCK_OPAQUE, {20, 21, 25}}},
 {"minecraft:black_concrete", {BLOCK_OPAQUE, {8, 10, 15}}},
 {"minecraft:black_concrete_powder", {BLOCK_OPAQUE, {25, 26, 31}}},
@@ -70,6 +78,8 @@
 {"minecraft:blast_furnace", {BLOCK_OPAQUE, {80, 80, 81}}},
 {"minecraft:blue_banner", {0, {0, 0, 0}}},
 {"minecraft:blue_bed", {0, {0, 0, 0}}},
+{"minecraft:blue_candle", {0, {0, 0, 0}}},
+{"minecraft:blue_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:blue_carpet", {BLOCK_OPAQUE, {53, 57, 157}}},
 {"minecraft:blue_concrete", {BLOCK_OPAQUE, {44, 46, 143}}},
 {"minecraft:blue_concrete_powder", {BLOCK_OPAQUE, {70, 73, 166}}},
@@ -95,6 +105,8 @@
 {"minecraft:bricks", {BLOCK_OPAQUE, {150, 97, 83}}},
 {"minecraft:brown_banner", {0, {0, 0, 0}}},
 {"minecraft:brown_bed", {0, {0, 0, 0}}},
+{"minecraft:brown_candle", {0, {0, 0, 0}}},
+{"minecraft:brown_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:brown_carpet", {BLOCK_OPAQUE, {114, 71, 40}}},
 {"minecraft:brown_concrete", {BLOCK_OPAQUE, {96, 59, 31}}},
 {"minecraft:brown_concrete_powder", {BLOCK_OPAQUE, {125, 84, 53}}},
@@ -112,18 +124,25 @@
 {"minecraft:bubble_coral_block", {BLOCK_OPAQUE, {165, 26, 162}}},
 {"minecraft:bubble_coral_fan", {0, {0, 0, 0}}},
 {"minecraft:bubble_coral_wall_fan", {0, {0, 0, 0}}},
+{"minecraft:budding_amethyst", {BLOCK_OPAQUE, {132, 96, 186}}},
 {"minecraft:cactus", {BLOCK_OPAQUE, {85, 127, 43}}},
 {"minecraft:cake", {BLOCK_OPAQUE, {248, 222, 214}}},
+{"minecraft:calcite", {BLOCK_OPAQUE, {223, 224, 220}}},
 {"minecraft:campfire", {BLOCK_OPAQUE, {110, 88, 54}}},
+{"minecraft:candle", {0, {0, 0, 0}}},
+{"minecraft:candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:carrots", {BLOCK_OPAQUE, {81, 123, 37}}},
 {"minecraft:cartography_table", {BLOCK_OPAQUE, {104, 87, 67}}},
 {"minecraft:carved_pumpkin", {BLOCK_OPAQUE, {198, 118, 24}}},
 {"minecraft:cauldron", {BLOCK_OPAQUE, {73, 72, 74}}},
 {"minecraft:cave_air", {0, {0, 0, 0}}},
+{"minecraft:cave_vines", {BLOCK_OPAQUE, {90, 109, 40}}},
+{"minecraft:cave_vines_plant", {BLOCK_OPAQUE, {88, 101, 38}}},
 {"minecraft:chain", {0, {0, 0, 0}}},
 {"minecraft:chain_command_block", {BLOCK_OPAQUE, {131, 161, 147}}},
 {"minecraft:chest", {BLOCK_OPAQUE, {162, 130, 78}}},
 {"minecraft:chipped_anvil", {BLOCK_OPAQUE, {72, 72, 72}}},
+{"minecraft:chiseled_deepslate", {BLOCK_OPAQUE, {54, 54, 54}}},
 {"minecraft:chiseled_nether_bricks", {BLOCK_OPAQUE, {47, 23, 28}}},
 {"minecraft:chiseled_polished_blackstone", {BLOCK_OPAQUE, {53, 48, 56}}},
 {"minecraft:chiseled_quartz_block", {BLOCK_OPAQUE, {231, 226, 218}}},
@@ -134,8 +153,12 @@
 {"minecraft:chorus_plant", {BLOCK_OPAQUE, {93, 57, 93}}},
 {"minecraft:clay", {BLOCK_OPAQUE, {160, 166, 179}}},
 {"minecraft:coal_block", {BLOCK_OPAQUE, {16, 15, 15}}},
-{"minecraft:coal_ore", {BLOCK_OPAQUE, {116, 116, 116}}},
+{"minecraft:coal_ore", {BLOCK_OPAQUE, {105, 105, 105}}},
 {"minecraft:coarse_dirt", {BLOCK_OPAQUE, {119, 85, 59}}},
+{"minecraft:cobbled_deepslate", {BLOCK_OPAQUE, {77, 77, 80}}},
+{"minecraft:cobbled_deepslate_slab", {BLOCK_OPAQUE, {77, 77, 80}}},
+{"minecraft:cobbled_deepslate_stairs", {BLOCK_OPAQUE, {77, 77, 80}}},
+{"minecraft:cobbled_deepslate_wall", {BLOCK_OPAQUE, {77, 77, 80}}},
 {"minecraft:cobblestone", {BLOCK_OPAQUE, {127, 127, 127}}},
 {"minecraft:cobblestone_slab", {BLOCK_OPAQUE, {127, 127, 127}}},
 {"minecraft:cobblestone_stairs", {BLOCK_OPAQUE, {127, 127, 127}}},
@@ -146,9 +169,13 @@
 {"minecraft:comparator", {BLOCK_OPAQUE, {166, 161, 159}}},
 {"minecraft:composter", {BLOCK_OPAQUE, {88, 61, 23}}},
 {"minecraft:conduit", {BLOCK_OPAQUE, {159, 139, 113}}},
+{"minecraft:copper_block", {BLOCK_OPAQUE, {192, 107, 79}}},
+{"minecraft:copper_ore", {BLOCK_OPAQUE, {124, 125, 120}}},
 {"minecraft:cornflower", {0, {0, 0, 0}}},
+{"minecraft:cracked_deepslate_bricks", {BLOCK_OPAQUE, {64, 64, 65}}},
+{"minecraft:cracked_deepslate_tiles", {BLOCK_OPAQUE, {52, 52, 52}}},
 {"minecraft:cracked_nether_bricks", {BLOCK_OPAQUE, {40, 20, 23}}},
-{"minecraft:cracked_polished_blackstone_bricks", {BLOCK_OPAQUE, {43, 37, 43}}},
+{"minecraft:cracked_polished_blackstone_bricks", {BLOCK_OPAQUE, {44, 37, 43}}},
 {"minecraft:cracked_stone_bricks", {BLOCK_OPAQUE, {118, 117, 118}}},
 {"minecraft:crafting_table", {BLOCK_OPAQUE, {119, 73, 42}}},
 {"minecraft:creeper_head", {0, {0, 0, 0}}},
@@ -170,12 +197,17 @@
 {"minecraft:crimson_trapdoor", {BLOCK_OPAQUE, {103, 50, 72}}},
 {"minecraft:crimson_wall_sign", {0, {0, 0, 0}}},
 {"minecraft:crying_obsidian", {BLOCK_OPAQUE, {32, 10, 60}}},
+{"minecraft:cut_copper", {BLOCK_OPAQUE, {191, 106, 80}}},
+{"minecraft:cut_copper_slab", {BLOCK_OPAQUE, {191, 106, 80}}},
+{"minecraft:cut_copper_stairs", {BLOCK_OPAQUE, {191, 106, 80}}},
 {"minecraft:cut_red_sandstone", {BLOCK_OPAQUE, {181, 97, 31}}},
 {"minecraft:cut_red_sandstone_slab", {BLOCK_OPAQUE, {181, 97, 31}}},
 {"minecraft:cut_sandstone", {BLOCK_OPAQUE, {223, 214, 170}}},
 {"minecraft:cut_sandstone_slab", {BLOCK_OPAQUE, {223, 214, 170}}},
 {"minecraft:cyan_banner", {0, {0, 0, 0}}},
 {"minecraft:cyan_bed", {0, {0, 0, 0}}},
+{"minecraft:cyan_candle", {0, {0, 0, 0}}},
+{"minecraft:cyan_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:cyan_carpet", {BLOCK_OPAQUE, {21, 137, 145}}},
 {"minecraft:cyan_concrete", {BLOCK_OPAQUE, {21, 119, 136}}},
 {"minecraft:cyan_concrete_powder", {BLOCK_OPAQUE, {36, 147, 157}}},
@@ -228,22 +260,41 @@
 {"minecraft:dead_tube_coral_block", {BLOCK_OPAQUE, {130, 123, 119}}},
 {"minecraft:dead_tube_coral_fan", {0, {0, 0, 0}}},
 {"minecraft:dead_tube_coral_wall_fan", {0, {0, 0, 0}}},
+{"minecraft:deepslate", {BLOCK_OPAQUE, {80, 80, 82}}},
+{"minecraft:deepslate_brick_slab", {BLOCK_OPAQUE, {70, 70, 71}}},
+{"minecraft:deepslate_brick_stairs", {BLOCK_OPAQUE, {70, 70, 71}}},
+{"minecraft:deepslate_brick_wall", {BLOCK_OPAQUE, {70, 70, 71}}},
+{"minecraft:deepslate_bricks", {BLOCK_OPAQUE, {70, 70, 71}}},
+{"minecraft:deepslate_coal_ore", {BLOCK_OPAQUE, {74, 74, 76}}},
+{"minecraft:deepslate_copper_ore", {BLOCK_OPAQUE, {92, 93, 89}}},
+{"minecraft:deepslate_diamond_ore", {BLOCK_OPAQUE, {83, 106, 106}}},
+{"minecraft:deepslate_emerald_ore", {BLOCK_OPAQUE, {78, 104, 87}}},
+{"minecraft:deepslate_gold_ore", {BLOCK_OPAQUE, {115, 102, 78}}},
+{"minecraft:deepslate_iron_ore", {BLOCK_OPAQUE, {106, 99, 94}}},
+{"minecraft:deepslate_lapis_ore", {BLOCK_OPAQUE, {79, 90, 115}}},
+{"minecraft:deepslate_redstone_ore", {BLOCK_OPAQUE, {104, 73, 74}}},
+{"minecraft:deepslate_tile_slab", {BLOCK_OPAQUE, {54, 54, 55}}},
+{"minecraft:deepslate_tile_stairs", {BLOCK_OPAQUE, {54, 54, 55}}},
+{"minecraft:deepslate_tile_wall", {BLOCK_OPAQUE, {54, 54, 55}}},
+{"minecraft:deepslate_tiles", {BLOCK_OPAQUE, {54, 54, 55}}},
 {"minecraft:detector_rail", {BLOCK_OPAQUE, {123, 104, 90}}},
 {"minecraft:diamond_block", {BLOCK_OPAQUE, {98, 237, 228}}},
-{"minecraft:diamond_ore", {BLOCK_OPAQUE, {125, 142, 141}}},
+{"minecraft:diamond_ore", {BLOCK_OPAQUE, {121, 141, 140}}},
 {"minecraft:diorite", {BLOCK_OPAQUE, {188, 188, 188}}},
 {"minecraft:diorite_slab", {BLOCK_OPAQUE, {188, 188, 188}}},
 {"minecraft:diorite_stairs", {BLOCK_OPAQUE, {188, 188, 188}}},
 {"minecraft:diorite_wall", {BLOCK_OPAQUE, {188, 188, 188}}},
 {"minecraft:dirt", {BLOCK_OPAQUE, {134, 96, 67}}},
+{"minecraft:dirt_path", {BLOCK_OPAQUE, {148, 121, 65}}},
 {"minecraft:dispenser", {BLOCK_OPAQUE, {110, 109, 109}}},
 {"minecraft:dragon_egg", {BLOCK_OPAQUE, {12, 9, 15}}},
 {"minecraft:dragon_head", {0, {0, 0, 0}}},
 {"minecraft:dragon_wall_head", {0, {0, 0, 0}}},
 {"minecraft:dried_kelp_block", {BLOCK_OPAQUE, {50, 58, 38}}},
+{"minecraft:dripstone_block", {BLOCK_OPAQUE, {134, 107, 92}}},
 {"minecraft:dropper", {BLOCK_OPAQUE, {110, 109, 109}}},
 {"minecraft:emerald_block", {BLOCK_OPAQUE, {42, 203, 87}}},
-{"minecraft:emerald_ore", {BLOCK_OPAQUE, {117, 136, 124}}},
+{"minecraft:emerald_ore", {BLOCK_OPAQUE, {108, 136, 115}}},
 {"minecraft:enchanting_table", {BLOCK_OPAQUE, {128, 75, 85}}},
 {"minecraft:end_gateway", {BLOCK_OPAQUE, {15, 10, 24}}},
 {"minecraft:end_portal", {BLOCK_OPAQUE, {15, 10, 24}}},
@@ -255,6 +306,10 @@
 {"minecraft:end_stone_brick_wall", {BLOCK_OPAQUE, {218, 224, 162}}},
 {"minecraft:end_stone_bricks", {BLOCK_OPAQUE, {218, 224, 162}}},
 {"minecraft:ender_chest", {BLOCK_OPAQUE, {15, 10, 24}}},
+{"minecraft:exposed_copper", {BLOCK_OPAQUE, {161, 125, 103}}},
+{"minecraft:exposed_cut_copper", {BLOCK_OPAQUE, {154, 121, 101}}},
+{"minecraft:exposed_cut_copper_slab", {BLOCK_OPAQUE, {154, 121, 101}}},
+{"minecraft:exposed_cut_copper_stairs", {BLOCK_OPAQUE, {154, 121, 101}}},
 {"minecraft:farmland", {BLOCK_OPAQUE, {81, 44, 15}}},
 {"minecraft:fern", {0, {0, 0, 0}}},
 {"minecraft:fire", {BLOCK_OPAQUE, {211, 140, 53}}},
@@ -264,14 +319,18 @@
 {"minecraft:fire_coral_wall_fan", {0, {0, 0, 0}}},
 {"minecraft:fletching_table", {BLOCK_OPAQUE, {197, 180, 133}}},
 {"minecraft:flower_pot", {BLOCK_OPAQUE, {124, 68, 53}}},
+{"minecraft:flowering_azalea", {BLOCK_OPAQUE, {112, 121, 64}}},
+{"minecraft:flowering_azalea_leaves", {BLOCK_OPAQUE, {99, 111, 60}}},
 {"minecraft:frosted_ice", {BLOCK_OPAQUE, {140, 181, 252}}},
 {"minecraft:furnace", {BLOCK_OPAQUE, {110, 109, 109}}},
-{"minecraft:gilded_blackstone", {BLOCK_OPAQUE, {56, 43, 38}}},
+{"minecraft:gilded_blackstone", {BLOCK_OPAQUE, {55, 42, 38}}},
 {"minecraft:glass", {BLOCK_OPAQUE, {175, 213, 219}}},
 {"minecraft:glass_pane", {BLOCK_OPAQUE, {211, 239, 244}}},
+{"minecraft:glow_item_frame", {0, {0, 0, 0}}},
+{"minecraft:glow_lichen", {0, {0, 0, 0}}},
 {"minecraft:glowstone", {BLOCK_OPAQUE, {171, 131, 84}}},
 {"minecraft:gold_block", {BLOCK_OPAQUE, {246, 208, 61}}},
-{"minecraft:gold_ore", {BLOCK_OPAQUE, {143, 140, 125}}},
+{"minecraft:gold_ore", {BLOCK_OPAQUE, {145, 133, 106}}},
 {"minecraft:granite", {BLOCK_OPAQUE, {149, 103, 85}}},
 {"minecraft:granite_slab", {BLOCK_OPAQUE, {149, 103, 85}}},
 {"minecraft:granite_stairs", {BLOCK_OPAQUE, {149, 103, 85}}},
@@ -282,6 +341,8 @@
 {"minecraft:gravel", {BLOCK_OPAQUE, {131, 127, 126}}},
 {"minecraft:gray_banner", {0, {0, 0, 0}}},
 {"minecraft:gray_bed", {0, {0, 0, 0}}},
+{"minecraft:gray_candle", {0, {0, 0, 0}}},
+{"minecraft:gray_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:gray_carpet", {BLOCK_OPAQUE, {62, 68, 71}}},
 {"minecraft:gray_concrete", {BLOCK_OPAQUE, {54, 57, 61}}},
 {"minecraft:gray_concrete_powder", {BLOCK_OPAQUE, {76, 81, 84}}},
@@ -294,6 +355,8 @@
 {"minecraft:gray_wool", {BLOCK_OPAQUE, {62, 68, 71}}},
 {"minecraft:green_banner", {0, {0, 0, 0}}},
 {"minecraft:green_bed", {0, {0, 0, 0}}},
+{"minecraft:green_candle", {0, {0, 0, 0}}},
+{"minecraft:green_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:green_carpet", {BLOCK_OPAQUE, {84, 109, 27}}},
 {"minecraft:green_concrete", {BLOCK_OPAQUE, {73, 91, 36}}},
 {"minecraft:green_concrete_powder", {BLOCK_OPAQUE, {97, 119, 44}}},
@@ -305,6 +368,7 @@
 {"minecraft:green_wall_banner", {0, {0, 0, 0}}},
 {"minecraft:green_wool", {BLOCK_OPAQUE, {84, 109, 27}}},
 {"minecraft:grindstone", {BLOCK_OPAQUE, {142, 142, 142}}},
+{"minecraft:hanging_roots", {BLOCK_OPAQUE, {161, 115, 91}}},
 {"minecraft:hay_block", {BLOCK_OPAQUE, {165, 139, 12}}},
 {"minecraft:heavy_weighted_pressure_plate", {BLOCK_OPAQUE, {220, 220, 220}}},
 {"minecraft:honey_block", {BLOCK_OPAQUE, {251, 185, 52}}},
@@ -318,13 +382,14 @@
 {"minecraft:infested_chiseled_stone_bricks", {BLOCK_OPAQUE, {119, 118, 119}}},
 {"minecraft:infested_cobblestone", {BLOCK_OPAQUE, {127, 127, 127}}},
 {"minecraft:infested_cracked_stone_bricks", {BLOCK_OPAQUE, {118, 117, 118}}},
+{"minecraft:infested_deepslate", {BLOCK_OPAQUE, {80, 80, 82}}},
 {"minecraft:infested_mossy_stone_bricks", {BLOCK_OPAQUE, {115, 121, 105}}},
 {"minecraft:infested_stone", {BLOCK_OPAQUE, {125, 125, 125}}},
 {"minecraft:infested_stone_bricks", {BLOCK_OPAQUE, {122, 121, 122}}},
 {"minecraft:iron_bars", {BLOCK_OPAQUE, {136, 139, 135}}},
 {"minecraft:iron_block", {BLOCK_OPAQUE, {220, 220, 220}}},
 {"minecraft:iron_door", {BLOCK_OPAQUE, {193, 192, 192}}},
-{"minecraft:iron_ore", {BLOCK_OPAQUE, {136, 130, 127}}},
+{"minecraft:iron_ore", {BLOCK_OPAQUE, {136, 129, 122}}},
 {"minecraft:iron_trapdoor", {BLOCK_OPAQUE, {202, 202, 202}}},
 {"minecraft:item_frame", {0, {0, 0, 0}}},
 {"minecraft:jack_o_lantern", {BLOCK_OPAQUE, {214, 152, 52}}},
@@ -350,13 +415,18 @@
 {"minecraft:ladder", {0, {0, 0, 0}}},
 {"minecraft:lantern", {BLOCK_OPAQUE, {106, 91, 83}}},
 {"minecraft:lapis_block", {BLOCK_OPAQUE, {30, 67, 140}}},
-{"minecraft:lapis_ore", {BLOCK_OPAQUE, {99, 110, 132}}},
+{"minecraft:lapis_ore", {BLOCK_OPAQUE, {107, 117, 141}}},
+{"minecraft:large_amethyst_bud", {0, {0, 0, 0}}},
 {"minecraft:large_fern", {BLOCK_OPAQUE|BLOCK_GRASS, {125, 125, 125}}},
 {"minecraft:lava", {BLOCK_OPAQUE, {212, 90, 18}}},
+{"minecraft:lava_cauldron", {BLOCK_OPAQUE, {73, 72, 74}}},
 {"minecraft:lectern", {BLOCK_OPAQUE, {173, 137, 83}}},
 {"minecraft:lever", {0, {0, 0, 0}}},
+{"minecraft:light", {0, {0, 0, 0}}},
 {"minecraft:light_blue_banner", {0, {0, 0, 0}}},
 {"minecraft:light_blue_bed", {0, {0, 0, 0}}},
+{"minecraft:light_blue_candle", {0, {0, 0, 0}}},
+{"minecraft:light_blue_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:light_blue_carpet", {BLOCK_OPAQUE, {58, 175, 217}}},
 {"minecraft:light_blue_concrete", {BLOCK_OPAQUE, {35, 137, 198}}},
 {"minecraft:light_blue_concrete_powder", {BLOCK_OPAQUE, {74, 180, 213}}},
@@ -369,6 +439,8 @@
 {"minecraft:light_blue_wool", {BLOCK_OPAQUE, {58, 175, 217}}},
 {"minecraft:light_gray_banner", {0, {0, 0, 0}}},
 {"minecraft:light_gray_bed", {0, {0, 0, 0}}},
+{"minecraft:light_gray_candle", {0, {0, 0, 0}}},
+{"minecraft:light_gray_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:light_gray_carpet", {BLOCK_OPAQUE, {142, 142, 134}}},
 {"minecraft:light_gray_concrete", {BLOCK_OPAQUE, {125, 125, 115}}},
 {"minecraft:light_gray_concrete_powder", {BLOCK_OPAQUE, {154, 154, 148}}},
@@ -380,11 +452,14 @@
 {"minecraft:light_gray_wall_banner", {0, {0, 0, 0}}},
 {"minecraft:light_gray_wool", {BLOCK_OPAQUE, {142, 142, 134}}},
 {"minecraft:light_weighted_pressure_plate", {BLOCK_OPAQUE, {246, 208, 61}}},
+{"minecraft:lightning_rod", {0, {0, 0, 0}}},
 {"minecraft:lilac", {BLOCK_OPAQUE, {154, 125, 147}}},
 {"minecraft:lily_of_the_valley", {0, {0, 0, 0}}},
 {"minecraft:lily_pad", {BLOCK_OPAQUE|BLOCK_GRASS, {133, 133, 133}}},
 {"minecraft:lime_banner", {0, {0, 0, 0}}},
 {"minecraft:lime_bed", {0, {0, 0, 0}}},
+{"minecraft:lime_candle", {0, {0, 0, 0}}},
+{"minecraft:lime_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:lime_carpet", {BLOCK_OPAQUE, {112, 185, 25}}},
 {"minecraft:lime_concrete", {BLOCK_OPAQUE, {94, 168, 24}}},
 {"minecraft:lime_concrete_powder", {BLOCK_OPAQUE, {125, 189, 41}}},
@@ -399,6 +474,8 @@
 {"minecraft:loom", {BLOCK_OPAQUE, {142, 119, 91}}},
 {"minecraft:magenta_banner", {0, {0, 0, 0}}},
 {"minecraft:magenta_bed", {0, {0, 0, 0}}},
+{"minecraft:magenta_candle", {0, {0, 0, 0}}},
+{"minecraft:magenta_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:magenta_carpet", {BLOCK_OPAQUE, {189, 68, 179}}},
 {"minecraft:magenta_concrete", {BLOCK_OPAQUE, {169, 48, 159}}},
 {"minecraft:magenta_concrete_powder", {BLOCK_OPAQUE, {192, 83, 184}}},
@@ -410,8 +487,11 @@
 {"minecraft:magenta_wall_banner", {0, {0, 0, 0}}},
 {"minecraft:magenta_wool", {BLOCK_OPAQUE, {189, 68, 179}}},
 {"minecraft:magma_block", {BLOCK_OPAQUE, {142, 63, 31}}},
+{"minecraft:medium_amethyst_bud", {0, {0, 0, 0}}},
 {"minecraft:melon", {BLOCK_OPAQUE, {111, 144, 30}}},
 {"minecraft:melon_stem", {BLOCK_OPAQUE|BLOCK_GRASS, {153, 153, 153}}},
+{"minecraft:moss_block", {BLOCK_OPAQUE, {89, 109, 45}}},
+{"minecraft:moss_carpet", {BLOCK_OPAQUE, {89, 109, 45}}},
 {"minecraft:mossy_cobblestone", {BLOCK_OPAQUE, {110, 118, 94}}},
 {"minecraft:mossy_cobblestone_slab", {BLOCK_OPAQUE, {110, 118, 94}}},
 {"minecraft:mossy_cobblestone_stairs", {BLOCK_OPAQUE, {110, 118, 94}}},
@@ -456,6 +536,8 @@
 {"minecraft:obsidian", {BLOCK_OPAQUE, {15, 10, 24}}},
 {"minecraft:orange_banner", {0, {0, 0, 0}}},
 {"minecraft:orange_bed", {0, {0, 0, 0}}},
+{"minecraft:orange_candle", {0, {0, 0, 0}}},
+{"minecraft:orange_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:orange_carpet", {BLOCK_OPAQUE, {240, 118, 19}}},
 {"minecraft:orange_concrete", {BLOCK_OPAQUE, {224, 97, 0}}},
 {"minecraft:orange_concrete_powder", {BLOCK_OPAQUE, {227, 131, 31}}},
@@ -468,11 +550,17 @@
 {"minecraft:orange_wall_banner", {0, {0, 0, 0}}},
 {"minecraft:orange_wool", {BLOCK_OPAQUE, {240, 118, 19}}},
 {"minecraft:oxeye_daisy", {0, {0, 0, 0}}},
+{"minecraft:oxidized_copper", {BLOCK_OPAQUE, {82, 162, 132}}},
+{"minecraft:oxidized_cut_copper", {BLOCK_OPAQUE, {79, 153, 126}}},
+{"minecraft:oxidized_cut_copper_slab", {BLOCK_OPAQUE, {79, 153, 126}}},
+{"minecraft:oxidized_cut_copper_stairs", {BLOCK_OPAQUE, {79, 153, 126}}},
 {"minecraft:packed_ice", {BLOCK_OPAQUE, {141, 180, 250}}},
 {"minecraft:peony", {BLOCK_OPAQUE, {129, 126, 139}}},
 {"minecraft:petrified_oak_slab", {BLOCK_OPAQUE, {162, 130, 78}}},
 {"minecraft:pink_banner", {0, {0, 0, 0}}},
 {"minecraft:pink_bed", {0, {0, 0, 0}}},
+{"minecraft:pink_candle", {0, {0, 0, 0}}},
+{"minecraft:pink_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:pink_carpet", {BLOCK_OPAQUE, {237, 141, 172}}},
 {"minecraft:pink_concrete", {BLOCK_OPAQUE, {213, 101, 142}}},
 {"minecraft:pink_concrete_powder", {BLOCK_OPAQUE, {228, 153, 181}}},
@@ -489,20 +577,25 @@
 {"minecraft:player_head", {0, {0, 0, 0}}},
 {"minecraft:player_wall_head", {0, {0, 0, 0}}},
 {"minecraft:podzol", {BLOCK_OPAQUE, {91, 63, 24}}},
+{"minecraft:pointed_dripstone", {BLOCK_OPAQUE, {129, 102, 89}}},
 {"minecraft:polished_andesite", {BLOCK_OPAQUE, {132, 134, 133}}},
 {"minecraft:polished_andesite_slab", {BLOCK_OPAQUE, {132, 134, 133}}},
 {"minecraft:polished_andesite_stairs", {BLOCK_OPAQUE, {132, 134, 133}}},
 {"minecraft:polished_basalt", {BLOCK_OPAQUE, {99, 98, 100}}},
 {"minecraft:polished_blackstone", {BLOCK_OPAQUE, {53, 48, 56}}},
-{"minecraft:polished_blackstone_brick_slab", {BLOCK_OPAQUE, {46, 41, 48}}},
-{"minecraft:polished_blackstone_brick_stairs", {BLOCK_OPAQUE, {46, 41, 48}}},
-{"minecraft:polished_blackstone_brick_wall", {BLOCK_OPAQUE, {46, 41, 48}}},
-{"minecraft:polished_blackstone_bricks", {BLOCK_OPAQUE, {46, 41, 48}}},
+{"minecraft:polished_blackstone_brick_slab", {BLOCK_OPAQUE, {48, 42, 49}}},
+{"minecraft:polished_blackstone_brick_stairs", {BLOCK_OPAQUE, {48, 42, 49}}},
+{"minecraft:polished_blackstone_brick_wall", {BLOCK_OPAQUE, {48, 42, 49}}},
+{"minecraft:polished_blackstone_bricks", {BLOCK_OPAQUE, {48, 42, 49}}},
 {"minecraft:polished_blackstone_button", {0, {0, 0, 0}}},
 {"minecraft:polished_blackstone_pressure_plate", {BLOCK_OPAQUE, {53, 48, 56}}},
 {"minecraft:polished_blackstone_slab", {BLOCK_OPAQUE, {53, 48, 56}}},
 {"minecraft:polished_blackstone_stairs", {BLOCK_OPAQUE, {53, 48, 56}}},
 {"minecraft:polished_blackstone_wall", {BLOCK_OPAQUE, {53, 48, 56}}},
+{"minecraft:polished_deepslate", {BLOCK_OPAQUE, {72, 72, 73}}},
+{"minecraft:polished_deepslate_slab", {BLOCK_OPAQUE, {72, 72, 73}}},
+{"minecraft:polished_deepslate_stairs", {BLOCK_OPAQUE, {72, 72, 73}}},
+{"minecraft:polished_deepslate_wall", {BLOCK_OPAQUE, {72, 72, 73}}},
 {"minecraft:polished_diorite", {BLOCK_OPAQUE, {192, 193, 194}}},
 {"minecraft:polished_diorite_slab", {BLOCK_OPAQUE, {192, 193, 194}}},
 {"minecraft:polished_diorite_stairs", {BLOCK_OPAQUE, {192, 193, 194}}},
@@ -513,6 +606,7 @@
 {"minecraft:potatoes", {BLOCK_OPAQUE, {84, 135, 47}}},
 {"minecraft:potted_acacia_sapling", {BLOCK_OPAQUE, {118, 117, 23}}},
 {"minecraft:potted_allium", {BLOCK_OPAQUE, {158, 137, 183}}},
+{"minecraft:potted_azalea_bush", {BLOCK_OPAQUE, {101, 124, 47}}},
 {"minecraft:potted_azure_bluet", {BLOCK_OPAQUE, {169, 204, 127}}},
 {"minecraft:potted_bamboo", {BLOCK_OPAQUE, {93, 144, 19}}},
 {"minecraft:potted_birch_sapling", {BLOCK_OPAQUE, {127, 160, 79}}},
@@ -526,6 +620,7 @@
 {"minecraft:potted_dark_oak_sapling", {BLOCK_OPAQUE, {61, 90, 30}}},
 {"minecraft:potted_dead_bush", {BLOCK_OPAQUE, {107, 78, 40}}},
 {"minecraft:potted_fern", {BLOCK_OPAQUE|BLOCK_GRASS, {124, 124, 124}}},
+{"minecraft:potted_flowering_azalea_bush", {BLOCK_OPAQUE, {112, 121, 64}}},
 {"minecraft:potted_jungle_sapling", {BLOCK_OPAQUE, {47, 81, 16}}},
 {"minecraft:potted_lily_of_the_valley", {BLOCK_OPAQUE, {123, 174, 95}}},
 {"minecraft:potted_oak_sapling", {BLOCK_OPAQUE, {77, 106, 40}}},
@@ -540,6 +635,8 @@
 {"minecraft:potted_warped_roots", {BLOCK_OPAQUE, {20, 136, 123}}},
 {"minecraft:potted_white_tulip", {BLOCK_OPAQUE, {93, 164, 71}}},
 {"minecraft:potted_wither_rose", {BLOCK_OPAQUE, {41, 44, 23}}},
+{"minecraft:powder_snow", {BLOCK_OPAQUE, {248, 253, 253}}},
+{"minecraft:powder_snow_cauldron", {BLOCK_OPAQUE, {73, 72, 74}}},
 {"minecraft:powered_rail", {BLOCK_OPAQUE, {137, 109, 74}}},
 {"minecraft:prismarine", {BLOCK_OPAQUE, {99, 156, 151}}},
 {"minecraft:prismarine_brick_slab", {BLOCK_OPAQUE, {99, 171, 158}}},
@@ -552,6 +649,8 @@
 {"minecraft:pumpkin_stem", {BLOCK_OPAQUE|BLOCK_GRASS, {154, 154, 154}}},
 {"minecraft:purple_banner", {0, {0, 0, 0}}},
 {"minecraft:purple_bed", {0, {0, 0, 0}}},
+{"minecraft:purple_candle", {0, {0, 0, 0}}},
+{"minecraft:purple_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:purple_carpet", {BLOCK_OPAQUE, {121, 42, 172}}},
 {"minecraft:purple_concrete", {BLOCK_OPAQUE, {100, 31, 156}}},
 {"minecraft:purple_concrete_powder", {BLOCK_OPAQUE, {131, 55, 177}}},
@@ -572,8 +671,13 @@
 {"minecraft:quartz_slab", {BLOCK_OPAQUE, {235, 229, 222}}},
 {"minecraft:quartz_stairs", {BLOCK_OPAQUE, {235, 229, 222}}},
 {"minecraft:rail", {BLOCK_OPAQUE, {125, 111, 88}}},
+{"minecraft:raw_copper_block", {BLOCK_OPAQUE, {154, 105, 79}}},
+{"minecraft:raw_gold_block", {BLOCK_OPAQUE, {221, 169, 46}}},
+{"minecraft:raw_iron_block", {BLOCK_OPAQUE, {166, 135, 107}}},
 {"minecraft:red_banner", {0, {0, 0, 0}}},
 {"minecraft:red_bed", {0, {0, 0, 0}}},
+{"minecraft:red_candle", {0, {0, 0, 0}}},
+{"minecraft:red_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:red_carpet", {BLOCK_OPAQUE, {160, 39, 34}}},
 {"minecraft:red_concrete", {BLOCK_OPAQUE, {142, 32, 32}}},
 {"minecraft:red_concrete_powder", {BLOCK_OPAQUE, {168, 54, 50}}},
@@ -598,13 +702,14 @@
 {"minecraft:red_wool", {BLOCK_OPAQUE, {160, 39, 34}}},
 {"minecraft:redstone_block", {BLOCK_OPAQUE, {175, 24, 5}}},
 {"minecraft:redstone_lamp", {BLOCK_OPAQUE, {95, 54, 30}}},
-{"minecraft:redstone_ore", {BLOCK_OPAQUE, {133, 107, 107}}},
+{"minecraft:redstone_ore", {BLOCK_OPAQUE, {140, 109, 109}}},
 {"minecraft:redstone_torch", {0, {0, 0, 0}}},
 {"minecraft:redstone_wall_torch", {0, {0, 0, 0}}},
 {"minecraft:redstone_wire", {BLOCK_OPAQUE, {175, 24, 5}}},
 {"minecraft:repeater", {BLOCK_OPAQUE, {160, 157, 156}}},
 {"minecraft:repeating_command_block", {BLOCK_OPAQUE, {129, 111, 176}}},
 {"minecraft:respawn_anchor", {BLOCK_OPAQUE, {75, 26, 144}}},
+{"minecraft:rooted_dirt", {BLOCK_OPAQUE, {144, 103, 76}}},
 {"minecraft:rose_bush", {BLOCK_OPAQUE, {131, 66, 37}}},
 {"minecraft:sand", {BLOCK_OPAQUE, {219, 207, 163}}},
 {"minecraft:sandstone", {BLOCK_OPAQUE, {223, 214, 170}}},
@@ -612,6 +717,7 @@
 {"minecraft:sandstone_stairs", {BLOCK_OPAQUE, {223, 214, 170}}},
 {"minecraft:sandstone_wall", {BLOCK_OPAQUE, {223, 214, 170}}},
 {"minecraft:scaffolding", {BLOCK_OPAQUE, {174, 134, 80}}},
+{"minecraft:sculk_sensor", {BLOCK_OPAQUE, {7, 70, 84}}},
 {"minecraft:sea_lantern", {BLOCK_OPAQUE, {172, 199, 190}}},
 {"minecraft:sea_pickle", {BLOCK_OPAQUE, {90, 97, 39}}},
 {"minecraft:seagrass", {0, {0, 0, 0}}},
@@ -621,8 +727,11 @@
 {"minecraft:skeleton_skull", {0, {0, 0, 0}}},
 {"minecraft:skeleton_wall_skull", {0, {0, 0, 0}}},
 {"minecraft:slime_block", {BLOCK_OPAQUE, {111, 192, 91}}},
+{"minecraft:small_amethyst_bud", {0, {0, 0, 0}}},
+{"minecraft:small_dripleaf", {0, {0, 0, 0}}},
 {"minecraft:smithing_table", {BLOCK_OPAQUE, {57, 58, 70}}},
-{"minecraft:smoker", {BLOCK_OPAQUE, {84, 82, 80}}},
+{"minecraft:smoker", {BLOCK_OPAQUE, {85, 83, 81}}},
+{"minecraft:smooth_basalt", {BLOCK_OPAQUE, {72, 72, 78}}},
 {"minecraft:smooth_quartz", {BLOCK_OPAQUE, {235, 229, 222}}},
 {"minecraft:smooth_quartz_slab", {BLOCK_OPAQUE, {235, 229, 222}}},
 {"minecraft:smooth_quartz_stairs", {BLOCK_OPAQUE, {235, 229, 222}}},
@@ -645,6 +754,7 @@
 {"minecraft:soul_wall_torch", {0, {0, 0, 0}}},
 {"minecraft:spawner", {BLOCK_OPAQUE, {36, 46, 62}}},
 {"minecraft:sponge", {BLOCK_OPAQUE, {195, 192, 74}}},
+{"minecraft:spore_blossom", {BLOCK_OPAQUE, {206, 96, 158}}},
 {"minecraft:spruce_button", {0, {0, 0, 0}}},
 {"minecraft:spruce_door", {BLOCK_OPAQUE, {106, 80, 48}}},
 {"minecraft:spruce_fence", {BLOCK_OPAQUE, {114, 84, 48}}},
@@ -696,6 +806,7 @@
 {"minecraft:tall_seagrass", {BLOCK_OPAQUE, {59, 139, 14}}},
 {"minecraft:target", {BLOCK_OPAQUE, {226, 170, 157}}},
 {"minecraft:terracotta", {BLOCK_OPAQUE, {152, 94, 67}}},
+{"minecraft:tinted_glass", {BLOCK_OPAQUE, {44, 38, 46}}},
 {"minecraft:tnt", {BLOCK_OPAQUE, {142, 62, 53}}},
 {"minecraft:torch", {0, {0, 0, 0}}},
 {"minecraft:trapped_chest", {BLOCK_OPAQUE, {162, 130, 78}}},
@@ -705,6 +816,7 @@
 {"minecraft:tube_coral_block", {BLOCK_OPAQUE, {49, 87, 206}}},
 {"minecraft:tube_coral_fan", {0, {0, 0, 0}}},
 {"minecraft:tube_coral_wall_fan", {0, {0, 0, 0}}},
+{"minecraft:tuff", {BLOCK_OPAQUE, {108, 109, 102}}},
 {"minecraft:turtle_egg", {BLOCK_OPAQUE, {228, 226, 191}}},
 {"minecraft:twisting_vines", {BLOCK_OPAQUE, {20, 143, 124}}},
 {"minecraft:twisting_vines_plant", {BLOCK_OPAQUE, {20, 135, 122}}},
@@ -730,12 +842,35 @@
 {"minecraft:warped_wall_sign", {0, {0, 0, 0}}},
 {"minecraft:warped_wart_block", {BLOCK_OPAQUE, {22, 119, 121}}},
 {"minecraft:water", {BLOCK_OPAQUE|BLOCK_WATER, {177, 177, 177}}},
+{"minecraft:water_cauldron", {BLOCK_OPAQUE, {73, 72, 74}}},
+{"minecraft:waxed_copper_block", {BLOCK_OPAQUE, {192, 107, 79}}},
+{"minecraft:waxed_cut_copper", {BLOCK_OPAQUE, {191, 106, 80}}},
+{"minecraft:waxed_cut_copper_slab", {BLOCK_OPAQUE, {191, 106, 80}}},
+{"minecraft:waxed_cut_copper_stairs", {BLOCK_OPAQUE, {191, 106, 80}}},
+{"minecraft:waxed_exposed_copper", {BLOCK_OPAQUE, {161, 125, 103}}},
+{"minecraft:waxed_exposed_cut_copper", {BLOCK_OPAQUE, {154, 121, 101}}},
+{"minecraft:waxed_exposed_cut_copper_slab", {BLOCK_OPAQUE, {154, 121, 101}}},
+{"minecraft:waxed_exposed_cut_copper_stairs", {BLOCK_OPAQUE, {154, 121, 101}}},
+{"minecraft:waxed_oxidized_copper", {BLOCK_OPAQUE, {82, 162, 132}}},
+{"minecraft:waxed_oxidized_cut_copper", {BLOCK_OPAQUE, {79, 153, 126}}},
+{"minecraft:waxed_oxidized_cut_copper_slab", {BLOCK_OPAQUE, {79, 153, 126}}},
+{"minecraft:waxed_oxidized_cut_copper_stairs", {BLOCK_OPAQUE, {79, 153, 126}}},
+{"minecraft:waxed_weathered_copper", {BLOCK_OPAQUE, {108, 153, 110}}},
+{"minecraft:waxed_weathered_cut_copper", {BLOCK_OPAQUE, {109, 145, 107}}},
+{"minecraft:waxed_weathered_cut_copper_slab", {BLOCK_OPAQUE, {109, 145, 107}}},
+{"minecraft:waxed_weathered_cut_copper_stairs", {BLOCK_OPAQUE, {109, 145, 107}}},
+{"minecraft:weathered_copper", {BLOCK_OPAQUE, {108, 153, 110}}},
+{"minecraft:weathered_cut_copper", {BLOCK_OPAQUE, {109, 145, 107}}},
+{"minecraft:weathered_cut_copper_slab", {BLOCK_OPAQUE, {109, 145, 107}}},
+{"minecraft:weathered_cut_copper_stairs", {BLOCK_OPAQUE, {109, 145, 107}}},
 {"minecraft:weeping_vines", {BLOCK_OPAQUE, {104, 1, 0}}},
 {"minecraft:weeping_vines_plant", {BLOCK_OPAQUE, {132, 16, 12}}},
 {"minecraft:wet_sponge", {BLOCK_OPAQUE, {171, 181, 70}}},
 {"minecraft:wheat", {BLOCK_OPAQUE, {166, 151, 73}}},
 {"minecraft:white_banner", {0, {0, 0, 0}}},
 {"minecraft:white_bed", {0, {0, 0, 0}}},
+{"minecraft:white_candle", {0, {0, 0, 0}}},
+{"minecraft:white_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:white_carpet", {BLOCK_OPAQUE, {233, 236, 236}}},
 {"minecraft:white_concrete", {BLOCK_OPAQUE, {207, 213, 214}}},
 {"minecraft:white_concrete_powder", {BLOCK_OPAQUE, {225, 227, 227}}},
@@ -752,6 +887,8 @@
 {"minecraft:wither_skeleton_wall_skull", {0, {0, 0, 0}}},
 {"minecraft:yellow_banner", {0, {0, 0, 0}}},
 {"minecraft:yellow_bed", {0, {0, 0, 0}}},
+{"minecraft:yellow_candle", {0, {0, 0, 0}}},
+{"minecraft:yellow_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
 {"minecraft:yellow_carpet", {BLOCK_OPAQUE, {248, 197, 39}}},
 {"minecraft:yellow_concrete", {BLOCK_OPAQUE, {240, 175, 21}}},
 {"minecraft:yellow_concrete_powder", {BLOCK_OPAQUE, {232, 199, 54}}},

From af1afc33155369e311726bff00014c013d11af64 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 24 Jun 2021 00:12:27 +0200
Subject: [PATCH 011/460] Biome: add Dripstone Caves and Lush Caves

Temperature and downfall values were taken from the Caves & Cliffs: Part II
Preview datapack.
---
 src/Resource/Biome.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Resource/Biome.cpp b/src/Resource/Biome.cpp
index 440b1d4..65f4831 100644
--- a/src/Resource/Biome.cpp
+++ b/src/Resource/Biome.cpp
@@ -342,6 +342,8 @@ const Biome *const BIOMES[256] = {
 	/* 171 */ &BiomeDesert, /* Crimson Forest */
 	/* 172 */ &BiomeDesert, /* Warped Forest */
 	/* 173 */ &BiomeDesert, /* Basalt Deltas */
+	/* 174 */ &BiomePlains, /* Dripstone Caves */
+	/* 175 */ &BiomeDefault, /* Lush Caves */
 };
 
 }

From 73e5c12cdee73a15d3e005791bd833a1e6488065 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 25 Jun 2021 19:43:14 +0200
Subject: [PATCH 012/460] Rename .inc files to .inc.cpp for better language
 detection by editors and Github

---
 resource/README.md                                            | 4 ++--
 resource/generate.py                                          | 2 +-
 src/Resource/BlockType.cpp                                    | 4 ++--
 src/Resource/{BlockType.inc => BlockType.inc.cpp}             | 0
 src/Resource/{LegacyBlockType.inc => LegacyBlockType.inc.cpp} | 0
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename src/Resource/{BlockType.inc => BlockType.inc.cpp} (100%)
 rename src/Resource/{LegacyBlockType.inc => LegacyBlockType.inc.cpp} (100%)

diff --git a/resource/README.md b/resource/README.md
index ed35118..f9dc955 100644
--- a/resource/README.md
+++ b/resource/README.md
@@ -10,7 +10,7 @@ work.
   of two different versions
 - `extract.py`: Takes the block type information from `blocks.json` and texture data
   from an unpacked Minecraft JAR, storing the result in `colors.json`
-- `generate.py`: Generates `BlockType.inc` from `colors.json`
+- `generate.py`: Generates `BlockType.inc.cpp` from `colors.json`
 
 In addition to these scripts, the JSON processor *jq* is a useful tool to work
 with MinedMap's resource metadata.
@@ -63,7 +63,7 @@ with MinedMap's resource metadata.
 7. Update the source code with the new block colors:
 
      ```sh
-     ./generate.py colors.json ../src/Resource/BlockType.inc
+     ./generate.py colors.json ../src/Resource/BlockType.inc.cpp
      ```
 
 After the update, the new version should be tested with old savegames (both
diff --git a/resource/generate.py b/resource/generate.py
index 8508c6b..de1f828 100755
--- a/resource/generate.py
+++ b/resource/generate.py
@@ -6,7 +6,7 @@ import sys
 
 
 if len(sys.argv) != 3:
-	sys.exit('Usage: extract.py <colors.json> <BlockType.inc>')
+	sys.exit('Usage: extract.py <colors.json> <BlockType.inc.cpp>')
 
 with open(sys.argv[1]) as f:
 	colors = json.load(f)
diff --git a/src/Resource/BlockType.cpp b/src/Resource/BlockType.cpp
index e72456e..8e04c58 100644
--- a/src/Resource/BlockType.cpp
+++ b/src/Resource/BlockType.cpp
@@ -32,7 +32,7 @@ namespace Resource {
 
 const std::unordered_map<std::string, BlockType> BlockType::Types = {
 
-#include "BlockType.inc"
+#include "BlockType.inc.cpp"
 
 };
 
@@ -51,7 +51,7 @@ static constexpr LegacyBlockType simple(const char *t) {
 
 static const LegacyBlockType LEGACY_BLOCK_TYPE_DATA[256] = {
 
-#include "LegacyBlockType.inc"
+#include "LegacyBlockType.inc.cpp"
 
 };
 
diff --git a/src/Resource/BlockType.inc b/src/Resource/BlockType.inc.cpp
similarity index 100%
rename from src/Resource/BlockType.inc
rename to src/Resource/BlockType.inc.cpp
diff --git a/src/Resource/LegacyBlockType.inc b/src/Resource/LegacyBlockType.inc.cpp
similarity index 100%
rename from src/Resource/LegacyBlockType.inc
rename to src/Resource/LegacyBlockType.inc.cpp

From 5263538a29c9c6030ced078a509dff48f9c4451f Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 26 Jun 2021 16:43:06 +0200
Subject: [PATCH 013/460] README.md: add 1.17 support

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a2c2daa..2fb8452 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 * Render beautiful maps of your [Minecraft](https://minecraft.net/) worlds!
 * Put them on a webserver and view them in your browser!
-* Compatible with unmodified Minecraft Java Edition 1.8 up to 1.16 (no mod installation necessary!)
+* Compatible with unmodified Minecraft Java Edition 1.8 up to 1.17 (no mod installation necessary!)
 * Illumination layer: the world at night
 * Fast: create a full map for a huge 3GB savegame in less than 5 minutes
 * Incremental updates: only recreate map tiles for regions that have changed

From fdce587c74228f80b214121515baa2540d836f53 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 24 Aug 2021 13:07:31 +0200
Subject: [PATCH 014/460] build: update to modern CMake, use pkg-config for
 zlib and libpng

Starting with CMake 3.7, we can avoid dealing with individual variables
for include dirs, libraries, ... for dependencies found using
pkg-config, and instead just reference them using an imported target.
---
 CMakeLists.txt     |  8 ++++----
 src/CMakeLists.txt | 12 ++++--------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 362fa58..70385e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,9 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.7)
 project(MINEDMAP CXX)
 
+find_package(PkgConfig REQUIRED)
 
-find_package(PNG REQUIRED)
-find_package(ZLIB REQUIRED)
-
+pkg_check_modules(ZLIB REQUIRED IMPORTED_TARGET zlib)
+pkg_check_modules(PNG REQUIRED IMPORTED_TARGET libpng16)
 
 add_subdirectory(src)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1eea2b3..0e4fd48 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,4 @@
-include_directories(${ZLIB_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS})
-add_definitions(${PNG_DEFINITIONS})
+add_compile_options(-std=c++11 -Wall)
 
 add_executable(MinedMap
   MinedMap.cpp
@@ -16,16 +15,14 @@ add_executable(MinedMap
   World/Region.cpp
   World/Section.cpp
 )
-set_target_properties(MinedMap PROPERTIES COMPILE_FLAGS "-std=c++11 -Wall")
-target_link_libraries(MinedMap ${ZLIB_LIBRARIES} ${PNG_LIBRARIES})
+target_link_libraries(MinedMap PkgConfig::ZLIB PkgConfig::PNG)
 
 add_executable(nbtdump
   nbtdump.cpp
   GZip.cpp
   NBT/Tag.cpp
 )
-set_target_properties(nbtdump PROPERTIES COMPILE_FLAGS "-std=c++11 -Wall")
-target_link_libraries(nbtdump ${ZLIB_LIBRARIES})
+target_link_libraries(nbtdump PkgConfig::ZLIB)
 
 add_executable(regiondump
   regiondump.cpp
@@ -34,7 +31,6 @@ add_executable(regiondump
   World/ChunkData.cpp
   World/Region.cpp
 )
-set_target_properties(regiondump PROPERTIES COMPILE_FLAGS "-std=c++11 -Wall")
-target_link_libraries(regiondump ${ZLIB_LIBRARIES})
+target_link_libraries(regiondump PkgConfig::ZLIB)
 
 install(TARGETS MinedMap RUNTIME DESTINATION bin)

From 38d8bd07386cb415cbe23d2fe56ed8be38cf4c53 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 24 Aug 2021 21:03:18 +0200
Subject: [PATCH 015/460] Chunk: replace withDepth argument with extensible
 flags field

---
 src/MinedMap.cpp    |  4 ++--
 src/World/Chunk.cpp | 10 +++++-----
 src/World/Chunk.hpp |  7 +++++--
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/MinedMap.cpp b/src/MinedMap.cpp
index 4855b6f..a361ab0 100644
--- a/src/MinedMap.cpp
+++ b/src/MinedMap.cpp
@@ -56,7 +56,7 @@ static const size_t DIM = World::Region::SIZE*World::Chunk::SIZE;
 
 static void addChunkBiome(uint8_t biomemap[DIM*DIM], size_t X, size_t Z, const World::ChunkData *data) {
 	World::Chunk chunk(data);
-	World::Chunk::Heightmap layer = chunk.getTopLayer(false);
+	World::Chunk::Heightmap layer = chunk.getTopLayer(0);
 
 	for (size_t x = 0; x < World::Chunk::SIZE; x++) {
 		for (size_t z = 0; z < World::Chunk::SIZE; z++) {
@@ -127,7 +127,7 @@ static void addChunk(Resource::Color image[DIM*DIM], uint8_t lightmap[2*DIM*DIM]
 	const World::ChunkData *data, const std::unique_ptr<uint8_t[]> biomemaps[3][3]
 ) {
 	World::Chunk chunk(data);
-	World::Chunk::Heightmap layer = chunk.getTopLayer(true);
+	World::Chunk::Heightmap layer = chunk.getTopLayer(World::Chunk::WITH_DEPTH);
 
 	for (size_t x = 0; x < World::Chunk::SIZE; x++) {
 		for (size_t z = 0; z < World::Chunk::SIZE; z++) {
diff --git a/src/World/Chunk.cpp b/src/World/Chunk.cpp
index 423d7e8..e428892 100644
--- a/src/World/Chunk.cpp
+++ b/src/World/Chunk.cpp
@@ -101,11 +101,11 @@ Block Chunk::getBlock(size_t x, Chunk::Height height, size_t z) const {
 	return block;
 }
 
-bool Chunk::getHeight(Chunk::Height *height, const Section *section, size_t x, size_t y, size_t z, bool withDepth) const {
+bool Chunk::getHeight(Chunk::Height *height, const Section *section, size_t x, size_t y, size_t z, int flags) const {
 	if (height->depth > 0)
 		return false;
 
-	if (!withDepth && height->y > 0)
+	if (!(flags & WITH_DEPTH) && height->y > 0)
 		return false;
 
 	const Resource::BlockType *type = section->getBlockStateAt(x, y, z);
@@ -115,7 +115,7 @@ bool Chunk::getHeight(Chunk::Height *height, const Section *section, size_t x, s
 	if (height->y == 0)
 		height->y = SIZE*section->getY() + y;
 
-	if (!withDepth)
+	if (!(flags & WITH_DEPTH))
 		return true;
 
 	if (type->flags & BLOCK_WATER)
@@ -126,7 +126,7 @@ bool Chunk::getHeight(Chunk::Height *height, const Section *section, size_t x, s
 	return true;
 }
 
-Chunk::Heightmap Chunk::getTopLayer(bool withDepth) const {
+Chunk::Heightmap Chunk::getTopLayer(int flags) const {
 	size_t done = 0;
 	Heightmap ret = {};
 
@@ -145,7 +145,7 @@ Chunk::Heightmap Chunk::getTopLayer(bool withDepth) const {
 
 			for (size_t z = 0; z < SIZE; z++) {
 				for (size_t x = 0; x < SIZE; x++) {
-					if (getHeight(&ret.v[x][z], section, x, y, z, withDepth))
+					if (getHeight(&ret.v[x][z], section, x, y, z, flags))
 						done++;
 				}
 			}
diff --git a/src/World/Chunk.hpp b/src/World/Chunk.hpp
index ccbba54..bcffa1e 100644
--- a/src/World/Chunk.hpp
+++ b/src/World/Chunk.hpp
@@ -50,6 +50,9 @@ public:
 	static const size_t BSIZE = SIZE / BGROUP;
 	static const size_t BMAXY = MAXY / BGROUP;
 
+	// Flags
+	static const int WITH_DEPTH = (1 << 0);
+
 	struct Height {
 		unsigned y;
 		unsigned depth;
@@ -67,7 +70,7 @@ private:
 	std::shared_ptr<const NBT::IntArrayTag> biomeIntsPre115;
 	std::shared_ptr<const NBT::IntArrayTag> biomeInts;
 
-	bool getHeight(Height *height, const Section *section, size_t x, size_t y, size_t z, bool withDepth) const;
+	bool getHeight(Height *height, const Section *section, size_t x, size_t y, size_t z, int flags) const;
 
 	const Resource::BlockType * getBlockStateAt(size_t x, size_t y, size_t z) const {
 		size_t Y = y / SIZE;
@@ -89,7 +92,7 @@ public:
 	uint8_t getBiome(size_t x, size_t y, size_t z) const;
 	Block getBlock(size_t x, Height y, size_t z) const;
 
-	Heightmap getTopLayer(bool withDepth) const;
+	Heightmap getTopLayer(int flags) const;
 };
 
 }

From fd4773c8cac7fc3e86983211ef9676f5162b593b Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 17 Nov 2021 12:07:56 +0100
Subject: [PATCH 016/460] treewide: replace license headers with
 SPDX-License-Identifier

---
 src/Buffer.hpp             | 21 +--------------------
 src/GZip.cpp               | 21 +--------------------
 src/GZip.hpp               | 21 +--------------------
 src/Info.cpp               | 21 +--------------------
 src/Info.hpp               | 21 +--------------------
 src/MinedMap.cpp           | 21 +--------------------
 src/NBT/ByteArrayTag.hpp   | 21 +--------------------
 src/NBT/ByteTag.hpp        | 21 +--------------------
 src/NBT/CompoundTag.hpp    | 21 +--------------------
 src/NBT/DoubleTag.hpp      | 21 +--------------------
 src/NBT/EndTag.hpp         | 21 +--------------------
 src/NBT/FloatTag.hpp       | 21 +--------------------
 src/NBT/IntArrayTag.hpp    | 21 +--------------------
 src/NBT/IntTag.hpp         | 21 +--------------------
 src/NBT/ListTag.hpp        | 21 +--------------------
 src/NBT/LongArrayTag.hpp   | 21 +--------------------
 src/NBT/LongTag.hpp        | 21 +--------------------
 src/NBT/ShortTag.hpp       | 21 +--------------------
 src/NBT/StringTag.hpp      | 21 +--------------------
 src/NBT/Tag.cpp            | 21 +--------------------
 src/NBT/Tag.hpp            | 21 +--------------------
 src/PNG.cpp                | 21 +--------------------
 src/PNG.hpp                | 21 +--------------------
 src/Resource/Biome.cpp     | 21 +--------------------
 src/Resource/Biome.hpp     | 21 +--------------------
 src/Resource/BlockType.cpp | 21 +--------------------
 src/Resource/BlockType.hpp | 21 +--------------------
 src/Resource/Color.hpp     | 21 +--------------------
 src/UniqueCPtr.hpp         | 21 +--------------------
 src/Util.hpp               | 21 +--------------------
 src/World/Block.hpp        | 21 +--------------------
 src/World/Chunk.cpp        | 21 +--------------------
 src/World/Chunk.hpp        | 21 +--------------------
 src/World/ChunkData.cpp    | 21 +--------------------
 src/World/ChunkData.hpp    | 21 +--------------------
 src/World/Level.cpp        | 21 +--------------------
 src/World/Level.hpp        | 21 +--------------------
 src/World/Region.cpp       | 21 +--------------------
 src/World/Region.hpp       | 21 +--------------------
 src/World/Section.cpp      | 21 +--------------------
 src/World/Section.hpp      | 21 +--------------------
 src/nbtdump.cpp            | 21 +--------------------
 src/regiondump.cpp         | 23 ++---------------------
 43 files changed, 44 insertions(+), 861 deletions(-)

diff --git a/src/Buffer.hpp b/src/Buffer.hpp
index 9975dcb..89d4649 100644
--- a/src/Buffer.hpp
+++ b/src/Buffer.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/GZip.cpp b/src/GZip.cpp
index 0005923..28f4737 100644
--- a/src/GZip.cpp
+++ b/src/GZip.cpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/GZip.hpp b/src/GZip.hpp
index 8505039..8449758 100644
--- a/src/GZip.hpp
+++ b/src/GZip.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/Info.cpp b/src/Info.cpp
index 9d9d751..48bbb45 100644
--- a/src/Info.cpp
+++ b/src/Info.cpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/Info.hpp b/src/Info.hpp
index 24f0c0e..4ab7dd3 100644
--- a/src/Info.hpp
+++ b/src/Info.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/MinedMap.cpp b/src/MinedMap.cpp
index a361ab0..5318f33 100644
--- a/src/MinedMap.cpp
+++ b/src/MinedMap.cpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/NBT/ByteArrayTag.hpp b/src/NBT/ByteArrayTag.hpp
index 95e9ddb..9c73647 100644
--- a/src/NBT/ByteArrayTag.hpp
+++ b/src/NBT/ByteArrayTag.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/NBT/ByteTag.hpp b/src/NBT/ByteTag.hpp
index c578b9c..7d3fff5 100644
--- a/src/NBT/ByteTag.hpp
+++ b/src/NBT/ByteTag.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/NBT/CompoundTag.hpp b/src/NBT/CompoundTag.hpp
index 2d3fcbe..b1e7521 100644
--- a/src/NBT/CompoundTag.hpp
+++ b/src/NBT/CompoundTag.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/NBT/DoubleTag.hpp b/src/NBT/DoubleTag.hpp
index b83efe2..a28c38a 100644
--- a/src/NBT/DoubleTag.hpp
+++ b/src/NBT/DoubleTag.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/NBT/EndTag.hpp b/src/NBT/EndTag.hpp
index 167412a..859d77a 100644
--- a/src/NBT/EndTag.hpp
+++ b/src/NBT/EndTag.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/NBT/FloatTag.hpp b/src/NBT/FloatTag.hpp
index 8748bc6..637c74b 100644
--- a/src/NBT/FloatTag.hpp
+++ b/src/NBT/FloatTag.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/NBT/IntArrayTag.hpp b/src/NBT/IntArrayTag.hpp
index 4dfcd05..cc24665 100644
--- a/src/NBT/IntArrayTag.hpp
+++ b/src/NBT/IntArrayTag.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/NBT/IntTag.hpp b/src/NBT/IntTag.hpp
index e6babd0..b2c2660 100644
--- a/src/NBT/IntTag.hpp
+++ b/src/NBT/IntTag.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/NBT/ListTag.hpp b/src/NBT/ListTag.hpp
index 7276923..6582098 100644
--- a/src/NBT/ListTag.hpp
+++ b/src/NBT/ListTag.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/NBT/LongArrayTag.hpp b/src/NBT/LongArrayTag.hpp
index 2e24d5a..2e54762 100644
--- a/src/NBT/LongArrayTag.hpp
+++ b/src/NBT/LongArrayTag.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015-2018, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/NBT/LongTag.hpp b/src/NBT/LongTag.hpp
index 05f6bc2..450f6b4 100644
--- a/src/NBT/LongTag.hpp
+++ b/src/NBT/LongTag.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/NBT/ShortTag.hpp b/src/NBT/ShortTag.hpp
index 593a1ed..32f32a2 100644
--- a/src/NBT/ShortTag.hpp
+++ b/src/NBT/ShortTag.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/NBT/StringTag.hpp b/src/NBT/StringTag.hpp
index 6fb2b41..40c5bfb 100644
--- a/src/NBT/StringTag.hpp
+++ b/src/NBT/StringTag.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/NBT/Tag.cpp b/src/NBT/Tag.cpp
index e8c429f..57dd395 100644
--- a/src/NBT/Tag.cpp
+++ b/src/NBT/Tag.cpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/NBT/Tag.hpp b/src/NBT/Tag.hpp
index 3fb824b..98c0ae2 100644
--- a/src/NBT/Tag.hpp
+++ b/src/NBT/Tag.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/PNG.cpp b/src/PNG.cpp
index 4e12608..5c2c098 100644
--- a/src/PNG.cpp
+++ b/src/PNG.cpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/PNG.hpp b/src/PNG.hpp
index b1a66dd..fdd2dc0 100644
--- a/src/PNG.hpp
+++ b/src/PNG.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/Resource/Biome.cpp b/src/Resource/Biome.cpp
index 65f4831..8384456 100644
--- a/src/Resource/Biome.cpp
+++ b/src/Resource/Biome.cpp
@@ -1,27 +1,8 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, 2018, Matthias Schiffer <mschiffer@universe-factory.net>
   Copyright (c) 2019, Roman Shishkin <spark@uwtech.org>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/Resource/Biome.hpp b/src/Resource/Biome.hpp
index e094f17..5583e08 100644
--- a/src/Resource/Biome.hpp
+++ b/src/Resource/Biome.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/Resource/BlockType.cpp b/src/Resource/BlockType.cpp
index 8e04c58..cc76cff 100644
--- a/src/Resource/BlockType.cpp
+++ b/src/Resource/BlockType.cpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015-2018, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/Resource/BlockType.hpp b/src/Resource/BlockType.hpp
index a551830..6861448 100644
--- a/src/Resource/BlockType.hpp
+++ b/src/Resource/BlockType.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/Resource/Color.hpp b/src/Resource/Color.hpp
index bad2df6..255db1b 100644
--- a/src/Resource/Color.hpp
+++ b/src/Resource/Color.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2018, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/UniqueCPtr.hpp b/src/UniqueCPtr.hpp
index 9e70b89..647f7e1 100644
--- a/src/UniqueCPtr.hpp
+++ b/src/UniqueCPtr.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/Util.hpp b/src/Util.hpp
index 68a83b1..e76fd6d 100644
--- a/src/Util.hpp
+++ b/src/Util.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/World/Block.hpp b/src/World/Block.hpp
index 30ed186..75a949d 100644
--- a/src/World/Block.hpp
+++ b/src/World/Block.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/World/Chunk.cpp b/src/World/Chunk.cpp
index e428892..4d77c10 100644
--- a/src/World/Chunk.cpp
+++ b/src/World/Chunk.cpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015-2019, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/World/Chunk.hpp b/src/World/Chunk.hpp
index bcffa1e..57fe314 100644
--- a/src/World/Chunk.hpp
+++ b/src/World/Chunk.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015-2018, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/World/ChunkData.cpp b/src/World/ChunkData.cpp
index 6cb73b5..972ee5e 100644
--- a/src/World/ChunkData.cpp
+++ b/src/World/ChunkData.cpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015-2018, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/World/ChunkData.hpp b/src/World/ChunkData.hpp
index 5fe27c9..cb27f7b 100644
--- a/src/World/ChunkData.hpp
+++ b/src/World/ChunkData.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015-2018, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/World/Level.cpp b/src/World/Level.cpp
index 56628b9..ec7d25a 100644
--- a/src/World/Level.cpp
+++ b/src/World/Level.cpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/World/Level.hpp b/src/World/Level.hpp
index 6fd45a8..dd40513 100644
--- a/src/World/Level.hpp
+++ b/src/World/Level.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/World/Region.cpp b/src/World/Region.cpp
index a813247..65ee913 100644
--- a/src/World/Region.cpp
+++ b/src/World/Region.cpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/World/Region.hpp b/src/World/Region.hpp
index 00bfd7b..7681bbc 100644
--- a/src/World/Region.hpp
+++ b/src/World/Region.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/World/Section.cpp b/src/World/Section.cpp
index 23b0ebf..dbf633f 100644
--- a/src/World/Section.cpp
+++ b/src/World/Section.cpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015-2019, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/World/Section.hpp b/src/World/Section.hpp
index 7e90acb..0791c26 100644
--- a/src/World/Section.hpp
+++ b/src/World/Section.hpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2015-2019, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/nbtdump.cpp b/src/nbtdump.cpp
index b364f41..d47b15e 100644
--- a/src/nbtdump.cpp
+++ b/src/nbtdump.cpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2018, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
diff --git a/src/regiondump.cpp b/src/regiondump.cpp
index 52ea31c..8e3deb4 100644
--- a/src/regiondump.cpp
+++ b/src/regiondump.cpp
@@ -1,26 +1,7 @@
+// SPDX-License-Identifier: BSD-2-Clause
 /*
   Copyright (c) 2018, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 
@@ -48,4 +29,4 @@ int main(int argc, char *argv[]) {
 	});
 
 	return 0;
-}
\ No newline at end of file
+}

From d4be401bcdb92b9a8a1a4878f62e0511515fdc65 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 11 Dec 2021 22:28:22 +0100
Subject: [PATCH 017/460] Resource: Biome: fix integer underflow

Explicitly cast height value to signed integer to fix incorrect biome color
values below a height of 64.
---
 src/Resource/Biome.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Resource/Biome.cpp b/src/Resource/Biome.cpp
index 8384456..c9e928b 100644
--- a/src/Resource/Biome.cpp
+++ b/src/Resource/Biome.cpp
@@ -49,7 +49,7 @@ FloatColor Biome::getBlockColor(const BlockType *type, unsigned height) const {
 		float(type->color.b),
 	};
 
-	float t = clamp(temp - std::max(0.0f, (height-64)/600.0f), 0, 1);
+	float t = clamp(temp - std::max(0.0f, (int(height)-64)/600.0f), 0, 1);
 	float r = clamp(rain, 0, 1) * t;
 
 	if (type->flags & BLOCK_GRASS)

From 457e993c92327d1c5ba81b653ee4e819ecc48902 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 17 Nov 2021 12:25:26 +0100
Subject: [PATCH 018/460] Introduce separate types for block/section/chunk
 indices

Newtypes are cumbersome in C++, so this is mostly documentation for now.

Also replace lots of questionable uses of size_t with int or types with
explicit width and add a few comments for constants.
---
 LICENSE                |  2 +-
 src/MinedMap.cpp       | 51 ++++++++++++++++++++++--------------------
 src/Resource/Biome.cpp |  5 ++---
 src/Resource/Biome.hpp |  5 +++--
 src/Util.hpp           | 15 ++++++++++++-
 src/World/Block.hpp    |  4 ++--
 src/World/Chunk.cpp    | 31 +++++++++++++------------
 src/World/Chunk.hpp    | 35 ++++++++++++++++++-----------
 src/World/Region.cpp   | 15 +++++++------
 src/World/Region.hpp   | 11 ++++-----
 src/World/Section.cpp  | 11 +++++----
 src/World/Section.hpp  | 26 +++++++++++----------
 src/regiondump.cpp     |  4 ++--
 13 files changed, 123 insertions(+), 92 deletions(-)

diff --git a/LICENSE b/LICENSE
index 0372923..e243464 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2015-2019, Matthias Schiffer <mschiffer@universe-factory.net>
+Copyright (c) 2015-2021, Matthias Schiffer <mschiffer@universe-factory.net>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/src/MinedMap.cpp b/src/MinedMap.cpp
index 5318f33..6c55851 100644
--- a/src/MinedMap.cpp
+++ b/src/MinedMap.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-2-Clause
 /*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
+  Copyright (c) 2015-2021, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
 */
 
@@ -32,15 +32,15 @@
 namespace MinedMap {
 
 static const int BIOME_SMOOTH = 3;
-static const size_t DIM = World::Region::SIZE*World::Chunk::SIZE;
+static const uint32_t DIM = World::Region::SIZE*World::Chunk::SIZE;
 
 
-static void addChunkBiome(uint8_t biomemap[DIM*DIM], size_t X, size_t Z, const World::ChunkData *data) {
+static void addChunkBiome(uint8_t biomemap[DIM*DIM], chunk_idx_t X, chunk_idx_t Z, const World::ChunkData *data) {
 	World::Chunk chunk(data);
 	World::Chunk::Heightmap layer = chunk.getTopLayer(0);
 
-	for (size_t x = 0; x < World::Chunk::SIZE; x++) {
-		for (size_t z = 0; z < World::Chunk::SIZE; z++) {
+	for (block_idx_t x = 0; x < World::Chunk::SIZE; x++) {
+		for (block_idx_t z = 0; z < World::Chunk::SIZE; z++) {
 			size_t i = (Z*World::Chunk::SIZE+z)*DIM + X*World::Chunk::SIZE+x;
 			const World::Chunk::Height &height = layer.v[x][z];
 			biomemap[i] = chunk.getBiome(x, height.y, z);
@@ -48,20 +48,20 @@ static void addChunkBiome(uint8_t biomemap[DIM*DIM], size_t X, size_t Z, const W
 	}
 }
 
-static uint8_t biomeAt(ssize_t x, ssize_t z, const std::unique_ptr<uint8_t[]> biomemaps[3][3]) {
+static uint8_t biomeAt(int16_t x, int16_t z, const std::unique_ptr<uint8_t[]> biomemaps[3][3]) {
 	size_t a = 1, b = 1;
 
 	if (x < 0) {
 		a--;
 		x += DIM;
-	} else if (x >= (ssize_t)DIM) {
+	} else if (x >= (int32_t)DIM) {
 		a++;
 		x -= DIM;
 	}
 	if (z < 0) {
 		b--;
 		z += DIM;
-	} else if (z >= (ssize_t)DIM) {
+	} else if (z >= (int32_t)DIM) {
 		b++;
 		z -= DIM;
 	}
@@ -69,10 +69,13 @@ static uint8_t biomeAt(ssize_t x, ssize_t z, const std::unique_ptr<uint8_t[]> bi
 	return biomemaps[a][b].get()[z*DIM + x];
 }
 
-static Resource::Color collectColors(size_t x, size_t z, const World::Block &block, const std::unique_ptr<uint8_t[]> biomemaps[3][3]) {
-	std::unordered_map<uint8_t, size_t> biomes;
-	for (int dx = -BIOME_SMOOTH; dx <= BIOME_SMOOTH; dx++) {
-		for (int dz = -BIOME_SMOOTH; dz <= BIOME_SMOOTH; dz++) {
+static Resource::Color collectColors(
+	region_block_idx_t x, region_block_idx_t z,
+	const World::Block &block, const std::unique_ptr<uint8_t[]> biomemaps[3][3]
+) {
+	std::unordered_map<uint8_t, unsigned> biomes;
+	for (int16_t dx = -BIOME_SMOOTH; dx <= BIOME_SMOOTH; dx++) {
+		for (int16_t dz = -BIOME_SMOOTH; dz <= BIOME_SMOOTH; dz++) {
 			if (std::abs(dx) + std::abs(dz) > BIOME_SMOOTH)
 				continue;
 
@@ -85,11 +88,11 @@ static Resource::Color collectColors(size_t x, size_t z, const World::Block &blo
 	}
 
 	Resource::FloatColor c = {};
-	size_t total = 0;
+	unsigned total = 0;
 
 	for (const auto &e : biomes) {
 		uint8_t biome = e.first;
-		size_t count = e.second;
+		unsigned count = e.second;
 
 		if (biome == 0xff)
 			continue;
@@ -104,14 +107,14 @@ static Resource::Color collectColors(size_t x, size_t z, const World::Block &blo
 	return (1.0f / total) * c;
 }
 
-static void addChunk(Resource::Color image[DIM*DIM], uint8_t lightmap[2*DIM*DIM], size_t X, size_t Z,
+static void addChunk(Resource::Color image[DIM*DIM], uint8_t lightmap[2*DIM*DIM], chunk_idx_t X, chunk_idx_t Z,
 	const World::ChunkData *data, const std::unique_ptr<uint8_t[]> biomemaps[3][3]
 ) {
 	World::Chunk chunk(data);
 	World::Chunk::Heightmap layer = chunk.getTopLayer(World::Chunk::WITH_DEPTH);
 
-	for (size_t x = 0; x < World::Chunk::SIZE; x++) {
-		for (size_t z = 0; z < World::Chunk::SIZE; z++) {
+	for (block_idx_t x = 0; x < World::Chunk::SIZE; x++) {
+		for (block_idx_t z = 0; z < World::Chunk::SIZE; z++) {
 			size_t i = (Z*World::Chunk::SIZE+z)*DIM + X*World::Chunk::SIZE+x;
 			const World::Chunk::Height &height = layer.v[x][z];
 			World::Block block = chunk.getBlock(x, height, z);
@@ -261,7 +264,7 @@ static void makeBiome(const std::string &regiondir, const std::string &outputdir
 		std::unique_ptr<uint8_t[]> biomemap(new uint8_t[DIM*DIM]);
 		std::memset(biomemap.get(), 0xff, DIM*DIM);
 
-		World::Region::visitChunks(input.c_str(), [&] (size_t X, size_t Z, const World::ChunkData *chunk) {
+		World::Region::visitChunks(input.c_str(), [&] (chunk_idx_t X, chunk_idx_t Z, const World::ChunkData *chunk) {
 			addChunkBiome(biomemap.get(), X, Z, chunk);
 		});
 
@@ -289,8 +292,8 @@ static void makeMap(const std::string &regiondir, const std::string &outputdir,
 	if (intime == INT64_MIN)
 		return;
 
-	for (size_t i = 0; i < 3; i++) {
-		for (size_t j = 0; j < 3; j++) {
+	for (int i = 0; i < 3; i++) {
+		for (int j = 0; j < 3; j++) {
 			biomenames[i][j] = outputdir + "/biome/" + formatTileName(x + i - 1, z + j - 1, "png");
 			intime = std::max(intime, getModTime(biomenames[i][j]));
 		}
@@ -304,8 +307,8 @@ static void makeMap(const std::string &regiondir, const std::string &outputdir,
 
 	try {
 		std::unique_ptr<uint8_t[]> biomemaps[3][3];
-		for (size_t i = 0; i < 3; i++) {
-			for (size_t j = 0; j < 3; j++) {
+		for (int i = 0; i < 3; i++) {
+			for (int j = 0; j < 3; j++) {
 				biomemaps[i][j].reset(new uint8_t[DIM*DIM]);
 				std::memset(biomemaps[i][j].get(), 0, DIM*DIM);
 
@@ -320,7 +323,7 @@ static void makeMap(const std::string &regiondir, const std::string &outputdir,
 		std::unique_ptr<uint8_t[]> lightmap(new uint8_t[2*DIM*DIM]);
 		std::memset(lightmap.get(), 0, 2*DIM*DIM);
 
-		World::Region::visitChunks(input.c_str(), [&] (size_t X, size_t Z, const World::ChunkData *chunk) {
+		World::Region::visitChunks(input.c_str(), [&] (chunk_idx_t X, chunk_idx_t Z, const World::ChunkData *chunk) {
 			addChunk(image.get(), lightmap.get(), X, Z, chunk, biomemaps);
 		});
 
@@ -355,7 +358,7 @@ static bool makeMipmap(const std::string &dir, size_t level, int x, int z, PNG::
 	const char *se = se_str.c_str();
 
 	int64_t t = INT64_MIN;
-	size_t count = 0;
+	unsigned count = 0;
 	for (auto name : {&nw, &ne, &sw, &se}) {
 		struct stat s;
 		if (stat(*name, &s) < 0) {
diff --git a/src/Resource/Biome.cpp b/src/Resource/Biome.cpp
index c9e928b..3cf1586 100644
--- a/src/Resource/Biome.cpp
+++ b/src/Resource/Biome.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-2-Clause
 /*
-  Copyright (c) 2015, 2018, Matthias Schiffer <mschiffer@universe-factory.net>
+  Copyright (c) 2015-2021, Matthias Schiffer <mschiffer@universe-factory.net>
   Copyright (c) 2019, Roman Shishkin <spark@uwtech.org>
   All rights reserved.
 */
@@ -9,7 +9,6 @@
 #include "Biome.hpp"
 
 #include "BlockType.hpp"
-#include "../Util.hpp"
 
 
 namespace MinedMap {
@@ -42,7 +41,7 @@ FloatColor Biome::getFoliageColor(float temp, float rain) const {
 }
 
 
-FloatColor Biome::getBlockColor(const BlockType *type, unsigned height) const {
+FloatColor Biome::getBlockColor(const BlockType *type, y_idx_t height) const {
 	FloatColor c = {
 		float(type->color.r),
 		float(type->color.g),
diff --git a/src/Resource/Biome.hpp b/src/Resource/Biome.hpp
index 5583e08..490668c 100644
--- a/src/Resource/Biome.hpp
+++ b/src/Resource/Biome.hpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-2-Clause
 /*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
+  Copyright (c) 2015-2021, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
 */
 
@@ -8,6 +8,7 @@
 #pragma once
 
 #include "Color.hpp"
+#include "../Util.hpp"
 
 
 namespace MinedMap {
@@ -30,7 +31,7 @@ public:
 	Biome(float temp0, float rain0, FloatColor water0 = {0.247f, 0.463f, 0.894f})
 	: temp(temp0), rain(rain0), water(water0) {}
 
-	FloatColor getBlockColor(const BlockType *type, unsigned height) const;
+	FloatColor getBlockColor(const BlockType *type, y_idx_t height) const;
 };
 
 extern const Biome *const BIOME_DEFAULT;
diff --git a/src/Util.hpp b/src/Util.hpp
index e76fd6d..1f50958 100644
--- a/src/Util.hpp
+++ b/src/Util.hpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-2-Clause
 /*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
+  Copyright (c) 2015-2021, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
 */
 
@@ -8,6 +8,7 @@
 #pragma once
 
 #include <algorithm>
+#include <cstdint>
 #include <stdexcept>
 #include <utility>
 
@@ -25,4 +26,16 @@ static inline float clamp(float v, float min, float max) {
 	return std::max(std::min(v, max), min);
 }
 
+// A block coordinate relative to a chunk/section (X/Y/Z)
+typedef uint8_t block_idx_t;
+// A section index in a chunk (Y)
+typedef uint8_t section_idx_t;
+// A chunk coordinate relative to a region (X/Z)
+typedef uint8_t chunk_idx_t;
+
+// A block coordinate relative to a region (X/Z)
+typedef uint16_t region_block_idx_t;
+// A block coordinate (Y)
+typedef uint16_t y_idx_t;
+
 }
diff --git a/src/World/Block.hpp b/src/World/Block.hpp
index 75a949d..2f207a3 100644
--- a/src/World/Block.hpp
+++ b/src/World/Block.hpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-2-Clause
 /*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
+  Copyright (c) 2015-2021, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
 */
 
@@ -17,7 +17,7 @@ namespace World {
 
 struct Block {
 	const Resource::BlockType *type;
-	unsigned depth;
+	y_idx_t depth;
 	uint8_t blockLight;
 
 	bool isVisible() const {
diff --git a/src/World/Chunk.cpp b/src/World/Chunk.cpp
index 4d77c10..e99af79 100644
--- a/src/World/Chunk.cpp
+++ b/src/World/Chunk.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-2-Clause
 /*
-  Copyright (c) 2015-2019, Matthias Schiffer <mschiffer@universe-factory.net>
+  Copyright (c) 2015-2021, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
 */
 
@@ -42,13 +42,13 @@ Chunk::Chunk(const ChunkData *data) {
 	for (auto &sTag : *sectionsTag) {
 		auto s = std::dynamic_pointer_cast<const NBT::CompoundTag>(sTag);
 		std::unique_ptr<Section> section = Section::makeSection(s, dataVersion);
-		size_t Y = section->getY();
+		section_idx_t Y = section->getY();
 		sections.resize(Y);
 		sections.push_back(std::move(section));
 	}
 }
 
-uint8_t Chunk::getBiome(size_t x, size_t y, size_t z) const {
+uint8_t Chunk::getBiome(block_idx_t x, y_idx_t y, block_idx_t z) const {
 	if (x > SIZE || y > MAXY || z > SIZE)
 		throw std::invalid_argument("corrupt chunk data");
 
@@ -62,19 +62,19 @@ uint8_t Chunk::getBiome(size_t x, size_t y, size_t z) const {
 		return 0xff;
 }
 
-Block Chunk::getBlock(size_t x, Chunk::Height height, size_t z) const {
+Block Chunk::getBlock(block_idx_t x, Chunk::Height height, block_idx_t z) const {
 	Block block = {};
 
 	block.depth = height.depth;
 
-	size_t Y = height.y / SIZE;
-	size_t y = height.y % SIZE;
+	section_idx_t Y = height.y / SIZE;
+	block_idx_t y = height.y % SIZE;
 
 	if (Y < sections.size() && sections[Y])
 		block.type = sections[Y]->getBlockStateAt(x, y, z);
 
-	size_t Yt = (height.y + 1) / SIZE;
-	size_t yt = (height.y + 1) % SIZE;
+	section_idx_t Yt = (height.y + 1) / SIZE;
+	block_idx_t yt = (height.y + 1) % SIZE;
 
 	if (Yt < sections.size() && sections[Yt])
 		block.blockLight = sections[Yt]->getBlockLightAt(x, yt, z);
@@ -82,7 +82,10 @@ Block Chunk::getBlock(size_t x, Chunk::Height height, size_t z) const {
 	return block;
 }
 
-bool Chunk::getHeight(Chunk::Height *height, const Section *section, size_t x, size_t y, size_t z, int flags) const {
+bool Chunk::getHeight(
+	Chunk::Height *height, const Section *section,
+	block_idx_t x, block_idx_t y, block_idx_t z, int flags
+) const {
 	if (height->depth > 0)
 		return false;
 
@@ -108,10 +111,10 @@ bool Chunk::getHeight(Chunk::Height *height, const Section *section, size_t x, s
 }
 
 Chunk::Heightmap Chunk::getTopLayer(int flags) const {
-	size_t done = 0;
+	uint32_t done = 0;
 	Heightmap ret = {};
 
-	for (ssize_t Y = sections.size() - 1; Y >= 0; Y--) {
+	for (int16_t Y = sections.size() - 1; Y >= 0; Y--) {
 		if (done == SIZE*SIZE)
 			break;
 
@@ -120,12 +123,12 @@ Chunk::Heightmap Chunk::getTopLayer(int flags) const {
 
 		const Section *section = sections[Y].get();
 
-		for (ssize_t y = SIZE-1; y >= 0; y--) {
+		for (int8_t y = SIZE-1; y >= 0; y--) {
 			if (done == SIZE*SIZE)
 				break;
 
-			for (size_t z = 0; z < SIZE; z++) {
-				for (size_t x = 0; x < SIZE; x++) {
+			for (block_idx_t z = 0; z < SIZE; z++) {
+				for (block_idx_t x = 0; x < SIZE; x++) {
 					if (getHeight(&ret.v[x][z], section, x, y, z, flags))
 						done++;
 				}
diff --git a/src/World/Chunk.hpp b/src/World/Chunk.hpp
index 57fe314..26d10d1 100644
--- a/src/World/Chunk.hpp
+++ b/src/World/Chunk.hpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-2-Clause
 /*
-  Copyright (c) 2015-2018, Matthias Schiffer <mschiffer@universe-factory.net>
+  Copyright (c) 2015-2021, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
 */
 
@@ -24,19 +24,25 @@ namespace World {
 
 class Chunk {
 public:
-	static const size_t SIZE = Section::SIZE;
-	static const size_t MAXY = 256;
+	// Number of blocks in a chunk in x/z dimensions
+	static const uint32_t SIZE = Section::SIZE;
+	// Maximum Y value
+	static const y_idx_t MAXY = 256;
 
-	static const size_t BGROUP = 4;
-	static const size_t BSIZE = SIZE / BGROUP;
-	static const size_t BMAXY = MAXY / BGROUP;
+	// Since Minecraft 1.15, biome information is stored for
+	// 4x4x4 block groups
+	static const uint32_t BGROUP = 4;
+	// Number of biome values in a chunk in x/z dimensions
+	static const uint32_t BSIZE = SIZE / BGROUP;
+	// Number of biome values in a chunk in y dimension
+	static const uint32_t BMAXY = MAXY / BGROUP;
 
 	// Flags
 	static const int WITH_DEPTH = (1 << 0);
 
 	struct Height {
-		unsigned y;
-		unsigned depth;
+		y_idx_t y;
+		y_idx_t depth;
 	};
 
 	struct Heightmap {
@@ -51,10 +57,13 @@ private:
 	std::shared_ptr<const NBT::IntArrayTag> biomeIntsPre115;
 	std::shared_ptr<const NBT::IntArrayTag> biomeInts;
 
-	bool getHeight(Height *height, const Section *section, size_t x, size_t y, size_t z, int flags) const;
+	bool getHeight(
+		Height *height, const Section *section,
+		block_idx_t x, block_idx_t y, block_idx_t z, int flags
+	) const;
 
-	const Resource::BlockType * getBlockStateAt(size_t x, size_t y, size_t z) const {
-		size_t Y = y / SIZE;
+	const Resource::BlockType * getBlockStateAt(block_idx_t x, y_idx_t y, block_idx_t z) const {
+		section_idx_t Y = y / SIZE;
 
 		if (Y >= sections.size() || !sections[Y])
 			return nullptr;
@@ -70,8 +79,8 @@ public:
 		return *level;
 	}
 
-	uint8_t getBiome(size_t x, size_t y, size_t z) const;
-	Block getBlock(size_t x, Height y, size_t z) const;
+	uint8_t getBiome(block_idx_t x, y_idx_t y, block_idx_t z) const;
+	Block getBlock(block_idx_t x, Height y, block_idx_t z) const;
 
 	Heightmap getTopLayer(int flags) const;
 };
diff --git a/src/World/Region.cpp b/src/World/Region.cpp
index 65ee913..cd21e6d 100644
--- a/src/World/Region.cpp
+++ b/src/World/Region.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-2-Clause
 /*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
+  Copyright (c) 2015-2021, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
 */
 
@@ -18,16 +18,16 @@ namespace World {
 Region::ChunkMap Region::processHeader(const uint8_t header[4096]) {
 	ChunkMap map;
 
-	for (size_t z = 0; z < 32; z++) {
-		for (size_t x = 0; x < 32; x++) {
+	for (chunk_idx_t z = 0; z < 32; z++) {
+		for (chunk_idx_t x = 0; x < 32; x++) {
 			const uint8_t *p = &header[128*z + x*4];
 
-			size_t offset = (p[0] << 16) | (p[1] << 8) | p[2];
+			uint32_t offset = (p[0] << 16) | (p[1] << 8) | p[2];
 
 			if (!offset)
 				continue;
 
-			size_t len = p[3];
+			uint8_t len = p[3];
 
 			map.emplace(offset, ChunkDesc(x, z, len));
 		}
@@ -61,8 +61,9 @@ void Region::visitChunks(const char *filename, const ChunkVisitor &visitor) {
 			continue;
 		}
 
-		size_t x, z, len;
-		std::tie(x, z, len) = it->second;
+		chunk_idx_t x = std::get<0>(it->second);
+		chunk_idx_t z = std::get<1>(it->second);
+		size_t len = std::get<2>(it->second);
 
 		if (seen[x][z])
 			throw std::invalid_argument("duplicate chunk");
diff --git a/src/World/Region.hpp b/src/World/Region.hpp
index 7681bbc..22840e8 100644
--- a/src/World/Region.hpp
+++ b/src/World/Region.hpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-2-Clause
 /*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
+  Copyright (c) 2015-2021, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
 */
 
@@ -21,15 +21,16 @@ namespace World {
 
 class Region {
 public:
-	static const size_t SIZE = 32;
+	// Number of chunks in a region in each dimension
+	static const uint32_t SIZE = 32;
 
-	typedef std::function<void (size_t, size_t, const ChunkData *)> ChunkVisitor;
+	typedef std::function<void (chunk_idx_t, chunk_idx_t, const ChunkData *)> ChunkVisitor;
 
 	Region() = delete;
 
 private:
-	typedef std::tuple<size_t, size_t, size_t> ChunkDesc;
-	typedef std::unordered_map<size_t, ChunkDesc> ChunkMap;
+	typedef std::tuple<chunk_idx_t, chunk_idx_t, uint8_t> ChunkDesc;
+	typedef std::unordered_map<uint32_t, ChunkDesc> ChunkMap;
 
 	static ChunkMap processHeader(const uint8_t header[4096]);
 
diff --git a/src/World/Section.cpp b/src/World/Section.cpp
index dbf633f..948fee3 100644
--- a/src/World/Section.cpp
+++ b/src/World/Section.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-2-Clause
 /*
-  Copyright (c) 2015-2019, Matthias Schiffer <mschiffer@universe-factory.net>
+  Copyright (c) 2015-2021, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
 */
 
@@ -8,7 +8,6 @@
 #include "Section.hpp"
 #include "../NBT/ByteTag.hpp"
 #include "../NBT/StringTag.hpp"
-#include "../Util.hpp"
 
 #include <cstdio>
 
@@ -21,7 +20,7 @@ Section::Section(const std::shared_ptr<const NBT::CompoundTag> &section) {
 	blockLight = section->get<NBT::ByteArrayTag>("BlockLight");
 }
 
-const Resource::BlockType * Section::getBlockStateAt(size_t, size_t, size_t) const {
+const Resource::BlockType * Section::getBlockStateAt(block_idx_t, block_idx_t, block_idx_t) const {
 	return nullptr;
 }
 
@@ -44,7 +43,7 @@ std::unique_ptr<Section> Section::makeSection(const std::shared_ptr<const NBT::C
 }
 
 
-const Resource::BlockType * LegacySection::getBlockStateAt(size_t x, size_t y, size_t z) const {
+const Resource::BlockType * LegacySection::getBlockStateAt(block_idx_t x, block_idx_t y, block_idx_t z) const {
 	uint8_t type = getBlockAt(x, y, z);
 	uint8_t data = getDataAt(x, y, z);
 
@@ -97,7 +96,7 @@ PaletteSection::PaletteSection(
 	}
 }
 
-const Resource::BlockType * PaletteSection::getBlockStateAt(size_t x, size_t y, size_t z) const {
+const Resource::BlockType * PaletteSection::getBlockStateAt(block_idx_t x, block_idx_t y, block_idx_t z) const {
 	size_t index = getIndex(x, y, z);
 	size_t bitIndex;
 
@@ -110,7 +109,7 @@ const Resource::BlockType * PaletteSection::getBlockStateAt(size_t x, size_t y,
 	}
 
 	size_t pos = bitIndex >> 3;
-	size_t shift = bitIndex & 7;
+	unsigned shift = bitIndex & 7;
 	uint16_t mask = (1u << bits) - 1;
 
 	uint32_t v = blockStates->getPointer()[mangleByteIndex(pos)];
diff --git a/src/World/Section.hpp b/src/World/Section.hpp
index 0791c26..d18f95f 100644
--- a/src/World/Section.hpp
+++ b/src/World/Section.hpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-2-Clause
 /*
-  Copyright (c) 2015-2019, Matthias Schiffer <mschiffer@universe-factory.net>
+  Copyright (c) 2015-2021, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
 */
 
@@ -13,6 +13,7 @@
 #include "../NBT/ListTag.hpp"
 #include "../NBT/LongArrayTag.hpp"
 #include "../Resource/BlockType.hpp"
+#include "../Util.hpp"
 
 #include <cstdint>
 #include <stdexcept>
@@ -23,21 +24,22 @@ namespace World {
 
 class Section {
 public:
-	static const size_t SIZE = 16;
+	// Number of blocks in a section in each dimension
+	static const uint32_t SIZE = 16;
 
 private:
-	size_t Y;
+	section_idx_t Y;
 	std::shared_ptr<const NBT::ByteArrayTag> blockLight;
 
 protected:
-	static size_t getIndex(size_t x, size_t y, size_t z) {
+	static size_t getIndex(block_idx_t x, block_idx_t y, block_idx_t z) {
 		if (x >= SIZE || y >= SIZE || z >= SIZE)
 			throw std::range_error("Chunk::getIndex(): bad coordinates");
 
 		return SIZE*SIZE*y + SIZE*z + x;
 	}
 
-	static uint8_t getHalf(const uint8_t *v, size_t x, size_t y, size_t z) {
+	static uint8_t getHalf(const uint8_t *v, block_idx_t x, block_idx_t y, block_idx_t z) {
 		size_t i = getIndex(x, y, z);
 
 		if (i % 2)
@@ -51,11 +53,11 @@ protected:
 public:
 	virtual ~Section() {}
 
-	size_t getY() const { return Y; };
+	section_idx_t getY() const { return Y; };
 
-	virtual const Resource::BlockType * getBlockStateAt(size_t x, size_t y, size_t z) const;
+	virtual const Resource::BlockType * getBlockStateAt(block_idx_t x, block_idx_t y, block_idx_t z) const;
 
-	uint8_t getBlockLightAt(size_t x, size_t y, size_t z) const {
+	uint8_t getBlockLightAt(block_idx_t x, block_idx_t y, block_idx_t z) const {
 		if (!blockLight)
 			return 0;
 
@@ -71,11 +73,11 @@ private:
 	std::shared_ptr<const NBT::ByteArrayTag> data;
 
 
-	uint8_t getBlockAt(size_t x, size_t y, size_t z) const {
+	uint8_t getBlockAt(block_idx_t x, block_idx_t y, block_idx_t z) const {
 		return blocks->getValue(getIndex(x, y, z));
 	}
 
-	uint8_t getDataAt(size_t x, size_t y, size_t z) const {
+	uint8_t getDataAt(block_idx_t x, block_idx_t y, block_idx_t z) const {
 		return getHalf(data->getPointer(), x, y, z);
 	}
 
@@ -86,7 +88,7 @@ public:
 		std::shared_ptr<const NBT::ByteArrayTag> &&data0
 	) : Section(section), blocks(blocks0), data(data0) {}
 
-	virtual const Resource::BlockType * getBlockStateAt(size_t x, size_t y, size_t z) const;
+	virtual const Resource::BlockType * getBlockStateAt(block_idx_t x, block_idx_t y, block_idx_t z) const;
 };
 
 class PaletteSection : public Section {
@@ -111,7 +113,7 @@ public:
 		uint32_t dataVersion0
 	);
 
-	virtual const Resource::BlockType * getBlockStateAt(size_t x, size_t y, size_t z) const;
+	virtual const Resource::BlockType * getBlockStateAt(block_idx_t x, block_idx_t y, block_idx_t z) const;
 };
 
 }
diff --git a/src/regiondump.cpp b/src/regiondump.cpp
index 8e3deb4..76df061 100644
--- a/src/regiondump.cpp
+++ b/src/regiondump.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: BSD-2-Clause
 /*
-  Copyright (c) 2018, Matthias Schiffer <mschiffer@universe-factory.net>
+  Copyright (c) 2018-2021, Matthias Schiffer <mschiffer@universe-factory.net>
   All rights reserved.
 */
 
@@ -23,7 +23,7 @@ int main(int argc, char *argv[]) {
 		return 1;
 	}
 
-	World::Region::visitChunks(argv[1], [&] (size_t X, size_t Z, const World::ChunkData *chunk) {
+	World::Region::visitChunks(argv[1], [&] (chunk_idx_t X, chunk_idx_t Z, const World::ChunkData *chunk) {
 		std::cout << "Chunk(" << X << ", " << Z << "): "
 			<< chunk->getRoot() << std::endl;
 	});

From 0f6c467566ab4765df340f6c9f4b11f084aca1f1 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 17 Nov 2021 13:16:00 +0100
Subject: [PATCH 019/460] World: Chunk: replace division/modulo with shift/mask
 for height values

Preparation for negative y coordinates.
---
 src/World/Chunk.cpp | 14 +++++++-------
 src/World/Chunk.hpp | 15 ++++++++++-----
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/World/Chunk.cpp b/src/World/Chunk.cpp
index e99af79..3845c9b 100644
--- a/src/World/Chunk.cpp
+++ b/src/World/Chunk.cpp
@@ -53,7 +53,7 @@ uint8_t Chunk::getBiome(block_idx_t x, y_idx_t y, block_idx_t z) const {
 		throw std::invalid_argument("corrupt chunk data");
 
 	if (biomeInts)
-		return biomeInts->getValue((y/BGROUP)*BSIZE*BSIZE + (z/BGROUP)*BSIZE + (x/BGROUP));
+		return biomeInts->getValue((y>>BSHIFT)*BSIZE*BSIZE + (z>>BSHIFT)*BSIZE + (x>>BSHIFT));
 	else if (biomeIntsPre115)
 		return biomeIntsPre115->getValue(z*SIZE + x);
 	else if (biomeBytes)
@@ -67,14 +67,14 @@ Block Chunk::getBlock(block_idx_t x, Chunk::Height height, block_idx_t z) const
 
 	block.depth = height.depth;
 
-	section_idx_t Y = height.y / SIZE;
-	block_idx_t y = height.y % SIZE;
+	section_idx_t Y = height.y >> HSHIFT;
+	block_idx_t y = height.y & HMASK;
 
 	if (Y < sections.size() && sections[Y])
 		block.type = sections[Y]->getBlockStateAt(x, y, z);
 
-	section_idx_t Yt = (height.y + 1) / SIZE;
-	block_idx_t yt = (height.y + 1) % SIZE;
+	section_idx_t Yt = (height.y + 1) >> HSHIFT;
+	block_idx_t yt = (height.y + 1) & HMASK;
 
 	if (Yt < sections.size() && sections[Yt])
 		block.blockLight = sections[Yt]->getBlockLightAt(x, yt, z);
@@ -97,7 +97,7 @@ bool Chunk::getHeight(
 		return false;
 
 	if (height->y == 0)
-		height->y = SIZE*section->getY() + y;
+		height->y = (section->getY() << HSHIFT) + y;
 
 	if (!(flags & WITH_DEPTH))
 		return true;
@@ -105,7 +105,7 @@ bool Chunk::getHeight(
 	if (type->flags & BLOCK_WATER)
 		return false;
 
-	height->depth = SIZE*section->getY() + y;
+	height->depth = (section->getY() << HSHIFT) + y;
 
 	return true;
 }
diff --git a/src/World/Chunk.hpp b/src/World/Chunk.hpp
index 26d10d1..817b29f 100644
--- a/src/World/Chunk.hpp
+++ b/src/World/Chunk.hpp
@@ -29,13 +29,18 @@ public:
 	// Maximum Y value
 	static const y_idx_t MAXY = 256;
 
+	// Shift to get from height to section index
+	static const unsigned HSHIFT = 4;
+	// Mask to get from height to y index inside section
+	static const block_idx_t HMASK = 0xf;
+
 	// Since Minecraft 1.15, biome information is stored for
 	// 4x4x4 block groups
-	static const uint32_t BGROUP = 4;
+	static const unsigned BSHIFT = 2;
 	// Number of biome values in a chunk in x/z dimensions
-	static const uint32_t BSIZE = SIZE / BGROUP;
+	static const uint32_t BSIZE = SIZE >> BSHIFT;
 	// Number of biome values in a chunk in y dimension
-	static const uint32_t BMAXY = MAXY / BGROUP;
+	static const uint32_t BMAXY = MAXY >> BSHIFT;
 
 	// Flags
 	static const int WITH_DEPTH = (1 << 0);
@@ -63,12 +68,12 @@ private:
 	) const;
 
 	const Resource::BlockType * getBlockStateAt(block_idx_t x, y_idx_t y, block_idx_t z) const {
-		section_idx_t Y = y / SIZE;
+		section_idx_t Y = y >> HSHIFT;
 
 		if (Y >= sections.size() || !sections[Y])
 			return nullptr;
 
-		return sections[Y]->getBlockStateAt(x, y % SIZE, z);
+		return sections[Y]->getBlockStateAt(x, y & HMASK, z);
 	}
 
 

From 16a1258f082b1e37e82757f559cfc1b1f9d4ba91 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 3 Dec 2021 23:45:31 +0100
Subject: [PATCH 020/460] World: Chunk: remove unnecessary level class member

---
 src/World/Chunk.cpp | 3 ++-
 src/World/Chunk.hpp | 5 -----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/World/Chunk.cpp b/src/World/Chunk.cpp
index 3845c9b..c326669 100644
--- a/src/World/Chunk.cpp
+++ b/src/World/Chunk.cpp
@@ -18,7 +18,8 @@ namespace MinedMap {
 namespace World {
 
 Chunk::Chunk(const ChunkData *data) {
-	level = assertValue(data->getRoot().get<NBT::CompoundTag>("Level"));
+	std::shared_ptr<const NBT::CompoundTag> level =
+		assertValue(data->getRoot().get<NBT::CompoundTag>("Level"));
 
 	std::shared_ptr<const NBT::ListTag> sectionsTag = level->get<NBT::ListTag>("Sections");
 	if (!sectionsTag || sectionsTag->empty())
diff --git a/src/World/Chunk.hpp b/src/World/Chunk.hpp
index 817b29f..cfae0f7 100644
--- a/src/World/Chunk.hpp
+++ b/src/World/Chunk.hpp
@@ -55,7 +55,6 @@ public:
 	};
 
 private:
-	std::shared_ptr<const NBT::CompoundTag> level;
 	std::vector<std::unique_ptr<Section>> sections;
 
 	std::shared_ptr<const NBT::ByteArrayTag> biomeBytes;
@@ -80,10 +79,6 @@ private:
 public:
 	Chunk(const ChunkData *data);
 
-	const NBT::CompoundTag & getLevel() const {
-		return *level;
-	}
-
 	uint8_t getBiome(block_idx_t x, y_idx_t y, block_idx_t z) const;
 	Block getBlock(block_idx_t x, Height y, block_idx_t z) const;
 

From 21966252ea6cede058b4b2c4323e0dc4a76747d9 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 3 Dec 2021 23:54:15 +0100
Subject: [PATCH 021/460] World: ChunkData: make getRoot() return shared
 pointer reference

---
 src/World/Chunk.cpp     | 4 ++--
 src/World/ChunkData.hpp | 4 ++--
 src/regiondump.cpp      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/World/Chunk.cpp b/src/World/Chunk.cpp
index c326669..fc0307e 100644
--- a/src/World/Chunk.cpp
+++ b/src/World/Chunk.cpp
@@ -19,7 +19,7 @@ namespace World {
 
 Chunk::Chunk(const ChunkData *data) {
 	std::shared_ptr<const NBT::CompoundTag> level =
-		assertValue(data->getRoot().get<NBT::CompoundTag>("Level"));
+		assertValue(data->getRoot()->get<NBT::CompoundTag>("Level"));
 
 	std::shared_ptr<const NBT::ListTag> sectionsTag = level->get<NBT::ListTag>("Sections");
 	if (!sectionsTag || sectionsTag->empty())
@@ -37,7 +37,7 @@ Chunk::Chunk(const ChunkData *data) {
 	else
 		throw std::invalid_argument("corrupt biome data");
 
-	auto dataVersionTag = data->getRoot().get<NBT::IntTag>("DataVersion");
+	auto dataVersionTag = data->getRoot()->get<NBT::IntTag>("DataVersion");
 	uint32_t dataVersion = dataVersionTag ? dataVersionTag->getValue() : 0;
 
 	for (auto &sTag : *sectionsTag) {
diff --git a/src/World/ChunkData.hpp b/src/World/ChunkData.hpp
index cb27f7b..62a69c1 100644
--- a/src/World/ChunkData.hpp
+++ b/src/World/ChunkData.hpp
@@ -32,8 +32,8 @@ private:
 public:
 	ChunkData(Buffer buffer);
 
-	const NBT::CompoundTag & getRoot() const {
-		return *root;
+	const std::shared_ptr<const NBT::CompoundTag> & getRoot() const {
+		return root;
 	}
 };
 
diff --git a/src/regiondump.cpp b/src/regiondump.cpp
index 76df061..a091536 100644
--- a/src/regiondump.cpp
+++ b/src/regiondump.cpp
@@ -25,7 +25,7 @@ int main(int argc, char *argv[]) {
 
 	World::Region::visitChunks(argv[1], [&] (chunk_idx_t X, chunk_idx_t Z, const World::ChunkData *chunk) {
 		std::cout << "Chunk(" << X << ", " << Z << "): "
-			<< chunk->getRoot() << std::endl;
+			<< *chunk->getRoot() << std::endl;
 	});
 
 	return 0;

From 9ee1007ade7f29972ab07df5e2436d8e824a58a9 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 4 Dec 2021 00:03:47 +0100
Subject: [PATCH 022/460] World: Chunk: use enum to store biome data format

---
 src/World/Chunk.cpp | 26 ++++++++++++++++----------
 src/World/Chunk.hpp |  8 +++++++-
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/World/Chunk.cpp b/src/World/Chunk.cpp
index fc0307e..8b4b9eb 100644
--- a/src/World/Chunk.cpp
+++ b/src/World/Chunk.cpp
@@ -28,14 +28,18 @@ Chunk::Chunk(const ChunkData *data) {
 	auto biomesIntArray = level->get<NBT::IntArrayTag>("Biomes");
 	auto biomesByteArray = level->get<NBT::ByteArrayTag>("Biomes");
 
-	if (biomesIntArray && biomesIntArray->getLength() == BSIZE*BSIZE*BMAXY)
+	if (biomesIntArray && biomesIntArray->getLength() == BSIZE*BSIZE*BMAXY) {
 		biomeInts = std::move(biomesIntArray);
-	else if (biomesIntArray && biomesIntArray->getLength() == SIZE*SIZE)
-		biomeIntsPre115 = std::move(biomesIntArray);
-	else if (biomesByteArray && biomesByteArray->getLength() == SIZE*SIZE)
+		biomeFormat = INT_ARRAY;
+	} else if (biomesIntArray && biomesIntArray->getLength() == SIZE*SIZE) {
+		biomeInts = std::move(biomesIntArray);
+		biomeFormat = INT_ARRAY_PRE1_15;
+	} else if (biomesByteArray && biomesByteArray->getLength() == SIZE*SIZE) {
 		biomeBytes = std::move(biomesByteArray);
-	else
+		biomeFormat = BYTE_ARRAY;
+	} else {
 		throw std::invalid_argument("corrupt biome data");
+	}
 
 	auto dataVersionTag = data->getRoot()->get<NBT::IntTag>("DataVersion");
 	uint32_t dataVersion = dataVersionTag ? dataVersionTag->getValue() : 0;
@@ -53,14 +57,16 @@ uint8_t Chunk::getBiome(block_idx_t x, y_idx_t y, block_idx_t z) const {
 	if (x > SIZE || y > MAXY || z > SIZE)
 		throw std::invalid_argument("corrupt chunk data");
 
-	if (biomeInts)
+	switch (biomeFormat) {
+	case INT_ARRAY:
 		return biomeInts->getValue((y>>BSHIFT)*BSIZE*BSIZE + (z>>BSHIFT)*BSIZE + (x>>BSHIFT));
-	else if (biomeIntsPre115)
-		return biomeIntsPre115->getValue(z*SIZE + x);
-	else if (biomeBytes)
+	case INT_ARRAY_PRE1_15:
+		return biomeInts->getValue(z*SIZE + x);
+	case BYTE_ARRAY:
 		return biomeBytes->getValue(z*SIZE + x);
-	else
+	default:
 		return 0xff;
+	}
 }
 
 Block Chunk::getBlock(block_idx_t x, Chunk::Height height, block_idx_t z) const {
diff --git a/src/World/Chunk.hpp b/src/World/Chunk.hpp
index cfae0f7..1a59efe 100644
--- a/src/World/Chunk.hpp
+++ b/src/World/Chunk.hpp
@@ -57,8 +57,14 @@ public:
 private:
 	std::vector<std::unique_ptr<Section>> sections;
 
+	enum BiomeFormat {
+		UNKNOWN = 0,
+		BYTE_ARRAY,
+		INT_ARRAY_PRE1_15,
+		INT_ARRAY,
+	} biomeFormat = UNKNOWN;
+
 	std::shared_ptr<const NBT::ByteArrayTag> biomeBytes;
-	std::shared_ptr<const NBT::IntArrayTag> biomeIntsPre115;
 	std::shared_ptr<const NBT::IntArrayTag> biomeInts;
 
 	bool getHeight(

From aacea26716b5dc94e8d00bbef16c70797797d831 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 4 Dec 2021 00:16:16 +0100
Subject: [PATCH 023/460] World: add support for negative Y coordinates and MC
 1.18 chunks

MC 1.18 biomes are not handled yet.
---
 src/Util.hpp          |  7 ++--
 src/World/Chunk.cpp   | 83 ++++++++++++++++++++++++++++---------------
 src/World/Chunk.hpp   |  8 +++--
 src/World/Section.cpp | 37 +++++++++++++------
 src/regiondump.cpp    |  2 +-
 5 files changed, 92 insertions(+), 45 deletions(-)

diff --git a/src/Util.hpp b/src/Util.hpp
index 1f50958..163813d 100644
--- a/src/Util.hpp
+++ b/src/Util.hpp
@@ -9,6 +9,7 @@
 
 #include <algorithm>
 #include <cstdint>
+#include <limits>
 #include <stdexcept>
 #include <utility>
 
@@ -29,13 +30,15 @@ static inline float clamp(float v, float min, float max) {
 // A block coordinate relative to a chunk/section (X/Y/Z)
 typedef uint8_t block_idx_t;
 // A section index in a chunk (Y)
-typedef uint8_t section_idx_t;
+typedef int8_t section_idx_t;
 // A chunk coordinate relative to a region (X/Z)
 typedef uint8_t chunk_idx_t;
 
 // A block coordinate relative to a region (X/Z)
 typedef uint16_t region_block_idx_t;
 // A block coordinate (Y)
-typedef uint16_t y_idx_t;
+typedef int16_t y_idx_t;
+
+const y_idx_t y_idx_min = std::numeric_limits<y_idx_t>::min();
 
 }
diff --git a/src/World/Chunk.cpp b/src/World/Chunk.cpp
index 8b4b9eb..a447cda 100644
--- a/src/World/Chunk.cpp
+++ b/src/World/Chunk.cpp
@@ -18,27 +18,35 @@ namespace MinedMap {
 namespace World {
 
 Chunk::Chunk(const ChunkData *data) {
-	std::shared_ptr<const NBT::CompoundTag> level =
-		assertValue(data->getRoot()->get<NBT::CompoundTag>("Level"));
+	std::shared_ptr<const NBT::ListTag> sectionsTag;
 
-	std::shared_ptr<const NBT::ListTag> sectionsTag = level->get<NBT::ListTag>("Sections");
-	if (!sectionsTag || sectionsTag->empty())
-		return;
+	auto level = data->getRoot()->get<NBT::CompoundTag>("Level");
+	if (level) {
+		sectionsTag = level->get<NBT::ListTag>("Sections");
+		if (!sectionsTag || sectionsTag->empty())
+			return;
 
-	auto biomesIntArray = level->get<NBT::IntArrayTag>("Biomes");
-	auto biomesByteArray = level->get<NBT::ByteArrayTag>("Biomes");
+		auto biomesIntArray = level->get<NBT::IntArrayTag>("Biomes");
+		auto biomesByteArray = level->get<NBT::ByteArrayTag>("Biomes");
 
-	if (biomesIntArray && biomesIntArray->getLength() == BSIZE*BSIZE*BMAXY) {
-		biomeInts = std::move(biomesIntArray);
-		biomeFormat = INT_ARRAY;
-	} else if (biomesIntArray && biomesIntArray->getLength() == SIZE*SIZE) {
-		biomeInts = std::move(biomesIntArray);
-		biomeFormat = INT_ARRAY_PRE1_15;
-	} else if (biomesByteArray && biomesByteArray->getLength() == SIZE*SIZE) {
-		biomeBytes = std::move(biomesByteArray);
-		biomeFormat = BYTE_ARRAY;
+		if (biomesIntArray && biomesIntArray->getLength() == BSIZE*BSIZE*BMAXY) {
+			biomeInts = std::move(biomesIntArray);
+			biomeFormat = INT_ARRAY;
+		} else if (biomesIntArray && biomesIntArray->getLength() == SIZE*SIZE) {
+			biomeInts = std::move(biomesIntArray);
+			biomeFormat = INT_ARRAY_PRE1_15;
+		} else if (biomesByteArray && biomesByteArray->getLength() == SIZE*SIZE) {
+			biomeBytes = std::move(biomesByteArray);
+			biomeFormat = BYTE_ARRAY;
+		} else {
+			throw std::invalid_argument("corrupt biome data");
+		}
 	} else {
-		throw std::invalid_argument("corrupt biome data");
+		sectionsTag = data->getRoot()->get<NBT::ListTag>("sections");
+		if (!sectionsTag || sectionsTag->empty())
+			return;
+
+		biomeFormat = SECTION;
 	}
 
 	auto dataVersionTag = data->getRoot()->get<NBT::IntTag>("DataVersion");
@@ -48,25 +56,34 @@ Chunk::Chunk(const ChunkData *data) {
 		auto s = std::dynamic_pointer_cast<const NBT::CompoundTag>(sTag);
 		std::unique_ptr<Section> section = Section::makeSection(s, dataVersion);
 		section_idx_t Y = section->getY();
+		if (sections.empty())
+			sectionOffset = Y;
+
+		Y -= sectionOffset;
+		assertValue(Y >= 0 && size_t(Y) >= sections.size());
 		sections.resize(Y);
 		sections.push_back(std::move(section));
 	}
 }
 
 uint8_t Chunk::getBiome(block_idx_t x, y_idx_t y, block_idx_t z) const {
-	if (x > SIZE || y > MAXY || z > SIZE)
-		throw std::invalid_argument("corrupt chunk data");
+	if (x >= SIZE || z >= SIZE)
+		throw std::invalid_argument("getBiome: invalid block coordinate");
 
 	switch (biomeFormat) {
 	case INT_ARRAY:
+		if (y < 0 || y >= MAXY)
+			break;
 		return biomeInts->getValue((y>>BSHIFT)*BSIZE*BSIZE + (z>>BSHIFT)*BSIZE + (x>>BSHIFT));
 	case INT_ARRAY_PRE1_15:
 		return biomeInts->getValue(z*SIZE + x);
 	case BYTE_ARRAY:
 		return biomeBytes->getValue(z*SIZE + x);
 	default:
-		return 0xff;
+		break;
 	}
+
+	return 0xff;
 }
 
 Block Chunk::getBlock(block_idx_t x, Chunk::Height height, block_idx_t z) const {
@@ -74,16 +91,19 @@ Block Chunk::getBlock(block_idx_t x, Chunk::Height height, block_idx_t z) const
 
 	block.depth = height.depth;
 
-	section_idx_t Y = height.y >> HSHIFT;
+	if (height.y == y_idx_min)
+		return block;
+
+	section_idx_t Y = (height.y >> HSHIFT) - sectionOffset;
 	block_idx_t y = height.y & HMASK;
 
-	if (Y < sections.size() && sections[Y])
+	if (Y >= 0 && size_t(Y) < sections.size() && sections[Y])
 		block.type = sections[Y]->getBlockStateAt(x, y, z);
 
-	section_idx_t Yt = (height.y + 1) >> HSHIFT;
+	section_idx_t Yt = ((height.y + 1) >> HSHIFT) - sectionOffset;
 	block_idx_t yt = (height.y + 1) & HMASK;
 
-	if (Yt < sections.size() && sections[Yt])
+	if (Yt >= 0 && size_t(Yt) < sections.size() && sections[Yt])
 		block.blockLight = sections[Yt]->getBlockLightAt(x, yt, z);
 
 	return block;
@@ -93,17 +113,17 @@ bool Chunk::getHeight(
 	Chunk::Height *height, const Section *section,
 	block_idx_t x, block_idx_t y, block_idx_t z, int flags
 ) const {
-	if (height->depth > 0)
+	if (height->depth > y_idx_min)
 		return false;
 
-	if (!(flags & WITH_DEPTH) && height->y > 0)
+	if (!(flags & WITH_DEPTH) && height->y > y_idx_min)
 		return false;
 
 	const Resource::BlockType *type = section->getBlockStateAt(x, y, z);
 	if (!type || !(type->flags & BLOCK_OPAQUE))
 		return false;
 
-	if (height->y == 0)
+	if (height->y == y_idx_min)
 		height->y = (section->getY() << HSHIFT) + y;
 
 	if (!(flags & WITH_DEPTH))
@@ -119,9 +139,14 @@ bool Chunk::getHeight(
 
 Chunk::Heightmap Chunk::getTopLayer(int flags) const {
 	uint32_t done = 0;
-	Heightmap ret = {};
+	Heightmap ret;
 
-	for (int16_t Y = sections.size() - 1; Y >= 0; Y--) {
+	for (block_idx_t z = 0; z < SIZE; z++) {
+		for (block_idx_t x = 0; x < SIZE; x++)
+			ret.v[x][z] = Height { .y = y_idx_min, .depth = y_idx_min };
+	}
+
+	for (section_idx_t Y = sections.size() - 1; Y >= 0; Y--) {
 		if (done == SIZE*SIZE)
 			break;
 
diff --git a/src/World/Chunk.hpp b/src/World/Chunk.hpp
index 1a59efe..34a5184 100644
--- a/src/World/Chunk.hpp
+++ b/src/World/Chunk.hpp
@@ -26,7 +26,7 @@ class Chunk {
 public:
 	// Number of blocks in a chunk in x/z dimensions
 	static const uint32_t SIZE = Section::SIZE;
-	// Maximum Y value
+	// Maximum Y value for pre-1.18 chunks
 	static const y_idx_t MAXY = 256;
 
 	// Shift to get from height to section index
@@ -55,6 +55,7 @@ public:
 	};
 
 private:
+	section_idx_t sectionOffset;
 	std::vector<std::unique_ptr<Section>> sections;
 
 	enum BiomeFormat {
@@ -62,6 +63,7 @@ private:
 		BYTE_ARRAY,
 		INT_ARRAY_PRE1_15,
 		INT_ARRAY,
+		SECTION,
 	} biomeFormat = UNKNOWN;
 
 	std::shared_ptr<const NBT::ByteArrayTag> biomeBytes;
@@ -73,9 +75,9 @@ private:
 	) const;
 
 	const Resource::BlockType * getBlockStateAt(block_idx_t x, y_idx_t y, block_idx_t z) const {
-		section_idx_t Y = y >> HSHIFT;
+		section_idx_t Y = (y >> HSHIFT) - sectionOffset;
 
-		if (Y >= sections.size() || !sections[Y])
+		if (Y < 0 || size_t(Y) >= sections.size() || !sections[Y])
 			return nullptr;
 
 		return sections[Y]->getBlockStateAt(x, y & HMASK, z);
diff --git a/src/World/Section.cpp b/src/World/Section.cpp
index 948fee3..bc10f96 100644
--- a/src/World/Section.cpp
+++ b/src/World/Section.cpp
@@ -16,7 +16,7 @@ namespace MinedMap {
 namespace World {
 
 Section::Section(const std::shared_ptr<const NBT::CompoundTag> &section) {
-	Y = assertValue(section->get<NBT::ByteTag>("Y"))->getValue();
+	Y = int8_t(assertValue(section->get<NBT::ByteTag>("Y"))->getValue());
 	blockLight = section->get<NBT::ByteArrayTag>("BlockLight");
 }
 
@@ -25,18 +25,32 @@ const Resource::BlockType * Section::getBlockStateAt(block_idx_t, block_idx_t, b
 }
 
 std::unique_ptr<Section> Section::makeSection(const std::shared_ptr<const NBT::CompoundTag> &section, uint32_t dataVersion) {
-	std::shared_ptr<const NBT::LongArrayTag> blockStates = section->get<NBT::LongArrayTag>("BlockStates");
-	if (blockStates) {
-		const std::shared_ptr<const NBT::ListTag> palette = assertValue(section->get<NBT::ListTag>("Palette"));
+	{
+		const std::shared_ptr<const NBT::CompoundTag> blockStates = section->get<NBT::CompoundTag>("block_states");
+		if (blockStates) {
+			const std::shared_ptr<const NBT::ListTag> palette = assertValue(blockStates->get<NBT::ListTag>("palette"));
+			std::shared_ptr<const NBT::LongArrayTag> data = blockStates->get<NBT::LongArrayTag>("data");
 
-		return std::unique_ptr<Section>(new PaletteSection(section, std::move(blockStates), palette, dataVersion));
+			return std::unique_ptr<Section>(new PaletteSection(section, std::move(data), palette, dataVersion));
+		}
 	}
 
-	std::shared_ptr<const NBT::ByteArrayTag> blocks = section->get<NBT::ByteArrayTag>("Blocks");
-	if (blocks) {
-		std::shared_ptr<const NBT::ByteArrayTag> data = assertValue(section->get<NBT::ByteArrayTag>("Data"));
+	{
+		std::shared_ptr<const NBT::LongArrayTag> blockStates = section->get<NBT::LongArrayTag>("BlockStates");
+		if (blockStates) {
+			const std::shared_ptr<const NBT::ListTag> palette = assertValue(section->get<NBT::ListTag>("Palette"));
 
-		return std::unique_ptr<Section>(new LegacySection(section, std::move(blocks), std::move(data)));
+			return std::unique_ptr<Section>(new PaletteSection(section, std::move(blockStates), palette, dataVersion));
+		}
+	}
+
+	{
+		std::shared_ptr<const NBT::ByteArrayTag> blocks = section->get<NBT::ByteArrayTag>("Blocks");
+		if (blocks) {
+			std::shared_ptr<const NBT::ByteArrayTag> data = assertValue(section->get<NBT::ByteArrayTag>("Data"));
+
+			return std::unique_ptr<Section>(new LegacySection(section, std::move(blocks), std::move(data)));
+		}
 	}
 
 	return std::unique_ptr<Section>(new Section(section));
@@ -81,7 +95,7 @@ PaletteSection::PaletteSection(
 		expectedLength = (4096 + blocksPerWord - 1) / blocksPerWord;
 	}
 
-	if (blockStates->getLength() != expectedLength)
+	if (blockStates && blockStates->getLength() != expectedLength)
 		throw std::invalid_argument("corrupt section data");
 
 	for (const auto &entry : *paletteData) {
@@ -97,6 +111,9 @@ PaletteSection::PaletteSection(
 }
 
 const Resource::BlockType * PaletteSection::getBlockStateAt(block_idx_t x, block_idx_t y, block_idx_t z) const {
+	if (!blockStates)
+		return palette.at(0);
+
 	size_t index = getIndex(x, y, z);
 	size_t bitIndex;
 
diff --git a/src/regiondump.cpp b/src/regiondump.cpp
index a091536..62fe359 100644
--- a/src/regiondump.cpp
+++ b/src/regiondump.cpp
@@ -24,7 +24,7 @@ int main(int argc, char *argv[]) {
 	}
 
 	World::Region::visitChunks(argv[1], [&] (chunk_idx_t X, chunk_idx_t Z, const World::ChunkData *chunk) {
-		std::cout << "Chunk(" << X << ", " << Z << "): "
+		std::cout << "Chunk(" << unsigned(X) << ", " << unsigned(Z) << "): "
 			<< *chunk->getRoot() << std::endl;
 	});
 

From 76e5d322b142bfdc19509fc4e53cf212d6ef7483 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 9 Dec 2021 02:07:20 +0100
Subject: [PATCH 024/460] Resource: Biome: add biome palette name mapping

For now we will continue to use the numerical biome IDs internally, as
our biome storage format is based on these IDs.
---
 src/Resource/Biome.cpp | 130 ++++++++++++++++++++++++++++++++++++++---
 src/Resource/Biome.hpp |   8 ++-
 src/World/Block.hpp    |   2 +-
 3 files changed, 128 insertions(+), 12 deletions(-)

diff --git a/src/Resource/Biome.cpp b/src/Resource/Biome.cpp
index 3cf1586..d871ad5 100644
--- a/src/Resource/Biome.cpp
+++ b/src/Resource/Biome.cpp
@@ -10,7 +10,6 @@
 
 #include "BlockType.hpp"
 
-
 namespace MinedMap {
 namespace Resource {
 
@@ -145,9 +144,19 @@ static const Biome BiomeWarmOcean(0.8f, 0.5f, {0.263f, 0.835f, 0.933f});
 static const Biome BiomeLukewarmOcean(0.8f, 0.5f, {0.271f, 0.678f, 0.949f});
 static const Biome BiomeColdOcean(0.8f, 0.5f, {0.239f, 0.341f, 0.839f});
 
-extern const Biome *const BIOME_DEFAULT = &BiomeDefault;
+static const Biome BiomeMeadow(0.5f, 0.8f);
+static const Biome BiomeGrove(-0.2f, 0.8f);
+static const Biome BiomeJaggedPeaks(-0.7f, 0.9f);
+static const Biome BiomeStonyPeaks(1.0f, 0.3f);
+static const Biome BiomeSnowySlopes(-0.3f, 0.9f);
 
-const Biome *const BIOMES[256] = {
+const Biome *const Biome::Default = &BiomeDefault;
+
+/* Minecraft 1.18 does not use numerical IDs for biomes anymore.
+ * Previously unused biome IDs are assigned to the new biome types of
+ * Minecraft 1.18 for storage in MinedMap's biome data cache. */
+
+const Biome *const Biome::Biomes[256] = {
 	/*   0 */ &BiomeDefault, /* Ocean */
 	/*   1 */ &BiomePlains,
 	/*   2 */ &BiomeDesert,
@@ -199,11 +208,11 @@ const Biome *const BIOMES[256] = {
 	/*  48 */ &BiomeLukewarmOcean, /* Deep Lukewarm Ocean */
 	/*  49 */ &BiomeColdOcean, /* Deep Cold Ocean */
 	/*  50 */ &BiomeFrozenOcean, /* Deep Frozen Ocean */
-	/*  51 */ nullptr,
-	/*  52 */ nullptr,
-	/*  53 */ nullptr,
-	/*  54 */ nullptr,
-	/*  55 */ nullptr,
+	/*  51 */ &BiomeMeadow, /* MinedMap assignment */
+	/*  52 */ &BiomeGrove, /* MinedMap assignment */
+	/*  53 */ &BiomeJaggedPeaks, /* MinedMap assignment */
+	/*  54 */ &BiomeStonyPeaks, /* MinedMap assignment */
+	/*  55 */ &BiomeSnowySlopes, /* MinedMap assignment */
 	/*  56 */ nullptr,
 	/*  57 */ nullptr,
 	/*  58 */ nullptr,
@@ -326,5 +335,110 @@ const Biome *const BIOMES[256] = {
 	/* 175 */ &BiomeDefault, /* Lush Caves */
 };
 
+/* It is unclear which of the renamed/merged biome IDs can appear in practice,
+ * but it shouldn't hurt to support them anyways */
+
+const std::unordered_map<std::string, uint8_t> Biome::Names = {
+	{ "minecraft:badlands", 37 },
+	{ "minecraft:badlands_plateau", 39 }, /* 1.18: Merged into badlands */
+	{ "minecraft:bamboo_jungle", 168 },
+	{ "minecraft:bamboo_jungle_hills", 169 }, /* 1.18: Merged into bamboo_jungle */
+	{ "minecraft:basalt_deltas", 173 },
+	{ "minecraft:beach", 16 },
+	{ "minecraft:birch_forest", 27 },
+	{ "minecraft:birch_forest_hills", 28 }, /* 1.18: Merged into birch_forest */
+	{ "minecraft:cold_ocean", 46 },
+	{ "minecraft:crimson_forest", 171 },
+	{ "minecraft:dark_forest", 29 },
+	{ "minecraft:dark_forest_hills", 157 }, /* 1.18: Merged into dark_forest */
+	{ "minecraft:deep_cold_ocean", 49 },
+	{ "minecraft:deep_frozen_ocean", 50 },
+	{ "minecraft:deep_lukewarm_ocean", 48 },
+	{ "minecraft:deep_ocean", 24 },
+	{ "minecraft:deep_warm_ocean", 47 }, /* 1.18: Merged into warm_ocean */
+	{ "minecraft:desert", 2 },
+	{ "minecraft:desert_hills", 17 }, /* 1.18: Merged into desert */
+	{ "minecraft:desert_lakes", 130 }, /* 1.18: Merged into desert */
+	{ "minecraft:dripstone_caves", 174 },
+	{ "minecraft:end_barrens", 43 },
+	{ "minecraft:end_highlands", 42 },
+	{ "minecraft:end_midlands", 41 },
+	{ "minecraft:eroded_badlands", 165 },
+	{ "minecraft:extreme_hills", 3 }, /* 1.18: Renamed to windswept_hills (after rename from mountains) */
+	{ "minecraft:flower_forest", 132 },
+	{ "minecraft:forest", 4 },
+	{ "minecraft:frozen_ocean", 10 },
+	{ "minecraft:frozen_peaks", 53 }, /* 1.18: New */
+	{ "minecraft:frozen_river", 11 },
+	{ "minecraft:giant_spruce_taiga", 160 }, /* 1.18: Renamed to old_growth_spruce_taiga */
+	{ "minecraft:giant_spruce_taiga_hills", 161 }, /* 1.18: Merged into giant_spruce_taiga */
+	{ "minecraft:giant_tree_taiga", 32 }, /* 1.18: Renamed to old_growth_pine_taiga */
+	{ "minecraft:giant_tree_taiga_hills", 33 }, /* 1.18: Merged into giant_tree_taiga */
+	{ "minecraft:gravelly_mountains", 131 }, /* 1.18: Renamed to windswept_gravelly_hills */
+	{ "minecraft:grove", 52 }, /* 1.18: New */
+	{ "minecraft:ice_spikes", 140 },
+	{ "minecraft:jagged_peaks", 53 }, /* 1.18: New */
+	{ "minecraft:jungle", 21 },
+	{ "minecraft:jungle_edge", 23 }, /* 1.18: Renamed to sparse_jungle */
+	{ "minecraft:jungle_hills", 22 }, /* 1.18: Merged into jungle */
+	{ "minecraft:lukewarm_ocean", 45 },
+	{ "minecraft:lush_caves", 175 },
+	{ "minecraft:meadow", 51 }, /* 1.18: New */
+	{ "minecraft:modified_badlands_plateau", 167 }, /* 1.18: Merged into badlands */
+	{ "minecraft:modified_gravelly_mountains", 162 }, /* 1.18: Merged into gravelly_mountains */
+	{ "minecraft:modified_jungle", 149 }, /* 1.18: Merged into jungle */
+	{ "minecraft:modified_jungle_edge", 151 }, /* 1.18: Merged into jungle_edge */
+	{ "minecraft:modified_wooded_badlands_plateau", 166 }, /* 1.18: Merged into wooded_badlands */
+	{ "minecraft:mountain_edge", 20 }, /* 1.18: Merged into mountains */
+	{ "minecraft:mountains", 3 }, /* 1.18: Renamed to windswept_hills */
+	{ "minecraft:mushroom_field_shore", 15 }, /* 1.18: Merged into mushroom_fields */
+	{ "minecraft:mushroom_fields", 14 },
+	{ "minecraft:nether_wastes", 8 },
+	{ "minecraft:ocean", 0 },
+	{ "minecraft:old_growth_birch_forest", 155 },
+	{ "minecraft:old_growth_pine_taiga", 32 },
+	{ "minecraft:old_growth_spruce_taiga", 160 },
+	{ "minecraft:plains", 1 },
+	{ "minecraft:river", 7 },
+	{ "minecraft:savanna", 35 },
+	{ "minecraft:savanna_plateau", 36 },
+	{ "minecraft:shattered_savanna", 163 },
+	{ "minecraft:shattered_savanna_plateau", 164 }, /* 1.18: Merged into shattered_savanna */
+	{ "minecraft:small_end_islands", 40 },
+	{ "minecraft:snowy_beach", 26 },
+	{ "minecraft:snowy_mountains", 13 }, /* 1.18: Merged into snowy_tundra */
+	{ "minecraft:snowy_plains", 12 },
+	{ "minecraft:snowy_slopes", 55 },
+	{ "minecraft:snowy_taiga", 30 },
+	{ "minecraft:snowy_taiga_hills", 31 }, /* 1.18: Merged into snowy_taiga */
+	{ "minecraft:snowy_taiga_mountains", 158 }, /* 1.18: Merged into snowy_taiga */
+	{ "minecraft:snowy_tundra", 12 },
+	{ "minecraft:soul_sand_valley", 170 },
+	{ "minecraft:sparse_jungle", 23 },
+	{ "minecraft:stone_shore", 25 },
+	{ "minecraft:stony_peaks", 54 }, /* 1.18: New */
+	{ "minecraft:stony_shore", 25 },
+	{ "minecraft:sunflower_plains", 129 },
+	{ "minecraft:swamp", 6 },
+	{ "minecraft:swamp_hills", 134 }, /* 1.18: Merged into swamp */
+	{ "minecraft:taiga", 5 },
+	{ "minecraft:taiga_hills", 19 }, /* 1.18: Merged into taiga */
+	{ "minecraft:taiga_mountains", 133 }, /* 1.18: Merged into taiga */
+	{ "minecraft:tall_birch_forest", 155 }, /* 1.18: Renamed to old_growth_birch_forest */
+	{ "minecraft:tall_birch_hills", 156 }, /* 1.18: Merged into tall_birch_forest */
+	{ "minecraft:the_end", 9 },
+	{ "minecraft:the_void", 127 },
+	{ "minecraft:warm_ocean", 44 },
+	{ "minecraft:warped_forest", 172 },
+	{ "minecraft:windswept_forest", 34 },
+	{ "minecraft:windswept_gravelly_hills", 131 },
+	{ "minecraft:windswept_hills", 3 },
+	{ "minecraft:windswept_savanna", 163 },
+	{ "minecraft:wooded_badlands", 38 },
+	{ "minecraft:wooded_badlands_plateau", 38 }, /* 1.18: Renamed to wooded_badlands */
+	{ "minecraft:wooded_hills", 18 }, /* 1.18: Merged into forest */
+	{ "minecraft:wooded_mountains", 34 /* 1.18: Renamed to windswept_forest */},
+};
+
 }
 }
diff --git a/src/Resource/Biome.hpp b/src/Resource/Biome.hpp
index 490668c..0cb4f8c 100644
--- a/src/Resource/Biome.hpp
+++ b/src/Resource/Biome.hpp
@@ -10,6 +10,7 @@
 #include "Color.hpp"
 #include "../Util.hpp"
 
+#include <unordered_map>
 
 namespace MinedMap {
 namespace Resource {
@@ -28,14 +29,15 @@ protected:
 	FloatColor getWaterColor() const { return water; };
 
 public:
+	static const Biome *const Default;
+	static const Biome *const Biomes[256];
+	static const std::unordered_map<std::string, uint8_t> Names;
+
 	Biome(float temp0, float rain0, FloatColor water0 = {0.247f, 0.463f, 0.894f})
 	: temp(temp0), rain(rain0), water(water0) {}
 
 	FloatColor getBlockColor(const BlockType *type, y_idx_t height) const;
 };
 
-extern const Biome *const BIOME_DEFAULT;
-extern const Biome *const BIOMES[256];
-
 }
 }
diff --git a/src/World/Block.hpp b/src/World/Block.hpp
index 2f207a3..e1ed09a 100644
--- a/src/World/Block.hpp
+++ b/src/World/Block.hpp
@@ -28,7 +28,7 @@ struct Block {
 		if (!isVisible())
 			return Resource::FloatColor {};
 
-		return (Resource::BIOMES[biome] ?: Resource::BIOME_DEFAULT)->getBlockColor(type, depth);
+		return (Resource::Biome::Biomes[biome] ?: Resource::Biome::Default)->getBlockColor(type, depth);
 	}
 
 	operator bool() const {

From baa20494bf5e4c98b220065d3a2813a3a36378c1 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 11 Dec 2021 19:34:38 +0100
Subject: [PATCH 025/460] World: Section: implement new section-based biome
 data format

---
 src/World/Chunk.cpp   |  8 +++++
 src/World/Chunk.hpp   |  4 +--
 src/World/Section.cpp | 83 ++++++++++++++++++++++++++++++++++++++++---
 src/World/Section.hpp | 26 ++++++++++++--
 4 files changed, 113 insertions(+), 8 deletions(-)

diff --git a/src/World/Chunk.cpp b/src/World/Chunk.cpp
index a447cda..136c3bf 100644
--- a/src/World/Chunk.cpp
+++ b/src/World/Chunk.cpp
@@ -79,6 +79,14 @@ uint8_t Chunk::getBiome(block_idx_t x, y_idx_t y, block_idx_t z) const {
 		return biomeInts->getValue(z*SIZE + x);
 	case BYTE_ARRAY:
 		return biomeBytes->getValue(z*SIZE + x);
+	case SECTION: {
+		section_idx_t Y = (y >> HSHIFT) - sectionOffset;
+
+		if (Y < 0 || size_t(Y) >= sections.size() || !sections[Y])
+			break;
+
+		return sections[Y]->getBiomeAt(x, y & HMASK, z);
+	}
 	default:
 		break;
 	}
diff --git a/src/World/Chunk.hpp b/src/World/Chunk.hpp
index 34a5184..611c3c8 100644
--- a/src/World/Chunk.hpp
+++ b/src/World/Chunk.hpp
@@ -36,9 +36,9 @@ public:
 
 	// Since Minecraft 1.15, biome information is stored for
 	// 4x4x4 block groups
-	static const unsigned BSHIFT = 2;
+	static const unsigned BSHIFT = Section::BSHIFT;
 	// Number of biome values in a chunk in x/z dimensions
-	static const uint32_t BSIZE = SIZE >> BSHIFT;
+	static const uint32_t BSIZE = Section::BSIZE;
 	// Number of biome values in a chunk in y dimension
 	static const uint32_t BMAXY = MAXY >> BSHIFT;
 
diff --git a/src/World/Section.cpp b/src/World/Section.cpp
index bc10f96..8d50bca 100644
--- a/src/World/Section.cpp
+++ b/src/World/Section.cpp
@@ -6,6 +6,7 @@
 
 
 #include "Section.hpp"
+#include "../Resource/Biome.hpp"
 #include "../NBT/ByteTag.hpp"
 #include "../NBT/StringTag.hpp"
 
@@ -24,6 +25,10 @@ const Resource::BlockType * Section::getBlockStateAt(block_idx_t, block_idx_t, b
 	return nullptr;
 }
 
+uint8_t Section::getBiomeAt(block_idx_t x, block_idx_t y, block_idx_t z) const {
+	return 0xff;
+}
+
 std::unique_ptr<Section> Section::makeSection(const std::shared_ptr<const NBT::CompoundTag> &section, uint32_t dataVersion) {
 	{
 		const std::shared_ptr<const NBT::CompoundTag> blockStates = section->get<NBT::CompoundTag>("block_states");
@@ -31,7 +36,13 @@ std::unique_ptr<Section> Section::makeSection(const std::shared_ptr<const NBT::C
 			const std::shared_ptr<const NBT::ListTag> palette = assertValue(blockStates->get<NBT::ListTag>("palette"));
 			std::shared_ptr<const NBT::LongArrayTag> data = blockStates->get<NBT::LongArrayTag>("data");
 
-			return std::unique_ptr<Section>(new PaletteSection(section, std::move(data), palette, dataVersion));
+			const std::shared_ptr<const NBT::CompoundTag> biomes = assertValue(section->get<NBT::CompoundTag>("biomes"));
+			const std::shared_ptr<const NBT::ListTag> biomePalette = assertValue(biomes->get<NBT::ListTag>("palette"));
+			std::shared_ptr<const NBT::LongArrayTag> biomeData = biomes->get<NBT::LongArrayTag>("data");
+
+			return std::unique_ptr<Section>(new PaletteSection(
+				section, std::move(data), palette, std::move(biomeData), biomePalette, dataVersion
+			));
 		}
 	}
 
@@ -40,7 +51,10 @@ std::unique_ptr<Section> Section::makeSection(const std::shared_ptr<const NBT::C
 		if (blockStates) {
 			const std::shared_ptr<const NBT::ListTag> palette = assertValue(section->get<NBT::ListTag>("Palette"));
 
-			return std::unique_ptr<Section>(new PaletteSection(section, std::move(blockStates), palette, dataVersion));
+			return std::unique_ptr<Section>(new PaletteSection(
+				section, std::move(blockStates), palette,
+				std::shared_ptr<const NBT::LongArrayTag>(), std::shared_ptr<const NBT::ListTag>(), dataVersion
+			));
 		}
 	}
 
@@ -76,8 +90,10 @@ PaletteSection::PaletteSection(
 	const std::shared_ptr<const NBT::CompoundTag> &section,
 	std::shared_ptr<const NBT::LongArrayTag> &&blockStates0,
 	const std::shared_ptr<const NBT::ListTag> &paletteData,
+	std::shared_ptr<const NBT::LongArrayTag> &&biomes0,
+	const std::shared_ptr<const NBT::ListTag> &biomePaletteData,
 	uint32_t dataVersion0
-) : Section(section), blockStates(blockStates0), dataVersion(dataVersion0) {
+) : Section(section), blockStates(blockStates0), biomes(biomes0), dataVersion(dataVersion0) {
 	bits = 4;
 	while ((1u << bits) < paletteData->size()) {
 		bits++;
@@ -86,6 +102,16 @@ PaletteSection::PaletteSection(
 			throw std::invalid_argument("unsupported block palette size");
 	}
 
+	biomeBits = 1;
+	if (biomePaletteData) {
+		while ((1u << biomeBits) < biomePaletteData->size()) {
+			biomeBits++;
+
+			if (bits > 6)
+				throw std::invalid_argument("unsupported biome palette size");
+		}
+	}
+
 	unsigned expectedLength;
 
 	if (dataVersion < 2529) {
@@ -96,7 +122,13 @@ PaletteSection::PaletteSection(
 	}
 
 	if (blockStates && blockStates->getLength() != expectedLength)
-		throw std::invalid_argument("corrupt section data");
+		throw std::invalid_argument("corrupt section block data");
+
+	unsigned biomesPerWord = (64 / biomeBits);
+	unsigned expectedBiomeLength = (64 + biomesPerWord - 1) / biomesPerWord;
+
+	if (biomes && biomes->getLength() != expectedBiomeLength)
+		throw std::invalid_argument("corrupt section biome data");
 
 	for (const auto &entry : *paletteData) {
 		const NBT::CompoundTag &paletteEntry = *assertValue(dynamic_cast<const NBT::CompoundTag *>(entry.get()));
@@ -108,6 +140,25 @@ PaletteSection::PaletteSection(
 
 		palette.push_back(type);
 	}
+
+	if (biomePaletteData) {
+		for (const auto &entry : *biomePaletteData) {
+			const NBT::StringTag &paletteEntry =
+				*assertValue(dynamic_cast<const NBT::StringTag *>(entry.get()));
+			std::string name = paletteEntry.getValue();
+
+			auto it = Resource::Biome::Names.find(name);
+			uint8_t biome;
+			if (it != Resource::Biome::Names.end()) {
+				biome = it->second;
+			} else {
+				std::fprintf(stderr, "Warning: unknown biome: %s\n", name.c_str());
+				biome = 0xff;
+			}
+
+			biomePalette.push_back(biome);
+		}
+	}
 }
 
 const Resource::BlockType * PaletteSection::getBlockStateAt(block_idx_t x, block_idx_t y, block_idx_t z) const {
@@ -141,5 +192,29 @@ const Resource::BlockType * PaletteSection::getBlockStateAt(block_idx_t x, block
 	return palette.at((v >> shift) & mask);
 }
 
+uint8_t PaletteSection::getBiomeAt(block_idx_t x, block_idx_t y, block_idx_t z) const {
+	if (!biomes)
+		return biomePalette.at(0);
+
+	size_t index = getBiomeIndex(x, y, z);
+
+	unsigned biomesPerWord = (64 / biomeBits);
+	size_t word = index / biomesPerWord;
+	size_t bitIndex = 64 * word + biomeBits * (index % biomesPerWord);
+
+	size_t pos = bitIndex >> 3;
+	unsigned shift = bitIndex & 7;
+	uint16_t mask = (1u << biomeBits) - 1;
+
+	uint32_t v = biomes->getPointer()[mangleByteIndex(pos)];
+
+	if (shift + biomeBits > 8)
+		v |= biomes->getPointer()[mangleByteIndex(pos + 1)] << 8;
+	/* We do not need to check for shift+bits > 16: biomeBits should never
+	be greater than 6, so our value will never span more than 2 bytes */
+
+	return biomePalette.at((v >> shift) & mask);
+}
+
 }
 }
diff --git a/src/World/Section.hpp b/src/World/Section.hpp
index d18f95f..9884a77 100644
--- a/src/World/Section.hpp
+++ b/src/World/Section.hpp
@@ -27,6 +27,13 @@ public:
 	// Number of blocks in a section in each dimension
 	static const uint32_t SIZE = 16;
 
+	// Since Minecraft 1.15, biome information is stored for
+	// 4x4x4 block groups
+	static const unsigned BSHIFT = 2;
+	// Number of biome values in a chunk in x/z dimensions
+	static const uint32_t BSIZE = SIZE >> BSHIFT;
+
+
 private:
 	section_idx_t Y;
 	std::shared_ptr<const NBT::ByteArrayTag> blockLight;
@@ -34,11 +41,18 @@ private:
 protected:
 	static size_t getIndex(block_idx_t x, block_idx_t y, block_idx_t z) {
 		if (x >= SIZE || y >= SIZE || z >= SIZE)
-			throw std::range_error("Chunk::getIndex(): bad coordinates");
+			throw std::range_error("Section::getIndex(): bad coordinates");
 
 		return SIZE*SIZE*y + SIZE*z + x;
 	}
 
+	static size_t getBiomeIndex(block_idx_t x, block_idx_t y, block_idx_t z) {
+		if (x >= SIZE || y >= SIZE || z >= SIZE)
+			throw std::range_error("Section::getBiomeIndex(): bad coordinates");
+
+		return BSIZE*BSIZE*(y>>BSHIFT) + BSIZE*(z>>BSHIFT) + (x>>BSHIFT);
+	}
+
 	static uint8_t getHalf(const uint8_t *v, block_idx_t x, block_idx_t y, block_idx_t z) {
 		size_t i = getIndex(x, y, z);
 
@@ -56,6 +70,7 @@ public:
 	section_idx_t getY() const { return Y; };
 
 	virtual const Resource::BlockType * getBlockStateAt(block_idx_t x, block_idx_t y, block_idx_t z) const;
+	virtual uint8_t getBiomeAt(block_idx_t x, block_idx_t y, block_idx_t z) const;
 
 	uint8_t getBlockLightAt(block_idx_t x, block_idx_t y, block_idx_t z) const {
 		if (!blockLight)
@@ -95,9 +110,13 @@ class PaletteSection : public Section {
 private:
 	std::shared_ptr<const NBT::LongArrayTag> blockStates;
 	std::vector<const Resource::BlockType *> palette;
-	uint32_t dataVersion;
 	unsigned bits;
 
+	std::shared_ptr<const NBT::LongArrayTag> biomes;
+	std::vector<uint8_t> biomePalette;
+	unsigned biomeBits;
+
+	uint32_t dataVersion;
 
 	static const Resource::BlockType * lookup(const std::string &name, uint32_t dataVersion);
 
@@ -110,10 +129,13 @@ public:
 		const std::shared_ptr<const NBT::CompoundTag> &section,
 		std::shared_ptr<const NBT::LongArrayTag> &&blockStates0,
 		const std::shared_ptr<const NBT::ListTag> &paletteData,
+		std::shared_ptr<const NBT::LongArrayTag> &&biomes0,
+		const std::shared_ptr<const NBT::ListTag> &biomePaletteData,
 		uint32_t dataVersion0
 	);
 
 	virtual const Resource::BlockType * getBlockStateAt(block_idx_t x, block_idx_t y, block_idx_t z) const;
+	virtual uint8_t getBiomeAt(block_idx_t x, block_idx_t y, block_idx_t z) const;
 };
 
 }

From 73dfecf37988f55b7b94e94e392c97e2d8ec91a0 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 11 Dec 2021 19:39:52 +0100
Subject: [PATCH 026/460] Resource: BlockType: update colors with MC1.18
 texture data

---
 src/Resource/BlockType.inc.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Resource/BlockType.inc.cpp b/src/Resource/BlockType.inc.cpp
index 0489fd9..9a4ff17 100644
--- a/src/Resource/BlockType.inc.cpp
+++ b/src/Resource/BlockType.inc.cpp
@@ -131,8 +131,8 @@
 {"minecraft:campfire", {BLOCK_OPAQUE, {110, 88, 54}}},
 {"minecraft:candle", {0, {0, 0, 0}}},
 {"minecraft:candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
-{"minecraft:carrots", {BLOCK_OPAQUE, {81, 123, 37}}},
-{"minecraft:cartography_table", {BLOCK_OPAQUE, {104, 87, 67}}},
+{"minecraft:carrots", {BLOCK_OPAQUE, {81, 124, 37}}},
+{"minecraft:cartography_table", {BLOCK_OPAQUE, {103, 87, 67}}},
 {"minecraft:carved_pumpkin", {BLOCK_OPAQUE, {198, 118, 24}}},
 {"minecraft:cauldron", {BLOCK_OPAQUE, {73, 72, 74}}},
 {"minecraft:cave_air", {0, {0, 0, 0}}},
@@ -193,7 +193,7 @@
 {"minecraft:crimson_sign", {BLOCK_OPAQUE, {101, 48, 70}}},
 {"minecraft:crimson_slab", {BLOCK_OPAQUE, {101, 48, 70}}},
 {"minecraft:crimson_stairs", {BLOCK_OPAQUE, {101, 48, 70}}},
-{"minecraft:crimson_stem", {BLOCK_OPAQUE, {107, 51, 74}}},
+{"minecraft:crimson_stem", {BLOCK_OPAQUE, {112, 49, 70}}},
 {"minecraft:crimson_trapdoor", {BLOCK_OPAQUE, {103, 50, 72}}},
 {"minecraft:crimson_wall_sign", {0, {0, 0, 0}}},
 {"minecraft:crying_obsidian", {BLOCK_OPAQUE, {32, 10, 60}}},
@@ -225,7 +225,7 @@
 {"minecraft:dark_oak_fence", {BLOCK_OPAQUE, {66, 43, 20}}},
 {"minecraft:dark_oak_fence_gate", {BLOCK_OPAQUE, {66, 43, 20}}},
 {"minecraft:dark_oak_leaves", {BLOCK_OPAQUE|BLOCK_FOLIAGE, {150, 150, 150}}},
-{"minecraft:dark_oak_log", {BLOCK_OPAQUE, {64, 42, 21}}},
+{"minecraft:dark_oak_log", {BLOCK_OPAQUE, {67, 45, 22}}},
 {"minecraft:dark_oak_planks", {BLOCK_OPAQUE, {66, 43, 20}}},
 {"minecraft:dark_oak_pressure_plate", {BLOCK_OPAQUE, {66, 43, 20}}},
 {"minecraft:dark_oak_sapling", {BLOCK_OPAQUE, {61, 90, 30}}},
@@ -325,7 +325,7 @@
 {"minecraft:furnace", {BLOCK_OPAQUE, {110, 109, 109}}},
 {"minecraft:gilded_blackstone", {BLOCK_OPAQUE, {55, 42, 38}}},
 {"minecraft:glass", {BLOCK_OPAQUE, {175, 213, 219}}},
-{"minecraft:glass_pane", {BLOCK_OPAQUE, {211, 239, 244}}},
+{"minecraft:glass_pane", {BLOCK_OPAQUE, {170, 210, 217}}},
 {"minecraft:glow_item_frame", {0, {0, 0, 0}}},
 {"minecraft:glow_lichen", {0, {0, 0, 0}}},
 {"minecraft:glowstone", {BLOCK_OPAQUE, {171, 131, 84}}},
@@ -388,7 +388,7 @@
 {"minecraft:infested_stone_bricks", {BLOCK_OPAQUE, {122, 121, 122}}},
 {"minecraft:iron_bars", {BLOCK_OPAQUE, {136, 139, 135}}},
 {"minecraft:iron_block", {BLOCK_OPAQUE, {220, 220, 220}}},
-{"minecraft:iron_door", {BLOCK_OPAQUE, {193, 192, 192}}},
+{"minecraft:iron_door", {BLOCK_OPAQUE, {194, 193, 193}}},
 {"minecraft:iron_ore", {BLOCK_OPAQUE, {136, 129, 122}}},
 {"minecraft:iron_trapdoor", {BLOCK_OPAQUE, {202, 202, 202}}},
 {"minecraft:item_frame", {0, {0, 0, 0}}},
@@ -518,7 +518,7 @@
 {"minecraft:netherrack", {BLOCK_OPAQUE, {97, 38, 38}}},
 {"minecraft:note_block", {BLOCK_OPAQUE, {88, 58, 40}}},
 {"minecraft:oak_button", {0, {0, 0, 0}}},
-{"minecraft:oak_door", {BLOCK_OPAQUE, {139, 110, 65}}},
+{"minecraft:oak_door", {BLOCK_OPAQUE, {140, 110, 66}}},
 {"minecraft:oak_fence", {BLOCK_OPAQUE, {162, 130, 78}}},
 {"minecraft:oak_fence_gate", {BLOCK_OPAQUE, {162, 130, 78}}},
 {"minecraft:oak_leaves", {BLOCK_OPAQUE|BLOCK_FOLIAGE, {144, 144, 144}}},
@@ -788,7 +788,7 @@
 {"minecraft:stripped_crimson_hyphae", {BLOCK_OPAQUE, {137, 57, 90}}},
 {"minecraft:stripped_crimson_stem", {BLOCK_OPAQUE, {121, 56, 82}}},
 {"minecraft:stripped_dark_oak_log", {BLOCK_OPAQUE, {65, 44, 22}}},
-{"minecraft:stripped_dark_oak_wood", {BLOCK_OPAQUE, {96, 76, 49}}},
+{"minecraft:stripped_dark_oak_wood", {BLOCK_OPAQUE, {72, 56, 36}}},
 {"minecraft:stripped_jungle_log", {BLOCK_OPAQUE, {165, 122, 81}}},
 {"minecraft:stripped_jungle_wood", {BLOCK_OPAQUE, {171, 132, 84}}},
 {"minecraft:stripped_oak_log", {BLOCK_OPAQUE, {160, 129, 77}}},
@@ -837,7 +837,7 @@
 {"minecraft:warped_sign", {BLOCK_OPAQUE, {43, 104, 99}}},
 {"minecraft:warped_slab", {BLOCK_OPAQUE, {43, 104, 99}}},
 {"minecraft:warped_stairs", {BLOCK_OPAQUE, {43, 104, 99}}},
-{"minecraft:warped_stem", {BLOCK_OPAQUE, {57, 103, 103}}},
+{"minecraft:warped_stem", {BLOCK_OPAQUE, {53, 109, 110}}},
 {"minecraft:warped_trapdoor", {BLOCK_OPAQUE, {47, 119, 111}}},
 {"minecraft:warped_wall_sign", {0, {0, 0, 0}}},
 {"minecraft:warped_wart_block", {BLOCK_OPAQUE, {22, 119, 121}}},

From d18e004743f2db8c9d71e5f8f96810f535c6ae6d Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 12 Dec 2021 10:28:17 +0100
Subject: [PATCH 027/460] World: Section: fix biome palette size check

We were accidentally checking the block type palette size.
---
 src/World/Section.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/World/Section.cpp b/src/World/Section.cpp
index 8d50bca..ffa2789 100644
--- a/src/World/Section.cpp
+++ b/src/World/Section.cpp
@@ -107,7 +107,7 @@ PaletteSection::PaletteSection(
 		while ((1u << biomeBits) < biomePaletteData->size()) {
 			biomeBits++;
 
-			if (bits > 6)
+			if (biomeBits > 6)
 				throw std::invalid_argument("unsupported biome palette size");
 		}
 	}

From a2fe33ef1f7a3b405066a14c69cc1a340a763a7f Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 12 Dec 2021 12:15:31 +0100
Subject: [PATCH 028/460] World: Section: add support for Int tag section Y
 values

For some reason, MC1.18 sometimes uses Int instead of Byte tags for
section Y values after "optimize world". Add support for this (but still
only accept values that fit in a int8_t).
---
 src/World/Section.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/World/Section.cpp b/src/World/Section.cpp
index ffa2789..ba7b0c9 100644
--- a/src/World/Section.cpp
+++ b/src/World/Section.cpp
@@ -8,6 +8,7 @@
 #include "Section.hpp"
 #include "../Resource/Biome.hpp"
 #include "../NBT/ByteTag.hpp"
+#include "../NBT/IntTag.hpp"
 #include "../NBT/StringTag.hpp"
 
 #include <cstdio>
@@ -17,7 +18,16 @@ namespace MinedMap {
 namespace World {
 
 Section::Section(const std::shared_ptr<const NBT::CompoundTag> &section) {
-	Y = int8_t(assertValue(section->get<NBT::ByteTag>("Y"))->getValue());
+	const std::shared_ptr<const NBT::ByteTag> YByteTag = section->get<NBT::ByteTag>("Y");
+	if (YByteTag) {
+		Y = int8_t(YByteTag->getValue());
+	} else {
+		const std::shared_ptr<const NBT::IntTag> YIntTag = assertValue(section->get<NBT::IntTag>("Y"));
+		int32_t value = YIntTag->getValue();
+		if (int8_t(value) != value)
+			throw std::invalid_argument("unsupported section Y coordinate");
+		Y = value;
+	}
 	blockLight = section->get<NBT::ByteArrayTag>("BlockLight");
 }
 

From fac2e4c8da6fd0af2178318bb6adfea341bbcbaf Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 12 Dec 2021 12:18:18 +0100
Subject: [PATCH 029/460] World: Chunk: add support for unordered sections

MC1.18 doesn't always store sections sorted by their Y value, possibly
related to "optimize world".
---
 src/World/Chunk.cpp | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/World/Chunk.cpp b/src/World/Chunk.cpp
index 136c3bf..b9d27c5 100644
--- a/src/World/Chunk.cpp
+++ b/src/World/Chunk.cpp
@@ -52,17 +52,35 @@ Chunk::Chunk(const ChunkData *data) {
 	auto dataVersionTag = data->getRoot()->get<NBT::IntTag>("DataVersion");
 	uint32_t dataVersion = dataVersionTag ? dataVersionTag->getValue() : 0;
 
+	std::vector<std::unique_ptr<Section>> tmpSections;
+	section_idx_t minY = std::numeric_limits<section_idx_t>::max();
+	section_idx_t maxY = std::numeric_limits<section_idx_t>::min();
+
 	for (auto &sTag : *sectionsTag) {
 		auto s = std::dynamic_pointer_cast<const NBT::CompoundTag>(sTag);
 		std::unique_ptr<Section> section = Section::makeSection(s, dataVersion);
 		section_idx_t Y = section->getY();
-		if (sections.empty())
-			sectionOffset = Y;
+		if (Y < minY)
+			minY = Y;
+		if (Y > maxY)
+			maxY = Y;
 
+		tmpSections.push_back(std::move(section));
+	}
+
+	if (tmpSections.empty())
+		return;
+
+	assertValue(minY <= maxY);
+	sectionOffset = minY;
+	sections.resize(maxY - minY + 1);
+
+	for (auto &section : tmpSections) {
+		section_idx_t Y = section->getY();
 		Y -= sectionOffset;
-		assertValue(Y >= 0 && size_t(Y) >= sections.size());
-		sections.resize(Y);
-		sections.push_back(std::move(section));
+		assertValue(Y >= 0 && size_t(Y) < sections.size());
+		assertValue(!sections[Y]);
+		sections[Y] = std::move(section);
 	}
 }
 

From 37340926f4a2a3f6cd346f78fa6f9c91e5c87775 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 19 Dec 2021 23:10:42 +0100
Subject: [PATCH 030/460] MinedMap: fix warning for unused fscanf result

---
 src/MinedMap.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/MinedMap.cpp b/src/MinedMap.cpp
index 6c55851..e4993a0 100644
--- a/src/MinedMap.cpp
+++ b/src/MinedMap.cpp
@@ -133,7 +133,9 @@ static int64_t readStamp(const std::string &filename) {
 
 	std::FILE *f = std::fopen((filename + ".stamp").c_str(), "r");
 	if (f) {
-		std::fscanf(f, "%" SCNd64, &v);
+		if (std::fscanf(f, "%" SCNd64, &v) != 1) {
+			// Ignore errors
+		}
 		std::fclose(f);
 	}
 

From 00b93c507d5d7d60808ca598be76fe535da28e69 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 19 Dec 2021 23:12:25 +0100
Subject: [PATCH 031/460] ci: add GitHub actions for Linux and Windows builds

We build a "static" binary for Windows now to avoid distributing the
dependencies as DLLs.
---
 .github/toolchains/x86_64-linux-gnu.cmake     |  0
 .github/toolchains/x86_64-w64-mingw32.cmake   | 22 +++++
 .../x86_64-w64-mingw32/FindPkgConfig.cmake    |  5 ++
 .github/workflows/MinedMap.yml                | 85 +++++++++++++++++++
 CMakePresets.json                             | 39 +++++++++
 5 files changed, 151 insertions(+)
 create mode 100644 .github/toolchains/x86_64-linux-gnu.cmake
 create mode 100644 .github/toolchains/x86_64-w64-mingw32.cmake
 create mode 100644 .github/toolchains/x86_64-w64-mingw32/FindPkgConfig.cmake
 create mode 100644 .github/workflows/MinedMap.yml
 create mode 100644 CMakePresets.json

diff --git a/.github/toolchains/x86_64-linux-gnu.cmake b/.github/toolchains/x86_64-linux-gnu.cmake
new file mode 100644
index 0000000..e69de29
diff --git a/.github/toolchains/x86_64-w64-mingw32.cmake b/.github/toolchains/x86_64-w64-mingw32.cmake
new file mode 100644
index 0000000..53256c1
--- /dev/null
+++ b/.github/toolchains/x86_64-w64-mingw32.cmake
@@ -0,0 +1,22 @@
+set(TARGET x86_64-w64-mingw32)
+
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/.github/toolchains/${TARGET})
+
+set(CMAKE_SYSTEM_NAME Windows)
+set(CMAKE_SYSROOT /usr/${TARGET})
+
+set(CMAKE_C_COMPILER ${TARGET}-gcc)
+set(CMAKE_CXX_COMPILER ${TARGET}-g++)
+
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+
+set(ENV{PKG_CONFIG_LIBDIR} ${CMAKE_SYSROOT}/lib/pkgconfig:${CMAKE_SYSROOT}/share/pkgconfig)
+set(ENV{PKG_CONFIG_PATH} $ENV{PKG_CONFIG_LIBDIR})
+
+set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
+
+set(CMAKE_EXE_LINKER_FLAGS "-static")
+
+
diff --git a/.github/toolchains/x86_64-w64-mingw32/FindPkgConfig.cmake b/.github/toolchains/x86_64-w64-mingw32/FindPkgConfig.cmake
new file mode 100644
index 0000000..79166ed
--- /dev/null
+++ b/.github/toolchains/x86_64-w64-mingw32/FindPkgConfig.cmake
@@ -0,0 +1,5 @@
+# Hack: The toolchain file is evaluated too early to set the library suffixes, so we use a wrapper
+# around FindPkgConfig set it right before we search for libraries.
+set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+
+include(${CMAKE_ROOT}/Modules/FindPkgConfig.cmake)
diff --git a/.github/workflows/MinedMap.yml b/.github/workflows/MinedMap.yml
new file mode 100644
index 0000000..7350a3e
--- /dev/null
+++ b/.github/workflows/MinedMap.yml
@@ -0,0 +1,85 @@
+name: 'MinedMap'
+on: ['push', 'pull_request', 'workflow_dispatch']
+
+jobs:
+  build:
+    name: 'Build MinedMap (${{ matrix.host }})'
+    runs-on: 'ubuntu-20.04'
+    strategy:
+      fail-fast: false
+      matrix:
+        host:
+          - 'x86_64-linux-gnu'
+          - 'x86_64-w64-mingw32'
+        include:
+          - host: 'x86_64-linux-gnu'
+            label: 'x86_64-linux-gnu'
+            packages: ['g++', 'libpng-dev']
+            prefix: '/usr'
+            build_libpng: false
+          - host: 'x86_64-w64-mingw32'
+            label: 'Win64'
+            packages: ['g++-mingw-w64-x86-64', 'libz-mingw-w64-dev']
+            prefix: '/usr/x86_64-w64-mingw32'
+            build_libpng: true
+
+    env:
+      CMAKE_TOOLCHAIN_FILE: '${{ github.workspace }}/.github/toolchains/${{ matrix.host }}.cmake'
+
+    steps:
+      - name: 'Checkout'
+        uses: 'actions/checkout@v2'
+
+      - name: 'Get version'
+        id: 'tag'
+        run: |
+          set -o pipefail
+          git fetch --prune --unshallow
+          git describe --abbrev=7 --match='v*' | sed 's/^v/::set-output name=tag::/'
+
+      - name: 'Dependencies (apt)'
+        run: |
+          sudo apt-get -y update
+          sudo apt-get -y install ninja-build ${{ join(matrix.packages, ' ') }}
+          sudo apt-get -y clean
+
+      - name: 'Dependencies (libpng)'
+        if: '${{ matrix.build_libpng }}'
+        run: |
+          pkgver=1.6.37
+          pkghash=505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca
+
+          mkdir -p build/libpng
+          cd build/libpng
+          wget http://downloads.sourceforge.net/sourceforge/libpng/libpng-$pkgver.tar.xz
+          echo "$pkghash libpng-$pkgver.tar.xz" | sha256sum -c -
+          tar xf libpng-$pkgver.tar.xz
+          cd libpng-$pkgver
+          ./configure \
+            --prefix=${{ matrix.prefix }} \
+            --host=${{ matrix.host }} \
+            --disable-shared
+          make -j$(nproc)
+          sudo make install
+          sudo rm ${{ matrix.prefix }}/lib/libpng*.la
+
+      - name: 'Build'
+        uses: lukka/run-cmake@v10
+        with:
+          configurePreset: 'ninja'
+          buildPreset: 'ninja-release'
+
+      - name: 'Install'
+        run: |
+          export DESTDIR="$(pwd)/build/install"
+          ninja -C builds/ninja -f build-RelWithDebInfo.ninja install/strip
+
+          pkgdir='build/pkg/MinedMap-${{ steps.tag.outputs.tag }}-${{ matrix.label }}'
+          mkdir -p "$pkgdir"
+          cp "$DESTDIR/usr/local/bin"/* "$pkgdir"/
+
+      - name: 'Archive'
+        uses: 'actions/upload-artifact@v2'
+        with:
+          name: 'MinedMap-${{ steps.tag.outputs.tag }}-${{ matrix.label }}'
+          path: 'build/pkg'
diff --git a/CMakePresets.json b/CMakePresets.json
new file mode 100644
index 0000000..bc371b3
--- /dev/null
+++ b/CMakePresets.json
@@ -0,0 +1,39 @@
+{
+  "version": 3,
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 7,
+    "patch": 0
+  },
+  "configurePresets": [
+    {
+      "name": "ninja",
+      "displayName": "Ninja",
+      "description": "Generate Ninja project files",
+      "binaryDir": "${sourceDir}/builds/${presetName}",
+      "generator": "Ninja Multi-Config",
+      "cacheVariables": {
+        "CMAKE_TOOLCHAIN_FILE": {
+          "type": "FILEPATH",
+          "value": "$env{CMAKE_TOOLCHAIN_FILE}"
+        }
+      }
+    }
+  ],
+  "buildPresets": [
+    {
+      "name": "ninja-debug",
+      "configurePreset": "ninja",
+      "displayName": "Build ninja-debug",
+      "description": "Build ninja Debug configuration",
+      "configuration": "Debug"
+    },
+    {
+      "name": "ninja-release",
+      "configurePreset": "ninja",
+      "displayName": "Build ninja-release",
+      "description": "Build ninja Release configuration",
+      "configuration": "RelWithDebInfo"
+    }
+  ]
+}

From 7c13d850b7bafd5064ec9951f8af93186e6fc518 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 19 Dec 2021 23:19:56 +0100
Subject: [PATCH 032/460] ci: add viewer artifact

---
 .github/workflows/MinedMap.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/.github/workflows/MinedMap.yml b/.github/workflows/MinedMap.yml
index 7350a3e..5d6d655 100644
--- a/.github/workflows/MinedMap.yml
+++ b/.github/workflows/MinedMap.yml
@@ -83,3 +83,30 @@ jobs:
         with:
           name: 'MinedMap-${{ steps.tag.outputs.tag }}-${{ matrix.label }}'
           path: 'build/pkg'
+
+  viewer:
+    name: 'Package viewer'
+    runs-on: 'ubuntu-20.04'
+
+    steps:
+      - name: 'Checkout'
+        uses: 'actions/checkout@v2'
+
+      - name: 'Get version'
+        id: 'tag'
+        run: |
+          set -o pipefail
+          git fetch --prune --unshallow
+          git describe --abbrev=7 --match='v*' | sed 's/^v/::set-output name=tag::/'
+
+      - name: 'Install'
+        run: |
+          pkgdir='build/pkg/MinedMap-${{ steps.tag.outputs.tag }}-viewer'
+          mkdir -p "$pkgdir"
+          cp -r viewer/* "$pkgdir"/
+
+      - name: 'Archive'
+        uses: 'actions/upload-artifact@v2'
+        with:
+          name: 'MinedMap-${{ steps.tag.outputs.tag }}-viewer'
+          path: 'build/pkg'

From 056cee8585bb1eb5294a45076a1d70b29892e0b4 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 21 Dec 2021 23:35:00 +0100
Subject: [PATCH 033/460] build: replace FindPkgConfig hack with BUILD_STATIC
 variable set by CI toolchain file

---
 .github/toolchains/x86_64-w64-mingw32.cmake            |  6 +-----
 .../toolchains/x86_64-w64-mingw32/FindPkgConfig.cmake  |  5 -----
 CMakeLists.txt                                         | 10 +++++++++-
 3 files changed, 10 insertions(+), 11 deletions(-)
 delete mode 100644 .github/toolchains/x86_64-w64-mingw32/FindPkgConfig.cmake

diff --git a/.github/toolchains/x86_64-w64-mingw32.cmake b/.github/toolchains/x86_64-w64-mingw32.cmake
index 53256c1..08e3281 100644
--- a/.github/toolchains/x86_64-w64-mingw32.cmake
+++ b/.github/toolchains/x86_64-w64-mingw32.cmake
@@ -1,6 +1,6 @@
 set(TARGET x86_64-w64-mingw32)
 
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/.github/toolchains/${TARGET})
+set(BUILD_STATIC ON)
 
 set(CMAKE_SYSTEM_NAME Windows)
 set(CMAKE_SYSROOT /usr/${TARGET})
@@ -16,7 +16,3 @@ set(ENV{PKG_CONFIG_LIBDIR} ${CMAKE_SYSROOT}/lib/pkgconfig:${CMAKE_SYSROOT}/share
 set(ENV{PKG_CONFIG_PATH} $ENV{PKG_CONFIG_LIBDIR})
 
 set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
-
-set(CMAKE_EXE_LINKER_FLAGS "-static")
-
-
diff --git a/.github/toolchains/x86_64-w64-mingw32/FindPkgConfig.cmake b/.github/toolchains/x86_64-w64-mingw32/FindPkgConfig.cmake
deleted file mode 100644
index 79166ed..0000000
--- a/.github/toolchains/x86_64-w64-mingw32/FindPkgConfig.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-# Hack: The toolchain file is evaluated too early to set the library suffixes, so we use a wrapper
-# around FindPkgConfig set it right before we search for libraries.
-set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-
-include(${CMAKE_ROOT}/Modules/FindPkgConfig.cmake)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70385e8..996ec67 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,14 @@
-cmake_minimum_required(VERSION 3.7)
+cmake_minimum_required(VERSION 3.13)
 project(MINEDMAP CXX)
 
+# May not work with all toolchains, added for the Windows CI build
+option(BUILD_STATIC "Create a statically linked MinedMap executable")
+
+if(BUILD_STATIC)
+  list(REMOVE_ITEM CMAKE_FIND_LIBRARY_SUFFIXES ".so" ".dll.a")
+  add_link_options("-static")
+endif()
+
 find_package(PkgConfig REQUIRED)
 
 pkg_check_modules(ZLIB REQUIRED IMPORTED_TARGET zlib)

From 429e449c64f7bdd50d200e2d76a53a393ac8d6cd Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 21 Dec 2021 23:55:27 +0100
Subject: [PATCH 034/460] ci: add Win32 build

---
 .github/toolchains/common-w64-mingw32.cmake | 16 ++++++++++++++++
 .github/toolchains/i686-w64-mingw32.cmake   |  2 ++
 .github/toolchains/x86_64-w64-mingw32.cmake | 18 +-----------------
 .github/workflows/MinedMap.yml              |  5 +++++
 4 files changed, 24 insertions(+), 17 deletions(-)
 create mode 100644 .github/toolchains/common-w64-mingw32.cmake
 create mode 100644 .github/toolchains/i686-w64-mingw32.cmake

diff --git a/.github/toolchains/common-w64-mingw32.cmake b/.github/toolchains/common-w64-mingw32.cmake
new file mode 100644
index 0000000..7fcee75
--- /dev/null
+++ b/.github/toolchains/common-w64-mingw32.cmake
@@ -0,0 +1,16 @@
+set(BUILD_STATIC ON)
+
+set(CMAKE_SYSTEM_NAME Windows)
+set(CMAKE_SYSROOT /usr/${TARGET})
+
+set(CMAKE_C_COMPILER ${TARGET}-gcc)
+set(CMAKE_CXX_COMPILER ${TARGET}-g++)
+
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+
+set(ENV{PKG_CONFIG_LIBDIR} ${CMAKE_SYSROOT}/lib/pkgconfig:${CMAKE_SYSROOT}/share/pkgconfig)
+set(ENV{PKG_CONFIG_PATH} $ENV{PKG_CONFIG_LIBDIR})
+
+set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
diff --git a/.github/toolchains/i686-w64-mingw32.cmake b/.github/toolchains/i686-w64-mingw32.cmake
new file mode 100644
index 0000000..7d1612a
--- /dev/null
+++ b/.github/toolchains/i686-w64-mingw32.cmake
@@ -0,0 +1,2 @@
+set(TARGET i686-w64-mingw32)
+include(${CMAKE_CURRENT_LIST_DIR}/common-w64-mingw32.cmake)
diff --git a/.github/toolchains/x86_64-w64-mingw32.cmake b/.github/toolchains/x86_64-w64-mingw32.cmake
index 08e3281..cab56f4 100644
--- a/.github/toolchains/x86_64-w64-mingw32.cmake
+++ b/.github/toolchains/x86_64-w64-mingw32.cmake
@@ -1,18 +1,2 @@
 set(TARGET x86_64-w64-mingw32)
-
-set(BUILD_STATIC ON)
-
-set(CMAKE_SYSTEM_NAME Windows)
-set(CMAKE_SYSROOT /usr/${TARGET})
-
-set(CMAKE_C_COMPILER ${TARGET}-gcc)
-set(CMAKE_CXX_COMPILER ${TARGET}-g++)
-
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
-
-set(ENV{PKG_CONFIG_LIBDIR} ${CMAKE_SYSROOT}/lib/pkgconfig:${CMAKE_SYSROOT}/share/pkgconfig)
-set(ENV{PKG_CONFIG_PATH} $ENV{PKG_CONFIG_LIBDIR})
-
-set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
+include(${CMAKE_CURRENT_LIST_DIR}/common-w64-mingw32.cmake)
diff --git a/.github/workflows/MinedMap.yml b/.github/workflows/MinedMap.yml
index 5d6d655..dcba86a 100644
--- a/.github/workflows/MinedMap.yml
+++ b/.github/workflows/MinedMap.yml
@@ -22,6 +22,11 @@ jobs:
             packages: ['g++-mingw-w64-x86-64', 'libz-mingw-w64-dev']
             prefix: '/usr/x86_64-w64-mingw32'
             build_libpng: true
+          - host: 'i686-w64-mingw32'
+            label: 'Win32'
+            packages: ['g++-mingw-w64-i686', 'libz-mingw-w64-dev']
+            prefix: '/usr/i686-w64-mingw32'
+            build_libpng: true
 
     env:
       CMAKE_TOOLCHAIN_FILE: '${{ github.workspace }}/.github/toolchains/${{ matrix.host }}.cmake'

From 3160b59cdd3665c46f61d38dc868265fcb837c03 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 22 Dec 2021 16:08:56 +0100
Subject: [PATCH 035/460] README.md: add 1.18 support

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2fb8452..a04462a 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 * Render beautiful maps of your [Minecraft](https://minecraft.net/) worlds!
 * Put them on a webserver and view them in your browser!
-* Compatible with unmodified Minecraft Java Edition 1.8 up to 1.17 (no mod installation necessary!)
+* Compatible with unmodified Minecraft Java Edition 1.8 up to 1.18 (no mod installation necessary!)
 * Illumination layer: the world at night
 * Fast: create a full map for a huge 3GB savegame in less than 5 minutes
 * Incremental updates: only recreate map tiles for regions that have changed

From fbef307c90a96b39dde1f36f2ebe1f764c18bdd2 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 9 Feb 2022 21:26:12 +0100
Subject: [PATCH 036/460] UniqueCPtr: add doc comment

Explain what a UniqueCPtr is.
---
 src/UniqueCPtr.hpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/UniqueCPtr.hpp b/src/UniqueCPtr.hpp
index 647f7e1..743a712 100644
--- a/src/UniqueCPtr.hpp
+++ b/src/UniqueCPtr.hpp
@@ -10,7 +10,9 @@
 #include <cstdlib>
 #include <memory>
 
-
+// UniqueCPtr is a wrapper around std::unique_ptr using std::free as its deallocator
+//
+// This allows to use it to manage memory allocated by C APIs (malloc, realloc, ...)
 template<typename T> class UniqueCPtr : public std::unique_ptr<T, void (*)(void *)> {
 public:
 	UniqueCPtr() : std::unique_ptr<T, void (*)(void *)>(nullptr, std::free) {}

From 7bba6d08637105a65503708f0a752aa4b866c46b Mon Sep 17 00:00:00 2001
From: Bruno Saad <saadbruno@gmail.com>
Date: Tue, 7 Jun 2022 16:48:43 +0000
Subject: [PATCH 037/460] Adding new blocks for 1.19

---
 resource/blocks.json           | 83 ++++++++++++++++++++++++++++++++++
 src/Resource/BlockType.inc.cpp | 45 ++++++++++++++++--
 2 files changed, 123 insertions(+), 5 deletions(-)

diff --git a/resource/blocks.json b/resource/blocks.json
index 78c0d4c..cfb908f 100644
--- a/resource/blocks.json
+++ b/resource/blocks.json
@@ -599,6 +599,7 @@
 		"texture": "flowering_azalea_top"
 	},
 	"flowering_azalea_leaves": {},
+	"frogspawn": {},
 	"frosted_ice": {
 		"texture": "frosted_ice_0"
 	},
@@ -889,6 +890,44 @@
 	"magma_block": {
 		"texture": "magma"
 	},
+	"mangrove_button": null,
+	"mangrove_door": {
+		"texture": "mangrove_door_top"
+	},
+	"mangrove_fence": {
+		"texture": "mangrove_planks"
+	},
+	"mangrove_fence_gate": {
+		"texture": "mangrove_planks"
+	},
+	"mangrove_leaves": {
+		"foliage": true
+	},
+	"mangrove_log": {
+		"texture": "mangrove_log_top"
+	},
+	"mangrove_planks": {},
+	"mangrove_pressure_plate": {
+		"texture": "mangrove_planks"
+	},
+	"mangrove_propagule": {},
+	"mangrove_roots": {
+		"texture": "mangrove_roots_top"
+	},
+	"mangrove_sign": {
+		"texture": "mangrove_planks"
+	},
+	"mangrove_slab": {
+		"texture": "mangrove_planks"
+	},
+	"mangrove_stairs": {
+		"texture": "mangrove_planks"
+	},
+	"mangrove_trapdoor": {},
+	"mangrove_wall_sign": null,
+	"mangrove_wood": {
+		"texture": "mangrove_log"
+	},
 	"medium_amethyst_bud": null,
 	"melon": {
 		"texture": "melon_top"
@@ -921,6 +960,20 @@
 	},
 	"mossy_stone_bricks": {},
 	"moving_piston": null,
+	"mud": {},
+	"mud_brick_slab": {
+		"texture": "mud_bricks"
+	},
+	"mud_brick_stairs": {
+		"texture": "mud_bricks"
+	},
+	"mud_brick_wall": {
+		"texture": "mud_bricks"
+	},
+	"mud_bricks": {},
+	"muddy_mangrove_roots": {
+		"texture": "muddy_mangrove_roots_top"
+	},
 	"mushroom_stem": {},
 	"mycelium": {
 		"texture": "mycelium_top"
@@ -988,6 +1041,9 @@
 		"texture": "observer_top"
 	},
 	"obsidian": {},
+	"ochre_froglight": {
+		"texture": "ochre_froglight_top"
+	},
 	"orange_banner": null,
 	"orange_bed": null,
 	"orange_candle": null,
@@ -1019,6 +1075,10 @@
 		"texture": "oxidized_cut_copper"
 	},
 	"packed_ice": {},
+	"packed_mud": {},
+	"pearlescent_froglight": {
+		"texture": "pearlescent_froglight_top"
+	},
 	"peony": {
 		"texture": "peony_top"
 	},
@@ -1180,6 +1240,9 @@
 	"potted_lily_of_the_valley": {
 		"texture": "lily_of_the_valley"
 	},
+	"potted_mangrove_propagule": {
+		"texture": "mangrove_propagule"
+	},
 	"potted_oak_sapling": {
 		"texture": "oak_sapling"
 	},
@@ -1341,6 +1404,9 @@
 	"redstone_wire": {
 		"texture": "redstone_block"
 	},
+	"reinforced_deepslate": {
+		"texture": "reinforced_deepslate_top"
+	},
 	"repeater": {},
 	"repeating_command_block": {
 		"texture": "repeating_command_block_front"
@@ -1368,9 +1434,17 @@
 	"scaffolding": {
 		"texture": "scaffolding_top"
 	},
+	"sculk": {},
+	"sculk_catalyst": {
+		"texture": "sculk_catalyst_top"
+	},
 	"sculk_sensor": {
 		"texture": "sculk_sensor_top"
 	},
+	"sculk_shrieker": {
+		"texture": "sculk_shrieker_top"
+	},
+	"sculk_vein": {},
 	"sea_lantern": {},
 	"sea_pickle": {},
 	"seagrass": null,
@@ -1532,6 +1606,12 @@
 	"stripped_jungle_wood": {
 		"texture": "stripped_jungle_log"
 	},
+	"stripped_mangrove_log": {
+		"texture": "stripped_mangrove_log_top"
+	},
+	"stripped_mangrove_wood": {
+		"texture": "stripped_mangrove_log"
+	},
 	"stripped_oak_log": {
 		"texture": "stripped_oak_log_top"
 	},
@@ -1588,6 +1668,9 @@
 	"turtle_egg": {},
 	"twisting_vines": {},
 	"twisting_vines_plant": {},
+	"verdant_froglight": {
+		"texture": "verdant_froglight_top"
+	},
 	"vine": {
 		"grass": true
 	},
diff --git a/src/Resource/BlockType.inc.cpp b/src/Resource/BlockType.inc.cpp
index 9a4ff17..bc6c087 100644
--- a/src/Resource/BlockType.inc.cpp
+++ b/src/Resource/BlockType.inc.cpp
@@ -98,7 +98,7 @@
 {"minecraft:brain_coral_block", {BLOCK_OPAQUE, {207, 91, 159}}},
 {"minecraft:brain_coral_fan", {0, {0, 0, 0}}},
 {"minecraft:brain_coral_wall_fan", {0, {0, 0, 0}}},
-{"minecraft:brewing_stand", {BLOCK_OPAQUE, {123, 101, 81}}},
+{"minecraft:brewing_stand", {BLOCK_OPAQUE, {122, 100, 80}}},
 {"minecraft:brick_slab", {BLOCK_OPAQUE, {150, 97, 83}}},
 {"minecraft:brick_stairs", {BLOCK_OPAQUE, {150, 97, 83}}},
 {"minecraft:brick_wall", {BLOCK_OPAQUE, {150, 97, 83}}},
@@ -164,7 +164,7 @@
 {"minecraft:cobblestone_stairs", {BLOCK_OPAQUE, {127, 127, 127}}},
 {"minecraft:cobblestone_wall", {BLOCK_OPAQUE, {127, 127, 127}}},
 {"minecraft:cobweb", {BLOCK_OPAQUE, {228, 233, 234}}},
-{"minecraft:cocoa", {BLOCK_OPAQUE, {156, 94, 43}}},
+{"minecraft:cocoa", {BLOCK_OPAQUE, {154, 91, 40}}},
 {"minecraft:command_block", {BLOCK_OPAQUE, {181, 136, 108}}},
 {"minecraft:comparator", {BLOCK_OPAQUE, {166, 161, 159}}},
 {"minecraft:composter", {BLOCK_OPAQUE, {88, 61, 23}}},
@@ -321,6 +321,7 @@
 {"minecraft:flower_pot", {BLOCK_OPAQUE, {124, 68, 53}}},
 {"minecraft:flowering_azalea", {BLOCK_OPAQUE, {112, 121, 64}}},
 {"minecraft:flowering_azalea_leaves", {BLOCK_OPAQUE, {99, 111, 60}}},
+{"minecraft:frogspawn", {BLOCK_OPAQUE, {105, 90, 82}}},
 {"minecraft:frosted_ice", {BLOCK_OPAQUE, {140, 181, 252}}},
 {"minecraft:furnace", {BLOCK_OPAQUE, {110, 109, 109}}},
 {"minecraft:gilded_blackstone", {BLOCK_OPAQUE, {55, 42, 38}}},
@@ -487,6 +488,22 @@
 {"minecraft:magenta_wall_banner", {0, {0, 0, 0}}},
 {"minecraft:magenta_wool", {BLOCK_OPAQUE, {189, 68, 179}}},
 {"minecraft:magma_block", {BLOCK_OPAQUE, {142, 63, 31}}},
+{"minecraft:mangrove_button", {0, {0, 0, 0}}},
+{"minecraft:mangrove_door", {BLOCK_OPAQUE, {112, 48, 46}}},
+{"minecraft:mangrove_fence", {BLOCK_OPAQUE, {117, 54, 48}}},
+{"minecraft:mangrove_fence_gate", {BLOCK_OPAQUE, {117, 54, 48}}},
+{"minecraft:mangrove_leaves", {BLOCK_OPAQUE|BLOCK_FOLIAGE, {129, 128, 128}}},
+{"minecraft:mangrove_log", {BLOCK_OPAQUE, {102, 48, 42}}},
+{"minecraft:mangrove_planks", {BLOCK_OPAQUE, {117, 54, 48}}},
+{"minecraft:mangrove_pressure_plate", {BLOCK_OPAQUE, {117, 54, 48}}},
+{"minecraft:mangrove_propagule", {BLOCK_OPAQUE, {96, 174, 83}}},
+{"minecraft:mangrove_roots", {BLOCK_OPAQUE, {74, 59, 38}}},
+{"minecraft:mangrove_sign", {BLOCK_OPAQUE, {117, 54, 48}}},
+{"minecraft:mangrove_slab", {BLOCK_OPAQUE, {117, 54, 48}}},
+{"minecraft:mangrove_stairs", {BLOCK_OPAQUE, {117, 54, 48}}},
+{"minecraft:mangrove_trapdoor", {BLOCK_OPAQUE, {110, 46, 42}}},
+{"minecraft:mangrove_wall_sign", {0, {0, 0, 0}}},
+{"minecraft:mangrove_wood", {BLOCK_OPAQUE, {83, 66, 41}}},
 {"minecraft:medium_amethyst_bud", {0, {0, 0, 0}}},
 {"minecraft:melon", {BLOCK_OPAQUE, {111, 144, 30}}},
 {"minecraft:melon_stem", {BLOCK_OPAQUE|BLOCK_GRASS, {153, 153, 153}}},
@@ -501,6 +518,12 @@
 {"minecraft:mossy_stone_brick_wall", {BLOCK_OPAQUE, {115, 121, 105}}},
 {"minecraft:mossy_stone_bricks", {BLOCK_OPAQUE, {115, 121, 105}}},
 {"minecraft:moving_piston", {0, {0, 0, 0}}},
+{"minecraft:mud", {BLOCK_OPAQUE, {60, 57, 60}}},
+{"minecraft:mud_brick_slab", {BLOCK_OPAQUE, {137, 103, 79}}},
+{"minecraft:mud_brick_stairs", {BLOCK_OPAQUE, {137, 103, 79}}},
+{"minecraft:mud_brick_wall", {BLOCK_OPAQUE, {137, 103, 79}}},
+{"minecraft:mud_bricks", {BLOCK_OPAQUE, {137, 103, 79}}},
+{"minecraft:muddy_mangrove_roots", {BLOCK_OPAQUE, {70, 58, 45}}},
 {"minecraft:mushroom_stem", {BLOCK_OPAQUE, {203, 196, 185}}},
 {"minecraft:mycelium", {BLOCK_OPAQUE, {111, 98, 101}}},
 {"minecraft:nether_brick_fence", {BLOCK_OPAQUE, {44, 21, 26}}},
@@ -534,6 +557,7 @@
 {"minecraft:oak_wood", {BLOCK_OPAQUE, {109, 85, 50}}},
 {"minecraft:observer", {BLOCK_OPAQUE, {98, 98, 98}}},
 {"minecraft:obsidian", {BLOCK_OPAQUE, {15, 10, 24}}},
+{"minecraft:ochre_froglight", {BLOCK_OPAQUE, {250, 245, 206}}},
 {"minecraft:orange_banner", {0, {0, 0, 0}}},
 {"minecraft:orange_bed", {0, {0, 0, 0}}},
 {"minecraft:orange_candle", {0, {0, 0, 0}}},
@@ -555,6 +579,8 @@
 {"minecraft:oxidized_cut_copper_slab", {BLOCK_OPAQUE, {79, 153, 126}}},
 {"minecraft:oxidized_cut_copper_stairs", {BLOCK_OPAQUE, {79, 153, 126}}},
 {"minecraft:packed_ice", {BLOCK_OPAQUE, {141, 180, 250}}},
+{"minecraft:packed_mud", {BLOCK_OPAQUE, {142, 106, 79}}},
+{"minecraft:pearlescent_froglight", {BLOCK_OPAQUE, {245, 240, 239}}},
 {"minecraft:peony", {BLOCK_OPAQUE, {129, 126, 139}}},
 {"minecraft:petrified_oak_slab", {BLOCK_OPAQUE, {162, 130, 78}}},
 {"minecraft:pink_banner", {0, {0, 0, 0}}},
@@ -572,8 +598,8 @@
 {"minecraft:pink_tulip", {0, {0, 0, 0}}},
 {"minecraft:pink_wall_banner", {0, {0, 0, 0}}},
 {"minecraft:pink_wool", {BLOCK_OPAQUE, {237, 141, 172}}},
-{"minecraft:piston", {BLOCK_OPAQUE, {110, 104, 96}}},
-{"minecraft:piston_head", {BLOCK_OPAQUE, {154, 127, 87}}},
+{"minecraft:piston", {BLOCK_OPAQUE, {109, 104, 96}}},
+{"minecraft:piston_head", {BLOCK_OPAQUE, {153, 127, 85}}},
 {"minecraft:player_head", {0, {0, 0, 0}}},
 {"minecraft:player_wall_head", {0, {0, 0, 0}}},
 {"minecraft:podzol", {BLOCK_OPAQUE, {91, 63, 24}}},
@@ -623,6 +649,7 @@
 {"minecraft:potted_flowering_azalea_bush", {BLOCK_OPAQUE, {112, 121, 64}}},
 {"minecraft:potted_jungle_sapling", {BLOCK_OPAQUE, {47, 81, 16}}},
 {"minecraft:potted_lily_of_the_valley", {BLOCK_OPAQUE, {123, 174, 95}}},
+{"minecraft:potted_mangrove_propagule", {BLOCK_OPAQUE, {96, 174, 83}}},
 {"minecraft:potted_oak_sapling", {BLOCK_OPAQUE, {77, 106, 40}}},
 {"minecraft:potted_orange_tulip", {BLOCK_OPAQUE, {93, 142, 30}}},
 {"minecraft:potted_oxeye_daisy", {BLOCK_OPAQUE, {179, 202, 143}}},
@@ -706,6 +733,7 @@
 {"minecraft:redstone_torch", {0, {0, 0, 0}}},
 {"minecraft:redstone_wall_torch", {0, {0, 0, 0}}},
 {"minecraft:redstone_wire", {BLOCK_OPAQUE, {175, 24, 5}}},
+{"minecraft:reinforced_deepslate", {BLOCK_OPAQUE, {80, 82, 78}}},
 {"minecraft:repeater", {BLOCK_OPAQUE, {160, 157, 156}}},
 {"minecraft:repeating_command_block", {BLOCK_OPAQUE, {129, 111, 176}}},
 {"minecraft:respawn_anchor", {BLOCK_OPAQUE, {75, 26, 144}}},
@@ -717,7 +745,11 @@
 {"minecraft:sandstone_stairs", {BLOCK_OPAQUE, {223, 214, 170}}},
 {"minecraft:sandstone_wall", {BLOCK_OPAQUE, {223, 214, 170}}},
 {"minecraft:scaffolding", {BLOCK_OPAQUE, {174, 134, 80}}},
+{"minecraft:sculk", {BLOCK_OPAQUE, {12, 29, 36}}},
+{"minecraft:sculk_catalyst", {BLOCK_OPAQUE, {15, 31, 38}}},
 {"minecraft:sculk_sensor", {BLOCK_OPAQUE, {7, 70, 84}}},
+{"minecraft:sculk_shrieker", {BLOCK_OPAQUE, {198, 205, 169}}},
+{"minecraft:sculk_vein", {BLOCK_OPAQUE, {7, 48, 57}}},
 {"minecraft:sea_lantern", {BLOCK_OPAQUE, {172, 199, 190}}},
 {"minecraft:sea_pickle", {BLOCK_OPAQUE, {90, 97, 39}}},
 {"minecraft:seagrass", {0, {0, 0, 0}}},
@@ -770,7 +802,7 @@
 {"minecraft:spruce_trapdoor", {BLOCK_OPAQUE, {103, 79, 47}}},
 {"minecraft:spruce_wall_sign", {0, {0, 0, 0}}},
 {"minecraft:spruce_wood", {BLOCK_OPAQUE, {58, 37, 16}}},
-{"minecraft:sticky_piston", {BLOCK_OPAQUE, {110, 104, 96}}},
+{"minecraft:sticky_piston", {BLOCK_OPAQUE, {109, 104, 96}}},
 {"minecraft:stone", {BLOCK_OPAQUE, {125, 125, 125}}},
 {"minecraft:stone_brick_slab", {BLOCK_OPAQUE, {122, 121, 122}}},
 {"minecraft:stone_brick_stairs", {BLOCK_OPAQUE, {122, 121, 122}}},
@@ -791,6 +823,8 @@
 {"minecraft:stripped_dark_oak_wood", {BLOCK_OPAQUE, {72, 56, 36}}},
 {"minecraft:stripped_jungle_log", {BLOCK_OPAQUE, {165, 122, 81}}},
 {"minecraft:stripped_jungle_wood", {BLOCK_OPAQUE, {171, 132, 84}}},
+{"minecraft:stripped_mangrove_log", {BLOCK_OPAQUE, {109, 43, 43}}},
+{"minecraft:stripped_mangrove_wood", {BLOCK_OPAQUE, {119, 54, 47}}},
 {"minecraft:stripped_oak_log", {BLOCK_OPAQUE, {160, 129, 77}}},
 {"minecraft:stripped_oak_wood", {BLOCK_OPAQUE, {177, 144, 86}}},
 {"minecraft:stripped_spruce_log", {BLOCK_OPAQUE, {105, 80, 46}}},
@@ -820,6 +854,7 @@
 {"minecraft:turtle_egg", {BLOCK_OPAQUE, {228, 226, 191}}},
 {"minecraft:twisting_vines", {BLOCK_OPAQUE, {20, 143, 124}}},
 {"minecraft:twisting_vines_plant", {BLOCK_OPAQUE, {20, 135, 122}}},
+{"minecraft:verdant_froglight", {BLOCK_OPAQUE, {229, 244, 228}}},
 {"minecraft:vine", {BLOCK_OPAQUE|BLOCK_GRASS, {116, 116, 116}}},
 {"minecraft:void_air", {0, {0, 0, 0}}},
 {"minecraft:wall_sign", {0, {0, 0, 0}}},

From 74bd6205b07e52d6fae3c3ff6b571888f44b895f Mon Sep 17 00:00:00 2001
From: Bruno Saad <saadbruno@gmail.com>
Date: Tue, 7 Jun 2022 22:43:02 +0000
Subject: [PATCH 038/460] updates the gitignore to include common used
 directories in the documentation

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 5e3deeb..a8d69d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 *~
 /viewer/data
+/resource/data
+/resource/colors.json
 .idea/
 cmake-build-debug/

From 600a20cde6846557e5865de4abc5416dc8997c46 Mon Sep 17 00:00:00 2001
From: Andrew Cox <adcox@users.noreply.github.com>
Date: Fri, 1 Jul 2022 14:27:58 -0700
Subject: [PATCH 039/460] Update to compile on Mac OS (#26)

---
 src/MinedMap.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/MinedMap.cpp b/src/MinedMap.cpp
index e4993a0..7103d89 100644
--- a/src/MinedMap.cpp
+++ b/src/MinedMap.cpp
@@ -192,8 +192,10 @@ static int64_t getModTime(const std::string &file) {
 		return INT64_MIN;
 	}
 
-#ifdef _WIN32
+#if defined(_WIN32)
 	return (int64_t)s.st_mtime * 1000000;
+#elif defined(__APPLE__)
+	return (int64_t)s.st_mtimespec.tv_sec * 1000000 + s.st_mtimespec.tv_nsec / 1000;
 #else
 	return (int64_t)s.st_mtim.tv_sec * 1000000 + s.st_mtim.tv_nsec / 1000;
 #endif

From 6125b1b0279469fbf253ed8ff6ec89f4050e897e Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 16 Oct 2022 11:11:09 +0200
Subject: [PATCH 040/460] README.md: add 1.19 support

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a04462a..708fe3d 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 * Render beautiful maps of your [Minecraft](https://minecraft.net/) worlds!
 * Put them on a webserver and view them in your browser!
-* Compatible with unmodified Minecraft Java Edition 1.8 up to 1.18 (no mod installation necessary!)
+* Compatible with unmodified Minecraft Java Edition 1.8 up to 1.19 (no mod installation necessary!)
 * Illumination layer: the world at night
 * Fast: create a full map for a huge 3GB savegame in less than 5 minutes
 * Incremental updates: only recreate map tiles for regions that have changed

From 6605483b4dd46f71d657634cba8a7ff7b964df55 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 16 Oct 2022 12:24:48 +0200
Subject: [PATCH 041/460] workflows: force tag update to get version

When building from a tag, Github will create a lightweight tag in place
of the proper one when fetching, breaking `git describe`. Force an update
of all tags to avoid this.
---
 .github/workflows/MinedMap.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/MinedMap.yml b/.github/workflows/MinedMap.yml
index dcba86a..bf157d6 100644
--- a/.github/workflows/MinedMap.yml
+++ b/.github/workflows/MinedMap.yml
@@ -39,7 +39,7 @@ jobs:
         id: 'tag'
         run: |
           set -o pipefail
-          git fetch --prune --unshallow
+          git fetch --prune --unshallow --tags -f
           git describe --abbrev=7 --match='v*' | sed 's/^v/::set-output name=tag::/'
 
       - name: 'Dependencies (apt)'
@@ -101,7 +101,7 @@ jobs:
         id: 'tag'
         run: |
           set -o pipefail
-          git fetch --prune --unshallow
+          git fetch --prune --unshallow --tags -f
           git describe --abbrev=7 --match='v*' | sed 's/^v/::set-output name=tag::/'
 
       - name: 'Install'

From c43c185d9bf3f4c5f6c1c64bc8cea5019d455997 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 16 Oct 2022 12:44:05 +0200
Subject: [PATCH 042/460] workflows: update checkout/upload actions

---
 .github/workflows/MinedMap.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/MinedMap.yml b/.github/workflows/MinedMap.yml
index bf157d6..f1c761a 100644
--- a/.github/workflows/MinedMap.yml
+++ b/.github/workflows/MinedMap.yml
@@ -33,7 +33,7 @@ jobs:
 
     steps:
       - name: 'Checkout'
-        uses: 'actions/checkout@v2'
+        uses: 'actions/checkout@v3'
 
       - name: 'Get version'
         id: 'tag'
@@ -84,7 +84,7 @@ jobs:
           cp "$DESTDIR/usr/local/bin"/* "$pkgdir"/
 
       - name: 'Archive'
-        uses: 'actions/upload-artifact@v2'
+        uses: 'actions/upload-artifact@v3'
         with:
           name: 'MinedMap-${{ steps.tag.outputs.tag }}-${{ matrix.label }}'
           path: 'build/pkg'
@@ -95,7 +95,7 @@ jobs:
 
     steps:
       - name: 'Checkout'
-        uses: 'actions/checkout@v2'
+        uses: 'actions/checkout@v3'
 
       - name: 'Get version'
         id: 'tag'
@@ -111,7 +111,7 @@ jobs:
           cp -r viewer/* "$pkgdir"/
 
       - name: 'Archive'
-        uses: 'actions/upload-artifact@v2'
+        uses: 'actions/upload-artifact@v3'
         with:
           name: 'MinedMap-${{ steps.tag.outputs.tag }}-viewer'
           path: 'build/pkg'

From 4ce08a7d5d01f0013f21b2fd2253a63bea119aa9 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 16 Oct 2022 12:49:13 +0200
Subject: [PATCH 043/460] workflows: replace deprecated set-output

---
 .github/workflows/MinedMap.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/MinedMap.yml b/.github/workflows/MinedMap.yml
index f1c761a..1318eab 100644
--- a/.github/workflows/MinedMap.yml
+++ b/.github/workflows/MinedMap.yml
@@ -40,7 +40,7 @@ jobs:
         run: |
           set -o pipefail
           git fetch --prune --unshallow --tags -f
-          git describe --abbrev=7 --match='v*' | sed 's/^v/::set-output name=tag::/'
+          echo "tag=$(git describe --abbrev=7 --match='v*' | sed 's/^v//')" >> $GITHUB_OUTPUT
 
       - name: 'Dependencies (apt)'
         run: |
@@ -102,7 +102,7 @@ jobs:
         run: |
           set -o pipefail
           git fetch --prune --unshallow --tags -f
-          git describe --abbrev=7 --match='v*' | sed 's/^v/::set-output name=tag::/'
+          echo "tag=$(git describe --abbrev=7 --match='v*' | sed 's/^v//')" >> $GITHUB_OUTPUT
 
       - name: 'Install'
         run: |

From c7e04649ff7cf625d2fb9ef3f85765c69a7cb906 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 16 Oct 2022 13:14:31 +0200
Subject: [PATCH 044/460] Resource: Biome: add 1.19 biomes

Add the new biome temperature and rainfall values, as found in
decompiled Minecraft code:

- Deep Dark uses the same the values as plains
- Mangrove Swamp has the same temperature/rainfall as regular Swamp, but a
  different water color
---
 src/Resource/Biome.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Resource/Biome.cpp b/src/Resource/Biome.cpp
index d871ad5..1ca2114 100644
--- a/src/Resource/Biome.cpp
+++ b/src/Resource/Biome.cpp
@@ -116,7 +116,8 @@ public:
 };
 
 
-/* Values from https://github.com/erich666/Mineways/blob/master/Win/biomes.cpp */
+/* Values from https://github.com/erich666/Mineways/blob/master/Win/biomes.cpp or
+ * extracted from Minecraft code decompiled using https://github.com/Hexeption/MCP-Reborn */
 
 static const Biome BiomeDefault(0.5f,  0.5f);
 static const Biome BiomePlains(0.8f, 0.4f);
@@ -149,6 +150,7 @@ static const Biome BiomeGrove(-0.2f, 0.8f);
 static const Biome BiomeJaggedPeaks(-0.7f, 0.9f);
 static const Biome BiomeStonyPeaks(1.0f, 0.3f);
 static const Biome BiomeSnowySlopes(-0.3f, 0.9f);
+static const SwampBiome BiomeMangroveSwamp(0.8f, 0.9f, {0.227f, 0.478f, 0.416f});
 
 const Biome *const Biome::Default = &BiomeDefault;
 
@@ -213,7 +215,7 @@ const Biome *const Biome::Biomes[256] = {
 	/*  53 */ &BiomeJaggedPeaks, /* MinedMap assignment */
 	/*  54 */ &BiomeStonyPeaks, /* MinedMap assignment */
 	/*  55 */ &BiomeSnowySlopes, /* MinedMap assignment */
-	/*  56 */ nullptr,
+	/*  56 */ &BiomeMangroveSwamp, /* MinedMap assignment */
 	/*  57 */ nullptr,
 	/*  58 */ nullptr,
 	/*  59 */ nullptr,
@@ -352,6 +354,7 @@ const std::unordered_map<std::string, uint8_t> Biome::Names = {
 	{ "minecraft:dark_forest", 29 },
 	{ "minecraft:dark_forest_hills", 157 }, /* 1.18: Merged into dark_forest */
 	{ "minecraft:deep_cold_ocean", 49 },
+	{ "minecraft:deep_dark", 1 },
 	{ "minecraft:deep_frozen_ocean", 50 },
 	{ "minecraft:deep_lukewarm_ocean", 48 },
 	{ "minecraft:deep_ocean", 24 },
@@ -383,6 +386,7 @@ const std::unordered_map<std::string, uint8_t> Biome::Names = {
 	{ "minecraft:jungle_hills", 22 }, /* 1.18: Merged into jungle */
 	{ "minecraft:lukewarm_ocean", 45 },
 	{ "minecraft:lush_caves", 175 },
+	{ "minecraft:mangrove_swamp", 56 },
 	{ "minecraft:meadow", 51 }, /* 1.18: New */
 	{ "minecraft:modified_badlands_plateau", 167 }, /* 1.18: Merged into badlands */
 	{ "minecraft:modified_gravelly_mountains", 162 }, /* 1.18: Merged into gravelly_mountains */

From 4b83f6376f39b34e61e291faee873a7cb444b72b Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 24 Jan 2023 18:46:48 +0100
Subject: [PATCH 045/460] Remove C++ implementation

---
 .github/toolchains/common-w64-mingw32.cmake |  16 -
 .github/toolchains/i686-w64-mingw32.cmake   |   2 -
 .github/toolchains/x86_64-linux-gnu.cmake   |   0
 .github/toolchains/x86_64-w64-mingw32.cmake |   2 -
 .github/workflows/MinedMap.yml              |  87 --
 CMakeLists.txt                              |  17 -
 CMakePresets.json                           |  39 -
 src/Buffer.hpp                              |  71 --
 src/CMakeLists.txt                          |  36 -
 src/GZip.cpp                                |  49 -
 src/GZip.hpp                                |  18 -
 src/Info.cpp                                |  90 --
 src/Info.hpp                                |  84 --
 src/MinedMap.cpp                            | 509 -----------
 src/NBT/ByteArrayTag.hpp                    |  68 --
 src/NBT/ByteTag.hpp                         |  44 -
 src/NBT/CompoundTag.hpp                     |  63 --
 src/NBT/DoubleTag.hpp                       |  44 -
 src/NBT/EndTag.hpp                          |  32 -
 src/NBT/FloatTag.hpp                        |  43 -
 src/NBT/IntArrayTag.hpp                     |  68 --
 src/NBT/IntTag.hpp                          |  44 -
 src/NBT/ListTag.hpp                         |  59 --
 src/NBT/LongArrayTag.hpp                    |  68 --
 src/NBT/LongTag.hpp                         |  44 -
 src/NBT/ShortTag.hpp                        |  44 -
 src/NBT/StringTag.hpp                       |  44 -
 src/NBT/Tag.cpp                             |  72 --
 src/NBT/Tag.hpp                             |  84 --
 src/PNG.cpp                                 | 143 ---
 src/PNG.hpp                                 |  38 -
 src/Resource/Biome.cpp                      | 448 ----------
 src/Resource/Biome.hpp                      |  43 -
 src/Resource/BlockType.cpp                  |  68 --
 src/Resource/BlockType.hpp                  |  45 -
 src/Resource/BlockType.inc.cpp              | 938 --------------------
 src/Resource/Color.hpp                      |  52 --
 src/Resource/LegacyBlockType.inc.cpp        | 597 -------------
 src/UniqueCPtr.hpp                          |  20 -
 src/Util.hpp                                |  44 -
 src/World/Block.hpp                         |  40 -
 src/World/Chunk.cpp                         | 201 -----
 src/World/Chunk.hpp                         |  97 --
 src/World/ChunkData.cpp                     |  78 --
 src/World/ChunkData.hpp                     |  41 -
 src/World/Level.cpp                         |  37 -
 src/World/Level.hpp                         |  33 -
 src/World/Region.cpp                        |  89 --
 src/World/Region.hpp                        |  42 -
 src/World/Section.cpp                       | 230 -----
 src/World/Section.hpp                       | 142 ---
 src/nbtdump.cpp                             |  36 -
 src/regiondump.cpp                          |  32 -
 53 files changed, 5375 deletions(-)
 delete mode 100644 .github/toolchains/common-w64-mingw32.cmake
 delete mode 100644 .github/toolchains/i686-w64-mingw32.cmake
 delete mode 100644 .github/toolchains/x86_64-linux-gnu.cmake
 delete mode 100644 .github/toolchains/x86_64-w64-mingw32.cmake
 delete mode 100644 CMakeLists.txt
 delete mode 100644 CMakePresets.json
 delete mode 100644 src/Buffer.hpp
 delete mode 100644 src/CMakeLists.txt
 delete mode 100644 src/GZip.cpp
 delete mode 100644 src/GZip.hpp
 delete mode 100644 src/Info.cpp
 delete mode 100644 src/Info.hpp
 delete mode 100644 src/MinedMap.cpp
 delete mode 100644 src/NBT/ByteArrayTag.hpp
 delete mode 100644 src/NBT/ByteTag.hpp
 delete mode 100644 src/NBT/CompoundTag.hpp
 delete mode 100644 src/NBT/DoubleTag.hpp
 delete mode 100644 src/NBT/EndTag.hpp
 delete mode 100644 src/NBT/FloatTag.hpp
 delete mode 100644 src/NBT/IntArrayTag.hpp
 delete mode 100644 src/NBT/IntTag.hpp
 delete mode 100644 src/NBT/ListTag.hpp
 delete mode 100644 src/NBT/LongArrayTag.hpp
 delete mode 100644 src/NBT/LongTag.hpp
 delete mode 100644 src/NBT/ShortTag.hpp
 delete mode 100644 src/NBT/StringTag.hpp
 delete mode 100644 src/NBT/Tag.cpp
 delete mode 100644 src/NBT/Tag.hpp
 delete mode 100644 src/PNG.cpp
 delete mode 100644 src/PNG.hpp
 delete mode 100644 src/Resource/Biome.cpp
 delete mode 100644 src/Resource/Biome.hpp
 delete mode 100644 src/Resource/BlockType.cpp
 delete mode 100644 src/Resource/BlockType.hpp
 delete mode 100644 src/Resource/BlockType.inc.cpp
 delete mode 100644 src/Resource/Color.hpp
 delete mode 100644 src/Resource/LegacyBlockType.inc.cpp
 delete mode 100644 src/UniqueCPtr.hpp
 delete mode 100644 src/Util.hpp
 delete mode 100644 src/World/Block.hpp
 delete mode 100644 src/World/Chunk.cpp
 delete mode 100644 src/World/Chunk.hpp
 delete mode 100644 src/World/ChunkData.cpp
 delete mode 100644 src/World/ChunkData.hpp
 delete mode 100644 src/World/Level.cpp
 delete mode 100644 src/World/Level.hpp
 delete mode 100644 src/World/Region.cpp
 delete mode 100644 src/World/Region.hpp
 delete mode 100644 src/World/Section.cpp
 delete mode 100644 src/World/Section.hpp
 delete mode 100644 src/nbtdump.cpp
 delete mode 100644 src/regiondump.cpp

diff --git a/.github/toolchains/common-w64-mingw32.cmake b/.github/toolchains/common-w64-mingw32.cmake
deleted file mode 100644
index 7fcee75..0000000
--- a/.github/toolchains/common-w64-mingw32.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-set(BUILD_STATIC ON)
-
-set(CMAKE_SYSTEM_NAME Windows)
-set(CMAKE_SYSROOT /usr/${TARGET})
-
-set(CMAKE_C_COMPILER ${TARGET}-gcc)
-set(CMAKE_CXX_COMPILER ${TARGET}-g++)
-
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
-
-set(ENV{PKG_CONFIG_LIBDIR} ${CMAKE_SYSROOT}/lib/pkgconfig:${CMAKE_SYSROOT}/share/pkgconfig)
-set(ENV{PKG_CONFIG_PATH} $ENV{PKG_CONFIG_LIBDIR})
-
-set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
diff --git a/.github/toolchains/i686-w64-mingw32.cmake b/.github/toolchains/i686-w64-mingw32.cmake
deleted file mode 100644
index 7d1612a..0000000
--- a/.github/toolchains/i686-w64-mingw32.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-set(TARGET i686-w64-mingw32)
-include(${CMAKE_CURRENT_LIST_DIR}/common-w64-mingw32.cmake)
diff --git a/.github/toolchains/x86_64-linux-gnu.cmake b/.github/toolchains/x86_64-linux-gnu.cmake
deleted file mode 100644
index e69de29..0000000
diff --git a/.github/toolchains/x86_64-w64-mingw32.cmake b/.github/toolchains/x86_64-w64-mingw32.cmake
deleted file mode 100644
index cab56f4..0000000
--- a/.github/toolchains/x86_64-w64-mingw32.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-set(TARGET x86_64-w64-mingw32)
-include(${CMAKE_CURRENT_LIST_DIR}/common-w64-mingw32.cmake)
diff --git a/.github/workflows/MinedMap.yml b/.github/workflows/MinedMap.yml
index 1318eab..66edb82 100644
--- a/.github/workflows/MinedMap.yml
+++ b/.github/workflows/MinedMap.yml
@@ -2,93 +2,6 @@ name: 'MinedMap'
 on: ['push', 'pull_request', 'workflow_dispatch']
 
 jobs:
-  build:
-    name: 'Build MinedMap (${{ matrix.host }})'
-    runs-on: 'ubuntu-20.04'
-    strategy:
-      fail-fast: false
-      matrix:
-        host:
-          - 'x86_64-linux-gnu'
-          - 'x86_64-w64-mingw32'
-        include:
-          - host: 'x86_64-linux-gnu'
-            label: 'x86_64-linux-gnu'
-            packages: ['g++', 'libpng-dev']
-            prefix: '/usr'
-            build_libpng: false
-          - host: 'x86_64-w64-mingw32'
-            label: 'Win64'
-            packages: ['g++-mingw-w64-x86-64', 'libz-mingw-w64-dev']
-            prefix: '/usr/x86_64-w64-mingw32'
-            build_libpng: true
-          - host: 'i686-w64-mingw32'
-            label: 'Win32'
-            packages: ['g++-mingw-w64-i686', 'libz-mingw-w64-dev']
-            prefix: '/usr/i686-w64-mingw32'
-            build_libpng: true
-
-    env:
-      CMAKE_TOOLCHAIN_FILE: '${{ github.workspace }}/.github/toolchains/${{ matrix.host }}.cmake'
-
-    steps:
-      - name: 'Checkout'
-        uses: 'actions/checkout@v3'
-
-      - name: 'Get version'
-        id: 'tag'
-        run: |
-          set -o pipefail
-          git fetch --prune --unshallow --tags -f
-          echo "tag=$(git describe --abbrev=7 --match='v*' | sed 's/^v//')" >> $GITHUB_OUTPUT
-
-      - name: 'Dependencies (apt)'
-        run: |
-          sudo apt-get -y update
-          sudo apt-get -y install ninja-build ${{ join(matrix.packages, ' ') }}
-          sudo apt-get -y clean
-
-      - name: 'Dependencies (libpng)'
-        if: '${{ matrix.build_libpng }}'
-        run: |
-          pkgver=1.6.37
-          pkghash=505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca
-
-          mkdir -p build/libpng
-          cd build/libpng
-          wget http://downloads.sourceforge.net/sourceforge/libpng/libpng-$pkgver.tar.xz
-          echo "$pkghash libpng-$pkgver.tar.xz" | sha256sum -c -
-          tar xf libpng-$pkgver.tar.xz
-          cd libpng-$pkgver
-          ./configure \
-            --prefix=${{ matrix.prefix }} \
-            --host=${{ matrix.host }} \
-            --disable-shared
-          make -j$(nproc)
-          sudo make install
-          sudo rm ${{ matrix.prefix }}/lib/libpng*.la
-
-      - name: 'Build'
-        uses: lukka/run-cmake@v10
-        with:
-          configurePreset: 'ninja'
-          buildPreset: 'ninja-release'
-
-      - name: 'Install'
-        run: |
-          export DESTDIR="$(pwd)/build/install"
-          ninja -C builds/ninja -f build-RelWithDebInfo.ninja install/strip
-
-          pkgdir='build/pkg/MinedMap-${{ steps.tag.outputs.tag }}-${{ matrix.label }}'
-          mkdir -p "$pkgdir"
-          cp "$DESTDIR/usr/local/bin"/* "$pkgdir"/
-
-      - name: 'Archive'
-        uses: 'actions/upload-artifact@v3'
-        with:
-          name: 'MinedMap-${{ steps.tag.outputs.tag }}-${{ matrix.label }}'
-          path: 'build/pkg'
-
   viewer:
     name: 'Package viewer'
     runs-on: 'ubuntu-20.04'
diff --git a/CMakeLists.txt b/CMakeLists.txt
deleted file mode 100644
index 996ec67..0000000
--- a/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-cmake_minimum_required(VERSION 3.13)
-project(MINEDMAP CXX)
-
-# May not work with all toolchains, added for the Windows CI build
-option(BUILD_STATIC "Create a statically linked MinedMap executable")
-
-if(BUILD_STATIC)
-  list(REMOVE_ITEM CMAKE_FIND_LIBRARY_SUFFIXES ".so" ".dll.a")
-  add_link_options("-static")
-endif()
-
-find_package(PkgConfig REQUIRED)
-
-pkg_check_modules(ZLIB REQUIRED IMPORTED_TARGET zlib)
-pkg_check_modules(PNG REQUIRED IMPORTED_TARGET libpng16)
-
-add_subdirectory(src)
diff --git a/CMakePresets.json b/CMakePresets.json
deleted file mode 100644
index bc371b3..0000000
--- a/CMakePresets.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "version": 3,
-  "cmakeMinimumRequired": {
-    "major": 3,
-    "minor": 7,
-    "patch": 0
-  },
-  "configurePresets": [
-    {
-      "name": "ninja",
-      "displayName": "Ninja",
-      "description": "Generate Ninja project files",
-      "binaryDir": "${sourceDir}/builds/${presetName}",
-      "generator": "Ninja Multi-Config",
-      "cacheVariables": {
-        "CMAKE_TOOLCHAIN_FILE": {
-          "type": "FILEPATH",
-          "value": "$env{CMAKE_TOOLCHAIN_FILE}"
-        }
-      }
-    }
-  ],
-  "buildPresets": [
-    {
-      "name": "ninja-debug",
-      "configurePreset": "ninja",
-      "displayName": "Build ninja-debug",
-      "description": "Build ninja Debug configuration",
-      "configuration": "Debug"
-    },
-    {
-      "name": "ninja-release",
-      "configurePreset": "ninja",
-      "displayName": "Build ninja-release",
-      "description": "Build ninja Release configuration",
-      "configuration": "RelWithDebInfo"
-    }
-  ]
-}
diff --git a/src/Buffer.hpp b/src/Buffer.hpp
deleted file mode 100644
index 89d4649..0000000
--- a/src/Buffer.hpp
+++ /dev/null
@@ -1,71 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-#include <cstdint>
-#include <cstring>
-#include <stdexcept>
-#include <string>
-
-
-namespace MinedMap {
-
-class Buffer {
-private:
-	const uint8_t *data;
-	size_t len;
-
-public:
-	static uint16_t parse16(const uint8_t *buf) {
-		return (buf[0] << 8) | buf[1];
-	}
-
-	static uint32_t parse32(const uint8_t *buf) {
-		return (uint32_t(buf[0]) << 24) | (uint32_t(buf[1]) << 16) | (uint32_t(buf[2]) << 8) | uint32_t(buf[3]);
-	}
-
-	static uint64_t parse64(const uint8_t *buf) {
-		return (uint64_t(buf[0]) << 56) | (uint64_t(buf[1]) << 48) | (uint64_t(buf[2]) << 40) | (uint64_t(buf[3]) << 32)
-			| (uint64_t(buf[4]) << 24) | (uint64_t(buf[5]) << 16) | (uint64_t(buf[6]) << 8) | uint64_t(buf[7]);
-	}
-
-
-	Buffer(const uint8_t *data0, size_t len0) : data(data0), len(len0) {}
-
-	size_t getRemaining() const {
-		return len;
-	}
-
-	const uint8_t * get(size_t n) {
-		if (n > len)
-			throw std::runtime_error("Buffer::get(): buffer underrun");
-
-		data += n;
-		len -= n;
-		return (data - n);
-	}
-
-	uint8_t get8() {
-		return *get(1);
-	}
-
-	uint16_t get16() {
-		return parse16(get(2));
-	}
-
-	uint32_t get32() {
-		return parse32(get(4));
-	}
-
-	uint64_t get64() {
-		return parse64(get(8));
-	}
-
-};
-
-}
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
deleted file mode 100644
index 0e4fd48..0000000
--- a/src/CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-add_compile_options(-std=c++11 -Wall)
-
-add_executable(MinedMap
-  MinedMap.cpp
-  GZip.cpp
-  Info.cpp
-  PNG.cpp
-
-  NBT/Tag.cpp
-  Resource/Biome.cpp
-  Resource/BlockType.cpp
-  World/Chunk.cpp
-  World/ChunkData.cpp
-  World/Level.cpp
-  World/Region.cpp
-  World/Section.cpp
-)
-target_link_libraries(MinedMap PkgConfig::ZLIB PkgConfig::PNG)
-
-add_executable(nbtdump
-  nbtdump.cpp
-  GZip.cpp
-  NBT/Tag.cpp
-)
-target_link_libraries(nbtdump PkgConfig::ZLIB)
-
-add_executable(regiondump
-  regiondump.cpp
-  GZip.cpp
-  NBT/Tag.cpp
-  World/ChunkData.cpp
-  World/Region.cpp
-)
-target_link_libraries(regiondump PkgConfig::ZLIB)
-
-install(TARGETS MinedMap RUNTIME DESTINATION bin)
diff --git a/src/GZip.cpp b/src/GZip.cpp
deleted file mode 100644
index 28f4737..0000000
--- a/src/GZip.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#include "GZip.hpp"
-
-#include <system_error>
-#include <stdexcept>
-#include <zlib.h>
-
-
-namespace MinedMap {
-
-std::vector<uint8_t> readGZip(const char *filename) {
-	std::vector<uint8_t> buffer;
-	size_t len = 0;
-
-	gzFile f = gzopen(filename, "rb");
-	if (!f)
-		throw std::system_error(
-			errno, std::generic_category(),
-			(std::string("unable to open file ") + filename).c_str()
-		);
-
-	while (true) {
-		if ((buffer.size() - len) < 4096)
-			buffer.resize(buffer.size() + 4096);
-
-		int r = gzread(f, buffer.data()+len, buffer.size()-len);
-		if (r < 0)
-			throw std::system_error(errno, std::generic_category(), "error reading GZip file");
-
-		if (!r)
-			break;
-
-		len += r;
-	}
-
-	gzclose_r(f);
-
-	buffer.resize(len);
-
-	return buffer;
-}
-
-}
diff --git a/src/GZip.hpp b/src/GZip.hpp
deleted file mode 100644
index 8449758..0000000
--- a/src/GZip.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-#include <cstdint>
-#include <vector>
-
-
-namespace MinedMap {
-
-std::vector<uint8_t> readGZip(const char *filename);
-
-}
diff --git a/src/Info.cpp b/src/Info.cpp
deleted file mode 100644
index 48bbb45..0000000
--- a/src/Info.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#include "Info.hpp"
-
-#include <cerrno>
-#include <cstdio>
-#include <cstring>
-#include <string>
-
-
-namespace MinedMap {
-
-void Info::writeJSON(const char *filename) const {
-	const std::string tmpfile = std::string(filename) + ".tmp";
-
-	FILE *f = std::fopen(tmpfile.c_str(), "w");
-	if (!f) {
-		std::fprintf(stderr, "Unable to open %s: %s\n", tmpfile.c_str(), std::strerror(errno));
-		return;
-	}
-
-	std::fprintf(f, "{");
-	std::fprintf(f, "\"mipmaps\":[");
-
-	bool first_level = true;
-	for (const auto &level : levels) {
-		if (!first_level)
-			std::fprintf(f, ",");
-		first_level = false;
-
-		int minX, maxX, minZ, maxZ;
-		std::tie(minX, maxX, minZ, maxZ) = level.bounds;
-
-		std::fprintf(f, "{");
-		std::fprintf(f, "\"bounds\":{");
-		std::fprintf(f, "\"minX\":%i,", minX);
-		std::fprintf(f, "\"maxX\":%i,", maxX);
-		std::fprintf(f, "\"minZ\":%i,", minZ);
-		std::fprintf(f, "\"maxZ\":%i", maxZ);
-		std::fprintf(f, "},");
-		std::fprintf(f, "\"regions\":{");
-
-		bool first_z = true;
-		for (const auto &item : level.regions) {
-			if (!first_z)
-				std::fprintf(f, ",");
-			first_z = false;
-
-			int z = item.first;
-			const std::set<int> &z_regions = item.second;
-
-			std::fprintf(f, "\"%d\":[", z);
-
-			bool first_x = true;
-			for (int x : z_regions) {
-				if (!first_x)
-					std::fprintf(f, ",");
-				first_x = false;
-
-
-				std::fprintf(f, "%d", x);
-			}
-
-			std::fprintf(f, "]");
-		}
-
-		std::fprintf(f, "}}");
-	}
-
-	std::fprintf(f, "],");
-	std::fprintf(f, "\"spawn\":{");
-	std::fprintf(f, "\"x\":%li,", (long)spawnX);
-	std::fprintf(f, "\"z\":%li", (long)spawnZ);
-	std::fprintf(f, "}");
-	std::fprintf(f, "}");
-
-	std::fclose(f);
-
-	if (std::rename(tmpfile.c_str(), filename) < 0) {
-		std::fprintf(stderr, "Unable to save %s: %s\n", filename, std::strerror(errno));
-		std::remove(tmpfile.c_str());
-	}
-}
-
-}
diff --git a/src/Info.hpp b/src/Info.hpp
deleted file mode 100644
index 4ab7dd3..0000000
--- a/src/Info.hpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-#include <climits>
-#include <cstddef>
-#include <cstdint>
-#include <functional>
-#include <map>
-#include <set>
-#include <tuple>
-#include <utility>
-#include <vector>
-
-
-namespace MinedMap {
-
-class Info {
-public:
-	typedef std::function<void (int, int)> RegionVisitor;
-
-	struct Level {
-		std::map<int, std::set<int>> regions;
-		std::tuple<int, int, int, int> bounds;
-	};
-
-private:
-	std::vector<Level> levels;
-
-	int32_t spawnX, spawnZ;
-
-public:
-	Info() : spawnX(0), spawnZ(0) {
-		addMipmapLevel();
-	}
-
-	std::tuple<int, int, int, int> getBounds(size_t level) const {
-		return levels[level].bounds;
-	}
-
-	void addRegion(int x, int z, size_t level) {
-		auto &the_level = levels[level];
-		auto z_regions = the_level.regions.emplace(
-			std::piecewise_construct,
-			std::make_tuple(z),
-			std::make_tuple()).first;
-		z_regions->second.insert(x);
-
-		std::tuple<int, int, int, int> &b = the_level.bounds;
-
-		if (x < std::get<0>(b)) std::get<0>(b) = x;
-		if (x > std::get<1>(b)) std::get<1>(b) = x;
-		if (z < std::get<2>(b)) std::get<2>(b) = z;
-		if (z > std::get<3>(b)) std::get<3>(b) = z;
-	}
-
-	void addMipmapLevel() {
-		levels.emplace_back(Level {
-			.regions = {},
-			.bounds = {INT_MAX, INT_MIN, INT_MAX, INT_MIN},
-		});
-	}
-
-	void visitRegions(size_t level, const RegionVisitor &visitor) const {
-		for (const auto &item : levels[level].regions) {
-			int z = item.first;
-			for (int x : item.second)
-				visitor(x, z);
-		}
-	}
-
-	void setSpawn(const std::pair<int32_t, int32_t> &v) {
-		std::tie(spawnX, spawnZ) = v;
-	}
-
-	void writeJSON(const char *filename) const;
-};
-
-}
diff --git a/src/MinedMap.cpp b/src/MinedMap.cpp
deleted file mode 100644
index 7103d89..0000000
--- a/src/MinedMap.cpp
+++ /dev/null
@@ -1,509 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015-2021, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#include "Info.hpp"
-#include "PNG.hpp"
-#include "World/Level.hpp"
-#include "World/Region.hpp"
-
-#include <cerrno>
-#include <cinttypes>
-#include <climits>
-#include <cstdio>
-#include <cstring>
-#include <cstdlib>
-#include <iostream>
-#include <unordered_map>
-#include <stdexcept>
-#include <sstream>
-#include <system_error>
-
-#include <sys/types.h>
-
-#include <dirent.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-
-
-namespace MinedMap {
-
-static const int BIOME_SMOOTH = 3;
-static const uint32_t DIM = World::Region::SIZE*World::Chunk::SIZE;
-
-
-static void addChunkBiome(uint8_t biomemap[DIM*DIM], chunk_idx_t X, chunk_idx_t Z, const World::ChunkData *data) {
-	World::Chunk chunk(data);
-	World::Chunk::Heightmap layer = chunk.getTopLayer(0);
-
-	for (block_idx_t x = 0; x < World::Chunk::SIZE; x++) {
-		for (block_idx_t z = 0; z < World::Chunk::SIZE; z++) {
-			size_t i = (Z*World::Chunk::SIZE+z)*DIM + X*World::Chunk::SIZE+x;
-			const World::Chunk::Height &height = layer.v[x][z];
-			biomemap[i] = chunk.getBiome(x, height.y, z);
-		}
-	}
-}
-
-static uint8_t biomeAt(int16_t x, int16_t z, const std::unique_ptr<uint8_t[]> biomemaps[3][3]) {
-	size_t a = 1, b = 1;
-
-	if (x < 0) {
-		a--;
-		x += DIM;
-	} else if (x >= (int32_t)DIM) {
-		a++;
-		x -= DIM;
-	}
-	if (z < 0) {
-		b--;
-		z += DIM;
-	} else if (z >= (int32_t)DIM) {
-		b++;
-		z -= DIM;
-	}
-
-	return biomemaps[a][b].get()[z*DIM + x];
-}
-
-static Resource::Color collectColors(
-	region_block_idx_t x, region_block_idx_t z,
-	const World::Block &block, const std::unique_ptr<uint8_t[]> biomemaps[3][3]
-) {
-	std::unordered_map<uint8_t, unsigned> biomes;
-	for (int16_t dx = -BIOME_SMOOTH; dx <= BIOME_SMOOTH; dx++) {
-		for (int16_t dz = -BIOME_SMOOTH; dz <= BIOME_SMOOTH; dz++) {
-			if (std::abs(dx) + std::abs(dz) > BIOME_SMOOTH)
-				continue;
-
-			uint8_t biome = biomeAt(x+dx, z+dz, biomemaps);
-			if (biomes.count(biome))
-				biomes[biome]++;
-			else
-				biomes[biome] = 1;
-		}
-	}
-
-	Resource::FloatColor c = {};
-	unsigned total = 0;
-
-	for (const auto &e : biomes) {
-		uint8_t biome = e.first;
-		unsigned count = e.second;
-
-		if (biome == 0xff)
-			continue;
-
-		c = c + count * block.getColor(biome);
-		total += count;
-	}
-
-	if (!total)
-		return block.getColor(0);
-
-	return (1.0f / total) * c;
-}
-
-static void addChunk(Resource::Color image[DIM*DIM], uint8_t lightmap[2*DIM*DIM], chunk_idx_t X, chunk_idx_t Z,
-	const World::ChunkData *data, const std::unique_ptr<uint8_t[]> biomemaps[3][3]
-) {
-	World::Chunk chunk(data);
-	World::Chunk::Heightmap layer = chunk.getTopLayer(World::Chunk::WITH_DEPTH);
-
-	for (block_idx_t x = 0; x < World::Chunk::SIZE; x++) {
-		for (block_idx_t z = 0; z < World::Chunk::SIZE; z++) {
-			size_t i = (Z*World::Chunk::SIZE+z)*DIM + X*World::Chunk::SIZE+x;
-			const World::Chunk::Height &height = layer.v[x][z];
-			World::Block block = chunk.getBlock(x, height, z);
-
-			if (!block.isVisible())
-				continue;
-
-			image[i] = collectColors(X*World::Chunk::SIZE+x, Z*World::Chunk::SIZE+z, block, biomemaps);
-			lightmap[2*i+1] = (1 - block.blockLight/15.f)*192;
-		}
-	}
-}
-
-static int64_t readStamp(const std::string &filename) {
-	int64_t v = INT64_MIN;
-
-	std::FILE *f = std::fopen((filename + ".stamp").c_str(), "r");
-	if (f) {
-		if (std::fscanf(f, "%" SCNd64, &v) != 1) {
-			// Ignore errors
-		}
-		std::fclose(f);
-	}
-
-	return v;
-}
-
-static void writeStamp(const std::string &filename, int64_t v) {
-	std::FILE *f = std::fopen((filename + ".stamp").c_str(), "w");
-	if (f) {
-		std::fprintf(f, "%" PRId64, v);
-		std::fclose(f);
-	}
-}
-
-static bool writeImage(const std::string &output, const uint8_t *data, PNG::Format format, int64_t t) {
-	const std::string tmpfile = output + ".tmp";
-
-	size_t len = PNG::formatBytes(format)*DIM*DIM;
-	bool changed = true;
-
-	try {
-		std::unique_ptr<uint8_t[]> old(new uint8_t[len]);
-		PNG::read(output.c_str(), old.get(), DIM, DIM, format);
-
-		if (std::memcmp(data, old.get(), len) == 0)
-			changed = false;
-	} catch (const std::exception& ex) {
-	}
-
-	try {
-		if (changed) {
-			PNG::write(tmpfile.c_str(), data, DIM, DIM, format);
-
-			if (std::rename(tmpfile.c_str(), output.c_str()) < 0) {
-				std::fprintf(stderr, "Unable to save %s: %s\n", output.c_str(), std::strerror(errno));
-				std::remove(tmpfile.c_str());
-			}
-		}
-
-		writeStamp(output, t);
-	} catch (const std::exception& ex) {
-		std::remove(tmpfile.c_str());
-		throw;
-	}
-
-	return changed;
-}
-
-static int64_t getModTime(const std::string &file) {
-	struct stat s;
-	if (stat(file.c_str(), &s) < 0) {
-		if (errno != ENOENT)
-			std::fprintf(stderr, "Unable to stat %s: %s\n", file.c_str(), std::strerror(errno));
-		return INT64_MIN;
-	}
-
-#if defined(_WIN32)
-	return (int64_t)s.st_mtime * 1000000;
-#elif defined(__APPLE__)
-	return (int64_t)s.st_mtimespec.tv_sec * 1000000 + s.st_mtimespec.tv_nsec / 1000;
-#else
-	return (int64_t)s.st_mtim.tv_sec * 1000000 + s.st_mtim.tv_nsec / 1000;
-#endif
-}
-
-static bool checkRegion(int64_t changed, const std::string &file) {
-	struct stat s;
-	if (stat(file.c_str(), &s) < 0)
-		return true;
-
-	int64_t outtime = readStamp(file);
-	if (changed <= outtime) {
-		std::printf("%s is up-to-date.\n", file.c_str());
-		return false;
-	}
-
-	return true;
-}
-
-template<typename T>
-static std::string format(const T &v) {
-	std::ostringstream s;
-
-	s << v;
-	return s.str();
-}
-
-static std::string formatTileName(int x, int z, const std::string &ext) {
-	std::ostringstream s;
-
-	s << "r." << x << "." << z << "." << ext;
-	return s.str();
-}
-
-static bool checkFilename(const char *name, int *x, int *z) {
-	if (std::sscanf(name, "r.%i.%i.mca", x, z) != 2)
-		return false;
-
-	return (std::string(name) == formatTileName(*x, *z, "mca"));
-}
-
-static void makeDir(const std::string &name) {
-	if (
-		mkdir(
-			name.c_str()
-#ifndef _WIN32
-			, 0777
-#endif
-		) < 0 && errno != EEXIST
-	)
-		throw std::system_error(errno, std::generic_category(), "unable to create directory " + name);
-}
-
-static void makeBiome(const std::string &regiondir, const std::string &outputdir, int x, int z) {
-	std::string inname = formatTileName(x, z, "mca");
-	std::string outname = formatTileName(x, z, "png");
-	std::string input = regiondir + "/" + inname, output = outputdir + "/biome/" + outname;
-
-	int64_t intime = getModTime(input);
-	if (intime == INT64_MIN)
-		return;
-
-	if (!checkRegion(intime, output))
-		return;
-
-	std::printf("Generating %s from %s... ", output.c_str(), input.c_str());
-	std::fflush(stdout);
-
-	try {
-		std::unique_ptr<uint8_t[]> biomemap(new uint8_t[DIM*DIM]);
-		std::memset(biomemap.get(), 0xff, DIM*DIM);
-
-		World::Region::visitChunks(input.c_str(), [&] (chunk_idx_t X, chunk_idx_t Z, const World::ChunkData *chunk) {
-			addChunkBiome(biomemap.get(), X, Z, chunk);
-		});
-
-		bool changed = writeImage(output, biomemap.get(), PNG::GRAY, intime);
-		std::printf("%s.\n", changed ? "done" : "unchanged");
-	} catch (const std::exception& ex) {
-		std::fprintf(stderr, "Failed to generate %s: %s\n", output.c_str(), ex.what());
-	}
-}
-
-static void makeBiomes(const std::string &regiondir, const std::string &outputdir, const Info *info) {
-	info->visitRegions(0, [&] (int x, int z) {
-		makeBiome(regiondir, outputdir, x, z);
-	});
-}
-
-static void makeMap(const std::string &regiondir, const std::string &outputdir, int x, int z) {
-	std::string inname = formatTileName(x, z, "mca");
-	std::string outname = formatTileName(x, z, "png");
-	std::string input = regiondir + "/" + inname;
-	std::string output = outputdir + "/map/0/" + outname, output_light = outputdir + "/light/0/" + outname;
-	std::string biomenames[3][3];
-
-	int64_t intime = getModTime(input);
-	if (intime == INT64_MIN)
-		return;
-
-	for (int i = 0; i < 3; i++) {
-		for (int j = 0; j < 3; j++) {
-			biomenames[i][j] = outputdir + "/biome/" + formatTileName(x + i - 1, z + j - 1, "png");
-			intime = std::max(intime, getModTime(biomenames[i][j]));
-		}
-	}
-
-	if (!checkRegion(intime, output))
-		return;
-
-	std::printf("Generating %s from %s... ", output.c_str(), input.c_str());
-	std::fflush(stdout);
-
-	try {
-		std::unique_ptr<uint8_t[]> biomemaps[3][3];
-		for (int i = 0; i < 3; i++) {
-			for (int j = 0; j < 3; j++) {
-				biomemaps[i][j].reset(new uint8_t[DIM*DIM]);
-				std::memset(biomemaps[i][j].get(), 0, DIM*DIM);
-
-				try {
-					PNG::read(biomenames[i][j].c_str(), biomemaps[i][j].get(), DIM, DIM, PNG::GRAY);
-				} catch (const std::exception& ex) {}
-			}
-		}
-
-		std::unique_ptr<Resource::Color[]> image(new Resource::Color[DIM*DIM]);
-
-		std::unique_ptr<uint8_t[]> lightmap(new uint8_t[2*DIM*DIM]);
-		std::memset(lightmap.get(), 0, 2*DIM*DIM);
-
-		World::Region::visitChunks(input.c_str(), [&] (chunk_idx_t X, chunk_idx_t Z, const World::ChunkData *chunk) {
-			addChunk(image.get(), lightmap.get(), X, Z, chunk, biomemaps);
-		});
-
-		bool changed = writeImage(output, reinterpret_cast<const uint8_t*>(image.get()), PNG::RGB_ALPHA, intime);
-		changed = writeImage(output_light, lightmap.get(), PNG::GRAY_ALPHA, intime) || changed;
-		std::printf("%s.\n", changed ? "done" : "unchanged");
-	} catch (const std::exception& ex) {
-		std::fprintf(stderr, "Failed to generate %s: %s\n", output.c_str(), ex.what());
-	}
-}
-
-static void makeMaps(const std::string &regiondir, const std::string &outputdir, const Info *info) {
-	info->visitRegions(0, [&] (int x, int z) {
-		makeMap(regiondir, outputdir, x, z);
-	});
-}
-
-static bool makeMipmap(const std::string &dir, size_t level, int x, int z, PNG::Format imageFormat) {
-	bool ret = false;
-
-	std::string indir = dir + "/" + format(level-1) + "/";
-	std::string outdir = dir + "/" + format(level) + "/";
-
-	const std::string nw_str = indir + formatTileName(x*2, z*2, "png");
-	const std::string ne_str = indir + formatTileName(x*2+1, z*2, "png");
-	const std::string sw_str = indir + formatTileName(x*2, z*2+1, "png");
-	const std::string se_str = indir + formatTileName(x*2+1, z*2+1, "png");
-
-	const char *nw = nw_str.c_str();
-	const char *ne = ne_str.c_str();
-	const char *sw = sw_str.c_str();
-	const char *se = se_str.c_str();
-
-	int64_t t = INT64_MIN;
-	unsigned count = 0;
-	for (auto name : {&nw, &ne, &sw, &se}) {
-		struct stat s;
-		if (stat(*name, &s) < 0) {
-			*name = nullptr;
-			continue;
-		}
-
-		int64_t t_part = readStamp(*name);
-		if (t_part > t)
-			t = t_part;
-
-		count++;
-	}
-
-	std::string output = outdir + formatTileName(x, z, "png");
-
-	{
-		struct stat s;
-		if (stat(output.c_str(), &s) == 0) {
-			ret = true;
-
-			int64_t outtime = readStamp(output);
-			if (t <= outtime)
-				return ret;
-		}
-	}
-
-	if (!count)
-		return ret;
-
-	const std::string tmpfile = output + ".tmp";
-
-	try {
-		PNG::mipmap(tmpfile.c_str(), DIM, DIM, imageFormat, nw, ne, sw, se);
-
-		if (std::rename(tmpfile.c_str(), output.c_str()) < 0) {
-			std::fprintf(stderr, "Unable to save %s: %s\n", output.c_str(), std::strerror(errno));
-			std::remove(tmpfile.c_str());
-		}
-
-		writeStamp(output, t);
-	} catch (const std::exception& ex) {
-		std::remove(tmpfile.c_str());
-		throw;
-	}
-
-	return true;
-}
-
-static int floored_half(int a) {
-	return (a - (a < 0)) / 2;
-}
-
-static void makeMipmaps(const std::string &dir, Info *info) {
-	for (size_t level = 0; ; level++) {
-		int minX, maxX, minZ, maxZ;
-		std::tie(minX, maxX, minZ, maxZ) = info->getBounds(level);
-
-		if (minX >= -1 && maxX <= 0 && minZ >= -1 && maxZ <= 0)
-			break;
-
-		info->addMipmapLevel();
-		makeDir(dir + "/map/" + format(level + 1));
-		makeDir(dir + "/light/" + format(level + 1));
-
-		info->visitRegions(level, [&] (int x, int z) {
-			info->addRegion(floored_half(x), floored_half(z), level + 1);
-		});
-
-		info->visitRegions(level + 1, [&] (int x, int z) {
-			if (makeMipmap(dir + "/map", level + 1, x, z, PNG::RGB_ALPHA))
-				info->addRegion(x, z, level + 1);
-
-			makeMipmap(dir + "/light", level + 1, x, z, PNG::GRAY_ALPHA);
-		});
-	}
-}
-
-static Info collectInfo(const std::string &regiondir) {
-	DIR *dir = opendir(regiondir.c_str());
-	if (!dir)
-		throw std::system_error(errno, std::generic_category(), "Unable to read input directory");
-
-	Info info;
-
-	struct dirent *entry;
-	while ((entry = readdir(dir)) != nullptr) {
-		int x, z;
-		if (!checkFilename(entry->d_name, &x, &z))
-			continue;
-
-		info.addRegion(x, z, 0);
-
-	}
-
-	closedir(dir);
-
-	return info;
-}
-
-static void doLevel(const std::string &inputdir, const std::string &outputdir) {
-	const std::string regiondir = inputdir + "/region";
-
-	makeDir(outputdir + "/biome");
-	makeDir(outputdir + "/map");
-	makeDir(outputdir + "/map/0");
-	makeDir(outputdir + "/light");
-	makeDir(outputdir + "/light/0");
-
-	Info info = collectInfo(regiondir);
-
-	std::printf("Updating biome data...\n");
-	makeBiomes(regiondir, outputdir, &info);
-
-	std::printf("Updating map data...\n");
-	makeMaps(regiondir, outputdir, &info);
-
-	World::Level level((inputdir + "/level.dat").c_str());
-	info.setSpawn(level.getSpawn());
-
-	std::printf("Updating mipmaps...\n");
-	makeMipmaps(outputdir, &info);
-
-	info.writeJSON((outputdir + "/info.json").c_str());
-}
-
-}
-
-
-int main(int argc, char *argv[]) {
-	if (argc < 3) {
-		std::fprintf(stderr, "Usage: %s <data directory> <output directory>\n", argv[0]);
-		return 1;
-	}
-
-	try {
-		MinedMap::doLevel(argv[1], argv[2]);
-	} catch (const std::runtime_error& ex) {
-		std::fprintf(stderr, "Error: %s\n", ex.what());
-		return 1;
-	}
-
-	return 0;
-}
diff --git a/src/NBT/ByteArrayTag.hpp b/src/NBT/ByteArrayTag.hpp
deleted file mode 100644
index 9c73647..0000000
--- a/src/NBT/ByteArrayTag.hpp
+++ /dev/null
@@ -1,68 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-#include "Tag.hpp"
-
-#include <vector>
-
-
-namespace MinedMap {
-namespace NBT {
-
-class ByteArrayTag : public Tag {
-private:
-	uint32_t len;
-	const uint8_t *ptr;
-
-public:
-	static const MakeType<ByteArrayTag> Type;
-
-
-	ByteArrayTag(Buffer *buffer) {
-		len = buffer->get32();
-		ptr = buffer->get(len);
-	}
-
-	virtual const TagType & getType() const {
-		return Type;
-	}
-
-	virtual void print(std::ostream& os, const std::string &indent) const {
-		os << "(" << len << ") [" << std::endl;
-
-		std::string inner = indent + "  ";
-
-		for (size_t i = 0; i < len; i++) {
-			uint8_t v = ptr[i];
-
-			os << inner
-			   << (unsigned)v << " / "
-			   << (int)(int8_t)v << " / "
-			   << std::hex << "0x" << (unsigned)v << std::dec
-			   << std::endl;
-		}
-
-		os << indent << "]";
-	}
-
-	uint32_t getLength() const {
-		return len;
-	}
-
-	const uint8_t * getPointer() const {
-		return ptr;
-	}
-
-	uint8_t getValue(size_t i) const {
-		return ptr[i];
-	}
-};
-
-}
-}
diff --git a/src/NBT/ByteTag.hpp b/src/NBT/ByteTag.hpp
deleted file mode 100644
index 7d3fff5..0000000
--- a/src/NBT/ByteTag.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-#include "Tag.hpp"
-
-
-namespace MinedMap {
-namespace NBT {
-
-class ByteTag : public Tag {
-private:
-	uint8_t value;
-
-public:
-	static const MakeType<ByteTag> Type;
-
-
-	ByteTag(Buffer *buffer) {
-		value = buffer->get8();
-	}
-
-	virtual const TagType & getType() const {
-		return Type;
-	}
-
-	virtual void print(std::ostream& os, const std::string &) const {
-		os << (unsigned)getValue() << " / "
-		   << (int)(int8_t)getValue() << " / "
-		   << std::hex << "0x" << (unsigned)getValue() << std::dec;
-	}
-
-	uint8_t getValue() const {
-		return value;
-	}
-};
-
-}
-}
diff --git a/src/NBT/CompoundTag.hpp b/src/NBT/CompoundTag.hpp
deleted file mode 100644
index b1e7521..0000000
--- a/src/NBT/CompoundTag.hpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-#include "EndTag.hpp"
-#include "Tag.hpp"
-
-#include <string>
-#include <unordered_map>
-
-
-namespace MinedMap {
-namespace NBT {
-
-class CompoundTag : public Tag, public std::unordered_map<std::string, std::shared_ptr<const Tag>> {
-public:
-	static const MakeType<CompoundTag> Type;
-
-
-	CompoundTag(Buffer *buffer) {
-		while (true) {
-			std::pair<std::string, std::shared_ptr<const Tag>> v = Tag::readNamedTag(buffer);
-			if (v.second->getType() == EndTag::Type)
-				break;
-
-			insert(std::move(v));
-		}
-	}
-
-	virtual const TagType & getType() const {
-		return Type;
-	}
-
-	virtual void print(std::ostream& os, const std::string &indent) const {
-		os << "{" << std::endl;
-
-		std::string inner = indent + "  ";
-
-		for (const auto &item : *this) {
-			os << inner << item.first << ": " << item.second->getType() << " ";
-			item.second->print(os, inner);
-			os << std::endl;
-		}
-
-		os << indent << "}";
-	}
-
-	template<typename T> std::shared_ptr<const T> get(const std::string &key) const {
-		auto it = find(key);
-		if (it == end())
-			return std::shared_ptr<const T>();
-
-		return std::dynamic_pointer_cast<const T>(it->second);
-	}
-};
-
-}
-}
diff --git a/src/NBT/DoubleTag.hpp b/src/NBT/DoubleTag.hpp
deleted file mode 100644
index a28c38a..0000000
--- a/src/NBT/DoubleTag.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-#include "Tag.hpp"
-
-
-namespace MinedMap {
-namespace NBT {
-
-class DoubleTag : public Tag {
-private:
-	const uint8_t *ptr;
-
-public:
-	static const MakeType<DoubleTag> Type;
-
-
-	DoubleTag(Buffer *buffer) {
-		ptr = buffer->get(8);
-	}
-
-	virtual const TagType & getType() const {
-		return Type;
-	}
-
-	virtual void print(std::ostream& os, const std::string &) const {
-		union {
-			uint64_t i;
-			double d;
-		};
-
-		i = Buffer::parse64(ptr);
-		os << d;
-	}
-};
-
-}
-}
diff --git a/src/NBT/EndTag.hpp b/src/NBT/EndTag.hpp
deleted file mode 100644
index 859d77a..0000000
--- a/src/NBT/EndTag.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-#include "Tag.hpp"
-
-
-namespace MinedMap {
-namespace NBT {
-
-class EndTag : public Tag {
-public:
-	static const MakeType<EndTag> Type;
-
-
-	EndTag(Buffer *) {}
-
-	virtual const TagType & getType() const {
-		return Type;
-	}
-
-	virtual void print(std::ostream&, const std::string &) const {
-	}
-};
-
-}
-}
diff --git a/src/NBT/FloatTag.hpp b/src/NBT/FloatTag.hpp
deleted file mode 100644
index 637c74b..0000000
--- a/src/NBT/FloatTag.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-#include "Tag.hpp"
-
-
-namespace MinedMap {
-namespace NBT {
-
-class FloatTag : public Tag {
-	const uint8_t *ptr;
-
-public:
-	static const MakeType<FloatTag> Type;
-
-
-	FloatTag(Buffer *buffer) {
-		ptr = buffer->get(4);
-	}
-
-	virtual const TagType & getType() const {
-		return Type;
-	}
-
-	virtual void print(std::ostream& os, const std::string &) const {
-		union {
-			uint32_t i;
-			float f;
-		};
-
-		i = Buffer::parse32(ptr);
-		os << f;
-	}
-};
-
-}
-}
diff --git a/src/NBT/IntArrayTag.hpp b/src/NBT/IntArrayTag.hpp
deleted file mode 100644
index cc24665..0000000
--- a/src/NBT/IntArrayTag.hpp
+++ /dev/null
@@ -1,68 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-#include "Tag.hpp"
-
-#include <vector>
-
-
-namespace MinedMap {
-namespace NBT {
-
-class IntArrayTag : public Tag {
-private:
-	uint32_t len;
-	const uint8_t *ptr;
-
-public:
-	static const MakeType<IntArrayTag> Type;
-
-
-	IntArrayTag(Buffer *buffer) {
-		len = buffer->get32();
-		ptr = buffer->get(4*len);
-	}
-
-	virtual const TagType & getType() const {
-		return Type;
-	}
-
-	virtual void print(std::ostream& os, const std::string &indent) const {
-		os << "(" << len << ") [" << std::endl;
-
-		std::string inner = indent + "  ";
-
-		for (size_t i = 0; i < len; i++) {
-			uint32_t v = getValue(i);
-
-			os << inner
-			   << v << " / "
-			   << (int32_t)v << " / "
-			   << std::hex << "0x" << v << std::dec
-			   << std::endl;
-		}
-
-		os << indent << "]";
-	}
-
-	uint32_t getLength() const {
-		return len;
-	}
-
-	const uint8_t * getPointer() const {
-		return ptr;
-	}
-
-	uint32_t getValue(size_t i) const {
-		return Buffer::parse32(&ptr[4*i]);
-	}
-};
-
-}
-}
diff --git a/src/NBT/IntTag.hpp b/src/NBT/IntTag.hpp
deleted file mode 100644
index b2c2660..0000000
--- a/src/NBT/IntTag.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-#include "Tag.hpp"
-
-
-namespace MinedMap {
-namespace NBT {
-
-class IntTag : public Tag {
-private:
-	const uint8_t *ptr;
-
-public:
-	static const MakeType<IntTag> Type;
-
-
-	IntTag(Buffer *buffer) {
-		ptr = buffer->get(4);
-	}
-
-	virtual const TagType & getType() const {
-		return Type;
-	}
-
-	virtual void print(std::ostream& os, const std::string &) const {
-		os << getValue() << " / "
-		   << (int32_t)getValue() << " / "
-		   << std::hex << "0x" << getValue() << std::dec;
-	}
-
-	uint32_t getValue() const {
-		return Buffer::parse32(ptr);
-	}
-};
-
-}
-}
diff --git a/src/NBT/ListTag.hpp b/src/NBT/ListTag.hpp
deleted file mode 100644
index 6582098..0000000
--- a/src/NBT/ListTag.hpp
+++ /dev/null
@@ -1,59 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-#include "Tag.hpp"
-
-#include <vector>
-
-
-namespace MinedMap {
-namespace NBT {
-
-class ListTag : public Tag, public std::vector<std::shared_ptr<const Tag>> {
-private:
-	const TagType *subtype;
-
-public:
-	static const MakeType<ListTag> Type;
-
-
-	ListTag(Buffer *buffer) {
-		subtype = &getTypeById(buffer->get8());
-
-		uint32_t len = buffer->get32();
-
-		for (uint32_t i = 0; i < len; i++)
-			push_back(subtype->read(buffer));
-	}
-
-	virtual const TagType & getType() const {
-		return Type;
-	}
-
-	virtual const TagType & getSubtype() const {
-		return *subtype;
-	}
-
-	virtual void print(std::ostream& os, const std::string &indent) const {
-		os << getSubtype() << " [" << std::endl;
-
-		std::string inner = indent + "  ";
-
-		for (const auto &item : *this) {
-			os << inner;
-			item->print(os, inner);
-			os << std::endl;
-		}
-
-		os << indent << "]";
-	}
-};
-
-}
-}
diff --git a/src/NBT/LongArrayTag.hpp b/src/NBT/LongArrayTag.hpp
deleted file mode 100644
index 2e54762..0000000
--- a/src/NBT/LongArrayTag.hpp
+++ /dev/null
@@ -1,68 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015-2018, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-#include "Tag.hpp"
-
-#include <vector>
-
-
-namespace MinedMap {
-namespace NBT {
-
-class LongArrayTag : public Tag {
-private:
-	uint32_t len;
-	const uint8_t *ptr;
-
-public:
-	static const MakeType<LongArrayTag> Type;
-
-
-	LongArrayTag(Buffer *buffer) {
-		len = buffer->get32();
-		ptr = buffer->get(8*len);
-	}
-
-	virtual const TagType & getType() const {
-		return Type;
-	}
-
-	virtual void print(std::ostream& os, const std::string &indent) const {
-		os << "(" << len << ") [" << std::endl;
-
-		std::string inner = indent + "  ";
-
-		for (size_t i = 0; i < len; i++) {
-			uint64_t v = Buffer::parse64(&ptr[8*i]);
-
-			os << inner
-			   << v << " / "
-			   << (int64_t)v << " / "
-			   << std::hex << "0x" << v << std::dec
-			   << std::endl;
-		}
-
-		os << indent << "]";
-	}
-
-	uint32_t getLength() const {
-		return len;
-	}
-
-	const uint8_t * getPointer() const {
-		return ptr;
-	}
-
-	uint64_t getValue(size_t i) const {
-		return Buffer::parse64(&ptr[8*i]);
-	}
-};
-
-}
-}
diff --git a/src/NBT/LongTag.hpp b/src/NBT/LongTag.hpp
deleted file mode 100644
index 450f6b4..0000000
--- a/src/NBT/LongTag.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-#include "Tag.hpp"
-
-
-namespace MinedMap {
-namespace NBT {
-
-class LongTag : public Tag {
-private:
-	const uint8_t *ptr;
-
-public:
-	static const MakeType<LongTag> Type;
-
-
-	LongTag(Buffer *buffer) {
-		ptr = buffer->get(8);
-	}
-
-	virtual const TagType & getType() const {
-		return Type;
-	}
-
-	virtual void print(std::ostream& os, const std::string &) const {
-		os << getValue() << " / "
-		   << (int64_t)getValue() << " / "
-		   << std::hex << "0x" << getValue() << std::dec;
-	}
-
-	uint64_t getValue() const {
-		return Buffer::parse64(ptr);
-	}
-};
-
-}
-}
diff --git a/src/NBT/ShortTag.hpp b/src/NBT/ShortTag.hpp
deleted file mode 100644
index 32f32a2..0000000
--- a/src/NBT/ShortTag.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-#include "Tag.hpp"
-
-
-namespace MinedMap {
-namespace NBT {
-
-class ShortTag : public Tag {
-private:
-	const uint8_t *ptr;
-
-public:
-	static const MakeType<ShortTag> Type;
-
-
-	ShortTag(Buffer *buffer) {
-		ptr = buffer->get(2);
-	}
-
-	virtual const TagType & getType() const {
-		return Type;
-	}
-
-	virtual void print(std::ostream& os, const std::string &) const {
-		os << getValue() << " / "
-		   << (int16_t)getValue() << " / "
-		   << std::hex << "0x" << getValue() << std::dec;
-	}
-
-	uint16_t getValue() const {
-		return Buffer::parse16(ptr);
-	}
-};
-
-}
-}
diff --git a/src/NBT/StringTag.hpp b/src/NBT/StringTag.hpp
deleted file mode 100644
index 40c5bfb..0000000
--- a/src/NBT/StringTag.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-#include "Tag.hpp"
-
-
-namespace MinedMap {
-namespace NBT {
-
-class StringTag : public Tag {
-private:
-	uint16_t len;
-	const uint8_t *ptr;
-
-public:
-	static const MakeType<StringTag> Type;
-
-
-	StringTag(Buffer *buffer) {
-		len = buffer->get16();
-		ptr = buffer->get(len);
-	}
-
-	virtual const TagType & getType() const {
-		return Type;
-	}
-
-	std::string getValue() const {
-		return std::string(reinterpret_cast<const char *>(ptr), len);
-	}
-
-	virtual void print(std::ostream& os, const std::string &) const {
-		os << "\"" << getValue() << "\"";
-	}
-};
-
-}
-}
diff --git a/src/NBT/Tag.cpp b/src/NBT/Tag.cpp
deleted file mode 100644
index 57dd395..0000000
--- a/src/NBT/Tag.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#include "Tag.hpp"
-
-#include "EndTag.hpp"
-#include "ByteTag.hpp"
-#include "ShortTag.hpp"
-#include "IntTag.hpp"
-#include "LongTag.hpp"
-#include "FloatTag.hpp"
-#include "DoubleTag.hpp"
-#include "ByteArrayTag.hpp"
-#include "StringTag.hpp"
-#include "ListTag.hpp"
-#include "CompoundTag.hpp"
-#include "IntArrayTag.hpp"
-#include "LongArrayTag.hpp"
-
-
-namespace MinedMap {
-namespace NBT {
-
-const Tag::MakeType<EndTag> EndTag::Type("End");
-const Tag::MakeType<ByteTag> ByteTag::Type("Byte");
-const Tag::MakeType<ShortTag> ShortTag::Type("Short");
-const Tag::MakeType<IntTag> IntTag::Type("Int");
-const Tag::MakeType<LongTag> LongTag::Type("Long");
-const Tag::MakeType<FloatTag> FloatTag::Type("Float");
-const Tag::MakeType<DoubleTag> DoubleTag::Type("Double");
-const Tag::MakeType<ByteArrayTag> ByteArrayTag::Type("ByteArray");
-const Tag::MakeType<StringTag> StringTag::Type("String");
-const Tag::MakeType<ListTag> ListTag::Type("List");
-const Tag::MakeType<CompoundTag> CompoundTag::Type("Compound");
-const Tag::MakeType<IntArrayTag> IntArrayTag::Type("IntArray");
-const Tag::MakeType<LongArrayTag> LongArrayTag::Type("LongArray");
-
-
-const std::vector<const TagType *> Tag::types = {
-	&EndTag::Type,
-	&ByteTag::Type,
-	&ShortTag::Type,
-	&IntTag::Type,
-	&LongTag::Type,
-	&FloatTag::Type,
-	&DoubleTag::Type,
-	&ByteArrayTag::Type,
-	&StringTag::Type,
-	&ListTag::Type,
-	&CompoundTag::Type,
-	&IntArrayTag::Type,
-	&LongArrayTag::Type,
-};
-
-
-std::pair<std::string, std::shared_ptr<const Tag>> Tag::readNamedTag(Buffer *buffer) {
-	const TagType &type = getTypeById(buffer->get8());
-	if (type == EndTag::Type)
-		return std::make_pair("", std::make_shared<EndTag>(buffer));
-
-	uint16_t len = buffer->get16();
-	std::string name(reinterpret_cast<const char*>(buffer->get(len)), len);
-
-	return std::make_pair(name, type.read(buffer));
-}
-
-}
-}
diff --git a/src/NBT/Tag.hpp b/src/NBT/Tag.hpp
deleted file mode 100644
index 98c0ae2..0000000
--- a/src/NBT/Tag.hpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-#include <cstdint>
-#include <memory>
-#include <ostream>
-#include <vector>
-
-#include "../Buffer.hpp"
-
-
-namespace MinedMap {
-namespace NBT {
-
-class Tag;
-
-class TagType {
-public:
-	TagType() = default;
-	TagType(const TagType&) = delete;
-	TagType & operator=(const TagType&) = delete;
-
-	virtual const char * getName() const = 0;
-	virtual std::shared_ptr<const Tag> read(Buffer *buffer) const = 0;
-
-	bool operator==(const TagType &type) const {
-		return this == &type;
-	}
-};
-
-class Tag {
-private:
-	static const std::vector<const TagType *> types;
-
-protected:
-	template<typename T>
-	class MakeType : public TagType {
-	private:
-		const char *name;
-
-	public:
-		MakeType(const char *name0) : name(name0) {}
-
-		virtual const char * getName() const {
-			return name;
-		}
-
-		virtual std::shared_ptr<const Tag> read(Buffer *buffer) const {
-			return std::make_shared<T>(buffer);
-		}
-	};
-
-
-	static const TagType & getTypeById(uint8_t id) {
-		return *types.at(id);
-	}
-
-public:
-	static std::pair<std::string, std::shared_ptr<const Tag>> readNamedTag(Buffer *buffer);
-
-	virtual const TagType & getType() const = 0;
-	virtual void print(std::ostream& os, const std::string &indent) const = 0;
-
-	virtual ~Tag() {}
-};
-
-static inline std::ostream& operator<<(std::ostream& os, const TagType &type) {
-	return os << type.getName();
-}
-
-static inline std::ostream& operator<<(std::ostream& os, const Tag &tag) {
-	os << tag.getType() << " ";
-	tag.print(os, "");
-	return os;
-}
-
-}
-}
diff --git a/src/PNG.cpp b/src/PNG.cpp
deleted file mode 100644
index 5c2c098..0000000
--- a/src/PNG.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#include "PNG.hpp"
-
-#include <cerrno>
-#include <cstdio>
-#include <cstring>
-#include <memory>
-#include <system_error>
-
-#include <png.h>
-
-
-namespace MinedMap {
-namespace PNG {
-
-static const int formatColorTypes[] = {
-	[RGB_ALPHA] = PNG_COLOR_TYPE_RGB_ALPHA,
-	[GRAY_ALPHA] = PNG_COLOR_TYPE_GRAY_ALPHA,
-	[GRAY] = PNG_COLOR_TYPE_GRAY,
-};
-
-void write(const char *filename, const uint8_t *data, size_t width, size_t height, Format format) {
-	std::FILE *f = std::fopen(filename, "wb");
-	if (!f)
-		throw std::system_error(errno, std::generic_category(), "unable to open PNG file");
-
-	png_structp png_ptr = png_create_write_struct (PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr);
-	if (!png_ptr)
-		throw std::runtime_error("unable to create PNG write struct");
-
-	png_infop info_ptr = png_create_info_struct(png_ptr);
-	if (!info_ptr) {
-		png_destroy_write_struct(&png_ptr, nullptr);
-		throw std::runtime_error("unable to create PNG info struct");
-	}
-
-	if (setjmp(png_jmpbuf(png_ptr))) {
-		png_destroy_write_struct(&png_ptr, &info_ptr);
-		std::fclose(f);
-		throw std::runtime_error("unable to write PNG file");
-	}
-
-	png_init_io(png_ptr, f);
-
-	png_set_IHDR(png_ptr, info_ptr, width, height, 8, formatColorTypes[format],
-		     PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
-
-	uint8_t *row_pointers[height];
-	for (size_t i = 0; i < height; i++)
-		row_pointers[i] = const_cast<uint8_t*>(&data[formatBytes(format)*i*width]);
-
-	png_set_rows(png_ptr, info_ptr, row_pointers);
-	png_write_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, nullptr);
-
-	png_destroy_write_struct(&png_ptr, &info_ptr);
-	std::fclose(f);
-}
-
-void read(const char *filename, uint8_t *data, size_t width, size_t height, Format format) {
-	std::FILE *f = std::fopen(filename, "rb");
-	if (!f)
-		throw std::system_error(errno, std::generic_category(), "unable to open PNG file");
-
-	png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, nullptr, nullptr, nullptr);
-	if (!png_ptr)
-		throw std::runtime_error("unable to create PNG read struct");
-
-	png_infop info_ptr = png_create_info_struct(png_ptr);
-	if (!info_ptr) {
-		png_destroy_read_struct(&png_ptr, nullptr, nullptr);
-		throw std::runtime_error("unable to create PNG info struct");
-	}
-
-	png_infop end_info = png_create_info_struct(png_ptr);
-	if (!end_info) {
-		png_destroy_read_struct(&png_ptr, &info_ptr, nullptr);
-		throw std::runtime_error("unable to create PNG info struct");
-	}
-
-	if (setjmp(png_jmpbuf(png_ptr))) {
-		png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
-		fclose(f);
-		throw std::runtime_error("unable to read PNG file");
-	}
-
-	png_init_io(png_ptr, f);
-
-	png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, nullptr);
-
-	if (png_get_image_width(png_ptr, info_ptr) != width
-	    || png_get_image_height(png_ptr, info_ptr) != height
-	    || png_get_bit_depth(png_ptr, info_ptr) != 8
-	    || png_get_color_type(png_ptr, info_ptr) != formatColorTypes[format])
-		longjmp(png_jmpbuf(png_ptr), 1);
-
-	uint8_t **row_pointers = png_get_rows(png_ptr, info_ptr);
-	for (size_t i = 0; i < height; i++)
-		std::memcpy(&data[formatBytes(format)*i*width], row_pointers[i], formatBytes(format)*width);
-
-	png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
-	std::fclose(f);
-}
-
-static void readScaled(uint8_t *data, size_t offset_w, size_t offset_h, const char *file, size_t width, size_t height, Format format) {
-	if (!file)
-		return;
-
-	size_t b = formatBytes(format);
-
-	std::unique_ptr<uint8_t[]> input(new uint8_t[b*width*height]);
-	read(file, input.get(), width, height, format);
-
-	for (size_t h = 0; h < width/2; h++) {
-		for (size_t w = 0; w < width/2; w++) {
-			for (size_t c = 0; c < b; c++) {
-				size_t i = 2*b*(width*h + w) + c;
-				data[b*(width*(offset_h+h) + offset_w+w) + c] = (input[i] + input[i+b] + input[i+b*width] + input[i+b*width+b])/4;
-			}
-		}
-	}
-}
-
-void mipmap(const char *output, size_t width, size_t height, Format format, const char *nw, const char *ne, const char *sw, const char *se) {
-	size_t size = formatBytes(format)*width*height;
-	std::unique_ptr<uint8_t[]> data(new uint8_t[size]);
-	std::memset(data.get(), 0, size);
-
-	readScaled(data.get(), 0, 0, nw, width, height, format);
-	readScaled(data.get(), width/2, 0, ne, width, height, format);
-	readScaled(data.get(), 0, height/2, sw, width, height, format);
-	readScaled(data.get(), width/2, height/2, se, width, height, format);
-
-	write(output, data.get(), width, height, format);
-}
-
-}
-}
diff --git a/src/PNG.hpp b/src/PNG.hpp
deleted file mode 100644
index fdd2dc0..0000000
--- a/src/PNG.hpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-#include <cstddef>
-#include <cstdint>
-
-
-namespace MinedMap {
-namespace PNG {
-
-enum Format {
-	RGB_ALPHA,
-	GRAY_ALPHA,
-	GRAY,
-};
-
-static inline size_t formatBytes(Format format) {
-	const size_t data[] = {
-		[RGB_ALPHA] = 4,
-		[GRAY_ALPHA] = 2,
-		[GRAY] = 1,
-	};
-
-	return data[format];
-}
-
-void write(const char *filename, const uint8_t *data, size_t width, size_t height, Format format);
-void read(const char *filename, uint8_t *data, size_t width, size_t height, Format format);
-void mipmap(const char *output, size_t width, size_t height, Format format, const char *nw, const char *ne, const char *sw, const char *se);
-
-}
-}
diff --git a/src/Resource/Biome.cpp b/src/Resource/Biome.cpp
deleted file mode 100644
index 1ca2114..0000000
--- a/src/Resource/Biome.cpp
+++ /dev/null
@@ -1,448 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015-2021, Matthias Schiffer <mschiffer@universe-factory.net>
-  Copyright (c) 2019, Roman Shishkin <spark@uwtech.org>
-  All rights reserved.
-*/
-
-
-#include "Biome.hpp"
-
-#include "BlockType.hpp"
-
-namespace MinedMap {
-namespace Resource {
-
-static FloatColor colorFromParams(float temp, float rain, bool grass) {
-	const FloatColor grassColors[3] = {
-		{0.502f, 0.706f, 0.592f}, // lower right
-		{0.247f, 0.012f, -0.259f}, // lower left - lower right
-		{-0.471f, 0.086f, -0.133f}, // upper left - lower left
-	};
-	const FloatColor foliageColors[3] = {
-		{0.376f, 0.631f, 0.482f}, // lower right
-		{0.306f, 0.012f, -0.317f}, // lower left - lower right
-		{-0.580f, 0.106f, -0.165f}, // upper left - lower left
-	};
-
-	const FloatColor *colors = grass ? grassColors : foliageColors;
-
-	return colors[0] + temp*colors[1] + rain*colors[2];
-}
-
-
-FloatColor Biome::getGrassColor(float temp, float rain) const {
-	return colorFromParams(temp, rain, true);
-}
-
-FloatColor Biome::getFoliageColor(float temp, float rain) const {
-	return colorFromParams(temp, rain, false);
-}
-
-
-FloatColor Biome::getBlockColor(const BlockType *type, y_idx_t height) const {
-	FloatColor c = {
-		float(type->color.r),
-		float(type->color.g),
-		float(type->color.b),
-	};
-
-	float t = clamp(temp - std::max(0.0f, (int(height)-64)/600.0f), 0, 1);
-	float r = clamp(rain, 0, 1) * t;
-
-	if (type->flags & BLOCK_GRASS)
-		c *= getGrassColor(t, r);
-	if (type->flags & BLOCK_FOLIAGE)
-		c *= getFoliageColor(t, r);
-	if (type->flags & BLOCK_BIRCH)
-		c *= FloatColor {0.380f, 0.600f, 0.380f};
-	if (type->flags & BLOCK_SPRUCE)
-		c *= FloatColor {0.502f, 0.655f, 0.333f};
-	if (type->flags & BLOCK_WATER)
-		c *= getWaterColor();
-
-	float h = 0.5f + height * 0.005f;
-
-	c.r = clamp(c.r * h, 0, 255);
-	c.g = clamp(c.g * h, 0, 255);
-	c.b = clamp(c.b * h, 0, 255);
-
-	return c;
-}
-
-
-class SwampBiome : public Biome {
-protected:
-	virtual FloatColor getGrassColor(float, float) const {
-		return {0.417f, 0.439f, 0.224f};
-	}
-	virtual FloatColor getFoliageColor(float temp, float rain) const {
-		return getGrassColor(temp, rain);
-	}
-
-public:
-	SwampBiome(float temp0, float rain0, FloatColor water0) :
-	Biome(temp0, rain0, water0) {}
-};
-
-class DarkForestBiome : public Biome {
-private:
-	const FloatColor darkGreen = {0.157f, 0.204f, 0.039f};
-
-protected:
-	virtual FloatColor getGrassColor(float temp, float rain) const {
-		return 0.5 * (darkGreen + colorFromParams(temp, rain, true));
-	}
-
-	virtual FloatColor getFoliageColor(float temp, float rain) const {
-		return 0.5 * (darkGreen + colorFromParams(temp, rain, false));
-	}
-
-public:
-	DarkForestBiome(float temp0, float rain0) : Biome(temp0, rain0) {}
-};
-
-class BadlandsBiome : public Biome {
-protected:
-	virtual FloatColor getGrassColor(float, float) const {
-		return {0.565f, 0.506f, 0.302f};
-	}
-	virtual FloatColor getFoliageColor(float, float) const {
-		return {0.620f, 0.506f, 0.302f};
-	}
-
-public:
-	BadlandsBiome(float temp0, float rain0) : Biome(temp0, rain0) {}
-};
-
-
-/* Values from https://github.com/erich666/Mineways/blob/master/Win/biomes.cpp or
- * extracted from Minecraft code decompiled using https://github.com/Hexeption/MCP-Reborn */
-
-static const Biome BiomeDefault(0.5f,  0.5f);
-static const Biome BiomePlains(0.8f, 0.4f);
-static const Biome BiomeDesert(2.0f, 0.0f);
-static const Biome BiomeMountains(0.2f, 0.3f);
-static const Biome BiomeForest(0.7f, 0.8f);
-static const Biome BiomeTaiga(0.25f, 0.8f);
-static const SwampBiome BiomeSwamp(0.8f, 0.9f, {0.380f, 0.482f, 0.392f});
-static const Biome BiomeFrozen(0.0f, 0.5f);
-static const Biome BiomeMushroomFields(0.9f, 1.0f);
-static const Biome BiomeJungle(0.95f, 0.9f);
-static const Biome BiomeJungleEdge(0.95f, 0.8f);
-static const Biome BiomeSnowyBeach(0.05f, 0.3f);
-static const Biome BiomeBirchForest(0.6f, 0.6f);
-static const DarkForestBiome BiomeDarkForest(0.7f, 0.8f);
-static const Biome BiomeSnowyTaiga(-0.5f, 0.4f);
-static const Biome BiomeGiantTreeTaiga(0.3f, 0.8f);
-static const Biome BiomeSavanna(1.2f, 0.0f);
-static const Biome BiomeSavannaPlateau(1.0f, 0.0f);
-static const Biome BiomeShatteredSavanna(1.1f, 0.0f);
-static const BadlandsBiome BiomeBadlands(2.0f, 0.0f);
-
-static const Biome BiomeFrozenOcean(0.0f, 0.5f, {0.224f, 0.220f, 0.788f});
-static const Biome BiomeWarmOcean(0.8f, 0.5f, {0.263f, 0.835f, 0.933f});
-static const Biome BiomeLukewarmOcean(0.8f, 0.5f, {0.271f, 0.678f, 0.949f});
-static const Biome BiomeColdOcean(0.8f, 0.5f, {0.239f, 0.341f, 0.839f});
-
-static const Biome BiomeMeadow(0.5f, 0.8f);
-static const Biome BiomeGrove(-0.2f, 0.8f);
-static const Biome BiomeJaggedPeaks(-0.7f, 0.9f);
-static const Biome BiomeStonyPeaks(1.0f, 0.3f);
-static const Biome BiomeSnowySlopes(-0.3f, 0.9f);
-static const SwampBiome BiomeMangroveSwamp(0.8f, 0.9f, {0.227f, 0.478f, 0.416f});
-
-const Biome *const Biome::Default = &BiomeDefault;
-
-/* Minecraft 1.18 does not use numerical IDs for biomes anymore.
- * Previously unused biome IDs are assigned to the new biome types of
- * Minecraft 1.18 for storage in MinedMap's biome data cache. */
-
-const Biome *const Biome::Biomes[256] = {
-	/*   0 */ &BiomeDefault, /* Ocean */
-	/*   1 */ &BiomePlains,
-	/*   2 */ &BiomeDesert,
-	/*   3 */ &BiomeMountains,
-	/*   4 */ &BiomeForest,
-	/*   5 */ &BiomeTaiga,
-	/*   6 */ &BiomeSwamp,
-	/*   7 */ &BiomeDefault, /* River */
-	/*   8 */ &BiomeDesert, /* Nether */
-	/*   9 */ &BiomeDefault, /* The End */
-	/*  10 */ &BiomeFrozenOcean,
-	/*  11 */ &BiomeFrozenOcean, /* Frozen River */
-	/*  12 */ &BiomeFrozen, /* Snowy Tundra */
-	/*  13 */ &BiomeFrozen, /* Snowy Mountains */
-	/*  14 */ &BiomeMushroomFields,
-	/*  15 */ &BiomeMushroomFields, /* Mushroom Field Shore */
-	/*  16 */ &BiomePlains, /* Beach */
-	/*  17 */ &BiomeDesert, /* Desert Hills */
-	/*  18 */ &BiomeForest, /* Wooded Hiils */
-	/*  19 */ &BiomeTaiga, /* Taiga Hills */
-	/*  20 */ &BiomeMountains, /* Moutain Edge */
-	/*  21 */ &BiomeJungle,
-	/*  22 */ &BiomeJungle, /* Jungle Hills */
-	/*  23 */ &BiomeJungleEdge,
-	/*  24 */ &BiomeDefault, /* Deep Ocean */
-	/*  25 */ &BiomeMountains, /* Stone Shore */
-	/*  26 */ &BiomeSnowyBeach,
-	/*  27 */ &BiomeBirchForest,
-	/*  28 */ &BiomeBirchForest, /* Birch Forest Hills */
-	/*  29 */ &BiomeDarkForest,
-	/*  30 */ &BiomeSnowyTaiga,
-	/*  31 */ &BiomeSnowyTaiga, /* Snowy Taiga Hills */
-	/*  32 */ &BiomeGiantTreeTaiga,
-	/*  33 */ &BiomeGiantTreeTaiga, /* Giant Tree Taiga Hills */
-	/*  34 */ &BiomeMountains, /* Wooded Mountains */
-	/*  35 */ &BiomeSavanna,
-	/*  36 */ &BiomeSavanna, /* Savanna Plateau */
-	/*  37 */ &BiomeBadlands,
-	/*  38 */ &BiomeBadlands, /* Wooded Badlands Plateau */
-	/*  39 */ &BiomeBadlands, /* Badlands Plateau */
-	/*  40 */ &BiomeDefault, /* Small End Islands */
-	/*  41 */ &BiomeDefault, /* End Midlands */
-	/*  42 */ &BiomeDefault, /* End Highlands */
-	/*  43 */ &BiomeDefault, /* End Barrens */
-	/*  44 */ &BiomeWarmOcean,
-	/*  45 */ &BiomeLukewarmOcean,
-	/*  46 */ &BiomeColdOcean,
-	/*  47 */ &BiomeWarmOcean, /* Deep Warm Ocean */
-	/*  48 */ &BiomeLukewarmOcean, /* Deep Lukewarm Ocean */
-	/*  49 */ &BiomeColdOcean, /* Deep Cold Ocean */
-	/*  50 */ &BiomeFrozenOcean, /* Deep Frozen Ocean */
-	/*  51 */ &BiomeMeadow, /* MinedMap assignment */
-	/*  52 */ &BiomeGrove, /* MinedMap assignment */
-	/*  53 */ &BiomeJaggedPeaks, /* MinedMap assignment */
-	/*  54 */ &BiomeStonyPeaks, /* MinedMap assignment */
-	/*  55 */ &BiomeSnowySlopes, /* MinedMap assignment */
-	/*  56 */ &BiomeMangroveSwamp, /* MinedMap assignment */
-	/*  57 */ nullptr,
-	/*  58 */ nullptr,
-	/*  59 */ nullptr,
-	/*  60 */ nullptr,
-	/*  61 */ nullptr,
-	/*  62 */ nullptr,
-	/*  63 */ nullptr,
-	/*  64 */ nullptr,
-	/*  65 */ nullptr,
-	/*  66 */ nullptr,
-	/*  67 */ nullptr,
-	/*  68 */ nullptr,
-	/*  69 */ nullptr,
-	/*  70 */ nullptr,
-	/*  71 */ nullptr,
-	/*  72 */ nullptr,
-	/*  73 */ nullptr,
-	/*  74 */ nullptr,
-	/*  75 */ nullptr,
-	/*  76 */ nullptr,
-	/*  77 */ nullptr,
-	/*  78 */ nullptr,
-	/*  79 */ nullptr,
-	/*  80 */ nullptr,
-	/*  81 */ nullptr,
-	/*  82 */ nullptr,
-	/*  83 */ nullptr,
-	/*  84 */ nullptr,
-	/*  85 */ nullptr,
-	/*  86 */ nullptr,
-	/*  87 */ nullptr,
-	/*  88 */ nullptr,
-	/*  89 */ nullptr,
-	/*  90 */ nullptr,
-	/*  91 */ nullptr,
-	/*  92 */ nullptr,
-	/*  93 */ nullptr,
-	/*  94 */ nullptr,
-	/*  95 */ nullptr,
-	/*  96 */ nullptr,
-	/*  97 */ nullptr,
-	/*  98 */ nullptr,
-	/*  99 */ nullptr,
-	/* 100 */ nullptr,
-	/* 101 */ nullptr,
-	/* 102 */ nullptr,
-	/* 103 */ nullptr,
-	/* 104 */ nullptr,
-	/* 105 */ nullptr,
-	/* 106 */ nullptr,
-	/* 107 */ nullptr,
-	/* 108 */ nullptr,
-	/* 109 */ nullptr,
-	/* 110 */ nullptr,
-	/* 111 */ nullptr,
-	/* 112 */ nullptr,
-	/* 113 */ nullptr,
-	/* 114 */ nullptr,
-	/* 115 */ nullptr,
-	/* 116 */ nullptr,
-	/* 117 */ nullptr,
-	/* 118 */ nullptr,
-	/* 119 */ nullptr,
-	/* 120 */ nullptr,
-	/* 121 */ nullptr,
-	/* 122 */ nullptr,
-	/* 123 */ nullptr,
-	/* 124 */ nullptr,
-	/* 125 */ nullptr,
-	/* 126 */ nullptr,
-	/* 127 */ &BiomeDefault, /* The Void */
-	/* 128 */ nullptr,
-	/* 129 */ &BiomeDefault, /* Sunflower Plains */
-	/* 130 */ &BiomeDesert, /* Desert Lakes */
-	/* 131 */ &BiomeMountains, /* Gravelly Mountains */
-	/* 132 */ &BiomeForest, /* Flower Forest */
-	/* 133 */ &BiomeTaiga, /* Taiga Mountains */
-	/* 134 */ &BiomeSwamp, /* Swamp Hills */
-	/* 135 */ nullptr,
-	/* 136 */ nullptr,
-	/* 137 */ nullptr,
-	/* 138 */ nullptr,
-	/* 139 */ nullptr,
-	/* 140 */ &BiomeFrozen, /* Ice Spikes */
-	/* 141 */ nullptr,
-	/* 142 */ nullptr,
-	/* 143 */ nullptr,
-	/* 144 */ nullptr,
-	/* 145 */ nullptr,
-	/* 146 */ nullptr,
-	/* 147 */ nullptr,
-	/* 148 */ nullptr,
-	/* 149 */ &BiomeJungle, /* Modified Jungle */
-	/* 150 */ nullptr,
-	/* 151 */ &BiomeJungleEdge, /* Modified Jungle Edge */
-	/* 152 */ nullptr,
-	/* 153 */ nullptr,
-	/* 154 */ nullptr,
-	/* 155 */ &BiomeBirchForest, /* Tall Birch Forest */
-	/* 156 */ &BiomeBirchForest, /* Tall Birch Hills */
-	/* 157 */ &BiomeDarkForest, /* Dark Forest Hills */
-	/* 158 */ &BiomeSnowyTaiga, /* Snowy Taiga Mountains */
-	/* 159 */ nullptr,
-	/* 160 */ &BiomeTaiga, /* Giant Spruce Taiga */
-	/* 161 */ &BiomeTaiga, /* Giant Spruce Taiga Hills */
-	/* 162 */ &BiomeMountains, /* Gravelly Mountains+ */
-	/* 163 */ &BiomeShatteredSavanna,
-	/* 164 */ &BiomeSavannaPlateau, /* Shattered Savanna Plateau */
-	/* 165 */ &BiomeBadlands, /* Eroded Badlands */
-	/* 166 */ &BiomeBadlands, /* Modified Wooded Badlands Plateau */
-	/* 167 */ &BiomeBadlands, /* Modified Badlands Plateau */
-	/* 168 */ &BiomeJungle, /* Bamboo Jungle */
-	/* 169 */ &BiomeJungle, /* Bamboo Jungle Hills */
-	/* 170 */ &BiomeDesert, /* Soul Sand Valley */
-	/* 171 */ &BiomeDesert, /* Crimson Forest */
-	/* 172 */ &BiomeDesert, /* Warped Forest */
-	/* 173 */ &BiomeDesert, /* Basalt Deltas */
-	/* 174 */ &BiomePlains, /* Dripstone Caves */
-	/* 175 */ &BiomeDefault, /* Lush Caves */
-};
-
-/* It is unclear which of the renamed/merged biome IDs can appear in practice,
- * but it shouldn't hurt to support them anyways */
-
-const std::unordered_map<std::string, uint8_t> Biome::Names = {
-	{ "minecraft:badlands", 37 },
-	{ "minecraft:badlands_plateau", 39 }, /* 1.18: Merged into badlands */
-	{ "minecraft:bamboo_jungle", 168 },
-	{ "minecraft:bamboo_jungle_hills", 169 }, /* 1.18: Merged into bamboo_jungle */
-	{ "minecraft:basalt_deltas", 173 },
-	{ "minecraft:beach", 16 },
-	{ "minecraft:birch_forest", 27 },
-	{ "minecraft:birch_forest_hills", 28 }, /* 1.18: Merged into birch_forest */
-	{ "minecraft:cold_ocean", 46 },
-	{ "minecraft:crimson_forest", 171 },
-	{ "minecraft:dark_forest", 29 },
-	{ "minecraft:dark_forest_hills", 157 }, /* 1.18: Merged into dark_forest */
-	{ "minecraft:deep_cold_ocean", 49 },
-	{ "minecraft:deep_dark", 1 },
-	{ "minecraft:deep_frozen_ocean", 50 },
-	{ "minecraft:deep_lukewarm_ocean", 48 },
-	{ "minecraft:deep_ocean", 24 },
-	{ "minecraft:deep_warm_ocean", 47 }, /* 1.18: Merged into warm_ocean */
-	{ "minecraft:desert", 2 },
-	{ "minecraft:desert_hills", 17 }, /* 1.18: Merged into desert */
-	{ "minecraft:desert_lakes", 130 }, /* 1.18: Merged into desert */
-	{ "minecraft:dripstone_caves", 174 },
-	{ "minecraft:end_barrens", 43 },
-	{ "minecraft:end_highlands", 42 },
-	{ "minecraft:end_midlands", 41 },
-	{ "minecraft:eroded_badlands", 165 },
-	{ "minecraft:extreme_hills", 3 }, /* 1.18: Renamed to windswept_hills (after rename from mountains) */
-	{ "minecraft:flower_forest", 132 },
-	{ "minecraft:forest", 4 },
-	{ "minecraft:frozen_ocean", 10 },
-	{ "minecraft:frozen_peaks", 53 }, /* 1.18: New */
-	{ "minecraft:frozen_river", 11 },
-	{ "minecraft:giant_spruce_taiga", 160 }, /* 1.18: Renamed to old_growth_spruce_taiga */
-	{ "minecraft:giant_spruce_taiga_hills", 161 }, /* 1.18: Merged into giant_spruce_taiga */
-	{ "minecraft:giant_tree_taiga", 32 }, /* 1.18: Renamed to old_growth_pine_taiga */
-	{ "minecraft:giant_tree_taiga_hills", 33 }, /* 1.18: Merged into giant_tree_taiga */
-	{ "minecraft:gravelly_mountains", 131 }, /* 1.18: Renamed to windswept_gravelly_hills */
-	{ "minecraft:grove", 52 }, /* 1.18: New */
-	{ "minecraft:ice_spikes", 140 },
-	{ "minecraft:jagged_peaks", 53 }, /* 1.18: New */
-	{ "minecraft:jungle", 21 },
-	{ "minecraft:jungle_edge", 23 }, /* 1.18: Renamed to sparse_jungle */
-	{ "minecraft:jungle_hills", 22 }, /* 1.18: Merged into jungle */
-	{ "minecraft:lukewarm_ocean", 45 },
-	{ "minecraft:lush_caves", 175 },
-	{ "minecraft:mangrove_swamp", 56 },
-	{ "minecraft:meadow", 51 }, /* 1.18: New */
-	{ "minecraft:modified_badlands_plateau", 167 }, /* 1.18: Merged into badlands */
-	{ "minecraft:modified_gravelly_mountains", 162 }, /* 1.18: Merged into gravelly_mountains */
-	{ "minecraft:modified_jungle", 149 }, /* 1.18: Merged into jungle */
-	{ "minecraft:modified_jungle_edge", 151 }, /* 1.18: Merged into jungle_edge */
-	{ "minecraft:modified_wooded_badlands_plateau", 166 }, /* 1.18: Merged into wooded_badlands */
-	{ "minecraft:mountain_edge", 20 }, /* 1.18: Merged into mountains */
-	{ "minecraft:mountains", 3 }, /* 1.18: Renamed to windswept_hills */
-	{ "minecraft:mushroom_field_shore", 15 }, /* 1.18: Merged into mushroom_fields */
-	{ "minecraft:mushroom_fields", 14 },
-	{ "minecraft:nether_wastes", 8 },
-	{ "minecraft:ocean", 0 },
-	{ "minecraft:old_growth_birch_forest", 155 },
-	{ "minecraft:old_growth_pine_taiga", 32 },
-	{ "minecraft:old_growth_spruce_taiga", 160 },
-	{ "minecraft:plains", 1 },
-	{ "minecraft:river", 7 },
-	{ "minecraft:savanna", 35 },
-	{ "minecraft:savanna_plateau", 36 },
-	{ "minecraft:shattered_savanna", 163 },
-	{ "minecraft:shattered_savanna_plateau", 164 }, /* 1.18: Merged into shattered_savanna */
-	{ "minecraft:small_end_islands", 40 },
-	{ "minecraft:snowy_beach", 26 },
-	{ "minecraft:snowy_mountains", 13 }, /* 1.18: Merged into snowy_tundra */
-	{ "minecraft:snowy_plains", 12 },
-	{ "minecraft:snowy_slopes", 55 },
-	{ "minecraft:snowy_taiga", 30 },
-	{ "minecraft:snowy_taiga_hills", 31 }, /* 1.18: Merged into snowy_taiga */
-	{ "minecraft:snowy_taiga_mountains", 158 }, /* 1.18: Merged into snowy_taiga */
-	{ "minecraft:snowy_tundra", 12 },
-	{ "minecraft:soul_sand_valley", 170 },
-	{ "minecraft:sparse_jungle", 23 },
-	{ "minecraft:stone_shore", 25 },
-	{ "minecraft:stony_peaks", 54 }, /* 1.18: New */
-	{ "minecraft:stony_shore", 25 },
-	{ "minecraft:sunflower_plains", 129 },
-	{ "minecraft:swamp", 6 },
-	{ "minecraft:swamp_hills", 134 }, /* 1.18: Merged into swamp */
-	{ "minecraft:taiga", 5 },
-	{ "minecraft:taiga_hills", 19 }, /* 1.18: Merged into taiga */
-	{ "minecraft:taiga_mountains", 133 }, /* 1.18: Merged into taiga */
-	{ "minecraft:tall_birch_forest", 155 }, /* 1.18: Renamed to old_growth_birch_forest */
-	{ "minecraft:tall_birch_hills", 156 }, /* 1.18: Merged into tall_birch_forest */
-	{ "minecraft:the_end", 9 },
-	{ "minecraft:the_void", 127 },
-	{ "minecraft:warm_ocean", 44 },
-	{ "minecraft:warped_forest", 172 },
-	{ "minecraft:windswept_forest", 34 },
-	{ "minecraft:windswept_gravelly_hills", 131 },
-	{ "minecraft:windswept_hills", 3 },
-	{ "minecraft:windswept_savanna", 163 },
-	{ "minecraft:wooded_badlands", 38 },
-	{ "minecraft:wooded_badlands_plateau", 38 }, /* 1.18: Renamed to wooded_badlands */
-	{ "minecraft:wooded_hills", 18 }, /* 1.18: Merged into forest */
-	{ "minecraft:wooded_mountains", 34 /* 1.18: Renamed to windswept_forest */},
-};
-
-}
-}
diff --git a/src/Resource/Biome.hpp b/src/Resource/Biome.hpp
deleted file mode 100644
index 0cb4f8c..0000000
--- a/src/Resource/Biome.hpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015-2021, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-#include "Color.hpp"
-#include "../Util.hpp"
-
-#include <unordered_map>
-
-namespace MinedMap {
-namespace Resource {
-
-class BlockType;
-
-class Biome {
-private:
-	float temp, rain;
-	FloatColor water;
-
-protected:
-	virtual FloatColor getGrassColor(float temp, float rain) const;
-	virtual FloatColor getFoliageColor(float temp, float rain) const;
-
-	FloatColor getWaterColor() const { return water; };
-
-public:
-	static const Biome *const Default;
-	static const Biome *const Biomes[256];
-	static const std::unordered_map<std::string, uint8_t> Names;
-
-	Biome(float temp0, float rain0, FloatColor water0 = {0.247f, 0.463f, 0.894f})
-	: temp(temp0), rain(rain0), water(water0) {}
-
-	FloatColor getBlockColor(const BlockType *type, y_idx_t height) const;
-};
-
-}
-}
diff --git a/src/Resource/BlockType.cpp b/src/Resource/BlockType.cpp
deleted file mode 100644
index cc76cff..0000000
--- a/src/Resource/BlockType.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015-2018, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#include "BlockType.hpp"
-
-
-namespace MinedMap {
-namespace Resource {
-
-const std::unordered_map<std::string, BlockType> BlockType::Types = {
-
-#include "BlockType.inc.cpp"
-
-};
-
-struct LegacyBlockType {
-       const char *data[16];
-};
-
-static constexpr LegacyBlockType simple(const char *t) {
-	return {
-		t, t, t, t,
-		t, t, t, t,
-		t, t, t, t,
-		t, t, t, t,
-	};
-}
-
-static const LegacyBlockType LEGACY_BLOCK_TYPE_DATA[256] = {
-
-#include "LegacyBlockType.inc.cpp"
-
-};
-
-
-const BlockType * BlockType::lookup(const std::string &name) {
-	auto it = Types.find(name);
-	if (it == Types.end())
-		return nullptr;
-
-	return &it->second;
-}
-
-static LegacyPalette makeLegacyPalette() {
-	const std::string name_prefix("minecraft:");
-
-	LegacyPalette palette = {};
-	for (size_t type = 0; type < 256; type++) {
-		for (size_t data = 0; data < 16; data++) {
-			const char *name = LEGACY_BLOCK_TYPE_DATA[type].data[data];
-			if (!name)
-				continue;
-
-			palette.types[type][data] = BlockType::lookup(name_prefix + name);
-		}
-	}
-
-	return palette;
-}
-
-const LegacyPalette LEGACY_BLOCK_TYPES = makeLegacyPalette();
-
-}
-}
diff --git a/src/Resource/BlockType.hpp b/src/Resource/BlockType.hpp
deleted file mode 100644
index 6861448..0000000
--- a/src/Resource/BlockType.hpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-#include <cstdint>
-#include <string>
-#include <unordered_map>
-
-namespace MinedMap {
-namespace Resource {
-
-#define BLOCK_OPAQUE	(1u << 0)
-#define BLOCK_GRASS	(1u << 1)
-#define BLOCK_FOLIAGE	(1u << 2)
-#define BLOCK_BIRCH	(1u << 3)
-#define BLOCK_SPRUCE	(1u << 4)
-#define BLOCK_WATER	(1u << 5)
-
-class BlockType {
-private:
-	static const std::unordered_map<std::string, BlockType> Types;
-
-public:
-	static const BlockType * lookup(const std::string &name);
-
-	uint8_t flags;
-	struct {
-		uint8_t r, g, b;
-	} color;
-};
-
-
-struct LegacyPalette {
-	const BlockType *types[256][16];
-};
-
-extern const LegacyPalette LEGACY_BLOCK_TYPES;
-
-}
-}
diff --git a/src/Resource/BlockType.inc.cpp b/src/Resource/BlockType.inc.cpp
deleted file mode 100644
index bc6c087..0000000
--- a/src/Resource/BlockType.inc.cpp
+++ /dev/null
@@ -1,938 +0,0 @@
-{"minecraft:acacia_button", {0, {0, 0, 0}}},
-{"minecraft:acacia_door", {BLOCK_OPAQUE, {167, 95, 60}}},
-{"minecraft:acacia_fence", {BLOCK_OPAQUE, {168, 90, 50}}},
-{"minecraft:acacia_fence_gate", {BLOCK_OPAQUE, {168, 90, 50}}},
-{"minecraft:acacia_leaves", {BLOCK_OPAQUE|BLOCK_FOLIAGE, {149, 148, 148}}},
-{"minecraft:acacia_log", {BLOCK_OPAQUE, {150, 88, 55}}},
-{"minecraft:acacia_planks", {BLOCK_OPAQUE, {168, 90, 50}}},
-{"minecraft:acacia_pressure_plate", {BLOCK_OPAQUE, {168, 90, 50}}},
-{"minecraft:acacia_sapling", {BLOCK_OPAQUE, {118, 117, 23}}},
-{"minecraft:acacia_sign", {BLOCK_OPAQUE, {168, 90, 50}}},
-{"minecraft:acacia_slab", {BLOCK_OPAQUE, {168, 90, 50}}},
-{"minecraft:acacia_stairs", {BLOCK_OPAQUE, {168, 90, 50}}},
-{"minecraft:acacia_trapdoor", {BLOCK_OPAQUE, {156, 87, 51}}},
-{"minecraft:acacia_wall_sign", {0, {0, 0, 0}}},
-{"minecraft:acacia_wood", {BLOCK_OPAQUE, {103, 96, 86}}},
-{"minecraft:activator_rail", {BLOCK_OPAQUE, {115, 87, 74}}},
-{"minecraft:air", {0, {0, 0, 0}}},
-{"minecraft:allium", {0, {0, 0, 0}}},
-{"minecraft:amethyst_block", {BLOCK_OPAQUE, {133, 97, 191}}},
-{"minecraft:amethyst_cluster", {BLOCK_OPAQUE, {163, 126, 207}}},
-{"minecraft:ancient_debris", {BLOCK_OPAQUE, {94, 66, 58}}},
-{"minecraft:andesite", {BLOCK_OPAQUE, {136, 136, 136}}},
-{"minecraft:andesite_slab", {BLOCK_OPAQUE, {136, 136, 136}}},
-{"minecraft:andesite_stairs", {BLOCK_OPAQUE, {136, 136, 136}}},
-{"minecraft:andesite_wall", {BLOCK_OPAQUE, {136, 136, 136}}},
-{"minecraft:anvil", {BLOCK_OPAQUE, {72, 72, 72}}},
-{"minecraft:attached_melon_stem", {BLOCK_OPAQUE|BLOCK_GRASS, {141, 142, 141}}},
-{"minecraft:attached_pumpkin_stem", {BLOCK_OPAQUE|BLOCK_GRASS, {139, 139, 139}}},
-{"minecraft:azalea", {BLOCK_OPAQUE, {101, 124, 47}}},
-{"minecraft:azalea_leaves", {BLOCK_OPAQUE, {90, 114, 44}}},
-{"minecraft:azure_bluet", {0, {0, 0, 0}}},
-{"minecraft:bamboo", {BLOCK_OPAQUE, {93, 144, 19}}},
-{"minecraft:bamboo_sapling", {0, {0, 0, 0}}},
-{"minecraft:barrel", {BLOCK_OPAQUE, {134, 100, 58}}},
-{"minecraft:barrier", {0, {0, 0, 0}}},
-{"minecraft:basalt", {BLOCK_OPAQUE, {80, 81, 86}}},
-{"minecraft:beacon", {BLOCK_OPAQUE, {117, 220, 215}}},
-{"minecraft:bedrock", {BLOCK_OPAQUE, {85, 85, 85}}},
-{"minecraft:bee_nest", {BLOCK_OPAQUE, {202, 160, 74}}},
-{"minecraft:beehive", {BLOCK_OPAQUE, {180, 146, 90}}},
-{"minecraft:beetroots", {BLOCK_OPAQUE, {93, 91, 30}}},
-{"minecraft:bell", {BLOCK_OPAQUE, {253, 235, 110}}},
-{"minecraft:big_dripleaf", {BLOCK_OPAQUE, {111, 141, 51}}},
-{"minecraft:big_dripleaf_stem", {0, {0, 0, 0}}},
-{"minecraft:birch_button", {0, {0, 0, 0}}},
-{"minecraft:birch_door", {BLOCK_OPAQUE, {220, 209, 176}}},
-{"minecraft:birch_fence", {BLOCK_OPAQUE, {192, 175, 121}}},
-{"minecraft:birch_fence_gate", {BLOCK_OPAQUE, {192, 175, 121}}},
-{"minecraft:birch_leaves", {BLOCK_OPAQUE|BLOCK_BIRCH, {130, 129, 130}}},
-{"minecraft:birch_log", {BLOCK_OPAQUE, {193, 179, 135}}},
-{"minecraft:birch_planks", {BLOCK_OPAQUE, {192, 175, 121}}},
-{"minecraft:birch_pressure_plate", {BLOCK_OPAQUE, {192, 175, 121}}},
-{"minecraft:birch_sapling", {BLOCK_OPAQUE, {127, 160, 79}}},
-{"minecraft:birch_sign", {BLOCK_OPAQUE, {192, 175, 121}}},
-{"minecraft:birch_slab", {BLOCK_OPAQUE, {192, 175, 121}}},
-{"minecraft:birch_stairs", {BLOCK_OPAQUE, {192, 175, 121}}},
-{"minecraft:birch_trapdoor", {BLOCK_OPAQUE, {207, 194, 157}}},
-{"minecraft:birch_wall_sign", {0, {0, 0, 0}}},
-{"minecraft:birch_wood", {BLOCK_OPAQUE, {216, 215, 210}}},
-{"minecraft:black_banner", {0, {0, 0, 0}}},
-{"minecraft:black_bed", {0, {0, 0, 0}}},
-{"minecraft:black_candle", {0, {0, 0, 0}}},
-{"minecraft:black_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
-{"minecraft:black_carpet", {BLOCK_OPAQUE, {20, 21, 25}}},
-{"minecraft:black_concrete", {BLOCK_OPAQUE, {8, 10, 15}}},
-{"minecraft:black_concrete_powder", {BLOCK_OPAQUE, {25, 26, 31}}},
-{"minecraft:black_glazed_terracotta", {BLOCK_OPAQUE, {67, 30, 32}}},
-{"minecraft:black_shulker_box", {BLOCK_OPAQUE, {25, 25, 29}}},
-{"minecraft:black_stained_glass", {BLOCK_OPAQUE, {25, 25, 25}}},
-{"minecraft:black_stained_glass_pane", {BLOCK_OPAQUE, {24, 24, 24}}},
-{"minecraft:black_terracotta", {BLOCK_OPAQUE, {37, 22, 16}}},
-{"minecraft:black_wall_banner", {0, {0, 0, 0}}},
-{"minecraft:black_wool", {BLOCK_OPAQUE, {20, 21, 25}}},
-{"minecraft:blackstone", {BLOCK_OPAQUE, {42, 36, 41}}},
-{"minecraft:blackstone_slab", {BLOCK_OPAQUE, {42, 36, 41}}},
-{"minecraft:blackstone_stairs", {BLOCK_OPAQUE, {42, 36, 41}}},
-{"minecraft:blackstone_wall", {BLOCK_OPAQUE, {42, 36, 41}}},
-{"minecraft:blast_furnace", {BLOCK_OPAQUE, {80, 80, 81}}},
-{"minecraft:blue_banner", {0, {0, 0, 0}}},
-{"minecraft:blue_bed", {0, {0, 0, 0}}},
-{"minecraft:blue_candle", {0, {0, 0, 0}}},
-{"minecraft:blue_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
-{"minecraft:blue_carpet", {BLOCK_OPAQUE, {53, 57, 157}}},
-{"minecraft:blue_concrete", {BLOCK_OPAQUE, {44, 46, 143}}},
-{"minecraft:blue_concrete_powder", {BLOCK_OPAQUE, {70, 73, 166}}},
-{"minecraft:blue_glazed_terracotta", {BLOCK_OPAQUE, {47, 64, 139}}},
-{"minecraft:blue_ice", {BLOCK_OPAQUE, {116, 167, 253}}},
-{"minecraft:blue_orchid", {0, {0, 0, 0}}},
-{"minecraft:blue_shulker_box", {BLOCK_OPAQUE, {43, 45, 140}}},
-{"minecraft:blue_stained_glass", {BLOCK_OPAQUE, {51, 76, 178}}},
-{"minecraft:blue_stained_glass_pane", {BLOCK_OPAQUE, {48, 73, 171}}},
-{"minecraft:blue_terracotta", {BLOCK_OPAQUE, {74, 59, 91}}},
-{"minecraft:blue_wall_banner", {0, {0, 0, 0}}},
-{"minecraft:blue_wool", {BLOCK_OPAQUE, {53, 57, 157}}},
-{"minecraft:bone_block", {BLOCK_OPAQUE, {209, 206, 179}}},
-{"minecraft:bookshelf", {BLOCK_OPAQUE, {162, 130, 78}}},
-{"minecraft:brain_coral", {0, {0, 0, 0}}},
-{"minecraft:brain_coral_block", {BLOCK_OPAQUE, {207, 91, 159}}},
-{"minecraft:brain_coral_fan", {0, {0, 0, 0}}},
-{"minecraft:brain_coral_wall_fan", {0, {0, 0, 0}}},
-{"minecraft:brewing_stand", {BLOCK_OPAQUE, {122, 100, 80}}},
-{"minecraft:brick_slab", {BLOCK_OPAQUE, {150, 97, 83}}},
-{"minecraft:brick_stairs", {BLOCK_OPAQUE, {150, 97, 83}}},
-{"minecraft:brick_wall", {BLOCK_OPAQUE, {150, 97, 83}}},
-{"minecraft:bricks", {BLOCK_OPAQUE, {150, 97, 83}}},
-{"minecraft:brown_banner", {0, {0, 0, 0}}},
-{"minecraft:brown_bed", {0, {0, 0, 0}}},
-{"minecraft:brown_candle", {0, {0, 0, 0}}},
-{"minecraft:brown_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
-{"minecraft:brown_carpet", {BLOCK_OPAQUE, {114, 71, 40}}},
-{"minecraft:brown_concrete", {BLOCK_OPAQUE, {96, 59, 31}}},
-{"minecraft:brown_concrete_powder", {BLOCK_OPAQUE, {125, 84, 53}}},
-{"minecraft:brown_glazed_terracotta", {BLOCK_OPAQUE, {119, 106, 85}}},
-{"minecraft:brown_mushroom", {0, {0, 0, 0}}},
-{"minecraft:brown_mushroom_block", {BLOCK_OPAQUE, {149, 111, 81}}},
-{"minecraft:brown_shulker_box", {BLOCK_OPAQUE, {106, 66, 35}}},
-{"minecraft:brown_stained_glass", {BLOCK_OPAQUE, {102, 76, 51}}},
-{"minecraft:brown_stained_glass_pane", {BLOCK_OPAQUE, {97, 73, 48}}},
-{"minecraft:brown_terracotta", {BLOCK_OPAQUE, {77, 51, 35}}},
-{"minecraft:brown_wall_banner", {0, {0, 0, 0}}},
-{"minecraft:brown_wool", {BLOCK_OPAQUE, {114, 71, 40}}},
-{"minecraft:bubble_column", {BLOCK_OPAQUE|BLOCK_WATER, {177, 177, 177}}},
-{"minecraft:bubble_coral", {0, {0, 0, 0}}},
-{"minecraft:bubble_coral_block", {BLOCK_OPAQUE, {165, 26, 162}}},
-{"minecraft:bubble_coral_fan", {0, {0, 0, 0}}},
-{"minecraft:bubble_coral_wall_fan", {0, {0, 0, 0}}},
-{"minecraft:budding_amethyst", {BLOCK_OPAQUE, {132, 96, 186}}},
-{"minecraft:cactus", {BLOCK_OPAQUE, {85, 127, 43}}},
-{"minecraft:cake", {BLOCK_OPAQUE, {248, 222, 214}}},
-{"minecraft:calcite", {BLOCK_OPAQUE, {223, 224, 220}}},
-{"minecraft:campfire", {BLOCK_OPAQUE, {110, 88, 54}}},
-{"minecraft:candle", {0, {0, 0, 0}}},
-{"minecraft:candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
-{"minecraft:carrots", {BLOCK_OPAQUE, {81, 124, 37}}},
-{"minecraft:cartography_table", {BLOCK_OPAQUE, {103, 87, 67}}},
-{"minecraft:carved_pumpkin", {BLOCK_OPAQUE, {198, 118, 24}}},
-{"minecraft:cauldron", {BLOCK_OPAQUE, {73, 72, 74}}},
-{"minecraft:cave_air", {0, {0, 0, 0}}},
-{"minecraft:cave_vines", {BLOCK_OPAQUE, {90, 109, 40}}},
-{"minecraft:cave_vines_plant", {BLOCK_OPAQUE, {88, 101, 38}}},
-{"minecraft:chain", {0, {0, 0, 0}}},
-{"minecraft:chain_command_block", {BLOCK_OPAQUE, {131, 161, 147}}},
-{"minecraft:chest", {BLOCK_OPAQUE, {162, 130, 78}}},
-{"minecraft:chipped_anvil", {BLOCK_OPAQUE, {72, 72, 72}}},
-{"minecraft:chiseled_deepslate", {BLOCK_OPAQUE, {54, 54, 54}}},
-{"minecraft:chiseled_nether_bricks", {BLOCK_OPAQUE, {47, 23, 28}}},
-{"minecraft:chiseled_polished_blackstone", {BLOCK_OPAQUE, {53, 48, 56}}},
-{"minecraft:chiseled_quartz_block", {BLOCK_OPAQUE, {231, 226, 218}}},
-{"minecraft:chiseled_red_sandstone", {BLOCK_OPAQUE, {181, 97, 31}}},
-{"minecraft:chiseled_sandstone", {BLOCK_OPAQUE, {223, 214, 170}}},
-{"minecraft:chiseled_stone_bricks", {BLOCK_OPAQUE, {119, 118, 119}}},
-{"minecraft:chorus_flower", {BLOCK_OPAQUE, {151, 120, 151}}},
-{"minecraft:chorus_plant", {BLOCK_OPAQUE, {93, 57, 93}}},
-{"minecraft:clay", {BLOCK_OPAQUE, {160, 166, 179}}},
-{"minecraft:coal_block", {BLOCK_OPAQUE, {16, 15, 15}}},
-{"minecraft:coal_ore", {BLOCK_OPAQUE, {105, 105, 105}}},
-{"minecraft:coarse_dirt", {BLOCK_OPAQUE, {119, 85, 59}}},
-{"minecraft:cobbled_deepslate", {BLOCK_OPAQUE, {77, 77, 80}}},
-{"minecraft:cobbled_deepslate_slab", {BLOCK_OPAQUE, {77, 77, 80}}},
-{"minecraft:cobbled_deepslate_stairs", {BLOCK_OPAQUE, {77, 77, 80}}},
-{"minecraft:cobbled_deepslate_wall", {BLOCK_OPAQUE, {77, 77, 80}}},
-{"minecraft:cobblestone", {BLOCK_OPAQUE, {127, 127, 127}}},
-{"minecraft:cobblestone_slab", {BLOCK_OPAQUE, {127, 127, 127}}},
-{"minecraft:cobblestone_stairs", {BLOCK_OPAQUE, {127, 127, 127}}},
-{"minecraft:cobblestone_wall", {BLOCK_OPAQUE, {127, 127, 127}}},
-{"minecraft:cobweb", {BLOCK_OPAQUE, {228, 233, 234}}},
-{"minecraft:cocoa", {BLOCK_OPAQUE, {154, 91, 40}}},
-{"minecraft:command_block", {BLOCK_OPAQUE, {181, 136, 108}}},
-{"minecraft:comparator", {BLOCK_OPAQUE, {166, 161, 159}}},
-{"minecraft:composter", {BLOCK_OPAQUE, {88, 61, 23}}},
-{"minecraft:conduit", {BLOCK_OPAQUE, {159, 139, 113}}},
-{"minecraft:copper_block", {BLOCK_OPAQUE, {192, 107, 79}}},
-{"minecraft:copper_ore", {BLOCK_OPAQUE, {124, 125, 120}}},
-{"minecraft:cornflower", {0, {0, 0, 0}}},
-{"minecraft:cracked_deepslate_bricks", {BLOCK_OPAQUE, {64, 64, 65}}},
-{"minecraft:cracked_deepslate_tiles", {BLOCK_OPAQUE, {52, 52, 52}}},
-{"minecraft:cracked_nether_bricks", {BLOCK_OPAQUE, {40, 20, 23}}},
-{"minecraft:cracked_polished_blackstone_bricks", {BLOCK_OPAQUE, {44, 37, 43}}},
-{"minecraft:cracked_stone_bricks", {BLOCK_OPAQUE, {118, 117, 118}}},
-{"minecraft:crafting_table", {BLOCK_OPAQUE, {119, 73, 42}}},
-{"minecraft:creeper_head", {0, {0, 0, 0}}},
-{"minecraft:creeper_wall_head", {0, {0, 0, 0}}},
-{"minecraft:crimson_button", {0, {0, 0, 0}}},
-{"minecraft:crimson_door", {BLOCK_OPAQUE, {114, 54, 79}}},
-{"minecraft:crimson_fence", {BLOCK_OPAQUE, {101, 48, 70}}},
-{"minecraft:crimson_fence_gate", {BLOCK_OPAQUE, {101, 48, 70}}},
-{"minecraft:crimson_fungus", {0, {0, 0, 0}}},
-{"minecraft:crimson_hyphae", {BLOCK_OPAQUE, {92, 25, 29}}},
-{"minecraft:crimson_nylium", {BLOCK_OPAQUE, {130, 31, 31}}},
-{"minecraft:crimson_planks", {BLOCK_OPAQUE, {101, 48, 70}}},
-{"minecraft:crimson_pressure_plate", {BLOCK_OPAQUE, {101, 48, 70}}},
-{"minecraft:crimson_roots", {BLOCK_OPAQUE, {126, 8, 41}}},
-{"minecraft:crimson_sign", {BLOCK_OPAQUE, {101, 48, 70}}},
-{"minecraft:crimson_slab", {BLOCK_OPAQUE, {101, 48, 70}}},
-{"minecraft:crimson_stairs", {BLOCK_OPAQUE, {101, 48, 70}}},
-{"minecraft:crimson_stem", {BLOCK_OPAQUE, {112, 49, 70}}},
-{"minecraft:crimson_trapdoor", {BLOCK_OPAQUE, {103, 50, 72}}},
-{"minecraft:crimson_wall_sign", {0, {0, 0, 0}}},
-{"minecraft:crying_obsidian", {BLOCK_OPAQUE, {32, 10, 60}}},
-{"minecraft:cut_copper", {BLOCK_OPAQUE, {191, 106, 80}}},
-{"minecraft:cut_copper_slab", {BLOCK_OPAQUE, {191, 106, 80}}},
-{"minecraft:cut_copper_stairs", {BLOCK_OPAQUE, {191, 106, 80}}},
-{"minecraft:cut_red_sandstone", {BLOCK_OPAQUE, {181, 97, 31}}},
-{"minecraft:cut_red_sandstone_slab", {BLOCK_OPAQUE, {181, 97, 31}}},
-{"minecraft:cut_sandstone", {BLOCK_OPAQUE, {223, 214, 170}}},
-{"minecraft:cut_sandstone_slab", {BLOCK_OPAQUE, {223, 214, 170}}},
-{"minecraft:cyan_banner", {0, {0, 0, 0}}},
-{"minecraft:cyan_bed", {0, {0, 0, 0}}},
-{"minecraft:cyan_candle", {0, {0, 0, 0}}},
-{"minecraft:cyan_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
-{"minecraft:cyan_carpet", {BLOCK_OPAQUE, {21, 137, 145}}},
-{"minecraft:cyan_concrete", {BLOCK_OPAQUE, {21, 119, 136}}},
-{"minecraft:cyan_concrete_powder", {BLOCK_OPAQUE, {36, 147, 157}}},
-{"minecraft:cyan_glazed_terracotta", {BLOCK_OPAQUE, {52, 118, 125}}},
-{"minecraft:cyan_shulker_box", {BLOCK_OPAQUE, {20, 121, 135}}},
-{"minecraft:cyan_stained_glass", {BLOCK_OPAQUE, {76, 127, 153}}},
-{"minecraft:cyan_stained_glass_pane", {BLOCK_OPAQUE, {73, 122, 147}}},
-{"minecraft:cyan_terracotta", {BLOCK_OPAQUE, {86, 91, 91}}},
-{"minecraft:cyan_wall_banner", {0, {0, 0, 0}}},
-{"minecraft:cyan_wool", {BLOCK_OPAQUE, {21, 137, 145}}},
-{"minecraft:damaged_anvil", {BLOCK_OPAQUE, {72, 72, 72}}},
-{"minecraft:dandelion", {0, {0, 0, 0}}},
-{"minecraft:dark_oak_button", {0, {0, 0, 0}}},
-{"minecraft:dark_oak_door", {BLOCK_OPAQUE, {76, 51, 25}}},
-{"minecraft:dark_oak_fence", {BLOCK_OPAQUE, {66, 43, 20}}},
-{"minecraft:dark_oak_fence_gate", {BLOCK_OPAQUE, {66, 43, 20}}},
-{"minecraft:dark_oak_leaves", {BLOCK_OPAQUE|BLOCK_FOLIAGE, {150, 150, 150}}},
-{"minecraft:dark_oak_log", {BLOCK_OPAQUE, {67, 45, 22}}},
-{"minecraft:dark_oak_planks", {BLOCK_OPAQUE, {66, 43, 20}}},
-{"minecraft:dark_oak_pressure_plate", {BLOCK_OPAQUE, {66, 43, 20}}},
-{"minecraft:dark_oak_sapling", {BLOCK_OPAQUE, {61, 90, 30}}},
-{"minecraft:dark_oak_sign", {BLOCK_OPAQUE, {66, 43, 20}}},
-{"minecraft:dark_oak_slab", {BLOCK_OPAQUE, {66, 43, 20}}},
-{"minecraft:dark_oak_stairs", {BLOCK_OPAQUE, {66, 43, 20}}},
-{"minecraft:dark_oak_trapdoor", {BLOCK_OPAQUE, {75, 49, 23}}},
-{"minecraft:dark_oak_wall_sign", {0, {0, 0, 0}}},
-{"minecraft:dark_oak_wood", {BLOCK_OPAQUE, {60, 46, 26}}},
-{"minecraft:dark_prismarine", {BLOCK_OPAQUE, {51, 91, 75}}},
-{"minecraft:dark_prismarine_slab", {BLOCK_OPAQUE, {51, 91, 75}}},
-{"minecraft:dark_prismarine_stairs", {BLOCK_OPAQUE, {51, 91, 75}}},
-{"minecraft:daylight_detector", {BLOCK_OPAQUE, {130, 116, 94}}},
-{"minecraft:dead_brain_coral", {0, {0, 0, 0}}},
-{"minecraft:dead_brain_coral_block", {BLOCK_OPAQUE, {124, 117, 114}}},
-{"minecraft:dead_brain_coral_fan", {0, {0, 0, 0}}},
-{"minecraft:dead_brain_coral_wall_fan", {0, {0, 0, 0}}},
-{"minecraft:dead_bubble_coral", {0, {0, 0, 0}}},
-{"minecraft:dead_bubble_coral_block", {BLOCK_OPAQUE, {131, 123, 119}}},
-{"minecraft:dead_bubble_coral_fan", {0, {0, 0, 0}}},
-{"minecraft:dead_bubble_coral_wall_fan", {0, {0, 0, 0}}},
-{"minecraft:dead_bush", {BLOCK_OPAQUE, {107, 78, 40}}},
-{"minecraft:dead_fire_coral", {0, {0, 0, 0}}},
-{"minecraft:dead_fire_coral_block", {BLOCK_OPAQUE, {131, 123, 119}}},
-{"minecraft:dead_fire_coral_fan", {0, {0, 0, 0}}},
-{"minecraft:dead_fire_coral_wall_fan", {0, {0, 0, 0}}},
-{"minecraft:dead_horn_coral", {0, {0, 0, 0}}},
-{"minecraft:dead_horn_coral_block", {BLOCK_OPAQUE, {133, 126, 122}}},
-{"minecraft:dead_horn_coral_fan", {0, {0, 0, 0}}},
-{"minecraft:dead_horn_coral_wall_fan", {0, {0, 0, 0}}},
-{"minecraft:dead_tube_coral", {0, {0, 0, 0}}},
-{"minecraft:dead_tube_coral_block", {BLOCK_OPAQUE, {130, 123, 119}}},
-{"minecraft:dead_tube_coral_fan", {0, {0, 0, 0}}},
-{"minecraft:dead_tube_coral_wall_fan", {0, {0, 0, 0}}},
-{"minecraft:deepslate", {BLOCK_OPAQUE, {80, 80, 82}}},
-{"minecraft:deepslate_brick_slab", {BLOCK_OPAQUE, {70, 70, 71}}},
-{"minecraft:deepslate_brick_stairs", {BLOCK_OPAQUE, {70, 70, 71}}},
-{"minecraft:deepslate_brick_wall", {BLOCK_OPAQUE, {70, 70, 71}}},
-{"minecraft:deepslate_bricks", {BLOCK_OPAQUE, {70, 70, 71}}},
-{"minecraft:deepslate_coal_ore", {BLOCK_OPAQUE, {74, 74, 76}}},
-{"minecraft:deepslate_copper_ore", {BLOCK_OPAQUE, {92, 93, 89}}},
-{"minecraft:deepslate_diamond_ore", {BLOCK_OPAQUE, {83, 106, 106}}},
-{"minecraft:deepslate_emerald_ore", {BLOCK_OPAQUE, {78, 104, 87}}},
-{"minecraft:deepslate_gold_ore", {BLOCK_OPAQUE, {115, 102, 78}}},
-{"minecraft:deepslate_iron_ore", {BLOCK_OPAQUE, {106, 99, 94}}},
-{"minecraft:deepslate_lapis_ore", {BLOCK_OPAQUE, {79, 90, 115}}},
-{"minecraft:deepslate_redstone_ore", {BLOCK_OPAQUE, {104, 73, 74}}},
-{"minecraft:deepslate_tile_slab", {BLOCK_OPAQUE, {54, 54, 55}}},
-{"minecraft:deepslate_tile_stairs", {BLOCK_OPAQUE, {54, 54, 55}}},
-{"minecraft:deepslate_tile_wall", {BLOCK_OPAQUE, {54, 54, 55}}},
-{"minecraft:deepslate_tiles", {BLOCK_OPAQUE, {54, 54, 55}}},
-{"minecraft:detector_rail", {BLOCK_OPAQUE, {123, 104, 90}}},
-{"minecraft:diamond_block", {BLOCK_OPAQUE, {98, 237, 228}}},
-{"minecraft:diamond_ore", {BLOCK_OPAQUE, {121, 141, 140}}},
-{"minecraft:diorite", {BLOCK_OPAQUE, {188, 188, 188}}},
-{"minecraft:diorite_slab", {BLOCK_OPAQUE, {188, 188, 188}}},
-{"minecraft:diorite_stairs", {BLOCK_OPAQUE, {188, 188, 188}}},
-{"minecraft:diorite_wall", {BLOCK_OPAQUE, {188, 188, 188}}},
-{"minecraft:dirt", {BLOCK_OPAQUE, {134, 96, 67}}},
-{"minecraft:dirt_path", {BLOCK_OPAQUE, {148, 121, 65}}},
-{"minecraft:dispenser", {BLOCK_OPAQUE, {110, 109, 109}}},
-{"minecraft:dragon_egg", {BLOCK_OPAQUE, {12, 9, 15}}},
-{"minecraft:dragon_head", {0, {0, 0, 0}}},
-{"minecraft:dragon_wall_head", {0, {0, 0, 0}}},
-{"minecraft:dried_kelp_block", {BLOCK_OPAQUE, {50, 58, 38}}},
-{"minecraft:dripstone_block", {BLOCK_OPAQUE, {134, 107, 92}}},
-{"minecraft:dropper", {BLOCK_OPAQUE, {110, 109, 109}}},
-{"minecraft:emerald_block", {BLOCK_OPAQUE, {42, 203, 87}}},
-{"minecraft:emerald_ore", {BLOCK_OPAQUE, {108, 136, 115}}},
-{"minecraft:enchanting_table", {BLOCK_OPAQUE, {128, 75, 85}}},
-{"minecraft:end_gateway", {BLOCK_OPAQUE, {15, 10, 24}}},
-{"minecraft:end_portal", {BLOCK_OPAQUE, {15, 10, 24}}},
-{"minecraft:end_portal_frame", {BLOCK_OPAQUE, {91, 120, 97}}},
-{"minecraft:end_rod", {0, {0, 0, 0}}},
-{"minecraft:end_stone", {BLOCK_OPAQUE, {219, 222, 158}}},
-{"minecraft:end_stone_brick_slab", {BLOCK_OPAQUE, {218, 224, 162}}},
-{"minecraft:end_stone_brick_stairs", {BLOCK_OPAQUE, {218, 224, 162}}},
-{"minecraft:end_stone_brick_wall", {BLOCK_OPAQUE, {218, 224, 162}}},
-{"minecraft:end_stone_bricks", {BLOCK_OPAQUE, {218, 224, 162}}},
-{"minecraft:ender_chest", {BLOCK_OPAQUE, {15, 10, 24}}},
-{"minecraft:exposed_copper", {BLOCK_OPAQUE, {161, 125, 103}}},
-{"minecraft:exposed_cut_copper", {BLOCK_OPAQUE, {154, 121, 101}}},
-{"minecraft:exposed_cut_copper_slab", {BLOCK_OPAQUE, {154, 121, 101}}},
-{"minecraft:exposed_cut_copper_stairs", {BLOCK_OPAQUE, {154, 121, 101}}},
-{"minecraft:farmland", {BLOCK_OPAQUE, {81, 44, 15}}},
-{"minecraft:fern", {0, {0, 0, 0}}},
-{"minecraft:fire", {BLOCK_OPAQUE, {211, 140, 53}}},
-{"minecraft:fire_coral", {0, {0, 0, 0}}},
-{"minecraft:fire_coral_block", {BLOCK_OPAQUE, {163, 35, 46}}},
-{"minecraft:fire_coral_fan", {0, {0, 0, 0}}},
-{"minecraft:fire_coral_wall_fan", {0, {0, 0, 0}}},
-{"minecraft:fletching_table", {BLOCK_OPAQUE, {197, 180, 133}}},
-{"minecraft:flower_pot", {BLOCK_OPAQUE, {124, 68, 53}}},
-{"minecraft:flowering_azalea", {BLOCK_OPAQUE, {112, 121, 64}}},
-{"minecraft:flowering_azalea_leaves", {BLOCK_OPAQUE, {99, 111, 60}}},
-{"minecraft:frogspawn", {BLOCK_OPAQUE, {105, 90, 82}}},
-{"minecraft:frosted_ice", {BLOCK_OPAQUE, {140, 181, 252}}},
-{"minecraft:furnace", {BLOCK_OPAQUE, {110, 109, 109}}},
-{"minecraft:gilded_blackstone", {BLOCK_OPAQUE, {55, 42, 38}}},
-{"minecraft:glass", {BLOCK_OPAQUE, {175, 213, 219}}},
-{"minecraft:glass_pane", {BLOCK_OPAQUE, {170, 210, 217}}},
-{"minecraft:glow_item_frame", {0, {0, 0, 0}}},
-{"minecraft:glow_lichen", {0, {0, 0, 0}}},
-{"minecraft:glowstone", {BLOCK_OPAQUE, {171, 131, 84}}},
-{"minecraft:gold_block", {BLOCK_OPAQUE, {246, 208, 61}}},
-{"minecraft:gold_ore", {BLOCK_OPAQUE, {145, 133, 106}}},
-{"minecraft:granite", {BLOCK_OPAQUE, {149, 103, 85}}},
-{"minecraft:granite_slab", {BLOCK_OPAQUE, {149, 103, 85}}},
-{"minecraft:granite_stairs", {BLOCK_OPAQUE, {149, 103, 85}}},
-{"minecraft:granite_wall", {BLOCK_OPAQUE, {149, 103, 85}}},
-{"minecraft:grass", {0, {0, 0, 0}}},
-{"minecraft:grass_block", {BLOCK_OPAQUE|BLOCK_GRASS, {147, 147, 147}}},
-{"minecraft:grass_path", {BLOCK_OPAQUE, {148, 121, 65}}},
-{"minecraft:gravel", {BLOCK_OPAQUE, {131, 127, 126}}},
-{"minecraft:gray_banner", {0, {0, 0, 0}}},
-{"minecraft:gray_bed", {0, {0, 0, 0}}},
-{"minecraft:gray_candle", {0, {0, 0, 0}}},
-{"minecraft:gray_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
-{"minecraft:gray_carpet", {BLOCK_OPAQUE, {62, 68, 71}}},
-{"minecraft:gray_concrete", {BLOCK_OPAQUE, {54, 57, 61}}},
-{"minecraft:gray_concrete_powder", {BLOCK_OPAQUE, {76, 81, 84}}},
-{"minecraft:gray_glazed_terracotta", {BLOCK_OPAQUE, {83, 90, 93}}},
-{"minecraft:gray_shulker_box", {BLOCK_OPAQUE, {55, 58, 62}}},
-{"minecraft:gray_stained_glass", {BLOCK_OPAQUE, {76, 76, 76}}},
-{"minecraft:gray_stained_glass_pane", {BLOCK_OPAQUE, {73, 73, 73}}},
-{"minecraft:gray_terracotta", {BLOCK_OPAQUE, {57, 42, 35}}},
-{"minecraft:gray_wall_banner", {0, {0, 0, 0}}},
-{"minecraft:gray_wool", {BLOCK_OPAQUE, {62, 68, 71}}},
-{"minecraft:green_banner", {0, {0, 0, 0}}},
-{"minecraft:green_bed", {0, {0, 0, 0}}},
-{"minecraft:green_candle", {0, {0, 0, 0}}},
-{"minecraft:green_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
-{"minecraft:green_carpet", {BLOCK_OPAQUE, {84, 109, 27}}},
-{"minecraft:green_concrete", {BLOCK_OPAQUE, {73, 91, 36}}},
-{"minecraft:green_concrete_powder", {BLOCK_OPAQUE, {97, 119, 44}}},
-{"minecraft:green_glazed_terracotta", {BLOCK_OPAQUE, {117, 142, 67}}},
-{"minecraft:green_shulker_box", {BLOCK_OPAQUE, {79, 100, 31}}},
-{"minecraft:green_stained_glass", {BLOCK_OPAQUE, {102, 127, 51}}},
-{"minecraft:green_stained_glass_pane", {BLOCK_OPAQUE, {97, 122, 48}}},
-{"minecraft:green_terracotta", {BLOCK_OPAQUE, {76, 83, 42}}},
-{"minecraft:green_wall_banner", {0, {0, 0, 0}}},
-{"minecraft:green_wool", {BLOCK_OPAQUE, {84, 109, 27}}},
-{"minecraft:grindstone", {BLOCK_OPAQUE, {142, 142, 142}}},
-{"minecraft:hanging_roots", {BLOCK_OPAQUE, {161, 115, 91}}},
-{"minecraft:hay_block", {BLOCK_OPAQUE, {165, 139, 12}}},
-{"minecraft:heavy_weighted_pressure_plate", {BLOCK_OPAQUE, {220, 220, 220}}},
-{"minecraft:honey_block", {BLOCK_OPAQUE, {251, 185, 52}}},
-{"minecraft:honeycomb_block", {BLOCK_OPAQUE, {229, 148, 29}}},
-{"minecraft:hopper", {BLOCK_OPAQUE, {75, 74, 75}}},
-{"minecraft:horn_coral", {0, {0, 0, 0}}},
-{"minecraft:horn_coral_block", {BLOCK_OPAQUE, {216, 199, 66}}},
-{"minecraft:horn_coral_fan", {0, {0, 0, 0}}},
-{"minecraft:horn_coral_wall_fan", {0, {0, 0, 0}}},
-{"minecraft:ice", {BLOCK_OPAQUE, {145, 183, 253}}},
-{"minecraft:infested_chiseled_stone_bricks", {BLOCK_OPAQUE, {119, 118, 119}}},
-{"minecraft:infested_cobblestone", {BLOCK_OPAQUE, {127, 127, 127}}},
-{"minecraft:infested_cracked_stone_bricks", {BLOCK_OPAQUE, {118, 117, 118}}},
-{"minecraft:infested_deepslate", {BLOCK_OPAQUE, {80, 80, 82}}},
-{"minecraft:infested_mossy_stone_bricks", {BLOCK_OPAQUE, {115, 121, 105}}},
-{"minecraft:infested_stone", {BLOCK_OPAQUE, {125, 125, 125}}},
-{"minecraft:infested_stone_bricks", {BLOCK_OPAQUE, {122, 121, 122}}},
-{"minecraft:iron_bars", {BLOCK_OPAQUE, {136, 139, 135}}},
-{"minecraft:iron_block", {BLOCK_OPAQUE, {220, 220, 220}}},
-{"minecraft:iron_door", {BLOCK_OPAQUE, {194, 193, 193}}},
-{"minecraft:iron_ore", {BLOCK_OPAQUE, {136, 129, 122}}},
-{"minecraft:iron_trapdoor", {BLOCK_OPAQUE, {202, 202, 202}}},
-{"minecraft:item_frame", {0, {0, 0, 0}}},
-{"minecraft:jack_o_lantern", {BLOCK_OPAQUE, {214, 152, 52}}},
-{"minecraft:jigsaw", {BLOCK_OPAQUE, {80, 69, 81}}},
-{"minecraft:jukebox", {BLOCK_OPAQUE, {93, 64, 47}}},
-{"minecraft:jungle_button", {0, {0, 0, 0}}},
-{"minecraft:jungle_door", {BLOCK_OPAQUE, {163, 119, 84}}},
-{"minecraft:jungle_fence", {BLOCK_OPAQUE, {160, 115, 80}}},
-{"minecraft:jungle_fence_gate", {BLOCK_OPAQUE, {160, 115, 80}}},
-{"minecraft:jungle_leaves", {BLOCK_OPAQUE|BLOCK_FOLIAGE, {156, 154, 143}}},
-{"minecraft:jungle_log", {BLOCK_OPAQUE, {149, 109, 70}}},
-{"minecraft:jungle_planks", {BLOCK_OPAQUE, {160, 115, 80}}},
-{"minecraft:jungle_pressure_plate", {BLOCK_OPAQUE, {160, 115, 80}}},
-{"minecraft:jungle_sapling", {BLOCK_OPAQUE, {47, 81, 16}}},
-{"minecraft:jungle_sign", {BLOCK_OPAQUE, {160, 115, 80}}},
-{"minecraft:jungle_slab", {BLOCK_OPAQUE, {160, 115, 80}}},
-{"minecraft:jungle_stairs", {BLOCK_OPAQUE, {160, 115, 80}}},
-{"minecraft:jungle_trapdoor", {BLOCK_OPAQUE, {152, 110, 77}}},
-{"minecraft:jungle_wall_sign", {0, {0, 0, 0}}},
-{"minecraft:jungle_wood", {BLOCK_OPAQUE, {85, 67, 25}}},
-{"minecraft:kelp", {0, {0, 0, 0}}},
-{"minecraft:kelp_plant", {BLOCK_OPAQUE, {86, 130, 42}}},
-{"minecraft:ladder", {0, {0, 0, 0}}},
-{"minecraft:lantern", {BLOCK_OPAQUE, {106, 91, 83}}},
-{"minecraft:lapis_block", {BLOCK_OPAQUE, {30, 67, 140}}},
-{"minecraft:lapis_ore", {BLOCK_OPAQUE, {107, 117, 141}}},
-{"minecraft:large_amethyst_bud", {0, {0, 0, 0}}},
-{"minecraft:large_fern", {BLOCK_OPAQUE|BLOCK_GRASS, {125, 125, 125}}},
-{"minecraft:lava", {BLOCK_OPAQUE, {212, 90, 18}}},
-{"minecraft:lava_cauldron", {BLOCK_OPAQUE, {73, 72, 74}}},
-{"minecraft:lectern", {BLOCK_OPAQUE, {173, 137, 83}}},
-{"minecraft:lever", {0, {0, 0, 0}}},
-{"minecraft:light", {0, {0, 0, 0}}},
-{"minecraft:light_blue_banner", {0, {0, 0, 0}}},
-{"minecraft:light_blue_bed", {0, {0, 0, 0}}},
-{"minecraft:light_blue_candle", {0, {0, 0, 0}}},
-{"minecraft:light_blue_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
-{"minecraft:light_blue_carpet", {BLOCK_OPAQUE, {58, 175, 217}}},
-{"minecraft:light_blue_concrete", {BLOCK_OPAQUE, {35, 137, 198}}},
-{"minecraft:light_blue_concrete_powder", {BLOCK_OPAQUE, {74, 180, 213}}},
-{"minecraft:light_blue_glazed_terracotta", {BLOCK_OPAQUE, {94, 164, 208}}},
-{"minecraft:light_blue_shulker_box", {BLOCK_OPAQUE, {49, 163, 212}}},
-{"minecraft:light_blue_stained_glass", {BLOCK_OPAQUE, {102, 153, 216}}},
-{"minecraft:light_blue_stained_glass_pane", {BLOCK_OPAQUE, {97, 147, 208}}},
-{"minecraft:light_blue_terracotta", {BLOCK_OPAQUE, {113, 108, 137}}},
-{"minecraft:light_blue_wall_banner", {0, {0, 0, 0}}},
-{"minecraft:light_blue_wool", {BLOCK_OPAQUE, {58, 175, 217}}},
-{"minecraft:light_gray_banner", {0, {0, 0, 0}}},
-{"minecraft:light_gray_bed", {0, {0, 0, 0}}},
-{"minecraft:light_gray_candle", {0, {0, 0, 0}}},
-{"minecraft:light_gray_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
-{"minecraft:light_gray_carpet", {BLOCK_OPAQUE, {142, 142, 134}}},
-{"minecraft:light_gray_concrete", {BLOCK_OPAQUE, {125, 125, 115}}},
-{"minecraft:light_gray_concrete_powder", {BLOCK_OPAQUE, {154, 154, 148}}},
-{"minecraft:light_gray_glazed_terracotta", {BLOCK_OPAQUE, {144, 166, 167}}},
-{"minecraft:light_gray_shulker_box", {BLOCK_OPAQUE, {124, 124, 115}}},
-{"minecraft:light_gray_stained_glass", {BLOCK_OPAQUE, {153, 153, 153}}},
-{"minecraft:light_gray_stained_glass_pane", {BLOCK_OPAQUE, {147, 147, 147}}},
-{"minecraft:light_gray_terracotta", {BLOCK_OPAQUE, {135, 106, 97}}},
-{"minecraft:light_gray_wall_banner", {0, {0, 0, 0}}},
-{"minecraft:light_gray_wool", {BLOCK_OPAQUE, {142, 142, 134}}},
-{"minecraft:light_weighted_pressure_plate", {BLOCK_OPAQUE, {246, 208, 61}}},
-{"minecraft:lightning_rod", {0, {0, 0, 0}}},
-{"minecraft:lilac", {BLOCK_OPAQUE, {154, 125, 147}}},
-{"minecraft:lily_of_the_valley", {0, {0, 0, 0}}},
-{"minecraft:lily_pad", {BLOCK_OPAQUE|BLOCK_GRASS, {133, 133, 133}}},
-{"minecraft:lime_banner", {0, {0, 0, 0}}},
-{"minecraft:lime_bed", {0, {0, 0, 0}}},
-{"minecraft:lime_candle", {0, {0, 0, 0}}},
-{"minecraft:lime_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
-{"minecraft:lime_carpet", {BLOCK_OPAQUE, {112, 185, 25}}},
-{"minecraft:lime_concrete", {BLOCK_OPAQUE, {94, 168, 24}}},
-{"minecraft:lime_concrete_powder", {BLOCK_OPAQUE, {125, 189, 41}}},
-{"minecraft:lime_glazed_terracotta", {BLOCK_OPAQUE, {162, 197, 55}}},
-{"minecraft:lime_shulker_box", {BLOCK_OPAQUE, {99, 172, 23}}},
-{"minecraft:lime_stained_glass", {BLOCK_OPAQUE, {127, 204, 25}}},
-{"minecraft:lime_stained_glass_pane", {BLOCK_OPAQUE, {122, 196, 24}}},
-{"minecraft:lime_terracotta", {BLOCK_OPAQUE, {103, 117, 52}}},
-{"minecraft:lime_wall_banner", {0, {0, 0, 0}}},
-{"minecraft:lime_wool", {BLOCK_OPAQUE, {112, 185, 25}}},
-{"minecraft:lodestone", {BLOCK_OPAQUE, {147, 149, 152}}},
-{"minecraft:loom", {BLOCK_OPAQUE, {142, 119, 91}}},
-{"minecraft:magenta_banner", {0, {0, 0, 0}}},
-{"minecraft:magenta_bed", {0, {0, 0, 0}}},
-{"minecraft:magenta_candle", {0, {0, 0, 0}}},
-{"minecraft:magenta_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
-{"minecraft:magenta_carpet", {BLOCK_OPAQUE, {189, 68, 179}}},
-{"minecraft:magenta_concrete", {BLOCK_OPAQUE, {169, 48, 159}}},
-{"minecraft:magenta_concrete_powder", {BLOCK_OPAQUE, {192, 83, 184}}},
-{"minecraft:magenta_glazed_terracotta", {BLOCK_OPAQUE, {208, 100, 191}}},
-{"minecraft:magenta_shulker_box", {BLOCK_OPAQUE, {173, 54, 163}}},
-{"minecraft:magenta_stained_glass", {BLOCK_OPAQUE, {178, 76, 216}}},
-{"minecraft:magenta_stained_glass_pane", {BLOCK_OPAQUE, {171, 73, 208}}},
-{"minecraft:magenta_terracotta", {BLOCK_OPAQUE, {149, 88, 108}}},
-{"minecraft:magenta_wall_banner", {0, {0, 0, 0}}},
-{"minecraft:magenta_wool", {BLOCK_OPAQUE, {189, 68, 179}}},
-{"minecraft:magma_block", {BLOCK_OPAQUE, {142, 63, 31}}},
-{"minecraft:mangrove_button", {0, {0, 0, 0}}},
-{"minecraft:mangrove_door", {BLOCK_OPAQUE, {112, 48, 46}}},
-{"minecraft:mangrove_fence", {BLOCK_OPAQUE, {117, 54, 48}}},
-{"minecraft:mangrove_fence_gate", {BLOCK_OPAQUE, {117, 54, 48}}},
-{"minecraft:mangrove_leaves", {BLOCK_OPAQUE|BLOCK_FOLIAGE, {129, 128, 128}}},
-{"minecraft:mangrove_log", {BLOCK_OPAQUE, {102, 48, 42}}},
-{"minecraft:mangrove_planks", {BLOCK_OPAQUE, {117, 54, 48}}},
-{"minecraft:mangrove_pressure_plate", {BLOCK_OPAQUE, {117, 54, 48}}},
-{"minecraft:mangrove_propagule", {BLOCK_OPAQUE, {96, 174, 83}}},
-{"minecraft:mangrove_roots", {BLOCK_OPAQUE, {74, 59, 38}}},
-{"minecraft:mangrove_sign", {BLOCK_OPAQUE, {117, 54, 48}}},
-{"minecraft:mangrove_slab", {BLOCK_OPAQUE, {117, 54, 48}}},
-{"minecraft:mangrove_stairs", {BLOCK_OPAQUE, {117, 54, 48}}},
-{"minecraft:mangrove_trapdoor", {BLOCK_OPAQUE, {110, 46, 42}}},
-{"minecraft:mangrove_wall_sign", {0, {0, 0, 0}}},
-{"minecraft:mangrove_wood", {BLOCK_OPAQUE, {83, 66, 41}}},
-{"minecraft:medium_amethyst_bud", {0, {0, 0, 0}}},
-{"minecraft:melon", {BLOCK_OPAQUE, {111, 144, 30}}},
-{"minecraft:melon_stem", {BLOCK_OPAQUE|BLOCK_GRASS, {153, 153, 153}}},
-{"minecraft:moss_block", {BLOCK_OPAQUE, {89, 109, 45}}},
-{"minecraft:moss_carpet", {BLOCK_OPAQUE, {89, 109, 45}}},
-{"minecraft:mossy_cobblestone", {BLOCK_OPAQUE, {110, 118, 94}}},
-{"minecraft:mossy_cobblestone_slab", {BLOCK_OPAQUE, {110, 118, 94}}},
-{"minecraft:mossy_cobblestone_stairs", {BLOCK_OPAQUE, {110, 118, 94}}},
-{"minecraft:mossy_cobblestone_wall", {BLOCK_OPAQUE, {110, 118, 94}}},
-{"minecraft:mossy_stone_brick_slab", {BLOCK_OPAQUE, {115, 121, 105}}},
-{"minecraft:mossy_stone_brick_stairs", {BLOCK_OPAQUE, {115, 121, 105}}},
-{"minecraft:mossy_stone_brick_wall", {BLOCK_OPAQUE, {115, 121, 105}}},
-{"minecraft:mossy_stone_bricks", {BLOCK_OPAQUE, {115, 121, 105}}},
-{"minecraft:moving_piston", {0, {0, 0, 0}}},
-{"minecraft:mud", {BLOCK_OPAQUE, {60, 57, 60}}},
-{"minecraft:mud_brick_slab", {BLOCK_OPAQUE, {137, 103, 79}}},
-{"minecraft:mud_brick_stairs", {BLOCK_OPAQUE, {137, 103, 79}}},
-{"minecraft:mud_brick_wall", {BLOCK_OPAQUE, {137, 103, 79}}},
-{"minecraft:mud_bricks", {BLOCK_OPAQUE, {137, 103, 79}}},
-{"minecraft:muddy_mangrove_roots", {BLOCK_OPAQUE, {70, 58, 45}}},
-{"minecraft:mushroom_stem", {BLOCK_OPAQUE, {203, 196, 185}}},
-{"minecraft:mycelium", {BLOCK_OPAQUE, {111, 98, 101}}},
-{"minecraft:nether_brick_fence", {BLOCK_OPAQUE, {44, 21, 26}}},
-{"minecraft:nether_brick_slab", {BLOCK_OPAQUE, {44, 21, 26}}},
-{"minecraft:nether_brick_stairs", {BLOCK_OPAQUE, {44, 21, 26}}},
-{"minecraft:nether_brick_wall", {BLOCK_OPAQUE, {44, 21, 26}}},
-{"minecraft:nether_bricks", {BLOCK_OPAQUE, {44, 21, 26}}},
-{"minecraft:nether_gold_ore", {BLOCK_OPAQUE, {115, 54, 42}}},
-{"minecraft:nether_portal", {BLOCK_OPAQUE, {89, 11, 192}}},
-{"minecraft:nether_quartz_ore", {BLOCK_OPAQUE, {117, 65, 62}}},
-{"minecraft:nether_sprouts", {BLOCK_OPAQUE, {19, 151, 133}}},
-{"minecraft:nether_wart", {BLOCK_OPAQUE, {111, 18, 19}}},
-{"minecraft:nether_wart_block", {BLOCK_OPAQUE, {114, 2, 2}}},
-{"minecraft:netherite_block", {BLOCK_OPAQUE, {66, 61, 63}}},
-{"minecraft:netherrack", {BLOCK_OPAQUE, {97, 38, 38}}},
-{"minecraft:note_block", {BLOCK_OPAQUE, {88, 58, 40}}},
-{"minecraft:oak_button", {0, {0, 0, 0}}},
-{"minecraft:oak_door", {BLOCK_OPAQUE, {140, 110, 66}}},
-{"minecraft:oak_fence", {BLOCK_OPAQUE, {162, 130, 78}}},
-{"minecraft:oak_fence_gate", {BLOCK_OPAQUE, {162, 130, 78}}},
-{"minecraft:oak_leaves", {BLOCK_OPAQUE|BLOCK_FOLIAGE, {144, 144, 144}}},
-{"minecraft:oak_log", {BLOCK_OPAQUE, {151, 121, 73}}},
-{"minecraft:oak_planks", {BLOCK_OPAQUE, {162, 130, 78}}},
-{"minecraft:oak_pressure_plate", {BLOCK_OPAQUE, {162, 130, 78}}},
-{"minecraft:oak_sapling", {BLOCK_OPAQUE, {77, 106, 40}}},
-{"minecraft:oak_sign", {BLOCK_OPAQUE, {162, 130, 78}}},
-{"minecraft:oak_slab", {BLOCK_OPAQUE, {162, 130, 78}}},
-{"minecraft:oak_stairs", {BLOCK_OPAQUE, {162, 130, 78}}},
-{"minecraft:oak_trapdoor", {BLOCK_OPAQUE, {124, 99, 56}}},
-{"minecraft:oak_wall_sign", {0, {0, 0, 0}}},
-{"minecraft:oak_wood", {BLOCK_OPAQUE, {109, 85, 50}}},
-{"minecraft:observer", {BLOCK_OPAQUE, {98, 98, 98}}},
-{"minecraft:obsidian", {BLOCK_OPAQUE, {15, 10, 24}}},
-{"minecraft:ochre_froglight", {BLOCK_OPAQUE, {250, 245, 206}}},
-{"minecraft:orange_banner", {0, {0, 0, 0}}},
-{"minecraft:orange_bed", {0, {0, 0, 0}}},
-{"minecraft:orange_candle", {0, {0, 0, 0}}},
-{"minecraft:orange_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
-{"minecraft:orange_carpet", {BLOCK_OPAQUE, {240, 118, 19}}},
-{"minecraft:orange_concrete", {BLOCK_OPAQUE, {224, 97, 0}}},
-{"minecraft:orange_concrete_powder", {BLOCK_OPAQUE, {227, 131, 31}}},
-{"minecraft:orange_glazed_terracotta", {BLOCK_OPAQUE, {154, 147, 91}}},
-{"minecraft:orange_shulker_box", {BLOCK_OPAQUE, {234, 106, 8}}},
-{"minecraft:orange_stained_glass", {BLOCK_OPAQUE, {216, 127, 51}}},
-{"minecraft:orange_stained_glass_pane", {BLOCK_OPAQUE, {208, 122, 48}}},
-{"minecraft:orange_terracotta", {BLOCK_OPAQUE, {161, 83, 37}}},
-{"minecraft:orange_tulip", {0, {0, 0, 0}}},
-{"minecraft:orange_wall_banner", {0, {0, 0, 0}}},
-{"minecraft:orange_wool", {BLOCK_OPAQUE, {240, 118, 19}}},
-{"minecraft:oxeye_daisy", {0, {0, 0, 0}}},
-{"minecraft:oxidized_copper", {BLOCK_OPAQUE, {82, 162, 132}}},
-{"minecraft:oxidized_cut_copper", {BLOCK_OPAQUE, {79, 153, 126}}},
-{"minecraft:oxidized_cut_copper_slab", {BLOCK_OPAQUE, {79, 153, 126}}},
-{"minecraft:oxidized_cut_copper_stairs", {BLOCK_OPAQUE, {79, 153, 126}}},
-{"minecraft:packed_ice", {BLOCK_OPAQUE, {141, 180, 250}}},
-{"minecraft:packed_mud", {BLOCK_OPAQUE, {142, 106, 79}}},
-{"minecraft:pearlescent_froglight", {BLOCK_OPAQUE, {245, 240, 239}}},
-{"minecraft:peony", {BLOCK_OPAQUE, {129, 126, 139}}},
-{"minecraft:petrified_oak_slab", {BLOCK_OPAQUE, {162, 130, 78}}},
-{"minecraft:pink_banner", {0, {0, 0, 0}}},
-{"minecraft:pink_bed", {0, {0, 0, 0}}},
-{"minecraft:pink_candle", {0, {0, 0, 0}}},
-{"minecraft:pink_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
-{"minecraft:pink_carpet", {BLOCK_OPAQUE, {237, 141, 172}}},
-{"minecraft:pink_concrete", {BLOCK_OPAQUE, {213, 101, 142}}},
-{"minecraft:pink_concrete_powder", {BLOCK_OPAQUE, {228, 153, 181}}},
-{"minecraft:pink_glazed_terracotta", {BLOCK_OPAQUE, {235, 154, 181}}},
-{"minecraft:pink_shulker_box", {BLOCK_OPAQUE, {230, 121, 157}}},
-{"minecraft:pink_stained_glass", {BLOCK_OPAQUE, {242, 127, 165}}},
-{"minecraft:pink_stained_glass_pane", {BLOCK_OPAQUE, {233, 122, 159}}},
-{"minecraft:pink_terracotta", {BLOCK_OPAQUE, {161, 78, 78}}},
-{"minecraft:pink_tulip", {0, {0, 0, 0}}},
-{"minecraft:pink_wall_banner", {0, {0, 0, 0}}},
-{"minecraft:pink_wool", {BLOCK_OPAQUE, {237, 141, 172}}},
-{"minecraft:piston", {BLOCK_OPAQUE, {109, 104, 96}}},
-{"minecraft:piston_head", {BLOCK_OPAQUE, {153, 127, 85}}},
-{"minecraft:player_head", {0, {0, 0, 0}}},
-{"minecraft:player_wall_head", {0, {0, 0, 0}}},
-{"minecraft:podzol", {BLOCK_OPAQUE, {91, 63, 24}}},
-{"minecraft:pointed_dripstone", {BLOCK_OPAQUE, {129, 102, 89}}},
-{"minecraft:polished_andesite", {BLOCK_OPAQUE, {132, 134, 133}}},
-{"minecraft:polished_andesite_slab", {BLOCK_OPAQUE, {132, 134, 133}}},
-{"minecraft:polished_andesite_stairs", {BLOCK_OPAQUE, {132, 134, 133}}},
-{"minecraft:polished_basalt", {BLOCK_OPAQUE, {99, 98, 100}}},
-{"minecraft:polished_blackstone", {BLOCK_OPAQUE, {53, 48, 56}}},
-{"minecraft:polished_blackstone_brick_slab", {BLOCK_OPAQUE, {48, 42, 49}}},
-{"minecraft:polished_blackstone_brick_stairs", {BLOCK_OPAQUE, {48, 42, 49}}},
-{"minecraft:polished_blackstone_brick_wall", {BLOCK_OPAQUE, {48, 42, 49}}},
-{"minecraft:polished_blackstone_bricks", {BLOCK_OPAQUE, {48, 42, 49}}},
-{"minecraft:polished_blackstone_button", {0, {0, 0, 0}}},
-{"minecraft:polished_blackstone_pressure_plate", {BLOCK_OPAQUE, {53, 48, 56}}},
-{"minecraft:polished_blackstone_slab", {BLOCK_OPAQUE, {53, 48, 56}}},
-{"minecraft:polished_blackstone_stairs", {BLOCK_OPAQUE, {53, 48, 56}}},
-{"minecraft:polished_blackstone_wall", {BLOCK_OPAQUE, {53, 48, 56}}},
-{"minecraft:polished_deepslate", {BLOCK_OPAQUE, {72, 72, 73}}},
-{"minecraft:polished_deepslate_slab", {BLOCK_OPAQUE, {72, 72, 73}}},
-{"minecraft:polished_deepslate_stairs", {BLOCK_OPAQUE, {72, 72, 73}}},
-{"minecraft:polished_deepslate_wall", {BLOCK_OPAQUE, {72, 72, 73}}},
-{"minecraft:polished_diorite", {BLOCK_OPAQUE, {192, 193, 194}}},
-{"minecraft:polished_diorite_slab", {BLOCK_OPAQUE, {192, 193, 194}}},
-{"minecraft:polished_diorite_stairs", {BLOCK_OPAQUE, {192, 193, 194}}},
-{"minecraft:polished_granite", {BLOCK_OPAQUE, {154, 106, 89}}},
-{"minecraft:polished_granite_slab", {BLOCK_OPAQUE, {154, 106, 89}}},
-{"minecraft:polished_granite_stairs", {BLOCK_OPAQUE, {154, 106, 89}}},
-{"minecraft:poppy", {0, {0, 0, 0}}},
-{"minecraft:potatoes", {BLOCK_OPAQUE, {84, 135, 47}}},
-{"minecraft:potted_acacia_sapling", {BLOCK_OPAQUE, {118, 117, 23}}},
-{"minecraft:potted_allium", {BLOCK_OPAQUE, {158, 137, 183}}},
-{"minecraft:potted_azalea_bush", {BLOCK_OPAQUE, {101, 124, 47}}},
-{"minecraft:potted_azure_bluet", {BLOCK_OPAQUE, {169, 204, 127}}},
-{"minecraft:potted_bamboo", {BLOCK_OPAQUE, {93, 144, 19}}},
-{"minecraft:potted_birch_sapling", {BLOCK_OPAQUE, {127, 160, 79}}},
-{"minecraft:potted_blue_orchid", {BLOCK_OPAQUE, {47, 162, 168}}},
-{"minecraft:potted_brown_mushroom", {BLOCK_OPAQUE, {153, 116, 92}}},
-{"minecraft:potted_cactus", {BLOCK_OPAQUE, {85, 127, 43}}},
-{"minecraft:potted_cornflower", {BLOCK_OPAQUE, {79, 121, 146}}},
-{"minecraft:potted_crimson_fungus", {BLOCK_OPAQUE, {141, 44, 29}}},
-{"minecraft:potted_crimson_roots", {BLOCK_OPAQUE, {127, 8, 41}}},
-{"minecraft:potted_dandelion", {BLOCK_OPAQUE, {147, 172, 43}}},
-{"minecraft:potted_dark_oak_sapling", {BLOCK_OPAQUE, {61, 90, 30}}},
-{"minecraft:potted_dead_bush", {BLOCK_OPAQUE, {107, 78, 40}}},
-{"minecraft:potted_fern", {BLOCK_OPAQUE|BLOCK_GRASS, {124, 124, 124}}},
-{"minecraft:potted_flowering_azalea_bush", {BLOCK_OPAQUE, {112, 121, 64}}},
-{"minecraft:potted_jungle_sapling", {BLOCK_OPAQUE, {47, 81, 16}}},
-{"minecraft:potted_lily_of_the_valley", {BLOCK_OPAQUE, {123, 174, 95}}},
-{"minecraft:potted_mangrove_propagule", {BLOCK_OPAQUE, {96, 174, 83}}},
-{"minecraft:potted_oak_sapling", {BLOCK_OPAQUE, {77, 106, 40}}},
-{"minecraft:potted_orange_tulip", {BLOCK_OPAQUE, {93, 142, 30}}},
-{"minecraft:potted_oxeye_daisy", {BLOCK_OPAQUE, {179, 202, 143}}},
-{"minecraft:potted_pink_tulip", {BLOCK_OPAQUE, {99, 157, 78}}},
-{"minecraft:potted_poppy", {BLOCK_OPAQUE, {128, 64, 37}}},
-{"minecraft:potted_red_mushroom", {BLOCK_OPAQUE, {216, 75, 67}}},
-{"minecraft:potted_red_tulip", {BLOCK_OPAQUE, {89, 128, 32}}},
-{"minecraft:potted_spruce_sapling", {BLOCK_OPAQUE, {44, 60, 36}}},
-{"minecraft:potted_warped_fungus", {BLOCK_OPAQUE, {74, 109, 87}}},
-{"minecraft:potted_warped_roots", {BLOCK_OPAQUE, {20, 136, 123}}},
-{"minecraft:potted_white_tulip", {BLOCK_OPAQUE, {93, 164, 71}}},
-{"minecraft:potted_wither_rose", {BLOCK_OPAQUE, {41, 44, 23}}},
-{"minecraft:powder_snow", {BLOCK_OPAQUE, {248, 253, 253}}},
-{"minecraft:powder_snow_cauldron", {BLOCK_OPAQUE, {73, 72, 74}}},
-{"minecraft:powered_rail", {BLOCK_OPAQUE, {137, 109, 74}}},
-{"minecraft:prismarine", {BLOCK_OPAQUE, {99, 156, 151}}},
-{"minecraft:prismarine_brick_slab", {BLOCK_OPAQUE, {99, 171, 158}}},
-{"minecraft:prismarine_brick_stairs", {BLOCK_OPAQUE, {99, 171, 158}}},
-{"minecraft:prismarine_bricks", {BLOCK_OPAQUE, {99, 171, 158}}},
-{"minecraft:prismarine_slab", {BLOCK_OPAQUE, {99, 156, 151}}},
-{"minecraft:prismarine_stairs", {BLOCK_OPAQUE, {99, 156, 151}}},
-{"minecraft:prismarine_wall", {BLOCK_OPAQUE, {99, 156, 151}}},
-{"minecraft:pumpkin", {BLOCK_OPAQUE, {198, 118, 24}}},
-{"minecraft:pumpkin_stem", {BLOCK_OPAQUE|BLOCK_GRASS, {154, 154, 154}}},
-{"minecraft:purple_banner", {0, {0, 0, 0}}},
-{"minecraft:purple_bed", {0, {0, 0, 0}}},
-{"minecraft:purple_candle", {0, {0, 0, 0}}},
-{"minecraft:purple_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
-{"minecraft:purple_carpet", {BLOCK_OPAQUE, {121, 42, 172}}},
-{"minecraft:purple_concrete", {BLOCK_OPAQUE, {100, 31, 156}}},
-{"minecraft:purple_concrete_powder", {BLOCK_OPAQUE, {131, 55, 177}}},
-{"minecraft:purple_glazed_terracotta", {BLOCK_OPAQUE, {109, 48, 152}}},
-{"minecraft:purple_shulker_box", {BLOCK_OPAQUE, {103, 32, 156}}},
-{"minecraft:purple_stained_glass", {BLOCK_OPAQUE, {127, 63, 178}}},
-{"minecraft:purple_stained_glass_pane", {BLOCK_OPAQUE, {122, 61, 171}}},
-{"minecraft:purple_terracotta", {BLOCK_OPAQUE, {118, 70, 86}}},
-{"minecraft:purple_wall_banner", {0, {0, 0, 0}}},
-{"minecraft:purple_wool", {BLOCK_OPAQUE, {121, 42, 172}}},
-{"minecraft:purpur_block", {BLOCK_OPAQUE, {169, 125, 169}}},
-{"minecraft:purpur_pillar", {BLOCK_OPAQUE, {171, 129, 171}}},
-{"minecraft:purpur_slab", {BLOCK_OPAQUE, {169, 125, 169}}},
-{"minecraft:purpur_stairs", {BLOCK_OPAQUE, {169, 125, 169}}},
-{"minecraft:quartz_block", {BLOCK_OPAQUE, {235, 229, 222}}},
-{"minecraft:quartz_bricks", {BLOCK_OPAQUE, {234, 229, 221}}},
-{"minecraft:quartz_pillar", {BLOCK_OPAQUE, {235, 230, 224}}},
-{"minecraft:quartz_slab", {BLOCK_OPAQUE, {235, 229, 222}}},
-{"minecraft:quartz_stairs", {BLOCK_OPAQUE, {235, 229, 222}}},
-{"minecraft:rail", {BLOCK_OPAQUE, {125, 111, 88}}},
-{"minecraft:raw_copper_block", {BLOCK_OPAQUE, {154, 105, 79}}},
-{"minecraft:raw_gold_block", {BLOCK_OPAQUE, {221, 169, 46}}},
-{"minecraft:raw_iron_block", {BLOCK_OPAQUE, {166, 135, 107}}},
-{"minecraft:red_banner", {0, {0, 0, 0}}},
-{"minecraft:red_bed", {0, {0, 0, 0}}},
-{"minecraft:red_candle", {0, {0, 0, 0}}},
-{"minecraft:red_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
-{"minecraft:red_carpet", {BLOCK_OPAQUE, {160, 39, 34}}},
-{"minecraft:red_concrete", {BLOCK_OPAQUE, {142, 32, 32}}},
-{"minecraft:red_concrete_powder", {BLOCK_OPAQUE, {168, 54, 50}}},
-{"minecraft:red_glazed_terracotta", {BLOCK_OPAQUE, {181, 59, 53}}},
-{"minecraft:red_mushroom", {0, {0, 0, 0}}},
-{"minecraft:red_mushroom_block", {BLOCK_OPAQUE, {200, 46, 45}}},
-{"minecraft:red_nether_brick_slab", {BLOCK_OPAQUE, {69, 7, 9}}},
-{"minecraft:red_nether_brick_stairs", {BLOCK_OPAQUE, {69, 7, 9}}},
-{"minecraft:red_nether_brick_wall", {BLOCK_OPAQUE, {69, 7, 9}}},
-{"minecraft:red_nether_bricks", {BLOCK_OPAQUE, {69, 7, 9}}},
-{"minecraft:red_sand", {BLOCK_OPAQUE, {190, 102, 33}}},
-{"minecraft:red_sandstone", {BLOCK_OPAQUE, {181, 97, 31}}},
-{"minecraft:red_sandstone_slab", {BLOCK_OPAQUE, {181, 97, 31}}},
-{"minecraft:red_sandstone_stairs", {BLOCK_OPAQUE, {181, 97, 31}}},
-{"minecraft:red_sandstone_wall", {BLOCK_OPAQUE, {181, 97, 31}}},
-{"minecraft:red_shulker_box", {BLOCK_OPAQUE, {140, 31, 30}}},
-{"minecraft:red_stained_glass", {BLOCK_OPAQUE, {153, 51, 51}}},
-{"minecraft:red_stained_glass_pane", {BLOCK_OPAQUE, {147, 48, 48}}},
-{"minecraft:red_terracotta", {BLOCK_OPAQUE, {143, 61, 46}}},
-{"minecraft:red_tulip", {0, {0, 0, 0}}},
-{"minecraft:red_wall_banner", {0, {0, 0, 0}}},
-{"minecraft:red_wool", {BLOCK_OPAQUE, {160, 39, 34}}},
-{"minecraft:redstone_block", {BLOCK_OPAQUE, {175, 24, 5}}},
-{"minecraft:redstone_lamp", {BLOCK_OPAQUE, {95, 54, 30}}},
-{"minecraft:redstone_ore", {BLOCK_OPAQUE, {140, 109, 109}}},
-{"minecraft:redstone_torch", {0, {0, 0, 0}}},
-{"minecraft:redstone_wall_torch", {0, {0, 0, 0}}},
-{"minecraft:redstone_wire", {BLOCK_OPAQUE, {175, 24, 5}}},
-{"minecraft:reinforced_deepslate", {BLOCK_OPAQUE, {80, 82, 78}}},
-{"minecraft:repeater", {BLOCK_OPAQUE, {160, 157, 156}}},
-{"minecraft:repeating_command_block", {BLOCK_OPAQUE, {129, 111, 176}}},
-{"minecraft:respawn_anchor", {BLOCK_OPAQUE, {75, 26, 144}}},
-{"minecraft:rooted_dirt", {BLOCK_OPAQUE, {144, 103, 76}}},
-{"minecraft:rose_bush", {BLOCK_OPAQUE, {131, 66, 37}}},
-{"minecraft:sand", {BLOCK_OPAQUE, {219, 207, 163}}},
-{"minecraft:sandstone", {BLOCK_OPAQUE, {223, 214, 170}}},
-{"minecraft:sandstone_slab", {BLOCK_OPAQUE, {223, 214, 170}}},
-{"minecraft:sandstone_stairs", {BLOCK_OPAQUE, {223, 214, 170}}},
-{"minecraft:sandstone_wall", {BLOCK_OPAQUE, {223, 214, 170}}},
-{"minecraft:scaffolding", {BLOCK_OPAQUE, {174, 134, 80}}},
-{"minecraft:sculk", {BLOCK_OPAQUE, {12, 29, 36}}},
-{"minecraft:sculk_catalyst", {BLOCK_OPAQUE, {15, 31, 38}}},
-{"minecraft:sculk_sensor", {BLOCK_OPAQUE, {7, 70, 84}}},
-{"minecraft:sculk_shrieker", {BLOCK_OPAQUE, {198, 205, 169}}},
-{"minecraft:sculk_vein", {BLOCK_OPAQUE, {7, 48, 57}}},
-{"minecraft:sea_lantern", {BLOCK_OPAQUE, {172, 199, 190}}},
-{"minecraft:sea_pickle", {BLOCK_OPAQUE, {90, 97, 39}}},
-{"minecraft:seagrass", {0, {0, 0, 0}}},
-{"minecraft:shroomlight", {BLOCK_OPAQUE, {240, 146, 70}}},
-{"minecraft:shulker_box", {BLOCK_OPAQUE, {139, 96, 139}}},
-{"minecraft:sign", {BLOCK_OPAQUE, {162, 130, 78}}},
-{"minecraft:skeleton_skull", {0, {0, 0, 0}}},
-{"minecraft:skeleton_wall_skull", {0, {0, 0, 0}}},
-{"minecraft:slime_block", {BLOCK_OPAQUE, {111, 192, 91}}},
-{"minecraft:small_amethyst_bud", {0, {0, 0, 0}}},
-{"minecraft:small_dripleaf", {0, {0, 0, 0}}},
-{"minecraft:smithing_table", {BLOCK_OPAQUE, {57, 58, 70}}},
-{"minecraft:smoker", {BLOCK_OPAQUE, {85, 83, 81}}},
-{"minecraft:smooth_basalt", {BLOCK_OPAQUE, {72, 72, 78}}},
-{"minecraft:smooth_quartz", {BLOCK_OPAQUE, {235, 229, 222}}},
-{"minecraft:smooth_quartz_slab", {BLOCK_OPAQUE, {235, 229, 222}}},
-{"minecraft:smooth_quartz_stairs", {BLOCK_OPAQUE, {235, 229, 222}}},
-{"minecraft:smooth_red_sandstone", {BLOCK_OPAQUE, {181, 97, 31}}},
-{"minecraft:smooth_red_sandstone_slab", {BLOCK_OPAQUE, {181, 97, 31}}},
-{"minecraft:smooth_red_sandstone_stairs", {BLOCK_OPAQUE, {181, 97, 31}}},
-{"minecraft:smooth_sandstone", {BLOCK_OPAQUE, {223, 214, 170}}},
-{"minecraft:smooth_sandstone_slab", {BLOCK_OPAQUE, {223, 214, 170}}},
-{"minecraft:smooth_sandstone_stairs", {BLOCK_OPAQUE, {223, 214, 170}}},
-{"minecraft:smooth_stone", {BLOCK_OPAQUE, {158, 158, 158}}},
-{"minecraft:smooth_stone_slab", {BLOCK_OPAQUE, {158, 158, 158}}},
-{"minecraft:snow", {BLOCK_OPAQUE, {249, 254, 254}}},
-{"minecraft:snow_block", {BLOCK_OPAQUE, {249, 254, 254}}},
-{"minecraft:soul_campfire", {BLOCK_OPAQUE, {80, 204, 208}}},
-{"minecraft:soul_fire", {BLOCK_OPAQUE, {51, 192, 197}}},
-{"minecraft:soul_lantern", {BLOCK_OPAQUE, {71, 99, 114}}},
-{"minecraft:soul_sand", {BLOCK_OPAQUE, {81, 62, 50}}},
-{"minecraft:soul_soil", {BLOCK_OPAQUE, {75, 57, 46}}},
-{"minecraft:soul_torch", {0, {0, 0, 0}}},
-{"minecraft:soul_wall_torch", {0, {0, 0, 0}}},
-{"minecraft:spawner", {BLOCK_OPAQUE, {36, 46, 62}}},
-{"minecraft:sponge", {BLOCK_OPAQUE, {195, 192, 74}}},
-{"minecraft:spore_blossom", {BLOCK_OPAQUE, {206, 96, 158}}},
-{"minecraft:spruce_button", {0, {0, 0, 0}}},
-{"minecraft:spruce_door", {BLOCK_OPAQUE, {106, 80, 48}}},
-{"minecraft:spruce_fence", {BLOCK_OPAQUE, {114, 84, 48}}},
-{"minecraft:spruce_fence_gate", {BLOCK_OPAQUE, {114, 84, 48}}},
-{"minecraft:spruce_leaves", {BLOCK_OPAQUE|BLOCK_SPRUCE, {126, 126, 126}}},
-{"minecraft:spruce_log", {BLOCK_OPAQUE, {108, 80, 46}}},
-{"minecraft:spruce_planks", {BLOCK_OPAQUE, {114, 84, 48}}},
-{"minecraft:spruce_pressure_plate", {BLOCK_OPAQUE, {114, 84, 48}}},
-{"minecraft:spruce_sapling", {BLOCK_OPAQUE, {44, 60, 36}}},
-{"minecraft:spruce_sign", {BLOCK_OPAQUE, {114, 84, 48}}},
-{"minecraft:spruce_slab", {BLOCK_OPAQUE, {114, 84, 48}}},
-{"minecraft:spruce_stairs", {BLOCK_OPAQUE, {114, 84, 48}}},
-{"minecraft:spruce_trapdoor", {BLOCK_OPAQUE, {103, 79, 47}}},
-{"minecraft:spruce_wall_sign", {0, {0, 0, 0}}},
-{"minecraft:spruce_wood", {BLOCK_OPAQUE, {58, 37, 16}}},
-{"minecraft:sticky_piston", {BLOCK_OPAQUE, {109, 104, 96}}},
-{"minecraft:stone", {BLOCK_OPAQUE, {125, 125, 125}}},
-{"minecraft:stone_brick_slab", {BLOCK_OPAQUE, {122, 121, 122}}},
-{"minecraft:stone_brick_stairs", {BLOCK_OPAQUE, {122, 121, 122}}},
-{"minecraft:stone_brick_wall", {BLOCK_OPAQUE, {122, 121, 122}}},
-{"minecraft:stone_bricks", {BLOCK_OPAQUE, {122, 121, 122}}},
-{"minecraft:stone_button", {0, {0, 0, 0}}},
-{"minecraft:stone_pressure_plate", {BLOCK_OPAQUE, {125, 125, 125}}},
-{"minecraft:stone_slab", {BLOCK_OPAQUE, {125, 125, 125}}},
-{"minecraft:stone_stairs", {BLOCK_OPAQUE, {125, 125, 125}}},
-{"minecraft:stonecutter", {BLOCK_OPAQUE, {123, 118, 111}}},
-{"minecraft:stripped_acacia_log", {BLOCK_OPAQUE, {166, 91, 51}}},
-{"minecraft:stripped_acacia_wood", {BLOCK_OPAQUE, {174, 92, 59}}},
-{"minecraft:stripped_birch_log", {BLOCK_OPAQUE, {191, 171, 116}}},
-{"minecraft:stripped_birch_wood", {BLOCK_OPAQUE, {196, 176, 118}}},
-{"minecraft:stripped_crimson_hyphae", {BLOCK_OPAQUE, {137, 57, 90}}},
-{"minecraft:stripped_crimson_stem", {BLOCK_OPAQUE, {121, 56, 82}}},
-{"minecraft:stripped_dark_oak_log", {BLOCK_OPAQUE, {65, 44, 22}}},
-{"minecraft:stripped_dark_oak_wood", {BLOCK_OPAQUE, {72, 56, 36}}},
-{"minecraft:stripped_jungle_log", {BLOCK_OPAQUE, {165, 122, 81}}},
-{"minecraft:stripped_jungle_wood", {BLOCK_OPAQUE, {171, 132, 84}}},
-{"minecraft:stripped_mangrove_log", {BLOCK_OPAQUE, {109, 43, 43}}},
-{"minecraft:stripped_mangrove_wood", {BLOCK_OPAQUE, {119, 54, 47}}},
-{"minecraft:stripped_oak_log", {BLOCK_OPAQUE, {160, 129, 77}}},
-{"minecraft:stripped_oak_wood", {BLOCK_OPAQUE, {177, 144, 86}}},
-{"minecraft:stripped_spruce_log", {BLOCK_OPAQUE, {105, 80, 46}}},
-{"minecraft:stripped_spruce_wood", {BLOCK_OPAQUE, {115, 89, 52}}},
-{"minecraft:stripped_warped_hyphae", {BLOCK_OPAQUE, {57, 150, 147}}},
-{"minecraft:stripped_warped_stem", {BLOCK_OPAQUE, {52, 128, 124}}},
-{"minecraft:structure_block", {BLOCK_OPAQUE, {88, 74, 90}}},
-{"minecraft:structure_void", {0, {0, 0, 0}}},
-{"minecraft:sugar_cane", {BLOCK_OPAQUE, {148, 192, 101}}},
-{"minecraft:sunflower", {BLOCK_OPAQUE, {246, 196, 54}}},
-{"minecraft:sweet_berry_bush", {BLOCK_OPAQUE, {68, 77, 50}}},
-{"minecraft:tall_grass", {BLOCK_OPAQUE|BLOCK_GRASS, {151, 149, 151}}},
-{"minecraft:tall_seagrass", {BLOCK_OPAQUE, {59, 139, 14}}},
-{"minecraft:target", {BLOCK_OPAQUE, {226, 170, 157}}},
-{"minecraft:terracotta", {BLOCK_OPAQUE, {152, 94, 67}}},
-{"minecraft:tinted_glass", {BLOCK_OPAQUE, {44, 38, 46}}},
-{"minecraft:tnt", {BLOCK_OPAQUE, {142, 62, 53}}},
-{"minecraft:torch", {0, {0, 0, 0}}},
-{"minecraft:trapped_chest", {BLOCK_OPAQUE, {162, 130, 78}}},
-{"minecraft:tripwire", {0, {0, 0, 0}}},
-{"minecraft:tripwire_hook", {0, {0, 0, 0}}},
-{"minecraft:tube_coral", {0, {0, 0, 0}}},
-{"minecraft:tube_coral_block", {BLOCK_OPAQUE, {49, 87, 206}}},
-{"minecraft:tube_coral_fan", {0, {0, 0, 0}}},
-{"minecraft:tube_coral_wall_fan", {0, {0, 0, 0}}},
-{"minecraft:tuff", {BLOCK_OPAQUE, {108, 109, 102}}},
-{"minecraft:turtle_egg", {BLOCK_OPAQUE, {228, 226, 191}}},
-{"minecraft:twisting_vines", {BLOCK_OPAQUE, {20, 143, 124}}},
-{"minecraft:twisting_vines_plant", {BLOCK_OPAQUE, {20, 135, 122}}},
-{"minecraft:verdant_froglight", {BLOCK_OPAQUE, {229, 244, 228}}},
-{"minecraft:vine", {BLOCK_OPAQUE|BLOCK_GRASS, {116, 116, 116}}},
-{"minecraft:void_air", {0, {0, 0, 0}}},
-{"minecraft:wall_sign", {0, {0, 0, 0}}},
-{"minecraft:wall_torch", {0, {0, 0, 0}}},
-{"minecraft:warped_button", {0, {0, 0, 0}}},
-{"minecraft:warped_door", {BLOCK_OPAQUE, {44, 126, 120}}},
-{"minecraft:warped_fence", {BLOCK_OPAQUE, {43, 104, 99}}},
-{"minecraft:warped_fence_gate", {BLOCK_OPAQUE, {43, 104, 99}}},
-{"minecraft:warped_fungus", {0, {0, 0, 0}}},
-{"minecraft:warped_hyphae", {BLOCK_OPAQUE, {58, 58, 77}}},
-{"minecraft:warped_nylium", {BLOCK_OPAQUE, {43, 114, 101}}},
-{"minecraft:warped_planks", {BLOCK_OPAQUE, {43, 104, 99}}},
-{"minecraft:warped_pressure_plate", {BLOCK_OPAQUE, {43, 104, 99}}},
-{"minecraft:warped_roots", {BLOCK_OPAQUE, {20, 138, 124}}},
-{"minecraft:warped_sign", {BLOCK_OPAQUE, {43, 104, 99}}},
-{"minecraft:warped_slab", {BLOCK_OPAQUE, {43, 104, 99}}},
-{"minecraft:warped_stairs", {BLOCK_OPAQUE, {43, 104, 99}}},
-{"minecraft:warped_stem", {BLOCK_OPAQUE, {53, 109, 110}}},
-{"minecraft:warped_trapdoor", {BLOCK_OPAQUE, {47, 119, 111}}},
-{"minecraft:warped_wall_sign", {0, {0, 0, 0}}},
-{"minecraft:warped_wart_block", {BLOCK_OPAQUE, {22, 119, 121}}},
-{"minecraft:water", {BLOCK_OPAQUE|BLOCK_WATER, {177, 177, 177}}},
-{"minecraft:water_cauldron", {BLOCK_OPAQUE, {73, 72, 74}}},
-{"minecraft:waxed_copper_block", {BLOCK_OPAQUE, {192, 107, 79}}},
-{"minecraft:waxed_cut_copper", {BLOCK_OPAQUE, {191, 106, 80}}},
-{"minecraft:waxed_cut_copper_slab", {BLOCK_OPAQUE, {191, 106, 80}}},
-{"minecraft:waxed_cut_copper_stairs", {BLOCK_OPAQUE, {191, 106, 80}}},
-{"minecraft:waxed_exposed_copper", {BLOCK_OPAQUE, {161, 125, 103}}},
-{"minecraft:waxed_exposed_cut_copper", {BLOCK_OPAQUE, {154, 121, 101}}},
-{"minecraft:waxed_exposed_cut_copper_slab", {BLOCK_OPAQUE, {154, 121, 101}}},
-{"minecraft:waxed_exposed_cut_copper_stairs", {BLOCK_OPAQUE, {154, 121, 101}}},
-{"minecraft:waxed_oxidized_copper", {BLOCK_OPAQUE, {82, 162, 132}}},
-{"minecraft:waxed_oxidized_cut_copper", {BLOCK_OPAQUE, {79, 153, 126}}},
-{"minecraft:waxed_oxidized_cut_copper_slab", {BLOCK_OPAQUE, {79, 153, 126}}},
-{"minecraft:waxed_oxidized_cut_copper_stairs", {BLOCK_OPAQUE, {79, 153, 126}}},
-{"minecraft:waxed_weathered_copper", {BLOCK_OPAQUE, {108, 153, 110}}},
-{"minecraft:waxed_weathered_cut_copper", {BLOCK_OPAQUE, {109, 145, 107}}},
-{"minecraft:waxed_weathered_cut_copper_slab", {BLOCK_OPAQUE, {109, 145, 107}}},
-{"minecraft:waxed_weathered_cut_copper_stairs", {BLOCK_OPAQUE, {109, 145, 107}}},
-{"minecraft:weathered_copper", {BLOCK_OPAQUE, {108, 153, 110}}},
-{"minecraft:weathered_cut_copper", {BLOCK_OPAQUE, {109, 145, 107}}},
-{"minecraft:weathered_cut_copper_slab", {BLOCK_OPAQUE, {109, 145, 107}}},
-{"minecraft:weathered_cut_copper_stairs", {BLOCK_OPAQUE, {109, 145, 107}}},
-{"minecraft:weeping_vines", {BLOCK_OPAQUE, {104, 1, 0}}},
-{"minecraft:weeping_vines_plant", {BLOCK_OPAQUE, {132, 16, 12}}},
-{"minecraft:wet_sponge", {BLOCK_OPAQUE, {171, 181, 70}}},
-{"minecraft:wheat", {BLOCK_OPAQUE, {166, 151, 73}}},
-{"minecraft:white_banner", {0, {0, 0, 0}}},
-{"minecraft:white_bed", {0, {0, 0, 0}}},
-{"minecraft:white_candle", {0, {0, 0, 0}}},
-{"minecraft:white_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
-{"minecraft:white_carpet", {BLOCK_OPAQUE, {233, 236, 236}}},
-{"minecraft:white_concrete", {BLOCK_OPAQUE, {207, 213, 214}}},
-{"minecraft:white_concrete_powder", {BLOCK_OPAQUE, {225, 227, 227}}},
-{"minecraft:white_glazed_terracotta", {BLOCK_OPAQUE, {188, 212, 202}}},
-{"minecraft:white_shulker_box", {BLOCK_OPAQUE, {215, 220, 221}}},
-{"minecraft:white_stained_glass", {BLOCK_OPAQUE, {255, 255, 255}}},
-{"minecraft:white_stained_glass_pane", {BLOCK_OPAQUE, {246, 246, 246}}},
-{"minecraft:white_terracotta", {BLOCK_OPAQUE, {209, 178, 161}}},
-{"minecraft:white_tulip", {0, {0, 0, 0}}},
-{"minecraft:white_wall_banner", {0, {0, 0, 0}}},
-{"minecraft:white_wool", {BLOCK_OPAQUE, {233, 236, 236}}},
-{"minecraft:wither_rose", {0, {0, 0, 0}}},
-{"minecraft:wither_skeleton_skull", {0, {0, 0, 0}}},
-{"minecraft:wither_skeleton_wall_skull", {0, {0, 0, 0}}},
-{"minecraft:yellow_banner", {0, {0, 0, 0}}},
-{"minecraft:yellow_bed", {0, {0, 0, 0}}},
-{"minecraft:yellow_candle", {0, {0, 0, 0}}},
-{"minecraft:yellow_candle_cake", {BLOCK_OPAQUE, {248, 222, 214}}},
-{"minecraft:yellow_carpet", {BLOCK_OPAQUE, {248, 197, 39}}},
-{"minecraft:yellow_concrete", {BLOCK_OPAQUE, {240, 175, 21}}},
-{"minecraft:yellow_concrete_powder", {BLOCK_OPAQUE, {232, 199, 54}}},
-{"minecraft:yellow_glazed_terracotta", {BLOCK_OPAQUE, {234, 192, 88}}},
-{"minecraft:yellow_shulker_box", {BLOCK_OPAQUE, {248, 188, 29}}},
-{"minecraft:yellow_stained_glass", {BLOCK_OPAQUE, {229, 229, 51}}},
-{"minecraft:yellow_stained_glass_pane", {BLOCK_OPAQUE, {221, 221, 48}}},
-{"minecraft:yellow_terracotta", {BLOCK_OPAQUE, {186, 133, 35}}},
-{"minecraft:yellow_wall_banner", {0, {0, 0, 0}}},
-{"minecraft:yellow_wool", {BLOCK_OPAQUE, {248, 197, 39}}},
-{"minecraft:zombie_head", {0, {0, 0, 0}}},
-{"minecraft:zombie_wall_head", {0, {0, 0, 0}}},
diff --git a/src/Resource/Color.hpp b/src/Resource/Color.hpp
deleted file mode 100644
index 255db1b..0000000
--- a/src/Resource/Color.hpp
+++ /dev/null
@@ -1,52 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2018, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-#include <cstdint>
-
-
-namespace MinedMap {
-namespace Resource {
-
-struct FloatColor {
-	float r, g, b;
-};
-
-static inline FloatColor operator+(const FloatColor &a, const FloatColor &b){
-	return FloatColor {
-		a.r+b.r,
-		a.g+b.g,
-		a.b+b.b,
-	};
-}
-
-static inline FloatColor & operator*=(FloatColor &a, const FloatColor &b) {
-	a.r *= b.r;
-	a.g *= b.g;
-	a.b *= b.b;
-
-	return a;
-}
-
-static inline FloatColor operator*(float s, const FloatColor &c) {
-	return FloatColor {
-		s*c.r,
-		s*c.g,
-		s*c.b,
-	};
-}
-
-struct Color {
-	uint8_t r, g, b, a;
-
-	Color() : r(0), g(0), b(0), a(0) {}
-	Color(FloatColor c) : r(c.r), g(c.g), b(c.b), a(0xff) {}
-};
-
-}
-}
diff --git a/src/Resource/LegacyBlockType.inc.cpp b/src/Resource/LegacyBlockType.inc.cpp
deleted file mode 100644
index b1dcdff..0000000
--- a/src/Resource/LegacyBlockType.inc.cpp
+++ /dev/null
@@ -1,597 +0,0 @@
-/*   0 */ simple("air"),
-/*   1 */ {
-	"stone",
-	"granite",
-	"polished_granite",
-	"diorite",
-	"polished_diorite",
-	"andesite",
-	"polished_andesite",
-},
-/*   2 */ simple("grass_block"),
-/*   3 */ {
-	"dirt",
-	"coarse_dirt",
-	"podzol",
-},
-/*   4 */ simple("cobblestone"),
-/*   5 */ {
-	"oak_planks",
-	"spruce_planks",
-	"birch_planks",
-	"jungle_planks",
-	"acacia_planks",
-	"dark_oak_planks",
-},
-/*   6 */ {
-	"oak_sapling",
-	"spruce_sapling",
-	"birch_sapling",
-	"jungle_sapling",
-	"acacia_sapling",
-	"dark_oak_sapling",
-	nullptr,
-	nullptr,
-	"oak_sapling",
-	"spruce_sapling",
-	"birch_sapling",
-	"jungle_sapling",
-	"acacia_sapling",
-	"dark_oak_sapling",
-},
-/*   7 */ simple("bedrock"),
-/*   8 */ simple("water"),
-/*   9 */ simple("water"),
-/*  10 */ simple("lava"),
-/*  11 */ simple("lava"),
-/*  12 */ {
-	"sand",
-	"red_sand",
-},
-/*  13 */ simple("gravel"),
-/*  14 */ simple("gold_ore"),
-/*  15 */ simple("iron_ore"),
-/*  16 */ simple("coal_ore"),
-/*  17 */ {
-	"oak_log",
-	"spruce_log",
-	"birch_log",
-	"jungle_log",
-	"oak_log",
-	"spruce_log",
-	"birch_log",
-	"jungle_log",
-	"oak_log",
-	"spruce_log",
-	"birch_log",
-	"jungle_log",
-	"oak_log",
-	"spruce_log",
-	"birch_log",
-	"jungle_log",
-},
-/*  18 */ {
-	"oak_leaves",
-	"spruce_leaves",
-	"birch_leaves",
-	"jungle_leaves",
-	"oak_leaves",
-	"spruce_leaves",
-	"birch_leaves",
-	"jungle_leaves",
-	"oak_leaves",
-	"spruce_leaves",
-	"birch_leaves",
-	"jungle_leaves",
-	"oak_leaves",
-	"spruce_leaves",
-	"birch_leaves",
-	"jungle_leaves",
-},
-/*  19 */ simple("sponge"),
-/*  20 */ simple("glass"),
-/*  21 */ simple("lapis_ore"),
-/*  22 */ simple("lapis_block"),
-/*  23 */ simple("dispenser"),
-/*  24 */ simple("sandstone"),
-/*  25 */ simple("note_block"),
-/*  26 */ {/* bed */},
-/*  27 */ simple("powered_rail"),
-/*  28 */ simple("detector_rail"),
-/*  29 */ simple("sticky_piston"),
-/*  30 */ simple("cobweb"),
-/*  31 */ {
-	"grass",
-	"fern",
-},
-/*  32 */ simple("dead_bush"),
-/*  33 */ simple("piston"),
-/*  34 */ simple("piston_head"),
-/*  35 */ {
-	"white_wool",
-	"orange_wool",
-	"magenta_wool",
-	"light_blue_wool",
-	"yellow_wool",
-	"lime_wool",
-	"pink_wool",
-	"gray_wool",
-	"light_gray_wool",
-	"cyan_wool",
-	"purple_wool",
-	"blue_wool",
-	"brown_wool",
-	"green_wool",
-	"red_wool",
-	"black_wool",
-},
-/*  36 */ simple("moving_piston"),
-/*  37 */ simple("dandelion"),
-/*  38 */ {
-	"poppy",
-	"blue_orchid",
-	"allium",
-	"azure_bluet",
-	"red_tulip",
-	"orange_tulip",
-	"white_tulip",
-	"pink_tulip",
-	"oxeye_daisy",
-},
-/*  39 */ simple("brown_mushroom"),
-/*  40 */ simple("red_mushroom"),
-/*  41 */ simple("gold_block"),
-/*  42 */ simple("iron_block"),
-/*  43 */ {
-	"smooth_stone_slab",
-	"sandstone_slab",
-	"oak_slab",
-	"cobblestone_slab",
-	"brick_slab",
-	"stone_brick_slab",
-	"nether_brick_slab",
-	"quartz_slab",
-},
-/*  44 */ {
-	"smooth_stone_slab",
-	"sandstone_slab",
-	"oak_slab",
-	"cobblestone_slab",
-	"brick_slab",
-	"stone_brick_slab",
-	"nether_brick_slab",
-	"quartz_slab",
-	"stone_slab",
-	"sandstone_slab",
-	"oak_slab",
-	"cobblestone_slab",
-	"brick_slab",
-	"stone_brick_slab",
-	"nether_brick_slab",
-	"quartz_slab",
-},
-/*  45 */ simple("bricks"),
-/*  46 */ simple("tnt"),
-/*  47 */ simple("bookshelf"),
-/*  48 */ simple("mossy_cobblestone"),
-/*  49 */ simple("obsidian"),
-/*  50 */ {
-	nullptr,
-	"wall_torch",
-	"wall_torch",
-	"wall_torch",
-	"wall_torch",
-	"torch",
-},
-/*  51 */ simple("fire"),
-/*  52 */ simple("spawner"),
-/*  53 */ simple("oak_stairs"),
-/*  54 */ simple("chest"),
-/*  55 */ simple("redstone_wire"),
-/*  56 */ simple("diamond_ore"),
-/*  57 */ simple("diamond_block"),
-/*  58 */ simple("crafting_table"),
-/*  59 */ simple("wheat"),
-/*  60 */ simple("farmland"),
-/*  61 */ simple("furnace"),
-/*  62 */ simple("furnace"),
-/*  63 */ simple("sign"),
-/*  64 */ simple("oak_door"),
-/*  65 */ simple("ladder"),
-/*  66 */ simple("rail"),
-/*  67 */ simple("cobblestone_stairs"),
-/*  68 */ simple("wall_sign"),
-/*  69 */ simple("lever"),
-/*  70 */ simple("stone_pressure_plate"),
-/*  71 */ simple("iron_door"),
-/*  72 */ simple("oak_pressure_plate"),
-/*  73 */ simple("redstone_ore"),
-/*  74 */ simple("redstone_ore"),
-/*  75 */ {
-	nullptr,
-	"redstone_wall_torch",
-	"redstone_wall_torch",
-	"redstone_wall_torch",
-	"redstone_wall_torch",
-	"redstone_torch",
-},
-/*  76 */ {
-	nullptr,
-	"redstone_wall_torch",
-	"redstone_wall_torch",
-	"redstone_wall_torch",
-	"redstone_wall_torch",
-	"redstone_torch",
-},
-/*  77 */ simple("stone_button"),
-/*  78 */ simple("snow"),
-/*  79 */ simple("ice"),
-/*  80 */ simple("snow_block"),
-/*  81 */ simple("cactus"),
-/*  82 */ simple("clay"),
-/*  83 */ simple("sugar_cane"),
-/*  84 */ simple("jukebox"),
-/*  85 */ simple("oak_fence"),
-/*  86 */ simple("pumpkin"),
-/*  87 */ simple("netherrack"),
-/*  88 */ simple("soul_sand"),
-/*  89 */ simple("glowstone"),
-/*  90 */ simple("nether_portal"),
-/*  91 */ simple("pumpkin"),
-/*  92 */ simple("cake"),
-/*  93 */ simple("repeater"),
-/*  94 */ simple("repeater"),
-/*  95 */ {
-	"white_stained_glass",
-	"orange_stained_glass",
-	"magenta_stained_glass",
-	"light_blue_stained_glass",
-	"yellow_stained_glass",
-	"lime_stained_glass",
-	"pink_stained_glass",
-	"gray_stained_glass",
-	"light_gray_stained_glass",
-	"cyan_stained_glass",
-	"purple_stained_glass",
-	"blue_stained_glass",
-	"brown_stained_glass",
-	"green_stained_glass",
-	"red_stained_glass",
-	"black_stained_glass",
-},
-/*  96 */ simple("oak_trapdoor"),
-/*  97 */ {
-	"infested_stone",
-	"infested_cobblestone",
-	"infested_stone_bricks",
-	"infested_mossy_stone_bricks",
-	"infested_cracked_stone_bricks",
-	"infested_chiseled_stone_bricks",
-},
-/*  98 */ {
-	"stone_bricks",
-	"mossy_stone_bricks",
-	"cracked_stone_bricks",
-	"chiseled_stone_bricks",
-},
-/*  99 */ simple("brown_mushroom_block"),
-/* 100 */ simple("red_mushroom_block"),
-/* 101 */ simple("iron_bars"),
-/* 102 */ simple("glass_pane"),
-/* 103 */ simple("melon"),
-/* 104 */ simple("pumpkin_stem"),
-/* 105 */ simple("melon_stem"),
-/* 106 */ simple("vine"),
-/* 107 */ simple("oak_fence_gate"),
-/* 108 */ simple("brick_stairs"),
-/* 109 */ simple("stone_brick_stairs"),
-/* 110 */ simple("mycelium"),
-/* 111 */ simple("lily_pad"),
-/* 112 */ simple("nether_bricks"),
-/* 113 */ simple("nether_brick_fence"),
-/* 114 */ simple("nether_brick_stairs"),
-/* 115 */ simple("nether_wart"),
-/* 116 */ simple("enchanting_table"),
-/* 117 */ simple("brewing_stand"),
-/* 118 */ simple("cauldron"),
-/* 119 */ simple("end_portal"),
-/* 120 */ simple("end_portal_frame"),
-/* 121 */ simple("end_stone"),
-/* 122 */ simple("dragon_egg"),
-/* 123 */ simple("redstone_lamp"),
-/* 124 */ simple("redstone_lamp"),
-/* 125 */ {
-	"oak_slab",
-	"spruce_slab",
-	"birch_slab",
-	"jungle_slab",
-	"acacia_slab",
-	"dark_oak_slab",
-},
-/* 126 */ {
-	"oak_slab",
-	"spruce_slab",
-	"birch_slab",
-	"jungle_slab",
-	"acacia_slab",
-	"dark_oak_slab",
-	nullptr,
-	nullptr,
-	"oak_slab",
-	"spruce_slab",
-	"birch_slab",
-	"jungle_slab",
-	"acacia_slab",
-	"dark_oak_slab",
-},
-/* 127 */ simple("cocoa"),
-/* 128 */ simple("sandstone_stairs"),
-/* 129 */ simple("emerald_ore"),
-/* 130 */ simple("ender_chest"),
-/* 131 */ simple("tripwire_hook"),
-/* 132 */ simple("tripwire"),
-/* 133 */ simple("emerald_block"),
-/* 134 */ simple("spruce_stairs"),
-/* 135 */ simple("birch_stairs"),
-/* 136 */ simple("jungle_stairs"),
-/* 137 */ simple("command_block"),
-/* 138 */ simple("beacon"),
-/* 139 */ {
-	"cobblestone_wall",
-	"mossy_cobblestone_wall",
-},
-/* 140 */ simple("flower_pot"),
-/* 141 */ simple("carrots"),
-/* 142 */ simple("potatoes"),
-/* 143 */ {},
-/* 144 */ {},
-/* 145 */ {
-	"anvil",
-	"anvil",
-	"anvil",
-	"anvil",
-	"chipped_anvil",
-	"chipped_anvil",
-	"chipped_anvil",
-	"chipped_anvil",
-	"damaged_anvil",
-	"damaged_anvil",
-	"damaged_anvil",
-	"damaged_anvil",
-},
-/* 146 */ simple("trapped_chest"),
-/* 147 */ simple("light_weighted_pressure_plate"),
-/* 148 */ simple("heavy_weighted_pressure_plate"),
-/* 149 */ simple("comparator"),
-/* 150 */ simple("comparator"),
-/* 151 */ simple("daylight_detector"),
-/* 152 */ simple("redstone_block"),
-/* 153 */ simple("nether_quartz_ore"),
-/* 154 */ simple("hopper"),
-/* 155 */ simple("quartz_block"),
-/* 156 */ simple("quartz_stairs"),
-/* 157 */ simple("activator_rail"),
-/* 158 */ simple("dropper"),
-/* 159 */ {
-	"white_terracotta",
-	"orange_terracotta",
-	"magenta_terracotta",
-	"light_blue_terracotta",
-	"yellow_terracotta",
-	"lime_terracotta",
-	"pink_terracotta",
-	"gray_terracotta",
-	"light_gray_terracotta",
-	"cyan_terracotta",
-	"purple_terracotta",
-	"blue_terracotta",
-	"brown_terracotta",
-	"green_terracotta",
-	"red_terracotta",
-	"black_terracotta",
-},
-/* 160 */ {
-	"white_stained_glass_pane",
-	"orange_stained_glass_pane",
-	"magenta_stained_glass_pane",
-	"light_blue_stained_glass_pane",
-	"yellow_stained_glass_pane",
-	"lime_stained_glass_pane",
-	"pink_stained_glass_pane",
-	"gray_stained_glass_pane",
-	"light_gray_stained_glass_pane",
-	"cyan_stained_glass_pane",
-	"purple_stained_glass_pane",
-	"blue_stained_glass_pane",
-	"brown_stained_glass_pane",
-	"green_stained_glass_pane",
-	"red_stained_glass_pane",
-	"black_stained_glass_pane",
-},
-/* 161 */ {
-	"acacia_leaves",
-	"dark_oak_leaves",
-	nullptr,
-	nullptr,
-	"acacia_leaves",
-	"dark_oak_leaves",
-	nullptr,
-	nullptr,
-	"acacia_leaves",
-	"dark_oak_leaves",
-	nullptr,
-	nullptr,
-	"acacia_leaves",
-	"dark_oak_leaves",
-},
-/* 162 */ {
-	"acacia_log",
-	"dark_oak_log",
-	nullptr,
-	nullptr,
-	"acacia_log",
-	"dark_oak_log",
-	nullptr,
-	nullptr,
-	"acacia_log",
-	"dark_oak_log",
-	nullptr,
-	nullptr,
-	"acacia_log",
-	"dark_oak_log",
-},
-/* 163 */ simple("acacia_stairs"),
-/* 164 */ simple("dark_oak_stairs"),
-/* 165 */ simple("slime_block"),
-/* 166 */ simple("barrier"),
-/* 167 */ simple("iron_trapdoor"),
-/* 168 */ {
-	"prismarine",
-	"prismarine_bricks",
-	"dark_prismarine",
-},
-/* 169 */ simple("sea_lantern"),
-/* 170 */ simple("hay_block"),
-/* 171 */ {
-	"white_carpet",
-	"orange_carpet",
-	"magenta_carpet",
-	"light_blue_carpet",
-	"yellow_carpet",
-	"lime_carpet",
-	"pink_carpet",
-	"gray_carpet",
-	"light_gray_carpet",
-	"cyan_carpet",
-	"purple_carpet",
-	"blue_carpet",
-	"brown_carpet",
-	"green_carpet",
-	"red_carpet",
-	"black_carpet",
-},
-/* 172 */ simple("terracotta"),
-/* 173 */ simple("coal_block"),
-/* 174 */ simple("packed_ice"),
-/* 175 */ {
-	"sunflower",
-	"lilac",
-	"tall_grass",
-	"large_fern",
-	"rose_bush",
-	"peony",
-},
-/* 176 */ {/* banner */},
-/* 177 */ {/* wall banner */},
-/* 178 */ simple("daylight_detector"),
-/* 179 */ simple("red_sandstone"),
-/* 180 */ simple("red_sandstone_stairs"),
-/* 181 */ simple("red_sandstone_slab"),
-/* 182 */ simple("red_sandstone_slab"),
-/* 183 */ simple("spruce_fence_gate"),
-/* 184 */ simple("birch_fence_gate"),
-/* 185 */ simple("jungle_fence_gate"),
-/* 186 */ simple("dark_oak_fence_gate"),
-/* 187 */ simple("acacia_fence_gate"),
-/* 188 */ simple("spruce_fence"),
-/* 189 */ simple("birch_fence"),
-/* 190 */ simple("jungle_fence"),
-/* 191 */ simple("dark_oak_fence"),
-/* 192 */ simple("acacia_fence"),
-/* 193 */ simple("spruce_door"),
-/* 194 */ simple("birch_door"),
-/* 195 */ simple("jungle_door"),
-/* 196 */ simple("acacia_door"),
-/* 197 */ simple("dark_oak_door"),
-/* 198 */ simple("end_rod"),
-/* 199 */ simple("chorus_plant"),
-/* 200 */ simple("chorus_flower"),
-/* 201 */ simple("purpur_block"),
-/* 202 */ simple("purpur_pillar"),
-/* 203 */ simple("purpur_stairs"),
-/* 204 */ simple("purpur_slab"),
-/* 205 */ simple("purpur_slab"),
-/* 206 */ simple("end_stone_bricks"),
-/* 207 */ simple("beetroots"),
-/* 208 */ simple("grass_path"),
-/* 209 */ simple("end_gateway"),
-/* 210 */ simple("repeating_command_block"),
-/* 211 */ simple("chain_command_block"),
-/* 212 */ simple("frosted_ice"),
-/* 213 */ simple("magma_block"),
-/* 214 */ simple("nether_wart_block"),
-/* 215 */ simple("red_nether_bricks"),
-/* 216 */ simple("bone_block"),
-/* 217 */ simple("structure_void"),
-/* 218 */ simple("observer"),
-/* 219 */ simple("white_shulker_box"),
-/* 220 */ simple("orange_shulker_box"),
-/* 221 */ simple("magenta_shulker_box"),
-/* 222 */ simple("light_blue_shulker_box"),
-/* 223 */ simple("yellow_shulker_box"),
-/* 224 */ simple("lime_shulker_box"),
-/* 225 */ simple("pink_shulker_box"),
-/* 226 */ simple("gray_shulker_box"),
-/* 227 */ simple("light_gray_shulker_box"),
-/* 228 */ simple("cyan_shulker_box"),
-/* 229 */ simple("purple_shulker_box"),
-/* 230 */ simple("blue_shulker_box"),
-/* 231 */ simple("brown_shulker_box"),
-/* 232 */ simple("green_shulker_box"),
-/* 233 */ simple("red_shulker_box"),
-/* 234 */ simple("black_shulker_box"),
-/* 235 */ simple("white_glazed_terracotta"),
-/* 236 */ simple("orange_glazed_terracotta"),
-/* 237 */ simple("magenta_glazed_terracotta"),
-/* 238 */ simple("light_blue_glazed_terracotta"),
-/* 239 */ simple("yellow_glazed_terracotta"),
-/* 240 */ simple("lime_glazed_terracotta"),
-/* 241 */ simple("pink_glazed_terracotta"),
-/* 242 */ simple("gray_glazed_terracotta"),
-/* 243 */ simple("light_gray_glazed_terracotta"),
-/* 244 */ simple("cyan_glazed_terracotta"),
-/* 245 */ simple("purple_glazed_terracotta"),
-/* 246 */ simple("blue_glazed_terracotta"),
-/* 247 */ simple("brown_glazed_terracotta"),
-/* 248 */ simple("green_glazed_terracotta"),
-/* 249 */ simple("red_glazed_terracotta"),
-/* 250 */ simple("black_glazed_terracotta"),
-/* 251 */ {
-	"white_concrete",
-	"orange_concrete",
-	"magenta_concrete",
-	"light_blue_concrete",
-	"yellow_concrete",
-	"lime_concrete",
-	"pink_concrete",
-	"gray_concrete",
-	"light_gray_concrete",
-	"cyan_concrete",
-	"purple_concrete",
-	"blue_concrete",
-	"brown_concrete",
-	"green_concrete",
-	"red_concrete",
-	"black_concrete",
-},
-/* 252 */ {
-	"white_concrete_powder",
-	"orange_concrete_powder",
-	"magenta_concrete_powder",
-	"light_blue_concrete_powder",
-	"yellow_concrete_powder",
-	"lime_concrete_powder",
-	"pink_concrete_powder",
-	"gray_concrete_powder",
-	"light_gray_concrete_powder",
-	"cyan_concrete_powder",
-	"purple_concrete_powder",
-	"blue_concrete_powder",
-	"brown_concrete_powder",
-	"green_concrete_powder",
-	"red_concrete_powder",
-	"black_concrete_powder",
-},
-/* 253 */ {},
-/* 254 */ {},
-/* 255 */ simple("structure_block"),
diff --git a/src/UniqueCPtr.hpp b/src/UniqueCPtr.hpp
deleted file mode 100644
index 743a712..0000000
--- a/src/UniqueCPtr.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-#include <cstdlib>
-#include <memory>
-
-// UniqueCPtr is a wrapper around std::unique_ptr using std::free as its deallocator
-//
-// This allows to use it to manage memory allocated by C APIs (malloc, realloc, ...)
-template<typename T> class UniqueCPtr : public std::unique_ptr<T, void (*)(void *)> {
-public:
-	UniqueCPtr() : std::unique_ptr<T, void (*)(void *)>(nullptr, std::free) {}
-	template<typename T2> UniqueCPtr(T2 ptr) : std::unique_ptr<T, void (*)(void *)>(ptr, std::free) {}
-};
diff --git a/src/Util.hpp b/src/Util.hpp
deleted file mode 100644
index 163813d..0000000
--- a/src/Util.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015-2021, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-#include <algorithm>
-#include <cstdint>
-#include <limits>
-#include <stdexcept>
-#include <utility>
-
-
-namespace MinedMap {
-
-template <typename T> static inline T assertValue(T&& val) {
-	if (!val)
-		throw std::invalid_argument("assertValue failed");
-
-	return std::forward<T>(val);
-}
-
-static inline float clamp(float v, float min, float max) {
-	return std::max(std::min(v, max), min);
-}
-
-// A block coordinate relative to a chunk/section (X/Y/Z)
-typedef uint8_t block_idx_t;
-// A section index in a chunk (Y)
-typedef int8_t section_idx_t;
-// A chunk coordinate relative to a region (X/Z)
-typedef uint8_t chunk_idx_t;
-
-// A block coordinate relative to a region (X/Z)
-typedef uint16_t region_block_idx_t;
-// A block coordinate (Y)
-typedef int16_t y_idx_t;
-
-const y_idx_t y_idx_min = std::numeric_limits<y_idx_t>::min();
-
-}
diff --git a/src/World/Block.hpp b/src/World/Block.hpp
deleted file mode 100644
index e1ed09a..0000000
--- a/src/World/Block.hpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015-2021, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-#include "../NBT/CompoundTag.hpp"
-#include "../Resource/Biome.hpp"
-#include "../Resource/BlockType.hpp"
-
-
-namespace MinedMap {
-namespace World {
-
-struct Block {
-	const Resource::BlockType *type;
-	y_idx_t depth;
-	uint8_t blockLight;
-
-	bool isVisible() const {
-		return type && (type->flags & BLOCK_OPAQUE);
-	}
-
-	Resource::FloatColor getColor(uint8_t biome) const {
-		if (!isVisible())
-			return Resource::FloatColor {};
-
-		return (Resource::Biome::Biomes[biome] ?: Resource::Biome::Default)->getBlockColor(type, depth);
-	}
-
-	operator bool() const {
-		return type;
-	}
-};
-
-}
-}
diff --git a/src/World/Chunk.cpp b/src/World/Chunk.cpp
deleted file mode 100644
index b9d27c5..0000000
--- a/src/World/Chunk.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015-2021, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#include "Chunk.hpp"
-#include "../NBT/IntTag.hpp"
-#include "../NBT/ListTag.hpp"
-#include "../NBT/StringTag.hpp"
-
-#include <cstring>
-#include <stdexcept>
-
-
-namespace MinedMap {
-namespace World {
-
-Chunk::Chunk(const ChunkData *data) {
-	std::shared_ptr<const NBT::ListTag> sectionsTag;
-
-	auto level = data->getRoot()->get<NBT::CompoundTag>("Level");
-	if (level) {
-		sectionsTag = level->get<NBT::ListTag>("Sections");
-		if (!sectionsTag || sectionsTag->empty())
-			return;
-
-		auto biomesIntArray = level->get<NBT::IntArrayTag>("Biomes");
-		auto biomesByteArray = level->get<NBT::ByteArrayTag>("Biomes");
-
-		if (biomesIntArray && biomesIntArray->getLength() == BSIZE*BSIZE*BMAXY) {
-			biomeInts = std::move(biomesIntArray);
-			biomeFormat = INT_ARRAY;
-		} else if (biomesIntArray && biomesIntArray->getLength() == SIZE*SIZE) {
-			biomeInts = std::move(biomesIntArray);
-			biomeFormat = INT_ARRAY_PRE1_15;
-		} else if (biomesByteArray && biomesByteArray->getLength() == SIZE*SIZE) {
-			biomeBytes = std::move(biomesByteArray);
-			biomeFormat = BYTE_ARRAY;
-		} else {
-			throw std::invalid_argument("corrupt biome data");
-		}
-	} else {
-		sectionsTag = data->getRoot()->get<NBT::ListTag>("sections");
-		if (!sectionsTag || sectionsTag->empty())
-			return;
-
-		biomeFormat = SECTION;
-	}
-
-	auto dataVersionTag = data->getRoot()->get<NBT::IntTag>("DataVersion");
-	uint32_t dataVersion = dataVersionTag ? dataVersionTag->getValue() : 0;
-
-	std::vector<std::unique_ptr<Section>> tmpSections;
-	section_idx_t minY = std::numeric_limits<section_idx_t>::max();
-	section_idx_t maxY = std::numeric_limits<section_idx_t>::min();
-
-	for (auto &sTag : *sectionsTag) {
-		auto s = std::dynamic_pointer_cast<const NBT::CompoundTag>(sTag);
-		std::unique_ptr<Section> section = Section::makeSection(s, dataVersion);
-		section_idx_t Y = section->getY();
-		if (Y < minY)
-			minY = Y;
-		if (Y > maxY)
-			maxY = Y;
-
-		tmpSections.push_back(std::move(section));
-	}
-
-	if (tmpSections.empty())
-		return;
-
-	assertValue(minY <= maxY);
-	sectionOffset = minY;
-	sections.resize(maxY - minY + 1);
-
-	for (auto &section : tmpSections) {
-		section_idx_t Y = section->getY();
-		Y -= sectionOffset;
-		assertValue(Y >= 0 && size_t(Y) < sections.size());
-		assertValue(!sections[Y]);
-		sections[Y] = std::move(section);
-	}
-}
-
-uint8_t Chunk::getBiome(block_idx_t x, y_idx_t y, block_idx_t z) const {
-	if (x >= SIZE || z >= SIZE)
-		throw std::invalid_argument("getBiome: invalid block coordinate");
-
-	switch (biomeFormat) {
-	case INT_ARRAY:
-		if (y < 0 || y >= MAXY)
-			break;
-		return biomeInts->getValue((y>>BSHIFT)*BSIZE*BSIZE + (z>>BSHIFT)*BSIZE + (x>>BSHIFT));
-	case INT_ARRAY_PRE1_15:
-		return biomeInts->getValue(z*SIZE + x);
-	case BYTE_ARRAY:
-		return biomeBytes->getValue(z*SIZE + x);
-	case SECTION: {
-		section_idx_t Y = (y >> HSHIFT) - sectionOffset;
-
-		if (Y < 0 || size_t(Y) >= sections.size() || !sections[Y])
-			break;
-
-		return sections[Y]->getBiomeAt(x, y & HMASK, z);
-	}
-	default:
-		break;
-	}
-
-	return 0xff;
-}
-
-Block Chunk::getBlock(block_idx_t x, Chunk::Height height, block_idx_t z) const {
-	Block block = {};
-
-	block.depth = height.depth;
-
-	if (height.y == y_idx_min)
-		return block;
-
-	section_idx_t Y = (height.y >> HSHIFT) - sectionOffset;
-	block_idx_t y = height.y & HMASK;
-
-	if (Y >= 0 && size_t(Y) < sections.size() && sections[Y])
-		block.type = sections[Y]->getBlockStateAt(x, y, z);
-
-	section_idx_t Yt = ((height.y + 1) >> HSHIFT) - sectionOffset;
-	block_idx_t yt = (height.y + 1) & HMASK;
-
-	if (Yt >= 0 && size_t(Yt) < sections.size() && sections[Yt])
-		block.blockLight = sections[Yt]->getBlockLightAt(x, yt, z);
-
-	return block;
-}
-
-bool Chunk::getHeight(
-	Chunk::Height *height, const Section *section,
-	block_idx_t x, block_idx_t y, block_idx_t z, int flags
-) const {
-	if (height->depth > y_idx_min)
-		return false;
-
-	if (!(flags & WITH_DEPTH) && height->y > y_idx_min)
-		return false;
-
-	const Resource::BlockType *type = section->getBlockStateAt(x, y, z);
-	if (!type || !(type->flags & BLOCK_OPAQUE))
-		return false;
-
-	if (height->y == y_idx_min)
-		height->y = (section->getY() << HSHIFT) + y;
-
-	if (!(flags & WITH_DEPTH))
-		return true;
-
-	if (type->flags & BLOCK_WATER)
-		return false;
-
-	height->depth = (section->getY() << HSHIFT) + y;
-
-	return true;
-}
-
-Chunk::Heightmap Chunk::getTopLayer(int flags) const {
-	uint32_t done = 0;
-	Heightmap ret;
-
-	for (block_idx_t z = 0; z < SIZE; z++) {
-		for (block_idx_t x = 0; x < SIZE; x++)
-			ret.v[x][z] = Height { .y = y_idx_min, .depth = y_idx_min };
-	}
-
-	for (section_idx_t Y = sections.size() - 1; Y >= 0; Y--) {
-		if (done == SIZE*SIZE)
-			break;
-
-		if (!sections[Y])
-			continue;
-
-		const Section *section = sections[Y].get();
-
-		for (int8_t y = SIZE-1; y >= 0; y--) {
-			if (done == SIZE*SIZE)
-				break;
-
-			for (block_idx_t z = 0; z < SIZE; z++) {
-				for (block_idx_t x = 0; x < SIZE; x++) {
-					if (getHeight(&ret.v[x][z], section, x, y, z, flags))
-						done++;
-				}
-			}
-		}
-	}
-
-	return ret;
-}
-
-}
-}
diff --git a/src/World/Chunk.hpp b/src/World/Chunk.hpp
deleted file mode 100644
index 611c3c8..0000000
--- a/src/World/Chunk.hpp
+++ /dev/null
@@ -1,97 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015-2021, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-
-#include "Block.hpp"
-#include "ChunkData.hpp"
-#include "Section.hpp"
-#include "../NBT/ByteArrayTag.hpp"
-#include "../NBT/IntArrayTag.hpp"
-#include "../Resource/BlockType.hpp"
-#include "../Util.hpp"
-
-#include <cstdint>
-
-
-namespace MinedMap {
-namespace World {
-
-class Chunk {
-public:
-	// Number of blocks in a chunk in x/z dimensions
-	static const uint32_t SIZE = Section::SIZE;
-	// Maximum Y value for pre-1.18 chunks
-	static const y_idx_t MAXY = 256;
-
-	// Shift to get from height to section index
-	static const unsigned HSHIFT = 4;
-	// Mask to get from height to y index inside section
-	static const block_idx_t HMASK = 0xf;
-
-	// Since Minecraft 1.15, biome information is stored for
-	// 4x4x4 block groups
-	static const unsigned BSHIFT = Section::BSHIFT;
-	// Number of biome values in a chunk in x/z dimensions
-	static const uint32_t BSIZE = Section::BSIZE;
-	// Number of biome values in a chunk in y dimension
-	static const uint32_t BMAXY = MAXY >> BSHIFT;
-
-	// Flags
-	static const int WITH_DEPTH = (1 << 0);
-
-	struct Height {
-		y_idx_t y;
-		y_idx_t depth;
-	};
-
-	struct Heightmap {
-		Height v[SIZE][SIZE];
-	};
-
-private:
-	section_idx_t sectionOffset;
-	std::vector<std::unique_ptr<Section>> sections;
-
-	enum BiomeFormat {
-		UNKNOWN = 0,
-		BYTE_ARRAY,
-		INT_ARRAY_PRE1_15,
-		INT_ARRAY,
-		SECTION,
-	} biomeFormat = UNKNOWN;
-
-	std::shared_ptr<const NBT::ByteArrayTag> biomeBytes;
-	std::shared_ptr<const NBT::IntArrayTag> biomeInts;
-
-	bool getHeight(
-		Height *height, const Section *section,
-		block_idx_t x, block_idx_t y, block_idx_t z, int flags
-	) const;
-
-	const Resource::BlockType * getBlockStateAt(block_idx_t x, y_idx_t y, block_idx_t z) const {
-		section_idx_t Y = (y >> HSHIFT) - sectionOffset;
-
-		if (Y < 0 || size_t(Y) >= sections.size() || !sections[Y])
-			return nullptr;
-
-		return sections[Y]->getBlockStateAt(x, y & HMASK, z);
-	}
-
-
-public:
-	Chunk(const ChunkData *data);
-
-	uint8_t getBiome(block_idx_t x, y_idx_t y, block_idx_t z) const;
-	Block getBlock(block_idx_t x, Height y, block_idx_t z) const;
-
-	Heightmap getTopLayer(int flags) const;
-};
-
-}
-}
diff --git a/src/World/ChunkData.cpp b/src/World/ChunkData.cpp
deleted file mode 100644
index 972ee5e..0000000
--- a/src/World/ChunkData.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015-2018, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#include "ChunkData.hpp"
-
-#include <iostream>
-#include <stdexcept>
-#include <cstdlib>
-
-#include <zlib.h>
-
-
-namespace MinedMap {
-namespace World {
-
-ChunkData::ChunkData(Buffer buffer) {
-	size_t size = buffer.get32();
-
-	Buffer buffer2(buffer.get(size), size);
-
-	uint8_t format = buffer2.get8();
-	if (format != 2)
-		throw std::invalid_argument("unknown chunk format");
-
-	inflateChunk(buffer2);
-	parseChunk();
-}
-
-void ChunkData::inflateChunk(Buffer buffer) {
-	size_t outlen = 0;
-	uint8_t *output = nullptr;
-
-	z_stream stream = {};
-	int ret = inflateInit(&stream);
-	if (ret != Z_OK)
-		throw std::runtime_error("inflateInit() failed");
-
-	stream.avail_in = buffer.getRemaining();
-	stream.next_in = const_cast<uint8_t *>(buffer.get(stream.avail_in));
-
-	while (stream.avail_in) {
-		outlen += 65536;
-		output = static_cast<uint8_t *>(std::realloc(output, outlen));
-
-		stream.next_out = output + stream.total_out;
-		stream.avail_out = outlen - stream.total_out;
-
-		ret = inflate(&stream, Z_NO_FLUSH);
-		switch (ret) {
-		case Z_NEED_DICT:
-		case Z_DATA_ERROR:
-		case Z_MEM_ERROR:
-			inflateEnd(&stream);
-			throw std::runtime_error("inflate() failed");
-		}
-	}
-
-	inflateEnd(&stream);
-
-	len = stream.total_out;
-	data = UniqueCPtr<uint8_t[]>(output);
-}
-
-void ChunkData::parseChunk() {
-	Buffer nbt(data.get(), len);
-	std::pair<std::string, std::shared_ptr<const NBT::Tag>> tag = NBT::Tag::readNamedTag(&nbt);
-	if (!tag.first.empty())
-		throw std::invalid_argument("invalid root tag");
-
-	root = assertValue(std::dynamic_pointer_cast<const NBT::CompoundTag>(tag.second));
-}
-
-}
-}
diff --git a/src/World/ChunkData.hpp b/src/World/ChunkData.hpp
deleted file mode 100644
index 62a69c1..0000000
--- a/src/World/ChunkData.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015-2018, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-
-#include "../Buffer.hpp"
-#include "../UniqueCPtr.hpp"
-#include "../Util.hpp"
-#include "../NBT/CompoundTag.hpp"
-
-#include <cstdint>
-
-
-namespace MinedMap {
-namespace World {
-
-class ChunkData {
-private:
-	size_t len;
-	UniqueCPtr<uint8_t[]> data;
-
-	std::shared_ptr<const NBT::CompoundTag> root;
-
-	void inflateChunk(Buffer buffer);
-	void parseChunk();
-
-public:
-	ChunkData(Buffer buffer);
-
-	const std::shared_ptr<const NBT::CompoundTag> & getRoot() const {
-		return root;
-	}
-};
-
-}
-}
diff --git a/src/World/Level.cpp b/src/World/Level.cpp
deleted file mode 100644
index ec7d25a..0000000
--- a/src/World/Level.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#include "Level.hpp"
-#include "../GZip.hpp"
-#include "../Util.hpp"
-#include "../NBT/IntTag.hpp"
-
-
-namespace MinedMap {
-namespace World {
-
-Level::Level(const char *filename) {
-	buffer = readGZip(filename);
-
-	Buffer nbt(buffer.data(), buffer.size());
-	std::pair<std::string, std::shared_ptr<const NBT::Tag>> tag = NBT::Tag::readNamedTag(&nbt);
-	if (tag.first != "")
-		throw std::invalid_argument("invalid root tag");
-
-	root = assertValue(std::dynamic_pointer_cast<const NBT::CompoundTag>(tag.second));
-	data = assertValue(root->get<NBT::CompoundTag>("Data"));
-}
-
-std::pair<int32_t, int32_t> Level::getSpawn() const {
-	int32_t x = assertValue(data->get<NBT::IntTag>("SpawnX"))->getValue();
-	int32_t z = assertValue(data->get<NBT::IntTag>("SpawnZ"))->getValue();
-
-	return std::make_pair(x, z);
-}
-
-}
-}
diff --git a/src/World/Level.hpp b/src/World/Level.hpp
deleted file mode 100644
index dd40513..0000000
--- a/src/World/Level.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-#include "../NBT/CompoundTag.hpp"
-
-#include <cstdint>
-#include <vector>
-
-
-namespace MinedMap {
-namespace World {
-
-class Level {
-private:
-	std::vector<uint8_t> buffer;
-
-	std::shared_ptr<const NBT::CompoundTag> root;
-	std::shared_ptr<const NBT::CompoundTag> data;
-
-public:
-	Level(const char *filename);
-
-	std::pair<int32_t, int32_t> getSpawn() const;
-};
-
-}
-}
diff --git a/src/World/Region.cpp b/src/World/Region.cpp
deleted file mode 100644
index cd21e6d..0000000
--- a/src/World/Region.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015-2021, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#include "Region.hpp"
-
-#include <cstring>
-#include <fstream>
-#include <iostream>
-
-
-namespace MinedMap {
-namespace World {
-
-Region::ChunkMap Region::processHeader(const uint8_t header[4096]) {
-	ChunkMap map;
-
-	for (chunk_idx_t z = 0; z < 32; z++) {
-		for (chunk_idx_t x = 0; x < 32; x++) {
-			const uint8_t *p = &header[128*z + x*4];
-
-			uint32_t offset = (p[0] << 16) | (p[1] << 8) | p[2];
-
-			if (!offset)
-				continue;
-
-			uint8_t len = p[3];
-
-			map.emplace(offset, ChunkDesc(x, z, len));
-		}
-	}
-
-	return map;
-}
-
-void Region::visitChunks(const char *filename, const ChunkVisitor &visitor) {
-	std::ifstream file;
-	file.exceptions(std::ios::badbit);
-	file.open(filename, std::ios::in | std::ios::binary);
-
-	ChunkMap chunkMap;
-
-	{
-		uint8_t header[4096];
-		file.read((char *)header, sizeof(header));
-
-		chunkMap = processHeader(header);
-	}
-
-	bool seen[SIZE][SIZE] = {};
-
-	size_t i = 1, c = 0;
-	while (!file.eof() && !file.fail()) {
-		auto it = chunkMap.find(i);
-		if (it == chunkMap.end()) {
-			file.ignore(4096);
-			i++;
-			continue;
-		}
-
-		chunk_idx_t x = std::get<0>(it->second);
-		chunk_idx_t z = std::get<1>(it->second);
-		size_t len = std::get<2>(it->second);
-
-		if (seen[x][z])
-			throw std::invalid_argument("duplicate chunk");
-
-		seen[x][z] = true;
-		c++;
-
-		uint8_t buffer[len * 4096];
-		std::memset(buffer, 0, sizeof(buffer));
-		file.read((char *)buffer, len * 4096);
-
-		ChunkData chunk(Buffer(buffer, len * 4096));
-		visitor(x, z, &chunk);
-
-		i += len;
-	}
-
-	if (c != chunkMap.size())
-		throw std::invalid_argument("region incomplete");
-}
-
-}
-}
diff --git a/src/World/Region.hpp b/src/World/Region.hpp
deleted file mode 100644
index 22840e8..0000000
--- a/src/World/Region.hpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015-2021, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-#include "Chunk.hpp"
-
-#include <functional>
-#include <memory>
-#include <stdexcept>
-#include <tuple>
-#include <unordered_map>
-
-
-namespace MinedMap {
-namespace World {
-
-class Region {
-public:
-	// Number of chunks in a region in each dimension
-	static const uint32_t SIZE = 32;
-
-	typedef std::function<void (chunk_idx_t, chunk_idx_t, const ChunkData *)> ChunkVisitor;
-
-	Region() = delete;
-
-private:
-	typedef std::tuple<chunk_idx_t, chunk_idx_t, uint8_t> ChunkDesc;
-	typedef std::unordered_map<uint32_t, ChunkDesc> ChunkMap;
-
-	static ChunkMap processHeader(const uint8_t header[4096]);
-
-public:
-	static void visitChunks(const char *filename, const ChunkVisitor &visitor);
-};
-
-}
-}
diff --git a/src/World/Section.cpp b/src/World/Section.cpp
deleted file mode 100644
index ba7b0c9..0000000
--- a/src/World/Section.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015-2021, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#include "Section.hpp"
-#include "../Resource/Biome.hpp"
-#include "../NBT/ByteTag.hpp"
-#include "../NBT/IntTag.hpp"
-#include "../NBT/StringTag.hpp"
-
-#include <cstdio>
-
-
-namespace MinedMap {
-namespace World {
-
-Section::Section(const std::shared_ptr<const NBT::CompoundTag> &section) {
-	const std::shared_ptr<const NBT::ByteTag> YByteTag = section->get<NBT::ByteTag>("Y");
-	if (YByteTag) {
-		Y = int8_t(YByteTag->getValue());
-	} else {
-		const std::shared_ptr<const NBT::IntTag> YIntTag = assertValue(section->get<NBT::IntTag>("Y"));
-		int32_t value = YIntTag->getValue();
-		if (int8_t(value) != value)
-			throw std::invalid_argument("unsupported section Y coordinate");
-		Y = value;
-	}
-	blockLight = section->get<NBT::ByteArrayTag>("BlockLight");
-}
-
-const Resource::BlockType * Section::getBlockStateAt(block_idx_t, block_idx_t, block_idx_t) const {
-	return nullptr;
-}
-
-uint8_t Section::getBiomeAt(block_idx_t x, block_idx_t y, block_idx_t z) const {
-	return 0xff;
-}
-
-std::unique_ptr<Section> Section::makeSection(const std::shared_ptr<const NBT::CompoundTag> &section, uint32_t dataVersion) {
-	{
-		const std::shared_ptr<const NBT::CompoundTag> blockStates = section->get<NBT::CompoundTag>("block_states");
-		if (blockStates) {
-			const std::shared_ptr<const NBT::ListTag> palette = assertValue(blockStates->get<NBT::ListTag>("palette"));
-			std::shared_ptr<const NBT::LongArrayTag> data = blockStates->get<NBT::LongArrayTag>("data");
-
-			const std::shared_ptr<const NBT::CompoundTag> biomes = assertValue(section->get<NBT::CompoundTag>("biomes"));
-			const std::shared_ptr<const NBT::ListTag> biomePalette = assertValue(biomes->get<NBT::ListTag>("palette"));
-			std::shared_ptr<const NBT::LongArrayTag> biomeData = biomes->get<NBT::LongArrayTag>("data");
-
-			return std::unique_ptr<Section>(new PaletteSection(
-				section, std::move(data), palette, std::move(biomeData), biomePalette, dataVersion
-			));
-		}
-	}
-
-	{
-		std::shared_ptr<const NBT::LongArrayTag> blockStates = section->get<NBT::LongArrayTag>("BlockStates");
-		if (blockStates) {
-			const std::shared_ptr<const NBT::ListTag> palette = assertValue(section->get<NBT::ListTag>("Palette"));
-
-			return std::unique_ptr<Section>(new PaletteSection(
-				section, std::move(blockStates), palette,
-				std::shared_ptr<const NBT::LongArrayTag>(), std::shared_ptr<const NBT::ListTag>(), dataVersion
-			));
-		}
-	}
-
-	{
-		std::shared_ptr<const NBT::ByteArrayTag> blocks = section->get<NBT::ByteArrayTag>("Blocks");
-		if (blocks) {
-			std::shared_ptr<const NBT::ByteArrayTag> data = assertValue(section->get<NBT::ByteArrayTag>("Data"));
-
-			return std::unique_ptr<Section>(new LegacySection(section, std::move(blocks), std::move(data)));
-		}
-	}
-
-	return std::unique_ptr<Section>(new Section(section));
-}
-
-
-const Resource::BlockType * LegacySection::getBlockStateAt(block_idx_t x, block_idx_t y, block_idx_t z) const {
-	uint8_t type = getBlockAt(x, y, z);
-	uint8_t data = getDataAt(x, y, z);
-
-	return Resource::LEGACY_BLOCK_TYPES.types[type][data];
-}
-
-
-const Resource::BlockType * PaletteSection::lookup(const std::string &name, uint32_t dataVersion) {
-	if (dataVersion < 1900 && name == "minecraft:stone_slab")
-		return Resource::BlockType::lookup("minecraft:smooth_stone_slab");
-
-	return Resource::BlockType::lookup(name);
-}
-
-PaletteSection::PaletteSection(
-	const std::shared_ptr<const NBT::CompoundTag> &section,
-	std::shared_ptr<const NBT::LongArrayTag> &&blockStates0,
-	const std::shared_ptr<const NBT::ListTag> &paletteData,
-	std::shared_ptr<const NBT::LongArrayTag> &&biomes0,
-	const std::shared_ptr<const NBT::ListTag> &biomePaletteData,
-	uint32_t dataVersion0
-) : Section(section), blockStates(blockStates0), biomes(biomes0), dataVersion(dataVersion0) {
-	bits = 4;
-	while ((1u << bits) < paletteData->size()) {
-		bits++;
-
-		if (bits > 12)
-			throw std::invalid_argument("unsupported block palette size");
-	}
-
-	biomeBits = 1;
-	if (biomePaletteData) {
-		while ((1u << biomeBits) < biomePaletteData->size()) {
-			biomeBits++;
-
-			if (biomeBits > 6)
-				throw std::invalid_argument("unsupported biome palette size");
-		}
-	}
-
-	unsigned expectedLength;
-
-	if (dataVersion < 2529) {
-		expectedLength = 64 * bits;
-	} else {
-		unsigned blocksPerWord = (64 / bits);
-		expectedLength = (4096 + blocksPerWord - 1) / blocksPerWord;
-	}
-
-	if (blockStates && blockStates->getLength() != expectedLength)
-		throw std::invalid_argument("corrupt section block data");
-
-	unsigned biomesPerWord = (64 / biomeBits);
-	unsigned expectedBiomeLength = (64 + biomesPerWord - 1) / biomesPerWord;
-
-	if (biomes && biomes->getLength() != expectedBiomeLength)
-		throw std::invalid_argument("corrupt section biome data");
-
-	for (const auto &entry : *paletteData) {
-		const NBT::CompoundTag &paletteEntry = *assertValue(dynamic_cast<const NBT::CompoundTag *>(entry.get()));
-		std::string name = assertValue(paletteEntry.get<NBT::StringTag>("Name"))->getValue();
-
-		const Resource::BlockType *type = lookup(name, dataVersion);
-		if (!type)
-			std::fprintf(stderr, "Warning: unknown block type: %s\n", name.c_str());
-
-		palette.push_back(type);
-	}
-
-	if (biomePaletteData) {
-		for (const auto &entry : *biomePaletteData) {
-			const NBT::StringTag &paletteEntry =
-				*assertValue(dynamic_cast<const NBT::StringTag *>(entry.get()));
-			std::string name = paletteEntry.getValue();
-
-			auto it = Resource::Biome::Names.find(name);
-			uint8_t biome;
-			if (it != Resource::Biome::Names.end()) {
-				biome = it->second;
-			} else {
-				std::fprintf(stderr, "Warning: unknown biome: %s\n", name.c_str());
-				biome = 0xff;
-			}
-
-			biomePalette.push_back(biome);
-		}
-	}
-}
-
-const Resource::BlockType * PaletteSection::getBlockStateAt(block_idx_t x, block_idx_t y, block_idx_t z) const {
-	if (!blockStates)
-		return palette.at(0);
-
-	size_t index = getIndex(x, y, z);
-	size_t bitIndex;
-
-	if (dataVersion < 2529) {
-		bitIndex = bits * index;
-	} else {
-		unsigned blocksPerWord = (64 / bits);
-		size_t word = index / blocksPerWord;
-		bitIndex = 64 * word + bits * (index % blocksPerWord);
-	}
-
-	size_t pos = bitIndex >> 3;
-	unsigned shift = bitIndex & 7;
-	uint16_t mask = (1u << bits) - 1;
-
-	uint32_t v = blockStates->getPointer()[mangleByteIndex(pos)];
-
-	if (shift + bits > 8)
-		v |= blockStates->getPointer()[mangleByteIndex(pos + 1)] << 8;
-	if (shift + bits > 16)
-		v |= blockStates->getPointer()[mangleByteIndex(pos + 2)] << 16;
-	/* We do not need to check for shift+bits > 24: bits should never
-	be greater than 12, so our value will never span more than 3 bytes */
-
-	return palette.at((v >> shift) & mask);
-}
-
-uint8_t PaletteSection::getBiomeAt(block_idx_t x, block_idx_t y, block_idx_t z) const {
-	if (!biomes)
-		return biomePalette.at(0);
-
-	size_t index = getBiomeIndex(x, y, z);
-
-	unsigned biomesPerWord = (64 / biomeBits);
-	size_t word = index / biomesPerWord;
-	size_t bitIndex = 64 * word + biomeBits * (index % biomesPerWord);
-
-	size_t pos = bitIndex >> 3;
-	unsigned shift = bitIndex & 7;
-	uint16_t mask = (1u << biomeBits) - 1;
-
-	uint32_t v = biomes->getPointer()[mangleByteIndex(pos)];
-
-	if (shift + biomeBits > 8)
-		v |= biomes->getPointer()[mangleByteIndex(pos + 1)] << 8;
-	/* We do not need to check for shift+bits > 16: biomeBits should never
-	be greater than 6, so our value will never span more than 2 bytes */
-
-	return biomePalette.at((v >> shift) & mask);
-}
-
-}
-}
diff --git a/src/World/Section.hpp b/src/World/Section.hpp
deleted file mode 100644
index 9884a77..0000000
--- a/src/World/Section.hpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2015-2021, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#pragma once
-
-
-#include "../NBT/ByteArrayTag.hpp"
-#include "../NBT/CompoundTag.hpp"
-#include "../NBT/ListTag.hpp"
-#include "../NBT/LongArrayTag.hpp"
-#include "../Resource/BlockType.hpp"
-#include "../Util.hpp"
-
-#include <cstdint>
-#include <stdexcept>
-
-
-namespace MinedMap {
-namespace World {
-
-class Section {
-public:
-	// Number of blocks in a section in each dimension
-	static const uint32_t SIZE = 16;
-
-	// Since Minecraft 1.15, biome information is stored for
-	// 4x4x4 block groups
-	static const unsigned BSHIFT = 2;
-	// Number of biome values in a chunk in x/z dimensions
-	static const uint32_t BSIZE = SIZE >> BSHIFT;
-
-
-private:
-	section_idx_t Y;
-	std::shared_ptr<const NBT::ByteArrayTag> blockLight;
-
-protected:
-	static size_t getIndex(block_idx_t x, block_idx_t y, block_idx_t z) {
-		if (x >= SIZE || y >= SIZE || z >= SIZE)
-			throw std::range_error("Section::getIndex(): bad coordinates");
-
-		return SIZE*SIZE*y + SIZE*z + x;
-	}
-
-	static size_t getBiomeIndex(block_idx_t x, block_idx_t y, block_idx_t z) {
-		if (x >= SIZE || y >= SIZE || z >= SIZE)
-			throw std::range_error("Section::getBiomeIndex(): bad coordinates");
-
-		return BSIZE*BSIZE*(y>>BSHIFT) + BSIZE*(z>>BSHIFT) + (x>>BSHIFT);
-	}
-
-	static uint8_t getHalf(const uint8_t *v, block_idx_t x, block_idx_t y, block_idx_t z) {
-		size_t i = getIndex(x, y, z);
-
-		if (i % 2)
-			return (v[i/2] >> 4);
-		else
-			return (v[i/2] & 0xf);
-	}
-
-	Section(const std::shared_ptr<const NBT::CompoundTag> &section);
-
-public:
-	virtual ~Section() {}
-
-	section_idx_t getY() const { return Y; };
-
-	virtual const Resource::BlockType * getBlockStateAt(block_idx_t x, block_idx_t y, block_idx_t z) const;
-	virtual uint8_t getBiomeAt(block_idx_t x, block_idx_t y, block_idx_t z) const;
-
-	uint8_t getBlockLightAt(block_idx_t x, block_idx_t y, block_idx_t z) const {
-		if (!blockLight)
-			return 0;
-
-		return getHalf(blockLight->getPointer(), x, y, z);
-	}
-
-	static std::unique_ptr<Section> makeSection(const std::shared_ptr<const NBT::CompoundTag> &section, uint32_t dataVersion);
-};
-
-class LegacySection : public Section {
-private:
-	std::shared_ptr<const NBT::ByteArrayTag> blocks;
-	std::shared_ptr<const NBT::ByteArrayTag> data;
-
-
-	uint8_t getBlockAt(block_idx_t x, block_idx_t y, block_idx_t z) const {
-		return blocks->getValue(getIndex(x, y, z));
-	}
-
-	uint8_t getDataAt(block_idx_t x, block_idx_t y, block_idx_t z) const {
-		return getHalf(data->getPointer(), x, y, z);
-	}
-
-public:
-	LegacySection(
-		const std::shared_ptr<const NBT::CompoundTag> &section,
-		std::shared_ptr<const NBT::ByteArrayTag> &&blocks0,
-		std::shared_ptr<const NBT::ByteArrayTag> &&data0
-	) : Section(section), blocks(blocks0), data(data0) {}
-
-	virtual const Resource::BlockType * getBlockStateAt(block_idx_t x, block_idx_t y, block_idx_t z) const;
-};
-
-class PaletteSection : public Section {
-private:
-	std::shared_ptr<const NBT::LongArrayTag> blockStates;
-	std::vector<const Resource::BlockType *> palette;
-	unsigned bits;
-
-	std::shared_ptr<const NBT::LongArrayTag> biomes;
-	std::vector<uint8_t> biomePalette;
-	unsigned biomeBits;
-
-	uint32_t dataVersion;
-
-	static const Resource::BlockType * lookup(const std::string &name, uint32_t dataVersion);
-
-	static size_t mangleByteIndex(size_t index) {
-		return (index & ~(size_t)7) + 7 - (index & 7);
-	}
-
-public:
-	PaletteSection(
-		const std::shared_ptr<const NBT::CompoundTag> &section,
-		std::shared_ptr<const NBT::LongArrayTag> &&blockStates0,
-		const std::shared_ptr<const NBT::ListTag> &paletteData,
-		std::shared_ptr<const NBT::LongArrayTag> &&biomes0,
-		const std::shared_ptr<const NBT::ListTag> &biomePaletteData,
-		uint32_t dataVersion0
-	);
-
-	virtual const Resource::BlockType * getBlockStateAt(block_idx_t x, block_idx_t y, block_idx_t z) const;
-	virtual uint8_t getBiomeAt(block_idx_t x, block_idx_t y, block_idx_t z) const;
-};
-
-}
-}
diff --git a/src/nbtdump.cpp b/src/nbtdump.cpp
deleted file mode 100644
index d47b15e..0000000
--- a/src/nbtdump.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2018, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#include "Buffer.hpp"
-#include "GZip.hpp"
-#include "Util.hpp"
-#include "NBT/Tag.hpp"
-
-#include <cstdio>
-#include <iostream>
-#include <stdexcept>
-
-
-int main(int argc, char *argv[]) {
-	using namespace MinedMap;
-
-	if (argc != 2) {
-		std::fprintf(stderr, "Usage: %s <nbtfile>\n", argv[0]);
-		return 1;
-	}
-
-	std::vector<uint8_t> buffer = readGZip(argv[1]);
-
-	Buffer nbt(buffer.data(), buffer.size());
-	std::pair<std::string, std::shared_ptr<const NBT::Tag>> tag = NBT::Tag::readNamedTag(&nbt);
-	if (tag.first != "")
-		throw std::invalid_argument("invalid root tag");
-
-	std::cout << *tag.second << std::endl;
-
-	return 0;
-}
diff --git a/src/regiondump.cpp b/src/regiondump.cpp
deleted file mode 100644
index 62fe359..0000000
--- a/src/regiondump.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// SPDX-License-Identifier: BSD-2-Clause
-/*
-  Copyright (c) 2018-2021, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-*/
-
-
-#include "Buffer.hpp"
-#include "GZip.hpp"
-#include "Util.hpp"
-#include "NBT/Tag.hpp"
-#include "World/Region.hpp"
-
-#include <cstdio>
-#include <iostream>
-
-
-int main(int argc, char *argv[]) {
-	using namespace MinedMap;
-
-	if (argc != 2) {
-		std::fprintf(stderr, "Usage: %s <regionfile>\n", argv[0]);
-		return 1;
-	}
-
-	World::Region::visitChunks(argv[1], [&] (chunk_idx_t X, chunk_idx_t Z, const World::ChunkData *chunk) {
-		std::cout << "Chunk(" << unsigned(X) << ", " << unsigned(Z) << "): "
-			<< *chunk->getRoot() << std::endl;
-	});
-
-	return 0;
-}

From 40105aaccd9b8a1a1b8d0e89368ba830ccba3dcc Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 24 Jan 2023 18:52:44 +0100
Subject: [PATCH 046/460] Initial Rust setup

---
 .gitignore   | 3 +--
 Cargo.lock   | 7 +++++++
 Cargo.toml   | 9 +++++++++
 rustfmt.toml | 1 +
 src/main.rs  | 3 +++
 5 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 Cargo.lock
 create mode 100644 Cargo.toml
 create mode 100644 rustfmt.toml
 create mode 100644 src/main.rs

diff --git a/.gitignore b/.gitignore
index a8d69d5..73d8961 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,4 @@
 /viewer/data
 /resource/data
 /resource/colors.json
-.idea/
-cmake-build-debug/
+/target
diff --git a/Cargo.lock b/Cargo.lock
new file mode 100644
index 0000000..418de4f
--- /dev/null
+++ b/Cargo.lock
@@ -0,0 +1,7 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "minedmap"
+version = "0.1.0"
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 0000000..d981c31
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "minedmap"
+version = "0.1.0"
+edition = "2021"
+license = "BSD-2-Clause"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
diff --git a/rustfmt.toml b/rustfmt.toml
new file mode 100644
index 0000000..218e203
--- /dev/null
+++ b/rustfmt.toml
@@ -0,0 +1 @@
+hard_tabs = true
diff --git a/src/main.rs b/src/main.rs
new file mode 100644
index 0000000..a30eb95
--- /dev/null
+++ b/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+	println!("Hello, world!");
+}

From ddd78079dcd8d2b0fa65030ea27db57ee2b36702 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 24 Jan 2023 20:39:54 +0100
Subject: [PATCH 047/460] Add new nbtdump util

---
 Cargo.lock         | 418 +++++++++++++++++++++++++++++++++++++++++++++
 Cargo.toml         |   4 +
 TODO.md            |   8 +
 src/bin/nbtdump.rs |  30 ++++
 4 files changed, 460 insertions(+)
 create mode 100644 TODO.md
 create mode 100644 src/bin/nbtdump.rs

diff --git a/Cargo.lock b/Cargo.lock
index 418de4f..c7a31f8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,6 +2,424 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "anyhow"
+version = "1.0.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "byteorder"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+
+[[package]]
+name = "cc"
+version = "1.0.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
+
+[[package]]
+name = "cesu8"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "clap"
+version = "4.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76"
+dependencies = [
+ "bitflags",
+ "clap_derive",
+ "clap_lex",
+ "is-terminal",
+ "once_cell",
+ "strsim",
+ "termcolor",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8"
+dependencies = [
+ "heck",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade"
+dependencies = [
+ "os_str_bytes",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "errno"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
+dependencies = [
+ "errno-dragonfly",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "errno-dragonfly"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "fastnbt"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da8cfe3db6e587f39487b01dae75222c5fa809342f6aa4b8310d17b53e666728"
+dependencies = [
+ "byteorder",
+ "cesu8",
+ "serde",
+ "serde_bytes",
+]
+
+[[package]]
+name = "flate2"
+version = "1.0.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "heck"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
+
+[[package]]
+name = "hermit-abi"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "io-lifetimes"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "is-terminal"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
+dependencies = [
+ "hermit-abi",
+ "io-lifetimes",
+ "rustix",
+ "windows-sys",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.139"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+
 [[package]]
 name = "minedmap"
 version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "clap",
+ "fastnbt",
+ "flate2",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
+
+[[package]]
+name = "os_str_bytes"
+version = "6.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
+
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rustix"
+version = "0.36.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03"
+dependencies = [
+ "bitflags",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.152"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_bytes"
+version = "0.11.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "718dc5fff5b36f99093fc49b280cfc96ce6fc824317783bff5a1fed0c7a64819"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.152"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "syn"
+version = "1.0.107"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-sys"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
diff --git a/Cargo.toml b/Cargo.toml
index d981c31..25eb4e2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,3 +7,7 @@ license = "BSD-2-Clause"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+anyhow = "1.0.68"
+clap = { version = "4.1.4", features = ["derive"] }
+fastnbt = "2.3.2"
+flate2 = "1.0.25"
diff --git a/TODO.md b/TODO.md
new file mode 100644
index 0000000..e6c14f6
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,8 @@
+# TODO
+
+## Optimizations
+
+- To check:
+  - fastnbt borrow
+  - fastnbt from_reader
+  - flate2 backends
diff --git a/src/bin/nbtdump.rs b/src/bin/nbtdump.rs
new file mode 100644
index 0000000..20236f7
--- /dev/null
+++ b/src/bin/nbtdump.rs
@@ -0,0 +1,30 @@
+use std::{fs::File, io::prelude::*, path::PathBuf};
+
+use anyhow::{Context, Result};
+use clap::Parser;
+use flate2::read::GzDecoder;
+
+#[derive(Debug, Parser)]
+struct Args {
+	/// Filename to dump
+	file: PathBuf,
+}
+
+fn main() -> Result<()> {
+	let args = Args::parse();
+
+	let file = File::open(&args.file).context("Failed to open file")?;
+
+	let mut decoder = GzDecoder::new(file);
+	let mut buf = vec![];
+	decoder
+		.read_to_end(&mut buf)
+		.context("Failed to read file")?;
+
+	let nbt: fastnbt::Value =
+		fastnbt::from_bytes(buf.as_slice()).context("Failed to decode NBT data")?;
+
+	println!("{:#x?}", nbt);
+
+	Ok(())
+}

From 5a364e243457fa9c5634f37ac84b44d113722665 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 25 Jan 2023 19:08:23 +0100
Subject: [PATCH 048/460] Add new regiondump implemention

---
 Cargo.lock            |   1 +
 Cargo.toml            |   1 +
 src/bin/regiondump.rs | 147 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 149 insertions(+)
 create mode 100644 src/bin/regiondump.rs

diff --git a/Cargo.lock b/Cargo.lock
index c7a31f8..3cf2b24 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -190,6 +190,7 @@ dependencies = [
  "clap",
  "fastnbt",
  "flate2",
+ "serde",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 25eb4e2..977525b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,3 +11,4 @@ anyhow = "1.0.68"
 clap = { version = "4.1.4", features = ["derive"] }
 fastnbt = "2.3.2"
 flate2 = "1.0.25"
+serde = "1.0.152"
diff --git a/src/bin/regiondump.rs b/src/bin/regiondump.rs
new file mode 100644
index 0000000..d0e27ce
--- /dev/null
+++ b/src/bin/regiondump.rs
@@ -0,0 +1,147 @@
+use std::{
+	collections::HashMap,
+	fs::File,
+	io::{prelude::*, SeekFrom},
+	path::PathBuf,
+};
+
+use anyhow::{bail, Context, Result};
+use clap::Parser;
+use flate2::read::ZlibDecoder;
+use serde::de::DeserializeOwned;
+
+const BLOCKSIZE: usize = 4096;
+const CHUNKS_PER_REGION: u8 = 32;
+
+/// A chunk X coordinate relative to a region
+#[derive(Debug, Clone, Copy)]
+pub struct ChunkX(pub u8);
+
+/// A chunk Z coordinate relative to a region
+#[derive(Debug, Clone, Copy)]
+pub struct ChunkZ(pub u8);
+
+#[derive(Debug)]
+struct ChunkDesc {
+	x: ChunkX,
+	z: ChunkZ,
+	len: u8,
+}
+
+fn parse_header(header: &[u8; BLOCKSIZE]) -> HashMap<u32, ChunkDesc> {
+	let mut map = HashMap::new();
+
+	for z in 0..CHUNKS_PER_REGION {
+		for x in 0..CHUNKS_PER_REGION {
+			let chunk =
+				&header[(4 * (usize::from(CHUNKS_PER_REGION) * usize::from(z) + usize::from(x)))..];
+
+			let offset = u32::from(chunk[0]) << 16 | u32::from(chunk[1]) << 8 | u32::from(chunk[2]);
+			if offset == 0 {
+				continue;
+			}
+
+			let len = chunk[3];
+
+			map.insert(
+				offset,
+				ChunkDesc {
+					x: ChunkX(x),
+					z: ChunkZ(z),
+					len,
+				},
+			);
+		}
+	}
+
+	map
+}
+
+fn decode_chunk<T>(buf: &[u8]) -> Result<T>
+where
+	T: DeserializeOwned,
+{
+	let (len_bytes, buf) = buf.split_at(4);
+	let len = u32::from_be_bytes(
+		len_bytes
+			.try_into()
+			.context("Failed to decode chunk size")?,
+	) as usize;
+
+	let buf = &buf[..len];
+	let (format, buf) = buf.split_at(1);
+	if format.get(0) != Some(&2) {
+		bail!("Unknown chunk format");
+	}
+
+	let mut decoder = ZlibDecoder::new(&buf[..]);
+	let mut decode_buffer = vec![];
+	decoder
+		.read_to_end(&mut decode_buffer)
+		.context("Failed to decompress chunk data")?;
+
+	fastnbt::from_bytes(&decode_buffer).context("Failed to decode NBT data")
+}
+
+fn foreach_chunk<R, T, F>(mut reader: R, mut f: F) -> Result<()>
+where
+	R: Read + Seek,
+	T: DeserializeOwned,
+	F: FnMut(ChunkX, ChunkZ, T),
+{
+	let chunk_map = {
+		let mut header = [0u8; BLOCKSIZE];
+		reader
+			.read_exact(&mut header)
+			.context("Failed to read region header")?;
+
+		parse_header(&header)
+	};
+
+	let mut index = 1;
+	let mut count = 0;
+	let mut seen = [[false; CHUNKS_PER_REGION as usize]; CHUNKS_PER_REGION as usize];
+
+	while count < chunk_map.len() {
+		let Some(&ChunkDesc { x, z, len }) = chunk_map.get(&index) else {
+			reader.seek(SeekFrom::Current(BLOCKSIZE as i64)).context("Failed to seek chunk data")?;
+			index += 1;
+			continue;
+		};
+
+		let chunk_seen = &mut seen[x.0 as usize][z.0 as usize];
+		if *chunk_seen {
+			bail!("Duplicate chunk");
+		}
+
+		*chunk_seen = true;
+		count += 1;
+
+		let mut buffer = vec![0; (len as usize) * BLOCKSIZE];
+		reader
+			.read_exact(&mut buffer[..])
+			.context("Failed to read chunk data")?;
+
+		f(x, z, decode_chunk(&buffer[..])?);
+
+		index += len as u32;
+	}
+
+	Ok(())
+}
+
+#[derive(Debug, Parser)]
+struct Args {
+	/// Filename to dump
+	file: PathBuf,
+}
+
+fn main() -> Result<()> {
+	let args = Args::parse();
+
+	let mut file = File::open(&args.file).context("Failed to open file")?;
+
+	foreach_chunk(&mut file, |x, z, value: fastnbt::Value| {
+		println!("Chunk({}, {}): {:#x?}", x.0, z.0, value);
+	})
+}

From 5e96be3fda14fe87941c4e7fcc51cfae881b7e11 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 25 Jan 2023 21:41:08 +0100
Subject: [PATCH 049/460] Refactor logic from new dump tools into library crate

---
 Cargo.toml            |   1 +
 src/bin/nbtdump.rs    |  19 ++----
 src/bin/regiondump.rs | 135 +-------------------------------------
 src/io/data.rs        |  28 ++++++++
 src/io/mod.rs         |   2 +
 src/io/region.rs      | 147 ++++++++++++++++++++++++++++++++++++++++++
 src/lib.rs            |   2 +
 src/types.rs          |   9 +++
 8 files changed, 196 insertions(+), 147 deletions(-)
 create mode 100644 src/io/data.rs
 create mode 100644 src/io/mod.rs
 create mode 100644 src/io/region.rs
 create mode 100644 src/lib.rs
 create mode 100644 src/types.rs

diff --git a/Cargo.toml b/Cargo.toml
index 977525b..b704512 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,6 +3,7 @@ name = "minedmap"
 version = "0.1.0"
 edition = "2021"
 license = "BSD-2-Clause"
+default-run = "minedmap"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/src/bin/nbtdump.rs b/src/bin/nbtdump.rs
index 20236f7..b2f287e 100644
--- a/src/bin/nbtdump.rs
+++ b/src/bin/nbtdump.rs
@@ -1,8 +1,7 @@
-use std::{fs::File, io::prelude::*, path::PathBuf};
+use std::path::PathBuf;
 
-use anyhow::{Context, Result};
+use anyhow::Result;
 use clap::Parser;
-use flate2::read::GzDecoder;
 
 #[derive(Debug, Parser)]
 struct Args {
@@ -13,18 +12,8 @@ struct Args {
 fn main() -> Result<()> {
 	let args = Args::parse();
 
-	let file = File::open(&args.file).context("Failed to open file")?;
-
-	let mut decoder = GzDecoder::new(file);
-	let mut buf = vec![];
-	decoder
-		.read_to_end(&mut buf)
-		.context("Failed to read file")?;
-
-	let nbt: fastnbt::Value =
-		fastnbt::from_bytes(buf.as_slice()).context("Failed to decode NBT data")?;
-
-	println!("{:#x?}", nbt);
+	let value: fastnbt::Value = minedmap::io::data::from_file(&args.file)?;
+	println!("{:#x?}", value);
 
 	Ok(())
 }
diff --git a/src/bin/regiondump.rs b/src/bin/regiondump.rs
index d0e27ce..1a3b216 100644
--- a/src/bin/regiondump.rs
+++ b/src/bin/regiondump.rs
@@ -1,134 +1,7 @@
-use std::{
-	collections::HashMap,
-	fs::File,
-	io::{prelude::*, SeekFrom},
-	path::PathBuf,
-};
+use std::path::PathBuf;
 
-use anyhow::{bail, Context, Result};
+use anyhow::Result;
 use clap::Parser;
-use flate2::read::ZlibDecoder;
-use serde::de::DeserializeOwned;
-
-const BLOCKSIZE: usize = 4096;
-const CHUNKS_PER_REGION: u8 = 32;
-
-/// A chunk X coordinate relative to a region
-#[derive(Debug, Clone, Copy)]
-pub struct ChunkX(pub u8);
-
-/// A chunk Z coordinate relative to a region
-#[derive(Debug, Clone, Copy)]
-pub struct ChunkZ(pub u8);
-
-#[derive(Debug)]
-struct ChunkDesc {
-	x: ChunkX,
-	z: ChunkZ,
-	len: u8,
-}
-
-fn parse_header(header: &[u8; BLOCKSIZE]) -> HashMap<u32, ChunkDesc> {
-	let mut map = HashMap::new();
-
-	for z in 0..CHUNKS_PER_REGION {
-		for x in 0..CHUNKS_PER_REGION {
-			let chunk =
-				&header[(4 * (usize::from(CHUNKS_PER_REGION) * usize::from(z) + usize::from(x)))..];
-
-			let offset = u32::from(chunk[0]) << 16 | u32::from(chunk[1]) << 8 | u32::from(chunk[2]);
-			if offset == 0 {
-				continue;
-			}
-
-			let len = chunk[3];
-
-			map.insert(
-				offset,
-				ChunkDesc {
-					x: ChunkX(x),
-					z: ChunkZ(z),
-					len,
-				},
-			);
-		}
-	}
-
-	map
-}
-
-fn decode_chunk<T>(buf: &[u8]) -> Result<T>
-where
-	T: DeserializeOwned,
-{
-	let (len_bytes, buf) = buf.split_at(4);
-	let len = u32::from_be_bytes(
-		len_bytes
-			.try_into()
-			.context("Failed to decode chunk size")?,
-	) as usize;
-
-	let buf = &buf[..len];
-	let (format, buf) = buf.split_at(1);
-	if format.get(0) != Some(&2) {
-		bail!("Unknown chunk format");
-	}
-
-	let mut decoder = ZlibDecoder::new(&buf[..]);
-	let mut decode_buffer = vec![];
-	decoder
-		.read_to_end(&mut decode_buffer)
-		.context("Failed to decompress chunk data")?;
-
-	fastnbt::from_bytes(&decode_buffer).context("Failed to decode NBT data")
-}
-
-fn foreach_chunk<R, T, F>(mut reader: R, mut f: F) -> Result<()>
-where
-	R: Read + Seek,
-	T: DeserializeOwned,
-	F: FnMut(ChunkX, ChunkZ, T),
-{
-	let chunk_map = {
-		let mut header = [0u8; BLOCKSIZE];
-		reader
-			.read_exact(&mut header)
-			.context("Failed to read region header")?;
-
-		parse_header(&header)
-	};
-
-	let mut index = 1;
-	let mut count = 0;
-	let mut seen = [[false; CHUNKS_PER_REGION as usize]; CHUNKS_PER_REGION as usize];
-
-	while count < chunk_map.len() {
-		let Some(&ChunkDesc { x, z, len }) = chunk_map.get(&index) else {
-			reader.seek(SeekFrom::Current(BLOCKSIZE as i64)).context("Failed to seek chunk data")?;
-			index += 1;
-			continue;
-		};
-
-		let chunk_seen = &mut seen[x.0 as usize][z.0 as usize];
-		if *chunk_seen {
-			bail!("Duplicate chunk");
-		}
-
-		*chunk_seen = true;
-		count += 1;
-
-		let mut buffer = vec![0; (len as usize) * BLOCKSIZE];
-		reader
-			.read_exact(&mut buffer[..])
-			.context("Failed to read chunk data")?;
-
-		f(x, z, decode_chunk(&buffer[..])?);
-
-		index += len as u32;
-	}
-
-	Ok(())
-}
 
 #[derive(Debug, Parser)]
 struct Args {
@@ -139,9 +12,7 @@ struct Args {
 fn main() -> Result<()> {
 	let args = Args::parse();
 
-	let mut file = File::open(&args.file).context("Failed to open file")?;
-
-	foreach_chunk(&mut file, |x, z, value: fastnbt::Value| {
+	minedmap::io::region::from_file(&args.file)?.foreach_chunk(|x, z, value: fastnbt::Value| {
 		println!("Chunk({}, {}): {:#x?}", x.0, z.0, value);
 	})
 }
diff --git a/src/io/data.rs b/src/io/data.rs
new file mode 100644
index 0000000..a4e08b7
--- /dev/null
+++ b/src/io/data.rs
@@ -0,0 +1,28 @@
+use std::{fs::File, io::prelude::*, path::Path};
+
+use anyhow::{Context, Result};
+use flate2::read::GzDecoder;
+use serde::de::DeserializeOwned;
+
+pub fn from_reader<R, T>(reader: R) -> Result<T>
+where
+	R: Read,
+	T: DeserializeOwned,
+{
+	let mut decoder = GzDecoder::new(reader);
+	let mut buf = vec![];
+	decoder
+		.read_to_end(&mut buf)
+		.context("Failed to read file")?;
+
+	fastnbt::from_bytes(&buf[..]).context("Failed to decode NBT data")
+}
+
+pub fn from_file<P, T>(path: P) -> Result<T>
+where
+	P: AsRef<Path>,
+	T: DeserializeOwned,
+{
+	let file = File::open(path).context("Failed to open file")?;
+	from_reader(file)
+}
diff --git a/src/io/mod.rs b/src/io/mod.rs
new file mode 100644
index 0000000..f109d15
--- /dev/null
+++ b/src/io/mod.rs
@@ -0,0 +1,2 @@
+pub mod data;
+pub mod region;
diff --git a/src/io/region.rs b/src/io/region.rs
new file mode 100644
index 0000000..fad020c
--- /dev/null
+++ b/src/io/region.rs
@@ -0,0 +1,147 @@
+use std::{
+	collections::HashMap,
+	fs::File,
+	io::{prelude::*, SeekFrom},
+	path::Path,
+};
+
+use anyhow::{bail, Context, Result};
+use flate2::read::ZlibDecoder;
+use serde::de::DeserializeOwned;
+
+use crate::types::*;
+
+const BLOCKSIZE: usize = 4096;
+
+#[derive(Debug)]
+struct ChunkDesc {
+	x: ChunkX,
+	z: ChunkZ,
+	len: u8,
+}
+
+fn parse_header(header: &[u8; BLOCKSIZE]) -> HashMap<u32, ChunkDesc> {
+	let mut map = HashMap::new();
+
+	for z in 0..CHUNKS_PER_REGION {
+		for x in 0..CHUNKS_PER_REGION {
+			let chunk =
+				&header[(4 * (usize::from(CHUNKS_PER_REGION) * usize::from(z) + usize::from(x)))..];
+
+			let offset = u32::from(chunk[0]) << 16 | u32::from(chunk[1]) << 8 | u32::from(chunk[2]);
+			if offset == 0 {
+				continue;
+			}
+
+			let len = chunk[3];
+
+			map.insert(
+				offset,
+				ChunkDesc {
+					x: ChunkX(x),
+					z: ChunkZ(z),
+					len,
+				},
+			);
+		}
+	}
+
+	map
+}
+
+fn decode_chunk<T>(buf: &[u8]) -> Result<T>
+where
+	T: DeserializeOwned,
+{
+	let (len_bytes, buf) = buf.split_at(4);
+	let len = u32::from_be_bytes(
+		len_bytes
+			.try_into()
+			.context("Failed to decode chunk size")?,
+	) as usize;
+
+	let buf = &buf[..len];
+	let (format, buf) = buf.split_at(1);
+	if format.get(0) != Some(&2) {
+		bail!("Unknown chunk format");
+	}
+
+	let mut decoder = ZlibDecoder::new(&buf[..]);
+	let mut decode_buffer = vec![];
+	decoder
+		.read_to_end(&mut decode_buffer)
+		.context("Failed to decompress chunk data")?;
+
+	fastnbt::from_bytes(&decode_buffer).context("Failed to decode NBT data")
+}
+
+#[derive(Debug)]
+pub struct Region<R: Read + Seek> {
+	reader: R,
+}
+
+impl<R: Read + Seek> Region<R> {
+	pub fn foreach_chunk<T, F>(self, mut f: F) -> Result<()>
+	where
+		R: Read + Seek,
+		T: DeserializeOwned,
+		F: FnMut(ChunkX, ChunkZ, T),
+	{
+		let Region { mut reader } = self;
+
+		let chunk_map = {
+			let mut header = [0u8; BLOCKSIZE];
+			reader
+				.read_exact(&mut header)
+				.context("Failed to read region header")?;
+
+			parse_header(&header)
+		};
+
+		let mut index = 1;
+		let mut count = 0;
+		let mut seen = [[false; CHUNKS_PER_REGION as usize]; CHUNKS_PER_REGION as usize];
+
+		while count < chunk_map.len() {
+			let Some(&ChunkDesc { x, z, len }) = chunk_map.get(&index) else {
+				reader.seek(SeekFrom::Current(BLOCKSIZE as i64)).context("Failed to seek chunk data")?;
+				index += 1;
+				continue;
+			};
+
+			let chunk_seen = &mut seen[x.0 as usize][z.0 as usize];
+			if *chunk_seen {
+				bail!("Duplicate chunk");
+			}
+
+			*chunk_seen = true;
+			count += 1;
+
+			let mut buffer = vec![0; (len as usize) * BLOCKSIZE];
+			reader
+				.read_exact(&mut buffer[..])
+				.context("Failed to read chunk data")?;
+
+			f(x, z, decode_chunk(&buffer[..])?);
+
+			index += len as u32;
+		}
+
+		Ok(())
+	}
+}
+
+pub fn from_reader<R>(reader: R) -> Region<R>
+where
+	R: Read + Seek,
+{
+	Region { reader }
+}
+
+pub fn from_file<P>(path: P) -> Result<Region<File>>
+where
+	P: AsRef<Path>,
+{
+	let file = File::open(path).context("Failed to open file")?;
+	Ok(from_reader(file))
+}
diff --git a/src/lib.rs b/src/lib.rs
new file mode 100644
index 0000000..146b296
--- /dev/null
+++ b/src/lib.rs
@@ -0,0 +1,2 @@
+pub mod io;
+pub mod types;
diff --git a/src/types.rs b/src/types.rs
new file mode 100644
index 0000000..54593a4
--- /dev/null
+++ b/src/types.rs
@@ -0,0 +1,9 @@
+pub const CHUNKS_PER_REGION: u8 = 32;
+
+/// A chunk X coordinate relative to a region
+#[derive(Debug, Clone, Copy)]
+pub struct ChunkX(pub u8);
+
+/// A chunk Z coordinate relative to a region
+#[derive(Debug, Clone, Copy)]
+pub struct ChunkZ(pub u8);

From 0d8b989c101655ede9934bfbf53728459f533bbe Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 25 Jan 2023 21:47:17 +0100
Subject: [PATCH 050/460] io/region: remove count variable from
 Region::foreach_chunk()

---
 src/io/region.rs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/io/region.rs b/src/io/region.rs
index fad020c..f2347bb 100644
--- a/src/io/region.rs
+++ b/src/io/region.rs
@@ -89,7 +89,7 @@ impl<R: Read + Seek> Region<R> {
 	{
 		let Region { mut reader } = self;
 
-		let chunk_map = {
+		let mut chunk_map = {
 			let mut header = [0u8; BLOCKSIZE];
 			reader
 				.read_exact(&mut header)
@@ -99,11 +99,10 @@ impl<R: Read + Seek> Region<R> {
 		};
 
 		let mut index = 1;
-		let mut count = 0;
 		let mut seen = [[false; CHUNKS_PER_REGION as usize]; CHUNKS_PER_REGION as usize];
 
-		while count < chunk_map.len() {
-			let Some(&ChunkDesc { x, z, len }) = chunk_map.get(&index) else {
+		while !chunk_map.is_empty() {
+			let Some(ChunkDesc { x, z, len }) = chunk_map.remove(&index) else {
 				reader.seek(SeekFrom::Current(BLOCKSIZE as i64)).context("Failed to seek chunk data")?;
 				index += 1;
 				continue;
@@ -113,9 +112,7 @@ impl<R: Read + Seek> Region<R> {
 			if *chunk_seen {
 				bail!("Duplicate chunk");
 			}
-
 			*chunk_seen = true;
-			count += 1;
 
 			let mut buffer = vec![0; (len as usize) * BLOCKSIZE];
 			reader

From 48e03aa2668f3f689ae155d65338b8e317ba1001 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 27 Jan 2023 21:21:09 +0100
Subject: [PATCH 051/460] Introduce ChunkCoords type

---
 src/bin/regiondump.rs |  4 ++--
 src/io/region.rs      | 17 +++++++++--------
 src/types.rs          | 15 +++++++++++++++
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/bin/regiondump.rs b/src/bin/regiondump.rs
index 1a3b216..3b68881 100644
--- a/src/bin/regiondump.rs
+++ b/src/bin/regiondump.rs
@@ -12,7 +12,7 @@ struct Args {
 fn main() -> Result<()> {
 	let args = Args::parse();
 
-	minedmap::io::region::from_file(&args.file)?.foreach_chunk(|x, z, value: fastnbt::Value| {
-		println!("Chunk({}, {}): {:#x?}", x.0, z.0, value);
+	minedmap::io::region::from_file(&args.file)?.foreach_chunk(|coords, value: fastnbt::Value| {
+		println!("Chunk {:?}: {:#x?}", coords, value);
 	})
 }
diff --git a/src/io/region.rs b/src/io/region.rs
index f2347bb..ec42d3c 100644
--- a/src/io/region.rs
+++ b/src/io/region.rs
@@ -15,8 +15,7 @@ const BLOCKSIZE: usize = 4096;
 
 #[derive(Debug)]
 struct ChunkDesc {
-	x: ChunkX,
-	z: ChunkZ,
+	coords: ChunkCoords,
 	len: u8,
 }
 
@@ -38,8 +37,10 @@ fn parse_header(header: &[u8; BLOCKSIZE]) -> HashMap<u32, ChunkDesc> {
 			map.insert(
 				offset,
 				ChunkDesc {
-					x: ChunkX(x),
-					z: ChunkZ(z),
+					coords: ChunkCoords {
+						x: ChunkX(x),
+						z: ChunkZ(z),
+					},
 					len,
 				},
 			);
@@ -85,7 +86,7 @@ impl<R: Read + Seek> Region<R> {
 	where
 		R: Read + Seek,
 		T: DeserializeOwned,
-		F: FnMut(ChunkX, ChunkZ, T),
+		F: FnMut(ChunkCoords, T),
 	{
 		let Region { mut reader } = self;
 
@@ -102,13 +103,13 @@ impl<R: Read + Seek> Region<R> {
 		let mut seen = [[false; CHUNKS_PER_REGION as usize]; CHUNKS_PER_REGION as usize];
 
 		while !chunk_map.is_empty() {
-			let Some(ChunkDesc { x, z, len }) = chunk_map.remove(&index) else {
+			let Some(ChunkDesc { coords, len }) = chunk_map.remove(&index) else {
 				reader.seek(SeekFrom::Current(BLOCKSIZE as i64)).context("Failed to seek chunk data")?;
 				index += 1;
 				continue;
 			};
 
-			let chunk_seen = &mut seen[x.0 as usize][z.0 as usize];
+			let chunk_seen = &mut seen[coords.x.0 as usize][coords.z.0 as usize];
 			if *chunk_seen {
 				bail!("Duplicate chunk");
 			}
@@ -119,7 +120,7 @@ impl<R: Read + Seek> Region<R> {
 				.read_exact(&mut buffer[..])
 				.context("Failed to read chunk data")?;
 
-			f(x, z, decode_chunk(&buffer[..])?);
+			f(coords, decode_chunk(&buffer[..])?);
 
 			index += len as u32;
 		}
diff --git a/src/types.rs b/src/types.rs
index 54593a4..7fb8649 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -1,3 +1,5 @@
+use std::fmt::Debug;
+
 pub const CHUNKS_PER_REGION: u8 = 32;
 
 /// A chunk X coordinate relative to a region
@@ -7,3 +9,16 @@ pub struct ChunkX(pub u8);
 /// A chunk Z coordinate relative to a region
 #[derive(Debug, Clone, Copy)]
 pub struct ChunkZ(pub u8);
+
+/// A pair of chunk coordinates relative to a region
+#[derive(Clone, Copy)]
+pub struct ChunkCoords {
+	pub x: ChunkX,
+	pub z: ChunkZ,
+}
+
+impl Debug for ChunkCoords {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		write!(f, "({}, {})", self.x.0, self.z.0)
+	}
+}

From 28b22ce4238a68fa551358d65320389d90c7f86d Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 27 Jan 2023 21:51:54 +0100
Subject: [PATCH 052/460] Introduce ChunkArray type

A generic array for per-chunk data, indexed by ChunkCoords.
---
 Cargo.lock       | 16 ++++++++++++++++
 Cargo.toml       |  1 +
 src/io/region.rs | 39 ++++++++++++++-------------------------
 src/types.rs     | 41 ++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 71 insertions(+), 26 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3cf2b24..e1222a5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -90,6 +90,12 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "either"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
+
 [[package]]
 name = "errno"
 version = "0.2.8"
@@ -170,6 +176,15 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "libc"
 version = "0.2.139"
@@ -190,6 +205,7 @@ dependencies = [
  "clap",
  "fastnbt",
  "flate2",
+ "itertools",
  "serde",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index b704512..6ab5984 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,4 +12,5 @@ anyhow = "1.0.68"
 clap = { version = "4.1.4", features = ["derive"] }
 fastnbt = "2.3.2"
 flate2 = "1.0.25"
+itertools = "0.10.5"
 serde = "1.0.152"
diff --git a/src/io/region.rs b/src/io/region.rs
index ec42d3c..909e548 100644
--- a/src/io/region.rs
+++ b/src/io/region.rs
@@ -22,29 +22,19 @@ struct ChunkDesc {
 fn parse_header(header: &[u8; BLOCKSIZE]) -> HashMap<u32, ChunkDesc> {
 	let mut map = HashMap::new();
 
-	for z in 0..CHUNKS_PER_REGION {
-		for x in 0..CHUNKS_PER_REGION {
-			let chunk =
-				&header[(4 * (usize::from(CHUNKS_PER_REGION) * usize::from(z) + usize::from(x)))..];
+	for coords in ChunkArray::<()>::keys() {
+		let chunk = &header[(4
+			* (usize::from(CHUNKS_PER_REGION) * usize::from(coords.z.0)
+				+ usize::from(coords.x.0)))..];
 
-			let offset = u32::from(chunk[0]) << 16 | u32::from(chunk[1]) << 8 | u32::from(chunk[2]);
-			if offset == 0 {
-				continue;
-			}
-
-			let len = chunk[3];
-
-			map.insert(
-				offset,
-				ChunkDesc {
-					coords: ChunkCoords {
-						x: ChunkX(x),
-						z: ChunkZ(z),
-					},
-					len,
-				},
-			);
+		let offset = u32::from(chunk[0]) << 16 | u32::from(chunk[1]) << 8 | u32::from(chunk[2]);
+		if offset == 0 {
+			continue;
 		}
+
+		let len = chunk[3];
+
+		map.insert(offset, ChunkDesc { coords, len });
 	}
 
 	map
@@ -100,7 +90,7 @@ impl<R: Read + Seek> Region<R> {
 		};
 
 		let mut index = 1;
-		let mut seen = [[false; CHUNKS_PER_REGION as usize]; CHUNKS_PER_REGION as usize];
+		let mut seen = ChunkArray::<bool>::default();
 
 		while !chunk_map.is_empty() {
 			let Some(ChunkDesc { coords, len }) = chunk_map.remove(&index) else {
@@ -109,11 +99,10 @@ impl<R: Read + Seek> Region<R> {
 				continue;
 			};
 
-			let chunk_seen = &mut seen[coords.x.0 as usize][coords.z.0 as usize];
-			if *chunk_seen {
+			if seen[coords] {
 				bail!("Duplicate chunk");
 			}
-			*chunk_seen = true;
+			seen[coords] = true;
 
 			let mut buffer = vec![0; (len as usize) * BLOCKSIZE];
 			reader
diff --git a/src/types.rs b/src/types.rs
index 7fb8649..9aa4b7d 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -1,4 +1,9 @@
-use std::fmt::Debug;
+use std::{
+	fmt::Debug,
+	ops::{Index, IndexMut},
+};
+
+use itertools::iproduct;
 
 pub const CHUNKS_PER_REGION: u8 = 32;
 
@@ -22,3 +27,37 @@ impl Debug for ChunkCoords {
 		write!(f, "({}, {})", self.x.0, self.z.0)
 	}
 }
+
+#[derive(Debug, Clone, Copy, Default)]
+pub struct ChunkArray<T>(pub [[T; CHUNKS_PER_REGION as usize]; CHUNKS_PER_REGION as usize]);
+
+impl<T> ChunkArray<T> {
+	pub fn keys() -> impl Iterator<Item = ChunkCoords> {
+		iproduct!(0..CHUNKS_PER_REGION, 0..CHUNKS_PER_REGION).map(|(z, x)| ChunkCoords {
+			x: ChunkX(x),
+			z: ChunkZ(z),
+		})
+	}
+
+	pub fn values(&self) -> impl Iterator<Item = &T> {
+		Self::keys().map(|k| &self[k])
+	}
+
+	pub fn iter(&self) -> impl Iterator<Item = (ChunkCoords, &T)> {
+		Self::keys().map(|k| (k, &self[k]))
+	}
+}
+
+impl<T> Index<ChunkCoords> for ChunkArray<T> {
+	type Output = T;
+
+	fn index(&self, index: ChunkCoords) -> &Self::Output {
+		&self.0[index.z.0 as usize][index.x.0 as usize]
+	}
+}
+
+impl<T> IndexMut<ChunkCoords> for ChunkArray<T> {
+	fn index_mut(&mut self, index: ChunkCoords) -> &mut Self::Output {
+		&mut self.0[index.z.0 as usize][index.x.0 as usize]
+	}
+}

From daa188eb1d7aee7db9ebe0203a2e45c6e4cdc4e9 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 27 Jan 2023 22:12:02 +0100
Subject: [PATCH 053/460] io/region: use ChunkArray to parse region header

A layout of a ChunkArray::<u32> matches the binary format of the region
header.
---
 Cargo.lock       |  7 +++++++
 Cargo.toml       |  1 +
 src/io/region.rs | 16 +++++++---------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e1222a5..c45a502 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20,6 +20,12 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "bytemuck"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393"
+
 [[package]]
 name = "byteorder"
 version = "1.4.3"
@@ -202,6 +208,7 @@ name = "minedmap"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "bytemuck",
  "clap",
  "fastnbt",
  "flate2",
diff --git a/Cargo.toml b/Cargo.toml
index 6ab5984..1ed267a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,6 +9,7 @@ default-run = "minedmap"
 
 [dependencies]
 anyhow = "1.0.68"
+bytemuck = "1.13.0"
 clap = { version = "4.1.4", features = ["derive"] }
 fastnbt = "2.3.2"
 flate2 = "1.0.25"
diff --git a/src/io/region.rs b/src/io/region.rs
index 909e548..332f2cd 100644
--- a/src/io/region.rs
+++ b/src/io/region.rs
@@ -19,20 +19,18 @@ struct ChunkDesc {
 	len: u8,
 }
 
-fn parse_header(header: &[u8; BLOCKSIZE]) -> HashMap<u32, ChunkDesc> {
+fn parse_header(header: &ChunkArray<u32>) -> HashMap<u32, ChunkDesc> {
 	let mut map = HashMap::new();
 
-	for coords in ChunkArray::<()>::keys() {
-		let chunk = &header[(4
-			* (usize::from(CHUNKS_PER_REGION) * usize::from(coords.z.0)
-				+ usize::from(coords.x.0)))..];
+	for (coords, &chunk) in header.iter() {
+		let offset_len = u32::from_be(chunk);
 
-		let offset = u32::from(chunk[0]) << 16 | u32::from(chunk[1]) << 8 | u32::from(chunk[2]);
+		let offset = offset_len >> 8;
 		if offset == 0 {
 			continue;
 		}
 
-		let len = chunk[3];
+		let len = offset_len as u8;
 
 		map.insert(offset, ChunkDesc { coords, len });
 	}
@@ -81,9 +79,9 @@ impl<R: Read + Seek> Region<R> {
 		let Region { mut reader } = self;
 
 		let mut chunk_map = {
-			let mut header = [0u8; BLOCKSIZE];
+			let mut header = ChunkArray::<u32>::default();
 			reader
-				.read_exact(&mut header)
+				.read_exact(bytemuck::cast_mut::<_, [u8; BLOCKSIZE]>(&mut header.0))
 				.context("Failed to read region header")?;
 
 			parse_header(&header)

From 3cdafa7be965117bbb48a85c1632b60fc0f89754 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 27 Jan 2023 23:01:01 +0100
Subject: [PATCH 054/460] Fix clippy warnings

---
 src/bin/nbtdump.rs    | 2 +-
 src/bin/regiondump.rs | 8 +++++---
 src/io/region.rs      | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/bin/nbtdump.rs b/src/bin/nbtdump.rs
index b2f287e..d944cf2 100644
--- a/src/bin/nbtdump.rs
+++ b/src/bin/nbtdump.rs
@@ -12,7 +12,7 @@ struct Args {
 fn main() -> Result<()> {
 	let args = Args::parse();
 
-	let value: fastnbt::Value = minedmap::io::data::from_file(&args.file)?;
+	let value: fastnbt::Value = minedmap::io::data::from_file(args.file.as_path())?;
 	println!("{:#x?}", value);
 
 	Ok(())
diff --git a/src/bin/regiondump.rs b/src/bin/regiondump.rs
index 3b68881..5663a80 100644
--- a/src/bin/regiondump.rs
+++ b/src/bin/regiondump.rs
@@ -12,7 +12,9 @@ struct Args {
 fn main() -> Result<()> {
 	let args = Args::parse();
 
-	minedmap::io::region::from_file(&args.file)?.foreach_chunk(|coords, value: fastnbt::Value| {
-		println!("Chunk {:?}: {:#x?}", coords, value);
-	})
+	minedmap::io::region::from_file(args.file.as_path())?.foreach_chunk(
+		|coords, value: fastnbt::Value| {
+			println!("Chunk {:?}: {:#x?}", coords, value);
+		},
+	)
 }
diff --git a/src/io/region.rs b/src/io/region.rs
index 332f2cd..df5578a 100644
--- a/src/io/region.rs
+++ b/src/io/region.rs
@@ -51,11 +51,11 @@ where
 
 	let buf = &buf[..len];
 	let (format, buf) = buf.split_at(1);
-	if format.get(0) != Some(&2) {
+	if !matches!(format, [2]) {
 		bail!("Unknown chunk format");
 	}
 
-	let mut decoder = ZlibDecoder::new(&buf[..]);
+	let mut decoder = ZlibDecoder::new(buf);
 	let mut decode_buffer = vec![];
 	decoder
 		.read_to_end(&mut decode_buffer)

From da8ac506d9e407533cf11ff243a1571c7a0913df Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 28 Jan 2023 00:58:47 +0100
Subject: [PATCH 055/460] io: remove a few unnecessary [..] for Vec -> slice
 deref

---
 src/io/data.rs   | 2 +-
 src/io/region.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/io/data.rs b/src/io/data.rs
index a4e08b7..d475465 100644
--- a/src/io/data.rs
+++ b/src/io/data.rs
@@ -15,7 +15,7 @@ where
 		.read_to_end(&mut buf)
 		.context("Failed to read file")?;
 
-	fastnbt::from_bytes(&buf[..]).context("Failed to decode NBT data")
+	fastnbt::from_bytes(&buf).context("Failed to decode NBT data")
 }
 
 pub fn from_file<P, T>(path: P) -> Result<T>
diff --git a/src/io/region.rs b/src/io/region.rs
index df5578a..1f02017 100644
--- a/src/io/region.rs
+++ b/src/io/region.rs
@@ -104,10 +104,10 @@ impl<R: Read + Seek> Region<R> {
 
 			let mut buffer = vec![0; (len as usize) * BLOCKSIZE];
 			reader
-				.read_exact(&mut buffer[..])
+				.read_exact(&mut buffer)
 				.context("Failed to read chunk data")?;
 
-			f(coords, decode_chunk(&buffer[..])?);
+			f(coords, decode_chunk(&buffer)?);
 
 			index += len as u32;
 		}

From 7c7e36f6bee2544afdc9fe7eec12fc6beb27b880 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 29 Jan 2023 00:53:48 +0100
Subject: [PATCH 056/460] io/region: avoid panic for invalid chunk lengths

---
 src/io/region.rs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/io/region.rs b/src/io/region.rs
index 1f02017..7602c62 100644
--- a/src/io/region.rs
+++ b/src/io/region.rs
@@ -26,12 +26,12 @@ fn parse_header(header: &ChunkArray<u32>) -> HashMap<u32, ChunkDesc> {
 		let offset_len = u32::from_be(chunk);
 
 		let offset = offset_len >> 8;
-		if offset == 0 {
+		let len = offset_len as u8;
+
+		if offset == 0 || len == 0 {
 			continue;
 		}
 
-		let len = offset_len as u8;
-
 		map.insert(offset, ChunkDesc { coords, len });
 	}
 
@@ -49,7 +49,11 @@ where
 			.context("Failed to decode chunk size")?,
 	) as usize;
 
+	if len < 1 || len > buf.len() {
+		bail!("Invalid chunk size");
+	}
 	let buf = &buf[..len];
+
 	let (format, buf) = buf.split_at(1);
 	if !matches!(format, [2]) {
 		bail!("Unknown chunk format");

From 1d126ba7712279ad00245a8e74e9ae4075223624 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 29 Jan 2023 17:04:28 +0100
Subject: [PATCH 057/460] io/region: remove error handling for impossible cases
 from decode_chunk()

---
 src/io/region.rs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/io/region.rs b/src/io/region.rs
index 7602c62..97dadcc 100644
--- a/src/io/region.rs
+++ b/src/io/region.rs
@@ -43,11 +43,7 @@ where
 	T: DeserializeOwned,
 {
 	let (len_bytes, buf) = buf.split_at(4);
-	let len = u32::from_be_bytes(
-		len_bytes
-			.try_into()
-			.context("Failed to decode chunk size")?,
-	) as usize;
+	let len = u32::from_be_bytes(len_bytes.try_into().unwrap()) as usize;
 
 	if len < 1 || len > buf.len() {
 		bail!("Invalid chunk size");
@@ -55,7 +51,7 @@ where
 	let buf = &buf[..len];
 
 	let (format, buf) = buf.split_at(1);
-	if !matches!(format, [2]) {
+	if format[0] != 2 {
 		bail!("Unknown chunk format");
 	}
 

From 92a9bb3bb3f16092aae9239a80d0539a9211e633 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 29 Jan 2023 17:08:39 +0100
Subject: [PATCH 058/460] io/region: add chunk coords to error descriptions

---
 src/io/region.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/io/region.rs b/src/io/region.rs
index 97dadcc..ac9784b 100644
--- a/src/io/region.rs
+++ b/src/io/region.rs
@@ -98,16 +98,18 @@ impl<R: Read + Seek> Region<R> {
 			};
 
 			if seen[coords] {
-				bail!("Duplicate chunk");
+				bail!("Duplicate chunk {:?}", coords);
 			}
 			seen[coords] = true;
 
 			let mut buffer = vec![0; (len as usize) * BLOCKSIZE];
 			reader
 				.read_exact(&mut buffer)
-				.context("Failed to read chunk data")?;
+				.with_context(|| format!("Failed to read data for chunk {:?}", coords))?;
+			let chunk = decode_chunk(&buffer)
+				.with_context(|| format!("Failed to decode data for chunk {:?}", coords))?;
 
-			f(coords, decode_chunk(&buffer)?);
+			f(coords, chunk);
 
 			index += len as u32;
 		}

From 6186a0d916dfbb9e62b94bf291d6fb266a079ca5 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 30 Jan 2023 00:45:05 +0100
Subject: [PATCH 059/460] io/region: accept incomplete block for final chunk

---
 src/io/region.rs | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/io/region.rs b/src/io/region.rs
index ac9784b..b75fcef 100644
--- a/src/io/region.rs
+++ b/src/io/region.rs
@@ -42,14 +42,6 @@ fn decode_chunk<T>(buf: &[u8]) -> Result<T>
 where
 	T: DeserializeOwned,
 {
-	let (len_bytes, buf) = buf.split_at(4);
-	let len = u32::from_be_bytes(len_bytes.try_into().unwrap()) as usize;
-
-	if len < 1 || len > buf.len() {
-		bail!("Invalid chunk size");
-	}
-	let buf = &buf[..len];
-
 	let (format, buf) = buf.split_at(1);
 	if format[0] != 2 {
 		bail!("Unknown chunk format");
@@ -92,7 +84,6 @@ impl<R: Read + Seek> Region<R> {
 
 		while !chunk_map.is_empty() {
 			let Some(ChunkDesc { coords, len }) = chunk_map.remove(&index) else {
-				reader.seek(SeekFrom::Current(BLOCKSIZE as i64)).context("Failed to seek chunk data")?;
 				index += 1;
 				continue;
 			};
@@ -102,7 +93,20 @@ impl<R: Read + Seek> Region<R> {
 			}
 			seen[coords] = true;
 
-			let mut buffer = vec![0; (len as usize) * BLOCKSIZE];
+			reader
+				.seek(SeekFrom::Start(index as u64 * BLOCKSIZE as u64))
+				.context("Failed to seek chunk data")?;
+
+			let mut len_buf = [0u8; 4];
+			reader
+				.read_exact(&mut len_buf)
+				.with_context(|| format!("Failed to read length for chunk {:?}", coords))?;
+			let byte_len = u32::from_be_bytes(len_buf) as usize;
+			if byte_len < 1 || byte_len > (len as usize) * BLOCKSIZE - 4 {
+				bail!("Invalid length for chunk {:?}", coords);
+			}
+
+			let mut buffer = vec![0; byte_len];
 			reader
 				.read_exact(&mut buffer)
 				.with_context(|| format!("Failed to read data for chunk {:?}", coords))?;

From 8c34f74952bbc2ecddbd74164b78808e850f3e39 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 30 Jan 2023 19:08:51 +0100
Subject: [PATCH 060/460] io/region: return sorted Vec instead of HashMap from
 parse_header()

Instead of counting and looking up indices in the HashMap, we can just
iterate over all offsets in the returned Vec.
---
 src/io/region.rs | 54 ++++++++++++++++++++++++++----------------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/src/io/region.rs b/src/io/region.rs
index b75fcef..93ff42b 100644
--- a/src/io/region.rs
+++ b/src/io/region.rs
@@ -1,5 +1,4 @@
 use std::{
-	collections::HashMap,
 	fs::File,
 	io::{prelude::*, SeekFrom},
 	path::Path,
@@ -15,27 +14,35 @@ const BLOCKSIZE: usize = 4096;
 
 #[derive(Debug)]
 struct ChunkDesc {
-	coords: ChunkCoords,
+	offset: u32,
 	len: u8,
+	coords: ChunkCoords,
 }
 
-fn parse_header(header: &ChunkArray<u32>) -> HashMap<u32, ChunkDesc> {
-	let mut map = HashMap::new();
+fn parse_header(header: &ChunkArray<u32>) -> Vec<ChunkDesc> {
+	let mut chunks: Vec<_> = header
+		.iter()
+		.filter_map(|(coords, &chunk)| {
+			let offset_len = u32::from_be(chunk);
 
-	for (coords, &chunk) in header.iter() {
-		let offset_len = u32::from_be(chunk);
+			let offset = offset_len >> 8;
+			let len = offset_len as u8;
 
-		let offset = offset_len >> 8;
-		let len = offset_len as u8;
+			if offset == 0 || len == 0 {
+				return None;
+			}
 
-		if offset == 0 || len == 0 {
-			continue;
-		}
+			Some(ChunkDesc {
+				offset,
+				len,
+				coords,
+			})
+		})
+		.collect();
 
-		map.insert(offset, ChunkDesc { coords, len });
-	}
+	chunks.sort_by_key(|chunk| chunk.offset);
 
-	map
+	chunks
 }
 
 fn decode_chunk<T>(buf: &[u8]) -> Result<T>
@@ -70,7 +77,7 @@ impl<R: Read + Seek> Region<R> {
 	{
 		let Region { mut reader } = self;
 
-		let mut chunk_map = {
+		let chunks = {
 			let mut header = ChunkArray::<u32>::default();
 			reader
 				.read_exact(bytemuck::cast_mut::<_, [u8; BLOCKSIZE]>(&mut header.0))
@@ -79,22 +86,21 @@ impl<R: Read + Seek> Region<R> {
 			parse_header(&header)
 		};
 
-		let mut index = 1;
 		let mut seen = ChunkArray::<bool>::default();
 
-		while !chunk_map.is_empty() {
-			let Some(ChunkDesc { coords, len }) = chunk_map.remove(&index) else {
-				index += 1;
-				continue;
-			};
-
+		for ChunkDesc {
+			offset,
+			len,
+			coords,
+		} in chunks
+		{
 			if seen[coords] {
 				bail!("Duplicate chunk {:?}", coords);
 			}
 			seen[coords] = true;
 
 			reader
-				.seek(SeekFrom::Start(index as u64 * BLOCKSIZE as u64))
+				.seek(SeekFrom::Start(offset as u64 * BLOCKSIZE as u64))
 				.context("Failed to seek chunk data")?;
 
 			let mut len_buf = [0u8; 4];
@@ -114,8 +120,6 @@ impl<R: Read + Seek> Region<R> {
 				.with_context(|| format!("Failed to decode data for chunk {:?}", coords))?;
 
 			f(coords, chunk);
-
-			index += len as u32;
 		}
 
 		Ok(())

From 63794722822ba35c8037d261e1f36114f5cd56d5 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 28 Jan 2023 22:29:12 +0100
Subject: [PATCH 061/460] world/de: new module for deserialization data
 structures

The new structures contain only the fields that MinedMap needs.
---
 src/lib.rs       |   1 +
 src/main.rs      |  21 +++++++++-
 src/world/de.rs  | 101 +++++++++++++++++++++++++++++++++++++++++++++++
 src/world/mod.rs |   1 +
 4 files changed, 122 insertions(+), 2 deletions(-)
 create mode 100644 src/world/de.rs
 create mode 100644 src/world/mod.rs

diff --git a/src/lib.rs b/src/lib.rs
index 146b296..54ea8b7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,2 +1,3 @@
 pub mod io;
 pub mod types;
+pub mod world;
diff --git a/src/main.rs b/src/main.rs
index a30eb95..2f104ed 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,3 +1,20 @@
-fn main() {
-	println!("Hello, world!");
+use std::path::PathBuf;
+
+use anyhow::Result;
+use clap::Parser;
+
+#[derive(Debug, Parser)]
+struct Args {
+	/// Filename to dump
+	file: PathBuf,
+}
+
+fn main() -> Result<()> {
+	let args = Args::parse();
+
+	minedmap::io::region::from_file(args.file.as_path())?.foreach_chunk(
+		|coords, value: minedmap::world::de::Chunk| {
+			println!("Chunk {:?}: {:#?}", coords, value);
+		},
+	)
 }
diff --git a/src/world/de.rs b/src/world/de.rs
new file mode 100644
index 0000000..ead4687
--- /dev/null
+++ b/src/world/de.rs
@@ -0,0 +1,101 @@
+//! Data structures used to deserialize Minecraft save data
+
+use serde::Deserialize;
+
+/// Element of the `palette` list of 1.18+ [block states](BlockStatesV1_18)
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "PascalCase")]
+pub struct BlockStatePaletteEntry {
+	pub name: String,
+}
+
+/// 1.18+ `block_states` element found in a [section](SectionV1_18)
+#[derive(Debug, Deserialize)]
+pub struct BlockStatesV1_18 {
+	pub palette: Vec<BlockStatePaletteEntry>,
+	pub data: Option<fastnbt::LongArray>,
+}
+
+/// 1.18+ `biomes` element found in a [section](SectionV1_18)
+#[derive(Debug, Deserialize)]
+pub struct BiomesV1_18 {
+	pub palette: Vec<String>,
+	pub data: Option<fastnbt::LongArray>,
+}
+
+/// Element of the 1.18+ `sections` list found in a [Chunk]
+#[derive(Debug, Deserialize)]
+pub struct SectionV1_18 {
+	#[serde(rename = "Y")]
+	pub y: i32,
+	pub block_states: BlockStatesV1_18,
+	pub biomes: BiomesV1_18,
+	#[serde(rename = "BlockLight")]
+	pub block_light: Option<fastnbt::ByteArray>,
+}
+
+/// Version-specific part of a pre-1.18 [Section](SectionOld)
+#[derive(Debug, Deserialize)]
+#[serde(untagged)]
+pub enum SectionOldVariants {
+	#[serde(rename_all = "PascalCase")]
+	V1_13 {
+		block_states: fastnbt::LongArray,
+		palette: Vec<BlockStatePaletteEntry>,
+	},
+	#[serde(rename_all = "PascalCase")]
+	Old {
+		blocks: fastnbt::ByteArray,
+		data: fastnbt::ByteArray,
+	},
+	Empty {},
+}
+
+/// Pre-1.18 section element found in the [Level](LevelOld) compound
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "PascalCase")]
+pub struct SectionOld {
+	pub y: i8,
+	pub block_light: Option<fastnbt::ByteArray>,
+	#[serde(flatten)]
+	pub section: SectionOldVariants,
+}
+
+/// Pre-1.18 biome fields found in the [Level](LevelOld) compound
+#[derive(Debug, Deserialize)]
+#[serde(untagged)]
+pub enum BiomesOld {
+	IntArray(fastnbt::IntArray),
+	ByteArray(fastnbt::ByteArray),
+}
+
+/// `Level` compound element found in pre-1.18 [chunks](Chunk)
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "PascalCase")]
+pub struct LevelOld {
+	#[serde(default)]
+	pub sections: Vec<SectionOld>,
+	pub biomes: Option<BiomesOld>,
+}
+
+/// Version-specific part of a [Chunk] compound
+#[derive(Debug, Deserialize)]
+#[serde(untagged)]
+pub enum ChunkVariants {
+	V1_18 {
+		sections: Vec<SectionV1_18>,
+	},
+	#[serde(rename_all = "PascalCase")]
+	Old {
+		level: LevelOld,
+	},
+}
+
+/// Toplevel compound element of a Minecraft chunk
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "PascalCase")]
+pub struct Chunk {
+	pub data_version: Option<u32>,
+	#[serde(flatten)]
+	pub chunk: ChunkVariants,
+}
diff --git a/src/world/mod.rs b/src/world/mod.rs
new file mode 100644
index 0000000..7bbc60f
--- /dev/null
+++ b/src/world/mod.rs
@@ -0,0 +1 @@
+pub mod de;

From 718ecf59093a2249f6675573699c3f3acd637cff Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 7 Feb 2023 22:09:14 +0100
Subject: [PATCH 062/460] resource: update block type code generator for Rust

---
 Cargo.lock                  |   21 +
 Cargo.toml                  |    1 +
 resource/generate.py        |   28 +-
 src/lib.rs                  |    1 +
 src/resource/block_types.rs | 6327 +++++++++++++++++++++++++++++++++++
 src/resource/mod.rs         |   33 +
 6 files changed, 6399 insertions(+), 12 deletions(-)
 create mode 100644 src/resource/block_types.rs
 create mode 100644 src/resource/mod.rs

diff --git a/Cargo.lock b/Cargo.lock
index c45a502..8d40e13 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -102,6 +102,26 @@ version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
 
+[[package]]
+name = "enumflags2"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e75d4cd21b95383444831539909fbb14b9dc3fdceb2a6f5d36577329a1f55ccb"
+dependencies = [
+ "enumflags2_derive",
+]
+
+[[package]]
+name = "enumflags2_derive"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "errno"
 version = "0.2.8"
@@ -210,6 +230,7 @@ dependencies = [
  "anyhow",
  "bytemuck",
  "clap",
+ "enumflags2",
  "fastnbt",
  "flate2",
  "itertools",
diff --git a/Cargo.toml b/Cargo.toml
index 1ed267a..1b43110 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,6 +11,7 @@ default-run = "minedmap"
 anyhow = "1.0.68"
 bytemuck = "1.13.0"
 clap = { version = "4.1.4", features = ["derive"] }
+enumflags2 = "0.7.5"
 fastnbt = "2.3.2"
 flate2 = "1.0.25"
 itertools = "0.10.5"
diff --git a/resource/generate.py b/resource/generate.py
index de1f828..7e6ee09 100755
--- a/resource/generate.py
+++ b/resource/generate.py
@@ -6,7 +6,7 @@ import sys
 
 
 if len(sys.argv) != 3:
-	sys.exit('Usage: extract.py <colors.json> <BlockType.inc.cpp>')
+	sys.exit('Usage: extract.py <colors.json> <block_types.rs>')
 
 with open(sys.argv[1]) as f:
 	colors = json.load(f)
@@ -14,29 +14,33 @@ with open(sys.argv[1]) as f:
 output = {}
 
 with open(sys.argv[2], 'w') as f:
+	print('use enumflags2::make_bitflags;', file=f);
+	print('', file=f)
+	print('use super::*;', file=f)
+	print('', file=f)
+	print('pub const BLOCK_TYPES: &[(&str, BlockType)] = &[', file=f)
+
 	for name, info in colors.items():
 		flags = []
 		if info['opaque']:
-			flags.append('BLOCK_OPAQUE')
+			flags.append('Opaque')
 		if info['grass']:
-			flags.append('BLOCK_GRASS')
+			flags.append('Grass')
 		if info['foliage']:
-			flags.append('BLOCK_FOLIAGE')
+			flags.append('Foliage')
 		if info['birch']:
-			flags.append('BLOCK_BIRCH')
+			flags.append('Birch')
 		if info['spruce']:
-			flags.append('BLOCK_SPRUCE')
+			flags.append('Spruce')
 		if info['water']:
-			flags.append('BLOCK_WATER')
-		if flags:
-			flags = '|'.join(flags)
-		else:
-			flags = '0'
+			flags.append('Water')
+		flags = 'make_bitflags!(BlockFlags::{' + '|'.join(flags) + '})'
 
-		print('{"%s", {%s, {%u, %u, %u}}},' % (
+		print('\t("%s", BlockType { flags: %s, color: BlockColor(%u, %u, %u) }),' % (
 			name,
 			flags,
 			info['color']['r'],
 			info['color']['g'],
 			info['color']['b'],
 		), file=f)
+	print('];', file=f)
diff --git a/src/lib.rs b/src/lib.rs
index 54ea8b7..8342ba8 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,3 +1,4 @@
 pub mod io;
+pub mod resource;
 pub mod types;
 pub mod world;
diff --git a/src/resource/block_types.rs b/src/resource/block_types.rs
new file mode 100644
index 0000000..94d1e2b
--- /dev/null
+++ b/src/resource/block_types.rs
@@ -0,0 +1,6327 @@
+use enumflags2::make_bitflags;
+
+use super::*;
+
+pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
+	(
+		"minecraft:acacia_button",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:acacia_door",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(167, 95, 60),
+		},
+	),
+	(
+		"minecraft:acacia_fence",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(168, 90, 50),
+		},
+	),
+	(
+		"minecraft:acacia_fence_gate",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(168, 90, 50),
+		},
+	),
+	(
+		"minecraft:acacia_leaves",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque|Foliage}),
+			color: BlockColor(149, 148, 148),
+		},
+	),
+	(
+		"minecraft:acacia_log",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(150, 88, 55),
+		},
+	),
+	(
+		"minecraft:acacia_planks",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(168, 90, 50),
+		},
+	),
+	(
+		"minecraft:acacia_pressure_plate",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(168, 90, 50),
+		},
+	),
+	(
+		"minecraft:acacia_sapling",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(118, 117, 23),
+		},
+	),
+	(
+		"minecraft:acacia_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(168, 90, 50),
+		},
+	),
+	(
+		"minecraft:acacia_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(168, 90, 50),
+		},
+	),
+	(
+		"minecraft:acacia_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(168, 90, 50),
+		},
+	),
+	(
+		"minecraft:acacia_trapdoor",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(156, 87, 51),
+		},
+	),
+	(
+		"minecraft:acacia_wall_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:acacia_wood",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(103, 96, 86),
+		},
+	),
+	(
+		"minecraft:activator_rail",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(115, 87, 74),
+		},
+	),
+	(
+		"minecraft:air",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:allium",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:amethyst_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(133, 97, 191),
+		},
+	),
+	(
+		"minecraft:amethyst_cluster",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(163, 126, 207),
+		},
+	),
+	(
+		"minecraft:ancient_debris",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(94, 66, 58),
+		},
+	),
+	(
+		"minecraft:andesite",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(136, 136, 136),
+		},
+	),
+	(
+		"minecraft:andesite_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(136, 136, 136),
+		},
+	),
+	(
+		"minecraft:andesite_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(136, 136, 136),
+		},
+	),
+	(
+		"minecraft:andesite_wall",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(136, 136, 136),
+		},
+	),
+	(
+		"minecraft:anvil",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(72, 72, 72),
+		},
+	),
+	(
+		"minecraft:attached_melon_stem",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque|Grass}),
+			color: BlockColor(141, 142, 141),
+		},
+	),
+	(
+		"minecraft:attached_pumpkin_stem",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque|Grass}),
+			color: BlockColor(139, 139, 139),
+		},
+	),
+	(
+		"minecraft:azalea",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(101, 124, 47),
+		},
+	),
+	(
+		"minecraft:azalea_leaves",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(90, 114, 44),
+		},
+	),
+	(
+		"minecraft:azure_bluet",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:bamboo",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(93, 144, 19),
+		},
+	),
+	(
+		"minecraft:bamboo_sapling",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:barrel",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(134, 100, 58),
+		},
+	),
+	(
+		"minecraft:barrier",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:basalt",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(80, 81, 86),
+		},
+	),
+	(
+		"minecraft:beacon",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(117, 220, 215),
+		},
+	),
+	(
+		"minecraft:bedrock",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(85, 85, 85),
+		},
+	),
+	(
+		"minecraft:bee_nest",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(202, 160, 74),
+		},
+	),
+	(
+		"minecraft:beehive",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(180, 146, 90),
+		},
+	),
+	(
+		"minecraft:beetroots",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(93, 91, 30),
+		},
+	),
+	(
+		"minecraft:bell",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(253, 235, 110),
+		},
+	),
+	(
+		"minecraft:big_dripleaf",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(111, 141, 51),
+		},
+	),
+	(
+		"minecraft:big_dripleaf_stem",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:birch_button",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:birch_door",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(220, 209, 176),
+		},
+	),
+	(
+		"minecraft:birch_fence",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(192, 175, 121),
+		},
+	),
+	(
+		"minecraft:birch_fence_gate",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(192, 175, 121),
+		},
+	),
+	(
+		"minecraft:birch_leaves",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque|Birch}),
+			color: BlockColor(130, 129, 130),
+		},
+	),
+	(
+		"minecraft:birch_log",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(193, 179, 135),
+		},
+	),
+	(
+		"minecraft:birch_planks",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(192, 175, 121),
+		},
+	),
+	(
+		"minecraft:birch_pressure_plate",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(192, 175, 121),
+		},
+	),
+	(
+		"minecraft:birch_sapling",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(127, 160, 79),
+		},
+	),
+	(
+		"minecraft:birch_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(192, 175, 121),
+		},
+	),
+	(
+		"minecraft:birch_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(192, 175, 121),
+		},
+	),
+	(
+		"minecraft:birch_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(192, 175, 121),
+		},
+	),
+	(
+		"minecraft:birch_trapdoor",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(207, 194, 157),
+		},
+	),
+	(
+		"minecraft:birch_wall_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:birch_wood",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(216, 215, 210),
+		},
+	),
+	(
+		"minecraft:black_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:black_bed",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:black_candle",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:black_candle_cake",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(248, 222, 214),
+		},
+	),
+	(
+		"minecraft:black_carpet",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(20, 21, 25),
+		},
+	),
+	(
+		"minecraft:black_concrete",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(8, 10, 15),
+		},
+	),
+	(
+		"minecraft:black_concrete_powder",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(25, 26, 31),
+		},
+	),
+	(
+		"minecraft:black_glazed_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(67, 30, 32),
+		},
+	),
+	(
+		"minecraft:black_shulker_box",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(25, 25, 29),
+		},
+	),
+	(
+		"minecraft:black_stained_glass",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(25, 25, 25),
+		},
+	),
+	(
+		"minecraft:black_stained_glass_pane",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(24, 24, 24),
+		},
+	),
+	(
+		"minecraft:black_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(37, 22, 16),
+		},
+	),
+	(
+		"minecraft:black_wall_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:black_wool",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(20, 21, 25),
+		},
+	),
+	(
+		"minecraft:blackstone",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(42, 36, 41),
+		},
+	),
+	(
+		"minecraft:blackstone_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(42, 36, 41),
+		},
+	),
+	(
+		"minecraft:blackstone_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(42, 36, 41),
+		},
+	),
+	(
+		"minecraft:blackstone_wall",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(42, 36, 41),
+		},
+	),
+	(
+		"minecraft:blast_furnace",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(80, 80, 81),
+		},
+	),
+	(
+		"minecraft:blue_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:blue_bed",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:blue_candle",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:blue_candle_cake",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(248, 222, 214),
+		},
+	),
+	(
+		"minecraft:blue_carpet",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(53, 57, 157),
+		},
+	),
+	(
+		"minecraft:blue_concrete",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(44, 46, 143),
+		},
+	),
+	(
+		"minecraft:blue_concrete_powder",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(70, 73, 166),
+		},
+	),
+	(
+		"minecraft:blue_glazed_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(47, 64, 139),
+		},
+	),
+	(
+		"minecraft:blue_ice",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(116, 167, 253),
+		},
+	),
+	(
+		"minecraft:blue_orchid",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:blue_shulker_box",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(43, 45, 140),
+		},
+	),
+	(
+		"minecraft:blue_stained_glass",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(51, 76, 178),
+		},
+	),
+	(
+		"minecraft:blue_stained_glass_pane",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(48, 73, 171),
+		},
+	),
+	(
+		"minecraft:blue_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(74, 59, 91),
+		},
+	),
+	(
+		"minecraft:blue_wall_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:blue_wool",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(53, 57, 157),
+		},
+	),
+	(
+		"minecraft:bone_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(209, 206, 179),
+		},
+	),
+	(
+		"minecraft:bookshelf",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(162, 130, 78),
+		},
+	),
+	(
+		"minecraft:brain_coral",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:brain_coral_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(207, 91, 159),
+		},
+	),
+	(
+		"minecraft:brain_coral_fan",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:brain_coral_wall_fan",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:brewing_stand",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(123, 101, 81),
+		},
+	),
+	(
+		"minecraft:brick_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(150, 97, 83),
+		},
+	),
+	(
+		"minecraft:brick_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(150, 97, 83),
+		},
+	),
+	(
+		"minecraft:brick_wall",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(150, 97, 83),
+		},
+	),
+	(
+		"minecraft:bricks",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(150, 97, 83),
+		},
+	),
+	(
+		"minecraft:brown_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:brown_bed",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:brown_candle",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:brown_candle_cake",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(248, 222, 214),
+		},
+	),
+	(
+		"minecraft:brown_carpet",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(114, 71, 40),
+		},
+	),
+	(
+		"minecraft:brown_concrete",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(96, 59, 31),
+		},
+	),
+	(
+		"minecraft:brown_concrete_powder",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(125, 84, 53),
+		},
+	),
+	(
+		"minecraft:brown_glazed_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(119, 106, 85),
+		},
+	),
+	(
+		"minecraft:brown_mushroom",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:brown_mushroom_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(149, 111, 81),
+		},
+	),
+	(
+		"minecraft:brown_shulker_box",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(106, 66, 35),
+		},
+	),
+	(
+		"minecraft:brown_stained_glass",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(102, 76, 51),
+		},
+	),
+	(
+		"minecraft:brown_stained_glass_pane",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(97, 73, 48),
+		},
+	),
+	(
+		"minecraft:brown_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(77, 51, 35),
+		},
+	),
+	(
+		"minecraft:brown_wall_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:brown_wool",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(114, 71, 40),
+		},
+	),
+	(
+		"minecraft:bubble_column",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque|Water}),
+			color: BlockColor(177, 177, 177),
+		},
+	),
+	(
+		"minecraft:bubble_coral",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:bubble_coral_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(165, 26, 162),
+		},
+	),
+	(
+		"minecraft:bubble_coral_fan",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:bubble_coral_wall_fan",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:budding_amethyst",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(132, 96, 186),
+		},
+	),
+	(
+		"minecraft:cactus",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(85, 127, 43),
+		},
+	),
+	(
+		"minecraft:cake",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(248, 222, 214),
+		},
+	),
+	(
+		"minecraft:calcite",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(223, 224, 220),
+		},
+	),
+	(
+		"minecraft:campfire",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(110, 88, 54),
+		},
+	),
+	(
+		"minecraft:candle",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:candle_cake",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(248, 222, 214),
+		},
+	),
+	(
+		"minecraft:carrots",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(81, 124, 37),
+		},
+	),
+	(
+		"minecraft:cartography_table",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(103, 87, 67),
+		},
+	),
+	(
+		"minecraft:carved_pumpkin",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(198, 118, 24),
+		},
+	),
+	(
+		"minecraft:cauldron",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(73, 72, 74),
+		},
+	),
+	(
+		"minecraft:cave_air",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:cave_vines",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(90, 109, 40),
+		},
+	),
+	(
+		"minecraft:cave_vines_plant",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(88, 101, 38),
+		},
+	),
+	(
+		"minecraft:chain",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:chain_command_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(131, 161, 147),
+		},
+	),
+	(
+		"minecraft:chest",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(162, 130, 78),
+		},
+	),
+	(
+		"minecraft:chipped_anvil",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(72, 72, 72),
+		},
+	),
+	(
+		"minecraft:chiseled_deepslate",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(54, 54, 54),
+		},
+	),
+	(
+		"minecraft:chiseled_nether_bricks",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(47, 23, 28),
+		},
+	),
+	(
+		"minecraft:chiseled_polished_blackstone",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(53, 48, 56),
+		},
+	),
+	(
+		"minecraft:chiseled_quartz_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(231, 226, 218),
+		},
+	),
+	(
+		"minecraft:chiseled_red_sandstone",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(181, 97, 31),
+		},
+	),
+	(
+		"minecraft:chiseled_sandstone",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(223, 214, 170),
+		},
+	),
+	(
+		"minecraft:chiseled_stone_bricks",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(119, 118, 119),
+		},
+	),
+	(
+		"minecraft:chorus_flower",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(151, 120, 151),
+		},
+	),
+	(
+		"minecraft:chorus_plant",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(93, 57, 93),
+		},
+	),
+	(
+		"minecraft:clay",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(160, 166, 179),
+		},
+	),
+	(
+		"minecraft:coal_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(16, 15, 15),
+		},
+	),
+	(
+		"minecraft:coal_ore",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(105, 105, 105),
+		},
+	),
+	(
+		"minecraft:coarse_dirt",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(119, 85, 59),
+		},
+	),
+	(
+		"minecraft:cobbled_deepslate",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(77, 77, 80),
+		},
+	),
+	(
+		"minecraft:cobbled_deepslate_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(77, 77, 80),
+		},
+	),
+	(
+		"minecraft:cobbled_deepslate_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(77, 77, 80),
+		},
+	),
+	(
+		"minecraft:cobbled_deepslate_wall",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(77, 77, 80),
+		},
+	),
+	(
+		"minecraft:cobblestone",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(127, 127, 127),
+		},
+	),
+	(
+		"minecraft:cobblestone_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(127, 127, 127),
+		},
+	),
+	(
+		"minecraft:cobblestone_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(127, 127, 127),
+		},
+	),
+	(
+		"minecraft:cobblestone_wall",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(127, 127, 127),
+		},
+	),
+	(
+		"minecraft:cobweb",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(228, 233, 234),
+		},
+	),
+	(
+		"minecraft:cocoa",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(156, 94, 43),
+		},
+	),
+	(
+		"minecraft:command_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(181, 136, 108),
+		},
+	),
+	(
+		"minecraft:comparator",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(166, 161, 159),
+		},
+	),
+	(
+		"minecraft:composter",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(88, 61, 23),
+		},
+	),
+	(
+		"minecraft:conduit",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(159, 139, 113),
+		},
+	),
+	(
+		"minecraft:copper_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(192, 107, 79),
+		},
+	),
+	(
+		"minecraft:copper_ore",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(124, 125, 120),
+		},
+	),
+	(
+		"minecraft:cornflower",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:cracked_deepslate_bricks",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(64, 64, 65),
+		},
+	),
+	(
+		"minecraft:cracked_deepslate_tiles",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(52, 52, 52),
+		},
+	),
+	(
+		"minecraft:cracked_nether_bricks",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(40, 20, 23),
+		},
+	),
+	(
+		"minecraft:cracked_polished_blackstone_bricks",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(44, 37, 43),
+		},
+	),
+	(
+		"minecraft:cracked_stone_bricks",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(118, 117, 118),
+		},
+	),
+	(
+		"minecraft:crafting_table",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(119, 73, 42),
+		},
+	),
+	(
+		"minecraft:creeper_head",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:creeper_wall_head",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:crimson_button",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:crimson_door",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(114, 54, 79),
+		},
+	),
+	(
+		"minecraft:crimson_fence",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(101, 48, 70),
+		},
+	),
+	(
+		"minecraft:crimson_fence_gate",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(101, 48, 70),
+		},
+	),
+	(
+		"minecraft:crimson_fungus",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:crimson_hyphae",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(92, 25, 29),
+		},
+	),
+	(
+		"minecraft:crimson_nylium",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(130, 31, 31),
+		},
+	),
+	(
+		"minecraft:crimson_planks",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(101, 48, 70),
+		},
+	),
+	(
+		"minecraft:crimson_pressure_plate",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(101, 48, 70),
+		},
+	),
+	(
+		"minecraft:crimson_roots",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(126, 8, 41),
+		},
+	),
+	(
+		"minecraft:crimson_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(101, 48, 70),
+		},
+	),
+	(
+		"minecraft:crimson_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(101, 48, 70),
+		},
+	),
+	(
+		"minecraft:crimson_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(101, 48, 70),
+		},
+	),
+	(
+		"minecraft:crimson_stem",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(112, 49, 70),
+		},
+	),
+	(
+		"minecraft:crimson_trapdoor",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(103, 50, 72),
+		},
+	),
+	(
+		"minecraft:crimson_wall_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:crying_obsidian",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(32, 10, 60),
+		},
+	),
+	(
+		"minecraft:cut_copper",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(191, 106, 80),
+		},
+	),
+	(
+		"minecraft:cut_copper_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(191, 106, 80),
+		},
+	),
+	(
+		"minecraft:cut_copper_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(191, 106, 80),
+		},
+	),
+	(
+		"minecraft:cut_red_sandstone",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(181, 97, 31),
+		},
+	),
+	(
+		"minecraft:cut_red_sandstone_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(181, 97, 31),
+		},
+	),
+	(
+		"minecraft:cut_sandstone",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(223, 214, 170),
+		},
+	),
+	(
+		"minecraft:cut_sandstone_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(223, 214, 170),
+		},
+	),
+	(
+		"minecraft:cyan_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:cyan_bed",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:cyan_candle",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:cyan_candle_cake",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(248, 222, 214),
+		},
+	),
+	(
+		"minecraft:cyan_carpet",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(21, 137, 145),
+		},
+	),
+	(
+		"minecraft:cyan_concrete",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(21, 119, 136),
+		},
+	),
+	(
+		"minecraft:cyan_concrete_powder",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(36, 147, 157),
+		},
+	),
+	(
+		"minecraft:cyan_glazed_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(52, 118, 125),
+		},
+	),
+	(
+		"minecraft:cyan_shulker_box",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(20, 121, 135),
+		},
+	),
+	(
+		"minecraft:cyan_stained_glass",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(76, 127, 153),
+		},
+	),
+	(
+		"minecraft:cyan_stained_glass_pane",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(73, 122, 147),
+		},
+	),
+	(
+		"minecraft:cyan_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(86, 91, 91),
+		},
+	),
+	(
+		"minecraft:cyan_wall_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:cyan_wool",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(21, 137, 145),
+		},
+	),
+	(
+		"minecraft:damaged_anvil",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(72, 72, 72),
+		},
+	),
+	(
+		"minecraft:dandelion",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:dark_oak_button",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:dark_oak_door",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(76, 51, 25),
+		},
+	),
+	(
+		"minecraft:dark_oak_fence",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(66, 43, 20),
+		},
+	),
+	(
+		"minecraft:dark_oak_fence_gate",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(66, 43, 20),
+		},
+	),
+	(
+		"minecraft:dark_oak_leaves",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque|Foliage}),
+			color: BlockColor(150, 150, 150),
+		},
+	),
+	(
+		"minecraft:dark_oak_log",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(67, 45, 22),
+		},
+	),
+	(
+		"minecraft:dark_oak_planks",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(66, 43, 20),
+		},
+	),
+	(
+		"minecraft:dark_oak_pressure_plate",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(66, 43, 20),
+		},
+	),
+	(
+		"minecraft:dark_oak_sapling",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(61, 90, 30),
+		},
+	),
+	(
+		"minecraft:dark_oak_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(66, 43, 20),
+		},
+	),
+	(
+		"minecraft:dark_oak_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(66, 43, 20),
+		},
+	),
+	(
+		"minecraft:dark_oak_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(66, 43, 20),
+		},
+	),
+	(
+		"minecraft:dark_oak_trapdoor",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(75, 49, 23),
+		},
+	),
+	(
+		"minecraft:dark_oak_wall_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:dark_oak_wood",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(60, 46, 26),
+		},
+	),
+	(
+		"minecraft:dark_prismarine",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(51, 91, 75),
+		},
+	),
+	(
+		"minecraft:dark_prismarine_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(51, 91, 75),
+		},
+	),
+	(
+		"minecraft:dark_prismarine_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(51, 91, 75),
+		},
+	),
+	(
+		"minecraft:daylight_detector",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(130, 116, 94),
+		},
+	),
+	(
+		"minecraft:dead_brain_coral",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:dead_brain_coral_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(124, 117, 114),
+		},
+	),
+	(
+		"minecraft:dead_brain_coral_fan",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:dead_brain_coral_wall_fan",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:dead_bubble_coral",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:dead_bubble_coral_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(131, 123, 119),
+		},
+	),
+	(
+		"minecraft:dead_bubble_coral_fan",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:dead_bubble_coral_wall_fan",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:dead_bush",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(107, 78, 40),
+		},
+	),
+	(
+		"minecraft:dead_fire_coral",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:dead_fire_coral_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(131, 123, 119),
+		},
+	),
+	(
+		"minecraft:dead_fire_coral_fan",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:dead_fire_coral_wall_fan",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:dead_horn_coral",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:dead_horn_coral_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(133, 126, 122),
+		},
+	),
+	(
+		"minecraft:dead_horn_coral_fan",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:dead_horn_coral_wall_fan",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:dead_tube_coral",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:dead_tube_coral_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(130, 123, 119),
+		},
+	),
+	(
+		"minecraft:dead_tube_coral_fan",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:dead_tube_coral_wall_fan",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:deepslate",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(80, 80, 82),
+		},
+	),
+	(
+		"minecraft:deepslate_brick_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(70, 70, 71),
+		},
+	),
+	(
+		"minecraft:deepslate_brick_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(70, 70, 71),
+		},
+	),
+	(
+		"minecraft:deepslate_brick_wall",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(70, 70, 71),
+		},
+	),
+	(
+		"minecraft:deepslate_bricks",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(70, 70, 71),
+		},
+	),
+	(
+		"minecraft:deepslate_coal_ore",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(74, 74, 76),
+		},
+	),
+	(
+		"minecraft:deepslate_copper_ore",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(92, 93, 89),
+		},
+	),
+	(
+		"minecraft:deepslate_diamond_ore",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(83, 106, 106),
+		},
+	),
+	(
+		"minecraft:deepslate_emerald_ore",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(78, 104, 87),
+		},
+	),
+	(
+		"minecraft:deepslate_gold_ore",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(115, 102, 78),
+		},
+	),
+	(
+		"minecraft:deepslate_iron_ore",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(106, 99, 94),
+		},
+	),
+	(
+		"minecraft:deepslate_lapis_ore",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(79, 90, 115),
+		},
+	),
+	(
+		"minecraft:deepslate_redstone_ore",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(104, 73, 74),
+		},
+	),
+	(
+		"minecraft:deepslate_tile_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(54, 54, 55),
+		},
+	),
+	(
+		"minecraft:deepslate_tile_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(54, 54, 55),
+		},
+	),
+	(
+		"minecraft:deepslate_tile_wall",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(54, 54, 55),
+		},
+	),
+	(
+		"minecraft:deepslate_tiles",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(54, 54, 55),
+		},
+	),
+	(
+		"minecraft:detector_rail",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(123, 104, 90),
+		},
+	),
+	(
+		"minecraft:diamond_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(98, 237, 228),
+		},
+	),
+	(
+		"minecraft:diamond_ore",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(121, 141, 140),
+		},
+	),
+	(
+		"minecraft:diorite",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(188, 188, 188),
+		},
+	),
+	(
+		"minecraft:diorite_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(188, 188, 188),
+		},
+	),
+	(
+		"minecraft:diorite_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(188, 188, 188),
+		},
+	),
+	(
+		"minecraft:diorite_wall",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(188, 188, 188),
+		},
+	),
+	(
+		"minecraft:dirt",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(134, 96, 67),
+		},
+	),
+	(
+		"minecraft:dirt_path",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(148, 121, 65),
+		},
+	),
+	(
+		"minecraft:dispenser",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(110, 109, 109),
+		},
+	),
+	(
+		"minecraft:dragon_egg",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(12, 9, 15),
+		},
+	),
+	(
+		"minecraft:dragon_head",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:dragon_wall_head",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:dried_kelp_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(50, 58, 38),
+		},
+	),
+	(
+		"minecraft:dripstone_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(134, 107, 92),
+		},
+	),
+	(
+		"minecraft:dropper",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(110, 109, 109),
+		},
+	),
+	(
+		"minecraft:emerald_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(42, 203, 87),
+		},
+	),
+	(
+		"minecraft:emerald_ore",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(108, 136, 115),
+		},
+	),
+	(
+		"minecraft:enchanting_table",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(128, 75, 85),
+		},
+	),
+	(
+		"minecraft:end_gateway",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(15, 10, 24),
+		},
+	),
+	(
+		"minecraft:end_portal",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(15, 10, 24),
+		},
+	),
+	(
+		"minecraft:end_portal_frame",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(91, 120, 97),
+		},
+	),
+	(
+		"minecraft:end_rod",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:end_stone",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(219, 222, 158),
+		},
+	),
+	(
+		"minecraft:end_stone_brick_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(218, 224, 162),
+		},
+	),
+	(
+		"minecraft:end_stone_brick_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(218, 224, 162),
+		},
+	),
+	(
+		"minecraft:end_stone_brick_wall",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(218, 224, 162),
+		},
+	),
+	(
+		"minecraft:end_stone_bricks",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(218, 224, 162),
+		},
+	),
+	(
+		"minecraft:ender_chest",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(15, 10, 24),
+		},
+	),
+	(
+		"minecraft:exposed_copper",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(161, 125, 103),
+		},
+	),
+	(
+		"minecraft:exposed_cut_copper",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(154, 121, 101),
+		},
+	),
+	(
+		"minecraft:exposed_cut_copper_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(154, 121, 101),
+		},
+	),
+	(
+		"minecraft:exposed_cut_copper_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(154, 121, 101),
+		},
+	),
+	(
+		"minecraft:farmland",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(81, 44, 15),
+		},
+	),
+	(
+		"minecraft:fern",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:fire",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(211, 140, 53),
+		},
+	),
+	(
+		"minecraft:fire_coral",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:fire_coral_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(163, 35, 46),
+		},
+	),
+	(
+		"minecraft:fire_coral_fan",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:fire_coral_wall_fan",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:fletching_table",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(197, 180, 133),
+		},
+	),
+	(
+		"minecraft:flower_pot",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(124, 68, 53),
+		},
+	),
+	(
+		"minecraft:flowering_azalea",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(112, 121, 64),
+		},
+	),
+	(
+		"minecraft:flowering_azalea_leaves",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(99, 111, 60),
+		},
+	),
+	(
+		"minecraft:frosted_ice",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(140, 181, 252),
+		},
+	),
+	(
+		"minecraft:furnace",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(110, 109, 109),
+		},
+	),
+	(
+		"minecraft:gilded_blackstone",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(55, 42, 38),
+		},
+	),
+	(
+		"minecraft:glass",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(175, 213, 219),
+		},
+	),
+	(
+		"minecraft:glass_pane",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(170, 210, 217),
+		},
+	),
+	(
+		"minecraft:glow_item_frame",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:glow_lichen",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:glowstone",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(171, 131, 84),
+		},
+	),
+	(
+		"minecraft:gold_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(246, 208, 61),
+		},
+	),
+	(
+		"minecraft:gold_ore",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(145, 133, 106),
+		},
+	),
+	(
+		"minecraft:granite",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(149, 103, 85),
+		},
+	),
+	(
+		"minecraft:granite_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(149, 103, 85),
+		},
+	),
+	(
+		"minecraft:granite_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(149, 103, 85),
+		},
+	),
+	(
+		"minecraft:granite_wall",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(149, 103, 85),
+		},
+	),
+	(
+		"minecraft:grass",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:grass_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque|Grass}),
+			color: BlockColor(147, 147, 147),
+		},
+	),
+	(
+		"minecraft:grass_path",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(148, 121, 65),
+		},
+	),
+	(
+		"minecraft:gravel",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(131, 127, 126),
+		},
+	),
+	(
+		"minecraft:gray_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:gray_bed",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:gray_candle",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:gray_candle_cake",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(248, 222, 214),
+		},
+	),
+	(
+		"minecraft:gray_carpet",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(62, 68, 71),
+		},
+	),
+	(
+		"minecraft:gray_concrete",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(54, 57, 61),
+		},
+	),
+	(
+		"minecraft:gray_concrete_powder",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(76, 81, 84),
+		},
+	),
+	(
+		"minecraft:gray_glazed_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(83, 90, 93),
+		},
+	),
+	(
+		"minecraft:gray_shulker_box",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(55, 58, 62),
+		},
+	),
+	(
+		"minecraft:gray_stained_glass",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(76, 76, 76),
+		},
+	),
+	(
+		"minecraft:gray_stained_glass_pane",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(73, 73, 73),
+		},
+	),
+	(
+		"minecraft:gray_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(57, 42, 35),
+		},
+	),
+	(
+		"minecraft:gray_wall_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:gray_wool",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(62, 68, 71),
+		},
+	),
+	(
+		"minecraft:green_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:green_bed",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:green_candle",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:green_candle_cake",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(248, 222, 214),
+		},
+	),
+	(
+		"minecraft:green_carpet",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(84, 109, 27),
+		},
+	),
+	(
+		"minecraft:green_concrete",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(73, 91, 36),
+		},
+	),
+	(
+		"minecraft:green_concrete_powder",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(97, 119, 44),
+		},
+	),
+	(
+		"minecraft:green_glazed_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(117, 142, 67),
+		},
+	),
+	(
+		"minecraft:green_shulker_box",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(79, 100, 31),
+		},
+	),
+	(
+		"minecraft:green_stained_glass",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(102, 127, 51),
+		},
+	),
+	(
+		"minecraft:green_stained_glass_pane",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(97, 122, 48),
+		},
+	),
+	(
+		"minecraft:green_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(76, 83, 42),
+		},
+	),
+	(
+		"minecraft:green_wall_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:green_wool",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(84, 109, 27),
+		},
+	),
+	(
+		"minecraft:grindstone",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(142, 142, 142),
+		},
+	),
+	(
+		"minecraft:hanging_roots",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(161, 115, 91),
+		},
+	),
+	(
+		"minecraft:hay_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(165, 139, 12),
+		},
+	),
+	(
+		"minecraft:heavy_weighted_pressure_plate",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(220, 220, 220),
+		},
+	),
+	(
+		"minecraft:honey_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(251, 185, 52),
+		},
+	),
+	(
+		"minecraft:honeycomb_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(229, 148, 29),
+		},
+	),
+	(
+		"minecraft:hopper",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(75, 74, 75),
+		},
+	),
+	(
+		"minecraft:horn_coral",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:horn_coral_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(216, 199, 66),
+		},
+	),
+	(
+		"minecraft:horn_coral_fan",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:horn_coral_wall_fan",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:ice",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(145, 183, 253),
+		},
+	),
+	(
+		"minecraft:infested_chiseled_stone_bricks",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(119, 118, 119),
+		},
+	),
+	(
+		"minecraft:infested_cobblestone",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(127, 127, 127),
+		},
+	),
+	(
+		"minecraft:infested_cracked_stone_bricks",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(118, 117, 118),
+		},
+	),
+	(
+		"minecraft:infested_deepslate",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(80, 80, 82),
+		},
+	),
+	(
+		"minecraft:infested_mossy_stone_bricks",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(115, 121, 105),
+		},
+	),
+	(
+		"minecraft:infested_stone",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(125, 125, 125),
+		},
+	),
+	(
+		"minecraft:infested_stone_bricks",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(122, 121, 122),
+		},
+	),
+	(
+		"minecraft:iron_bars",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(136, 139, 135),
+		},
+	),
+	(
+		"minecraft:iron_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(220, 220, 220),
+		},
+	),
+	(
+		"minecraft:iron_door",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(194, 193, 193),
+		},
+	),
+	(
+		"minecraft:iron_ore",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(136, 129, 122),
+		},
+	),
+	(
+		"minecraft:iron_trapdoor",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(202, 202, 202),
+		},
+	),
+	(
+		"minecraft:item_frame",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:jack_o_lantern",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(214, 152, 52),
+		},
+	),
+	(
+		"minecraft:jigsaw",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(80, 69, 81),
+		},
+	),
+	(
+		"minecraft:jukebox",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(93, 64, 47),
+		},
+	),
+	(
+		"minecraft:jungle_button",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:jungle_door",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(163, 119, 84),
+		},
+	),
+	(
+		"minecraft:jungle_fence",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(160, 115, 80),
+		},
+	),
+	(
+		"minecraft:jungle_fence_gate",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(160, 115, 80),
+		},
+	),
+	(
+		"minecraft:jungle_leaves",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque|Foliage}),
+			color: BlockColor(156, 154, 143),
+		},
+	),
+	(
+		"minecraft:jungle_log",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(149, 109, 70),
+		},
+	),
+	(
+		"minecraft:jungle_planks",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(160, 115, 80),
+		},
+	),
+	(
+		"minecraft:jungle_pressure_plate",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(160, 115, 80),
+		},
+	),
+	(
+		"minecraft:jungle_sapling",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(47, 81, 16),
+		},
+	),
+	(
+		"minecraft:jungle_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(160, 115, 80),
+		},
+	),
+	(
+		"minecraft:jungle_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(160, 115, 80),
+		},
+	),
+	(
+		"minecraft:jungle_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(160, 115, 80),
+		},
+	),
+	(
+		"minecraft:jungle_trapdoor",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(152, 110, 77),
+		},
+	),
+	(
+		"minecraft:jungle_wall_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:jungle_wood",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(85, 67, 25),
+		},
+	),
+	(
+		"minecraft:kelp",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:kelp_plant",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(86, 130, 42),
+		},
+	),
+	(
+		"minecraft:ladder",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:lantern",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(106, 91, 83),
+		},
+	),
+	(
+		"minecraft:lapis_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(30, 67, 140),
+		},
+	),
+	(
+		"minecraft:lapis_ore",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(107, 117, 141),
+		},
+	),
+	(
+		"minecraft:large_amethyst_bud",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:large_fern",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque|Grass}),
+			color: BlockColor(125, 125, 125),
+		},
+	),
+	(
+		"minecraft:lava",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(212, 90, 18),
+		},
+	),
+	(
+		"minecraft:lava_cauldron",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(73, 72, 74),
+		},
+	),
+	(
+		"minecraft:lectern",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(173, 137, 83),
+		},
+	),
+	(
+		"minecraft:lever",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:light",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:light_blue_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:light_blue_bed",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:light_blue_candle",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:light_blue_candle_cake",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(248, 222, 214),
+		},
+	),
+	(
+		"minecraft:light_blue_carpet",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(58, 175, 217),
+		},
+	),
+	(
+		"minecraft:light_blue_concrete",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(35, 137, 198),
+		},
+	),
+	(
+		"minecraft:light_blue_concrete_powder",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(74, 180, 213),
+		},
+	),
+	(
+		"minecraft:light_blue_glazed_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(94, 164, 208),
+		},
+	),
+	(
+		"minecraft:light_blue_shulker_box",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(49, 163, 212),
+		},
+	),
+	(
+		"minecraft:light_blue_stained_glass",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(102, 153, 216),
+		},
+	),
+	(
+		"minecraft:light_blue_stained_glass_pane",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(97, 147, 208),
+		},
+	),
+	(
+		"minecraft:light_blue_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(113, 108, 137),
+		},
+	),
+	(
+		"minecraft:light_blue_wall_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:light_blue_wool",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(58, 175, 217),
+		},
+	),
+	(
+		"minecraft:light_gray_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:light_gray_bed",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:light_gray_candle",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:light_gray_candle_cake",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(248, 222, 214),
+		},
+	),
+	(
+		"minecraft:light_gray_carpet",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(142, 142, 134),
+		},
+	),
+	(
+		"minecraft:light_gray_concrete",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(125, 125, 115),
+		},
+	),
+	(
+		"minecraft:light_gray_concrete_powder",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(154, 154, 148),
+		},
+	),
+	(
+		"minecraft:light_gray_glazed_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(144, 166, 167),
+		},
+	),
+	(
+		"minecraft:light_gray_shulker_box",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(124, 124, 115),
+		},
+	),
+	(
+		"minecraft:light_gray_stained_glass",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(153, 153, 153),
+		},
+	),
+	(
+		"minecraft:light_gray_stained_glass_pane",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(147, 147, 147),
+		},
+	),
+	(
+		"minecraft:light_gray_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(135, 106, 97),
+		},
+	),
+	(
+		"minecraft:light_gray_wall_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:light_gray_wool",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(142, 142, 134),
+		},
+	),
+	(
+		"minecraft:light_weighted_pressure_plate",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(246, 208, 61),
+		},
+	),
+	(
+		"minecraft:lightning_rod",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:lilac",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(154, 125, 147),
+		},
+	),
+	(
+		"minecraft:lily_of_the_valley",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:lily_pad",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque|Grass}),
+			color: BlockColor(133, 133, 133),
+		},
+	),
+	(
+		"minecraft:lime_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:lime_bed",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:lime_candle",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:lime_candle_cake",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(248, 222, 214),
+		},
+	),
+	(
+		"minecraft:lime_carpet",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(112, 185, 25),
+		},
+	),
+	(
+		"minecraft:lime_concrete",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(94, 168, 24),
+		},
+	),
+	(
+		"minecraft:lime_concrete_powder",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(125, 189, 41),
+		},
+	),
+	(
+		"minecraft:lime_glazed_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(162, 197, 55),
+		},
+	),
+	(
+		"minecraft:lime_shulker_box",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(99, 172, 23),
+		},
+	),
+	(
+		"minecraft:lime_stained_glass",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(127, 204, 25),
+		},
+	),
+	(
+		"minecraft:lime_stained_glass_pane",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(122, 196, 24),
+		},
+	),
+	(
+		"minecraft:lime_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(103, 117, 52),
+		},
+	),
+	(
+		"minecraft:lime_wall_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:lime_wool",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(112, 185, 25),
+		},
+	),
+	(
+		"minecraft:lodestone",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(147, 149, 152),
+		},
+	),
+	(
+		"minecraft:loom",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(142, 119, 91),
+		},
+	),
+	(
+		"minecraft:magenta_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:magenta_bed",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:magenta_candle",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:magenta_candle_cake",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(248, 222, 214),
+		},
+	),
+	(
+		"minecraft:magenta_carpet",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(189, 68, 179),
+		},
+	),
+	(
+		"minecraft:magenta_concrete",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(169, 48, 159),
+		},
+	),
+	(
+		"minecraft:magenta_concrete_powder",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(192, 83, 184),
+		},
+	),
+	(
+		"minecraft:magenta_glazed_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(208, 100, 191),
+		},
+	),
+	(
+		"minecraft:magenta_shulker_box",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(173, 54, 163),
+		},
+	),
+	(
+		"minecraft:magenta_stained_glass",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(178, 76, 216),
+		},
+	),
+	(
+		"minecraft:magenta_stained_glass_pane",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(171, 73, 208),
+		},
+	),
+	(
+		"minecraft:magenta_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(149, 88, 108),
+		},
+	),
+	(
+		"minecraft:magenta_wall_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:magenta_wool",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(189, 68, 179),
+		},
+	),
+	(
+		"minecraft:magma_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(142, 63, 31),
+		},
+	),
+	(
+		"minecraft:medium_amethyst_bud",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:melon",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(111, 144, 30),
+		},
+	),
+	(
+		"minecraft:melon_stem",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque|Grass}),
+			color: BlockColor(153, 153, 153),
+		},
+	),
+	(
+		"minecraft:moss_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(89, 109, 45),
+		},
+	),
+	(
+		"minecraft:moss_carpet",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(89, 109, 45),
+		},
+	),
+	(
+		"minecraft:mossy_cobblestone",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(110, 118, 94),
+		},
+	),
+	(
+		"minecraft:mossy_cobblestone_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(110, 118, 94),
+		},
+	),
+	(
+		"minecraft:mossy_cobblestone_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(110, 118, 94),
+		},
+	),
+	(
+		"minecraft:mossy_cobblestone_wall",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(110, 118, 94),
+		},
+	),
+	(
+		"minecraft:mossy_stone_brick_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(115, 121, 105),
+		},
+	),
+	(
+		"minecraft:mossy_stone_brick_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(115, 121, 105),
+		},
+	),
+	(
+		"minecraft:mossy_stone_brick_wall",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(115, 121, 105),
+		},
+	),
+	(
+		"minecraft:mossy_stone_bricks",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(115, 121, 105),
+		},
+	),
+	(
+		"minecraft:moving_piston",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:mushroom_stem",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(203, 196, 185),
+		},
+	),
+	(
+		"minecraft:mycelium",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(111, 98, 101),
+		},
+	),
+	(
+		"minecraft:nether_brick_fence",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(44, 21, 26),
+		},
+	),
+	(
+		"minecraft:nether_brick_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(44, 21, 26),
+		},
+	),
+	(
+		"minecraft:nether_brick_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(44, 21, 26),
+		},
+	),
+	(
+		"minecraft:nether_brick_wall",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(44, 21, 26),
+		},
+	),
+	(
+		"minecraft:nether_bricks",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(44, 21, 26),
+		},
+	),
+	(
+		"minecraft:nether_gold_ore",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(115, 54, 42),
+		},
+	),
+	(
+		"minecraft:nether_portal",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(89, 11, 192),
+		},
+	),
+	(
+		"minecraft:nether_quartz_ore",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(117, 65, 62),
+		},
+	),
+	(
+		"minecraft:nether_sprouts",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(19, 151, 133),
+		},
+	),
+	(
+		"minecraft:nether_wart",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(111, 18, 19),
+		},
+	),
+	(
+		"minecraft:nether_wart_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(114, 2, 2),
+		},
+	),
+	(
+		"minecraft:netherite_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(66, 61, 63),
+		},
+	),
+	(
+		"minecraft:netherrack",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(97, 38, 38),
+		},
+	),
+	(
+		"minecraft:note_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(88, 58, 40),
+		},
+	),
+	(
+		"minecraft:oak_button",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:oak_door",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(140, 110, 66),
+		},
+	),
+	(
+		"minecraft:oak_fence",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(162, 130, 78),
+		},
+	),
+	(
+		"minecraft:oak_fence_gate",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(162, 130, 78),
+		},
+	),
+	(
+		"minecraft:oak_leaves",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque|Foliage}),
+			color: BlockColor(144, 144, 144),
+		},
+	),
+	(
+		"minecraft:oak_log",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(151, 121, 73),
+		},
+	),
+	(
+		"minecraft:oak_planks",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(162, 130, 78),
+		},
+	),
+	(
+		"minecraft:oak_pressure_plate",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(162, 130, 78),
+		},
+	),
+	(
+		"minecraft:oak_sapling",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(77, 106, 40),
+		},
+	),
+	(
+		"minecraft:oak_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(162, 130, 78),
+		},
+	),
+	(
+		"minecraft:oak_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(162, 130, 78),
+		},
+	),
+	(
+		"minecraft:oak_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(162, 130, 78),
+		},
+	),
+	(
+		"minecraft:oak_trapdoor",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(124, 99, 56),
+		},
+	),
+	(
+		"minecraft:oak_wall_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:oak_wood",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(109, 85, 50),
+		},
+	),
+	(
+		"minecraft:observer",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(98, 98, 98),
+		},
+	),
+	(
+		"minecraft:obsidian",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(15, 10, 24),
+		},
+	),
+	(
+		"minecraft:orange_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:orange_bed",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:orange_candle",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:orange_candle_cake",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(248, 222, 214),
+		},
+	),
+	(
+		"minecraft:orange_carpet",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(240, 118, 19),
+		},
+	),
+	(
+		"minecraft:orange_concrete",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(224, 97, 0),
+		},
+	),
+	(
+		"minecraft:orange_concrete_powder",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(227, 131, 31),
+		},
+	),
+	(
+		"minecraft:orange_glazed_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(154, 147, 91),
+		},
+	),
+	(
+		"minecraft:orange_shulker_box",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(234, 106, 8),
+		},
+	),
+	(
+		"minecraft:orange_stained_glass",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(216, 127, 51),
+		},
+	),
+	(
+		"minecraft:orange_stained_glass_pane",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(208, 122, 48),
+		},
+	),
+	(
+		"minecraft:orange_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(161, 83, 37),
+		},
+	),
+	(
+		"minecraft:orange_tulip",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:orange_wall_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:orange_wool",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(240, 118, 19),
+		},
+	),
+	(
+		"minecraft:oxeye_daisy",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:oxidized_copper",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(82, 162, 132),
+		},
+	),
+	(
+		"minecraft:oxidized_cut_copper",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(79, 153, 126),
+		},
+	),
+	(
+		"minecraft:oxidized_cut_copper_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(79, 153, 126),
+		},
+	),
+	(
+		"minecraft:oxidized_cut_copper_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(79, 153, 126),
+		},
+	),
+	(
+		"minecraft:packed_ice",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(141, 180, 250),
+		},
+	),
+	(
+		"minecraft:peony",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(129, 126, 139),
+		},
+	),
+	(
+		"minecraft:petrified_oak_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(162, 130, 78),
+		},
+	),
+	(
+		"minecraft:pink_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:pink_bed",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:pink_candle",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:pink_candle_cake",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(248, 222, 214),
+		},
+	),
+	(
+		"minecraft:pink_carpet",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(237, 141, 172),
+		},
+	),
+	(
+		"minecraft:pink_concrete",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(213, 101, 142),
+		},
+	),
+	(
+		"minecraft:pink_concrete_powder",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(228, 153, 181),
+		},
+	),
+	(
+		"minecraft:pink_glazed_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(235, 154, 181),
+		},
+	),
+	(
+		"minecraft:pink_shulker_box",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(230, 121, 157),
+		},
+	),
+	(
+		"minecraft:pink_stained_glass",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(242, 127, 165),
+		},
+	),
+	(
+		"minecraft:pink_stained_glass_pane",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(233, 122, 159),
+		},
+	),
+	(
+		"minecraft:pink_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(161, 78, 78),
+		},
+	),
+	(
+		"minecraft:pink_tulip",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:pink_wall_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:pink_wool",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(237, 141, 172),
+		},
+	),
+	(
+		"minecraft:piston",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(110, 104, 96),
+		},
+	),
+	(
+		"minecraft:piston_head",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(154, 127, 87),
+		},
+	),
+	(
+		"minecraft:player_head",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:player_wall_head",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:podzol",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(91, 63, 24),
+		},
+	),
+	(
+		"minecraft:pointed_dripstone",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(129, 102, 89),
+		},
+	),
+	(
+		"minecraft:polished_andesite",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(132, 134, 133),
+		},
+	),
+	(
+		"minecraft:polished_andesite_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(132, 134, 133),
+		},
+	),
+	(
+		"minecraft:polished_andesite_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(132, 134, 133),
+		},
+	),
+	(
+		"minecraft:polished_basalt",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(99, 98, 100),
+		},
+	),
+	(
+		"minecraft:polished_blackstone",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(53, 48, 56),
+		},
+	),
+	(
+		"minecraft:polished_blackstone_brick_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(48, 42, 49),
+		},
+	),
+	(
+		"minecraft:polished_blackstone_brick_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(48, 42, 49),
+		},
+	),
+	(
+		"minecraft:polished_blackstone_brick_wall",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(48, 42, 49),
+		},
+	),
+	(
+		"minecraft:polished_blackstone_bricks",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(48, 42, 49),
+		},
+	),
+	(
+		"minecraft:polished_blackstone_button",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:polished_blackstone_pressure_plate",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(53, 48, 56),
+		},
+	),
+	(
+		"minecraft:polished_blackstone_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(53, 48, 56),
+		},
+	),
+	(
+		"minecraft:polished_blackstone_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(53, 48, 56),
+		},
+	),
+	(
+		"minecraft:polished_blackstone_wall",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(53, 48, 56),
+		},
+	),
+	(
+		"minecraft:polished_deepslate",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(72, 72, 73),
+		},
+	),
+	(
+		"minecraft:polished_deepslate_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(72, 72, 73),
+		},
+	),
+	(
+		"minecraft:polished_deepslate_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(72, 72, 73),
+		},
+	),
+	(
+		"minecraft:polished_deepslate_wall",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(72, 72, 73),
+		},
+	),
+	(
+		"minecraft:polished_diorite",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(192, 193, 194),
+		},
+	),
+	(
+		"minecraft:polished_diorite_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(192, 193, 194),
+		},
+	),
+	(
+		"minecraft:polished_diorite_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(192, 193, 194),
+		},
+	),
+	(
+		"minecraft:polished_granite",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(154, 106, 89),
+		},
+	),
+	(
+		"minecraft:polished_granite_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(154, 106, 89),
+		},
+	),
+	(
+		"minecraft:polished_granite_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(154, 106, 89),
+		},
+	),
+	(
+		"minecraft:poppy",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:potatoes",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(84, 135, 47),
+		},
+	),
+	(
+		"minecraft:potted_acacia_sapling",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(118, 117, 23),
+		},
+	),
+	(
+		"minecraft:potted_allium",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(158, 137, 183),
+		},
+	),
+	(
+		"minecraft:potted_azalea_bush",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(101, 124, 47),
+		},
+	),
+	(
+		"minecraft:potted_azure_bluet",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(169, 204, 127),
+		},
+	),
+	(
+		"minecraft:potted_bamboo",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(93, 144, 19),
+		},
+	),
+	(
+		"minecraft:potted_birch_sapling",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(127, 160, 79),
+		},
+	),
+	(
+		"minecraft:potted_blue_orchid",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(47, 162, 168),
+		},
+	),
+	(
+		"minecraft:potted_brown_mushroom",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(153, 116, 92),
+		},
+	),
+	(
+		"minecraft:potted_cactus",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(85, 127, 43),
+		},
+	),
+	(
+		"minecraft:potted_cornflower",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(79, 121, 146),
+		},
+	),
+	(
+		"minecraft:potted_crimson_fungus",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(141, 44, 29),
+		},
+	),
+	(
+		"minecraft:potted_crimson_roots",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(127, 8, 41),
+		},
+	),
+	(
+		"minecraft:potted_dandelion",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(147, 172, 43),
+		},
+	),
+	(
+		"minecraft:potted_dark_oak_sapling",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(61, 90, 30),
+		},
+	),
+	(
+		"minecraft:potted_dead_bush",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(107, 78, 40),
+		},
+	),
+	(
+		"minecraft:potted_fern",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque|Grass}),
+			color: BlockColor(124, 124, 124),
+		},
+	),
+	(
+		"minecraft:potted_flowering_azalea_bush",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(112, 121, 64),
+		},
+	),
+	(
+		"minecraft:potted_jungle_sapling",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(47, 81, 16),
+		},
+	),
+	(
+		"minecraft:potted_lily_of_the_valley",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(123, 174, 95),
+		},
+	),
+	(
+		"minecraft:potted_oak_sapling",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(77, 106, 40),
+		},
+	),
+	(
+		"minecraft:potted_orange_tulip",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(93, 142, 30),
+		},
+	),
+	(
+		"minecraft:potted_oxeye_daisy",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(179, 202, 143),
+		},
+	),
+	(
+		"minecraft:potted_pink_tulip",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(99, 157, 78),
+		},
+	),
+	(
+		"minecraft:potted_poppy",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(128, 64, 37),
+		},
+	),
+	(
+		"minecraft:potted_red_mushroom",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(216, 75, 67),
+		},
+	),
+	(
+		"minecraft:potted_red_tulip",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(89, 128, 32),
+		},
+	),
+	(
+		"minecraft:potted_spruce_sapling",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(44, 60, 36),
+		},
+	),
+	(
+		"minecraft:potted_warped_fungus",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(74, 109, 87),
+		},
+	),
+	(
+		"minecraft:potted_warped_roots",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(20, 136, 123),
+		},
+	),
+	(
+		"minecraft:potted_white_tulip",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(93, 164, 71),
+		},
+	),
+	(
+		"minecraft:potted_wither_rose",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(41, 44, 23),
+		},
+	),
+	(
+		"minecraft:powder_snow",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(248, 253, 253),
+		},
+	),
+	(
+		"minecraft:powder_snow_cauldron",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(73, 72, 74),
+		},
+	),
+	(
+		"minecraft:powered_rail",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(137, 109, 74),
+		},
+	),
+	(
+		"minecraft:prismarine",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(99, 156, 151),
+		},
+	),
+	(
+		"minecraft:prismarine_brick_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(99, 171, 158),
+		},
+	),
+	(
+		"minecraft:prismarine_brick_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(99, 171, 158),
+		},
+	),
+	(
+		"minecraft:prismarine_bricks",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(99, 171, 158),
+		},
+	),
+	(
+		"minecraft:prismarine_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(99, 156, 151),
+		},
+	),
+	(
+		"minecraft:prismarine_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(99, 156, 151),
+		},
+	),
+	(
+		"minecraft:prismarine_wall",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(99, 156, 151),
+		},
+	),
+	(
+		"minecraft:pumpkin",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(198, 118, 24),
+		},
+	),
+	(
+		"minecraft:pumpkin_stem",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque|Grass}),
+			color: BlockColor(154, 154, 154),
+		},
+	),
+	(
+		"minecraft:purple_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:purple_bed",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:purple_candle",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:purple_candle_cake",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(248, 222, 214),
+		},
+	),
+	(
+		"minecraft:purple_carpet",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(121, 42, 172),
+		},
+	),
+	(
+		"minecraft:purple_concrete",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(100, 31, 156),
+		},
+	),
+	(
+		"minecraft:purple_concrete_powder",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(131, 55, 177),
+		},
+	),
+	(
+		"minecraft:purple_glazed_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(109, 48, 152),
+		},
+	),
+	(
+		"minecraft:purple_shulker_box",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(103, 32, 156),
+		},
+	),
+	(
+		"minecraft:purple_stained_glass",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(127, 63, 178),
+		},
+	),
+	(
+		"minecraft:purple_stained_glass_pane",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(122, 61, 171),
+		},
+	),
+	(
+		"minecraft:purple_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(118, 70, 86),
+		},
+	),
+	(
+		"minecraft:purple_wall_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:purple_wool",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(121, 42, 172),
+		},
+	),
+	(
+		"minecraft:purpur_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(169, 125, 169),
+		},
+	),
+	(
+		"minecraft:purpur_pillar",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(171, 129, 171),
+		},
+	),
+	(
+		"minecraft:purpur_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(169, 125, 169),
+		},
+	),
+	(
+		"minecraft:purpur_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(169, 125, 169),
+		},
+	),
+	(
+		"minecraft:quartz_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(235, 229, 222),
+		},
+	),
+	(
+		"minecraft:quartz_bricks",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(234, 229, 221),
+		},
+	),
+	(
+		"minecraft:quartz_pillar",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(235, 230, 224),
+		},
+	),
+	(
+		"minecraft:quartz_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(235, 229, 222),
+		},
+	),
+	(
+		"minecraft:quartz_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(235, 229, 222),
+		},
+	),
+	(
+		"minecraft:rail",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(125, 111, 88),
+		},
+	),
+	(
+		"minecraft:raw_copper_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(154, 105, 79),
+		},
+	),
+	(
+		"minecraft:raw_gold_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(221, 169, 46),
+		},
+	),
+	(
+		"minecraft:raw_iron_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(166, 135, 107),
+		},
+	),
+	(
+		"minecraft:red_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:red_bed",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:red_candle",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:red_candle_cake",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(248, 222, 214),
+		},
+	),
+	(
+		"minecraft:red_carpet",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(160, 39, 34),
+		},
+	),
+	(
+		"minecraft:red_concrete",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(142, 32, 32),
+		},
+	),
+	(
+		"minecraft:red_concrete_powder",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(168, 54, 50),
+		},
+	),
+	(
+		"minecraft:red_glazed_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(181, 59, 53),
+		},
+	),
+	(
+		"minecraft:red_mushroom",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:red_mushroom_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(200, 46, 45),
+		},
+	),
+	(
+		"minecraft:red_nether_brick_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(69, 7, 9),
+		},
+	),
+	(
+		"minecraft:red_nether_brick_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(69, 7, 9),
+		},
+	),
+	(
+		"minecraft:red_nether_brick_wall",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(69, 7, 9),
+		},
+	),
+	(
+		"minecraft:red_nether_bricks",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(69, 7, 9),
+		},
+	),
+	(
+		"minecraft:red_sand",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(190, 102, 33),
+		},
+	),
+	(
+		"minecraft:red_sandstone",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(181, 97, 31),
+		},
+	),
+	(
+		"minecraft:red_sandstone_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(181, 97, 31),
+		},
+	),
+	(
+		"minecraft:red_sandstone_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(181, 97, 31),
+		},
+	),
+	(
+		"minecraft:red_sandstone_wall",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(181, 97, 31),
+		},
+	),
+	(
+		"minecraft:red_shulker_box",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(140, 31, 30),
+		},
+	),
+	(
+		"minecraft:red_stained_glass",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(153, 51, 51),
+		},
+	),
+	(
+		"minecraft:red_stained_glass_pane",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(147, 48, 48),
+		},
+	),
+	(
+		"minecraft:red_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(143, 61, 46),
+		},
+	),
+	(
+		"minecraft:red_tulip",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:red_wall_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:red_wool",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(160, 39, 34),
+		},
+	),
+	(
+		"minecraft:redstone_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(175, 24, 5),
+		},
+	),
+	(
+		"minecraft:redstone_lamp",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(95, 54, 30),
+		},
+	),
+	(
+		"minecraft:redstone_ore",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(140, 109, 109),
+		},
+	),
+	(
+		"minecraft:redstone_torch",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:redstone_wall_torch",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:redstone_wire",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(175, 24, 5),
+		},
+	),
+	(
+		"minecraft:repeater",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(160, 157, 156),
+		},
+	),
+	(
+		"minecraft:repeating_command_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(129, 111, 176),
+		},
+	),
+	(
+		"minecraft:respawn_anchor",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(75, 26, 144),
+		},
+	),
+	(
+		"minecraft:rooted_dirt",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(144, 103, 76),
+		},
+	),
+	(
+		"minecraft:rose_bush",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(131, 66, 37),
+		},
+	),
+	(
+		"minecraft:sand",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(219, 207, 163),
+		},
+	),
+	(
+		"minecraft:sandstone",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(223, 214, 170),
+		},
+	),
+	(
+		"minecraft:sandstone_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(223, 214, 170),
+		},
+	),
+	(
+		"minecraft:sandstone_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(223, 214, 170),
+		},
+	),
+	(
+		"minecraft:sandstone_wall",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(223, 214, 170),
+		},
+	),
+	(
+		"minecraft:scaffolding",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(174, 134, 80),
+		},
+	),
+	(
+		"minecraft:sculk_sensor",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(7, 70, 84),
+		},
+	),
+	(
+		"minecraft:sea_lantern",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(172, 199, 190),
+		},
+	),
+	(
+		"minecraft:sea_pickle",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(90, 97, 39),
+		},
+	),
+	(
+		"minecraft:seagrass",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:shroomlight",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(240, 146, 70),
+		},
+	),
+	(
+		"minecraft:shulker_box",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(139, 96, 139),
+		},
+	),
+	(
+		"minecraft:sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(162, 130, 78),
+		},
+	),
+	(
+		"minecraft:skeleton_skull",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:skeleton_wall_skull",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:slime_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(111, 192, 91),
+		},
+	),
+	(
+		"minecraft:small_amethyst_bud",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:small_dripleaf",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:smithing_table",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(57, 58, 70),
+		},
+	),
+	(
+		"minecraft:smoker",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(85, 83, 81),
+		},
+	),
+	(
+		"minecraft:smooth_basalt",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(72, 72, 78),
+		},
+	),
+	(
+		"minecraft:smooth_quartz",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(235, 229, 222),
+		},
+	),
+	(
+		"minecraft:smooth_quartz_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(235, 229, 222),
+		},
+	),
+	(
+		"minecraft:smooth_quartz_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(235, 229, 222),
+		},
+	),
+	(
+		"minecraft:smooth_red_sandstone",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(181, 97, 31),
+		},
+	),
+	(
+		"minecraft:smooth_red_sandstone_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(181, 97, 31),
+		},
+	),
+	(
+		"minecraft:smooth_red_sandstone_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(181, 97, 31),
+		},
+	),
+	(
+		"minecraft:smooth_sandstone",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(223, 214, 170),
+		},
+	),
+	(
+		"minecraft:smooth_sandstone_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(223, 214, 170),
+		},
+	),
+	(
+		"minecraft:smooth_sandstone_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(223, 214, 170),
+		},
+	),
+	(
+		"minecraft:smooth_stone",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(158, 158, 158),
+		},
+	),
+	(
+		"minecraft:smooth_stone_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(158, 158, 158),
+		},
+	),
+	(
+		"minecraft:snow",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(249, 254, 254),
+		},
+	),
+	(
+		"minecraft:snow_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(249, 254, 254),
+		},
+	),
+	(
+		"minecraft:soul_campfire",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(80, 204, 208),
+		},
+	),
+	(
+		"minecraft:soul_fire",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(51, 192, 197),
+		},
+	),
+	(
+		"minecraft:soul_lantern",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(71, 99, 114),
+		},
+	),
+	(
+		"minecraft:soul_sand",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(81, 62, 50),
+		},
+	),
+	(
+		"minecraft:soul_soil",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(75, 57, 46),
+		},
+	),
+	(
+		"minecraft:soul_torch",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:soul_wall_torch",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:spawner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(36, 46, 62),
+		},
+	),
+	(
+		"minecraft:sponge",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(195, 192, 74),
+		},
+	),
+	(
+		"minecraft:spore_blossom",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(206, 96, 158),
+		},
+	),
+	(
+		"minecraft:spruce_button",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:spruce_door",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(106, 80, 48),
+		},
+	),
+	(
+		"minecraft:spruce_fence",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(114, 84, 48),
+		},
+	),
+	(
+		"minecraft:spruce_fence_gate",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(114, 84, 48),
+		},
+	),
+	(
+		"minecraft:spruce_leaves",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque|Spruce}),
+			color: BlockColor(126, 126, 126),
+		},
+	),
+	(
+		"minecraft:spruce_log",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(108, 80, 46),
+		},
+	),
+	(
+		"minecraft:spruce_planks",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(114, 84, 48),
+		},
+	),
+	(
+		"minecraft:spruce_pressure_plate",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(114, 84, 48),
+		},
+	),
+	(
+		"minecraft:spruce_sapling",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(44, 60, 36),
+		},
+	),
+	(
+		"minecraft:spruce_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(114, 84, 48),
+		},
+	),
+	(
+		"minecraft:spruce_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(114, 84, 48),
+		},
+	),
+	(
+		"minecraft:spruce_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(114, 84, 48),
+		},
+	),
+	(
+		"minecraft:spruce_trapdoor",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(103, 79, 47),
+		},
+	),
+	(
+		"minecraft:spruce_wall_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:spruce_wood",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(58, 37, 16),
+		},
+	),
+	(
+		"minecraft:sticky_piston",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(110, 104, 96),
+		},
+	),
+	(
+		"minecraft:stone",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(125, 125, 125),
+		},
+	),
+	(
+		"minecraft:stone_brick_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(122, 121, 122),
+		},
+	),
+	(
+		"minecraft:stone_brick_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(122, 121, 122),
+		},
+	),
+	(
+		"minecraft:stone_brick_wall",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(122, 121, 122),
+		},
+	),
+	(
+		"minecraft:stone_bricks",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(122, 121, 122),
+		},
+	),
+	(
+		"minecraft:stone_button",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:stone_pressure_plate",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(125, 125, 125),
+		},
+	),
+	(
+		"minecraft:stone_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(125, 125, 125),
+		},
+	),
+	(
+		"minecraft:stone_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(125, 125, 125),
+		},
+	),
+	(
+		"minecraft:stonecutter",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(123, 118, 111),
+		},
+	),
+	(
+		"minecraft:stripped_acacia_log",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(166, 91, 51),
+		},
+	),
+	(
+		"minecraft:stripped_acacia_wood",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(174, 92, 59),
+		},
+	),
+	(
+		"minecraft:stripped_birch_log",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(191, 171, 116),
+		},
+	),
+	(
+		"minecraft:stripped_birch_wood",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(196, 176, 118),
+		},
+	),
+	(
+		"minecraft:stripped_crimson_hyphae",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(137, 57, 90),
+		},
+	),
+	(
+		"minecraft:stripped_crimson_stem",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(121, 56, 82),
+		},
+	),
+	(
+		"minecraft:stripped_dark_oak_log",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(65, 44, 22),
+		},
+	),
+	(
+		"minecraft:stripped_dark_oak_wood",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(72, 56, 36),
+		},
+	),
+	(
+		"minecraft:stripped_jungle_log",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(165, 122, 81),
+		},
+	),
+	(
+		"minecraft:stripped_jungle_wood",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(171, 132, 84),
+		},
+	),
+	(
+		"minecraft:stripped_oak_log",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(160, 129, 77),
+		},
+	),
+	(
+		"minecraft:stripped_oak_wood",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(177, 144, 86),
+		},
+	),
+	(
+		"minecraft:stripped_spruce_log",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(105, 80, 46),
+		},
+	),
+	(
+		"minecraft:stripped_spruce_wood",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(115, 89, 52),
+		},
+	),
+	(
+		"minecraft:stripped_warped_hyphae",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(57, 150, 147),
+		},
+	),
+	(
+		"minecraft:stripped_warped_stem",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(52, 128, 124),
+		},
+	),
+	(
+		"minecraft:structure_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(88, 74, 90),
+		},
+	),
+	(
+		"minecraft:structure_void",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:sugar_cane",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(148, 192, 101),
+		},
+	),
+	(
+		"minecraft:sunflower",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(246, 196, 54),
+		},
+	),
+	(
+		"minecraft:sweet_berry_bush",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(68, 77, 50),
+		},
+	),
+	(
+		"minecraft:tall_grass",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque|Grass}),
+			color: BlockColor(151, 149, 151),
+		},
+	),
+	(
+		"minecraft:tall_seagrass",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(59, 139, 14),
+		},
+	),
+	(
+		"minecraft:target",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(226, 170, 157),
+		},
+	),
+	(
+		"minecraft:terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(152, 94, 67),
+		},
+	),
+	(
+		"minecraft:tinted_glass",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(44, 38, 46),
+		},
+	),
+	(
+		"minecraft:tnt",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(142, 62, 53),
+		},
+	),
+	(
+		"minecraft:torch",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:trapped_chest",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(162, 130, 78),
+		},
+	),
+	(
+		"minecraft:tripwire",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:tripwire_hook",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:tube_coral",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:tube_coral_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(49, 87, 206),
+		},
+	),
+	(
+		"minecraft:tube_coral_fan",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:tube_coral_wall_fan",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:tuff",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(108, 109, 102),
+		},
+	),
+	(
+		"minecraft:turtle_egg",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(228, 226, 191),
+		},
+	),
+	(
+		"minecraft:twisting_vines",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(20, 143, 124),
+		},
+	),
+	(
+		"minecraft:twisting_vines_plant",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(20, 135, 122),
+		},
+	),
+	(
+		"minecraft:vine",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque|Grass}),
+			color: BlockColor(116, 116, 116),
+		},
+	),
+	(
+		"minecraft:void_air",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:wall_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:wall_torch",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:warped_button",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:warped_door",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(44, 126, 120),
+		},
+	),
+	(
+		"minecraft:warped_fence",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(43, 104, 99),
+		},
+	),
+	(
+		"minecraft:warped_fence_gate",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(43, 104, 99),
+		},
+	),
+	(
+		"minecraft:warped_fungus",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:warped_hyphae",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(58, 58, 77),
+		},
+	),
+	(
+		"minecraft:warped_nylium",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(43, 114, 101),
+		},
+	),
+	(
+		"minecraft:warped_planks",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(43, 104, 99),
+		},
+	),
+	(
+		"minecraft:warped_pressure_plate",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(43, 104, 99),
+		},
+	),
+	(
+		"minecraft:warped_roots",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(20, 138, 124),
+		},
+	),
+	(
+		"minecraft:warped_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(43, 104, 99),
+		},
+	),
+	(
+		"minecraft:warped_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(43, 104, 99),
+		},
+	),
+	(
+		"minecraft:warped_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(43, 104, 99),
+		},
+	),
+	(
+		"minecraft:warped_stem",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(53, 109, 110),
+		},
+	),
+	(
+		"minecraft:warped_trapdoor",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(47, 119, 111),
+		},
+	),
+	(
+		"minecraft:warped_wall_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:warped_wart_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(22, 119, 121),
+		},
+	),
+	(
+		"minecraft:water",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque|Water}),
+			color: BlockColor(177, 177, 177),
+		},
+	),
+	(
+		"minecraft:water_cauldron",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(73, 72, 74),
+		},
+	),
+	(
+		"minecraft:waxed_copper_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(192, 107, 79),
+		},
+	),
+	(
+		"minecraft:waxed_cut_copper",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(191, 106, 80),
+		},
+	),
+	(
+		"minecraft:waxed_cut_copper_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(191, 106, 80),
+		},
+	),
+	(
+		"minecraft:waxed_cut_copper_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(191, 106, 80),
+		},
+	),
+	(
+		"minecraft:waxed_exposed_copper",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(161, 125, 103),
+		},
+	),
+	(
+		"minecraft:waxed_exposed_cut_copper",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(154, 121, 101),
+		},
+	),
+	(
+		"minecraft:waxed_exposed_cut_copper_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(154, 121, 101),
+		},
+	),
+	(
+		"minecraft:waxed_exposed_cut_copper_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(154, 121, 101),
+		},
+	),
+	(
+		"minecraft:waxed_oxidized_copper",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(82, 162, 132),
+		},
+	),
+	(
+		"minecraft:waxed_oxidized_cut_copper",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(79, 153, 126),
+		},
+	),
+	(
+		"minecraft:waxed_oxidized_cut_copper_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(79, 153, 126),
+		},
+	),
+	(
+		"minecraft:waxed_oxidized_cut_copper_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(79, 153, 126),
+		},
+	),
+	(
+		"minecraft:waxed_weathered_copper",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(108, 153, 110),
+		},
+	),
+	(
+		"minecraft:waxed_weathered_cut_copper",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(109, 145, 107),
+		},
+	),
+	(
+		"minecraft:waxed_weathered_cut_copper_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(109, 145, 107),
+		},
+	),
+	(
+		"minecraft:waxed_weathered_cut_copper_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(109, 145, 107),
+		},
+	),
+	(
+		"minecraft:weathered_copper",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(108, 153, 110),
+		},
+	),
+	(
+		"minecraft:weathered_cut_copper",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(109, 145, 107),
+		},
+	),
+	(
+		"minecraft:weathered_cut_copper_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(109, 145, 107),
+		},
+	),
+	(
+		"minecraft:weathered_cut_copper_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(109, 145, 107),
+		},
+	),
+	(
+		"minecraft:weeping_vines",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(104, 1, 0),
+		},
+	),
+	(
+		"minecraft:weeping_vines_plant",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(132, 16, 12),
+		},
+	),
+	(
+		"minecraft:wet_sponge",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(171, 181, 70),
+		},
+	),
+	(
+		"minecraft:wheat",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(166, 151, 73),
+		},
+	),
+	(
+		"minecraft:white_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:white_bed",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:white_candle",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:white_candle_cake",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(248, 222, 214),
+		},
+	),
+	(
+		"minecraft:white_carpet",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(233, 236, 236),
+		},
+	),
+	(
+		"minecraft:white_concrete",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(207, 213, 214),
+		},
+	),
+	(
+		"minecraft:white_concrete_powder",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(225, 227, 227),
+		},
+	),
+	(
+		"minecraft:white_glazed_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(188, 212, 202),
+		},
+	),
+	(
+		"minecraft:white_shulker_box",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(215, 220, 221),
+		},
+	),
+	(
+		"minecraft:white_stained_glass",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(255, 255, 255),
+		},
+	),
+	(
+		"minecraft:white_stained_glass_pane",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(246, 246, 246),
+		},
+	),
+	(
+		"minecraft:white_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(209, 178, 161),
+		},
+	),
+	(
+		"minecraft:white_tulip",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:white_wall_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:white_wool",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(233, 236, 236),
+		},
+	),
+	(
+		"minecraft:wither_rose",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:wither_skeleton_skull",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:wither_skeleton_wall_skull",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:yellow_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:yellow_bed",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:yellow_candle",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:yellow_candle_cake",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(248, 222, 214),
+		},
+	),
+	(
+		"minecraft:yellow_carpet",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(248, 197, 39),
+		},
+	),
+	(
+		"minecraft:yellow_concrete",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(240, 175, 21),
+		},
+	),
+	(
+		"minecraft:yellow_concrete_powder",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(232, 199, 54),
+		},
+	),
+	(
+		"minecraft:yellow_glazed_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(234, 192, 88),
+		},
+	),
+	(
+		"minecraft:yellow_shulker_box",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(248, 188, 29),
+		},
+	),
+	(
+		"minecraft:yellow_stained_glass",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(229, 229, 51),
+		},
+	),
+	(
+		"minecraft:yellow_stained_glass_pane",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(221, 221, 48),
+		},
+	),
+	(
+		"minecraft:yellow_terracotta",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(186, 133, 35),
+		},
+	),
+	(
+		"minecraft:yellow_wall_banner",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:yellow_wool",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{Opaque}),
+			color: BlockColor(248, 197, 39),
+		},
+	),
+	(
+		"minecraft:zombie_head",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:zombie_wall_head",
+		BlockType {
+			flags: make_bitflags!(BlockFlags::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+];
diff --git a/src/resource/mod.rs b/src/resource/mod.rs
new file mode 100644
index 0000000..cadac86
--- /dev/null
+++ b/src/resource/mod.rs
@@ -0,0 +1,33 @@
+mod block_types;
+
+use std::collections::HashMap;
+
+use enumflags2::{bitflags, BitFlags};
+
+#[bitflags]
+#[repr(u8)]
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum BlockFlags {
+	Opaque,
+	Grass,
+	Foliage,
+	Birch,
+	Spruce,
+	Water,
+}
+
+#[derive(Debug, Clone, Copy)]
+pub struct BlockColor(pub u8, pub u8, pub u8);
+
+#[derive(Debug, Clone, Copy)]
+pub struct BlockType {
+	pub flags: BitFlags<BlockFlags>,
+	pub color: BlockColor,
+}
+
+pub fn get_block_types() -> HashMap<String, BlockType> {
+	block_types::BLOCK_TYPES
+		.iter()
+		.map(|(k, v)| (String::from(*k), *v))
+		.collect()
+}

From a174d627cdb76ca0d8508760375cb4c5036404d7 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 12 Feb 2023 10:22:38 +0100
Subject: [PATCH 063/460] Cargo.toml: change license to MIT

The copy of the license text in the repository is dropped.
---
 Cargo.toml |  2 +-
 LICENSE    | 22 ----------------------
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 LICENSE

diff --git a/Cargo.toml b/Cargo.toml
index 1b43110..4c6ee7f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "minedmap"
 version = "0.1.0"
 edition = "2021"
-license = "BSD-2-Clause"
+license = "MIT"
 default-run = "minedmap"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index e243464..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2015-2021, Matthias Schiffer <mschiffer@universe-factory.net>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-  2. Redistributions in binary form must reproduce the above copyright notice,
-     this list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

From 357ef46731fe39dd4bb29ba35d7616aa25c1382a Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 12 Feb 2023 12:14:10 +0100
Subject: [PATCH 064/460] types: add helper for division + remainder

We frequently require these operations together when converting between
bit and byte offsets, or similar purposes.
---
 src/types.rs | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/types.rs b/src/types.rs
index 9aa4b7d..9f0cf0d 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -1,6 +1,6 @@
 use std::{
 	fmt::Debug,
-	ops::{Index, IndexMut},
+	ops::{Div, Index, IndexMut, Rem},
 };
 
 use itertools::iproduct;
@@ -61,3 +61,25 @@ impl<T> IndexMut<ChunkCoords> for ChunkArray<T> {
 		&mut self.0[index.z.0 as usize][index.x.0 as usize]
 	}
 }
+
+pub trait DivRem<Rhs> {
+	type DivOutput;
+	type RemOutput;
+
+	fn div_rem(self, rhs: Rhs) -> (Self::DivOutput, Self::RemOutput);
+}
+
+impl<Lhs, Rhs> DivRem<Rhs> for Lhs
+where
+	Self: Div<Rhs>,
+	Self: Rem<Rhs>,
+	Self: Copy,
+	Rhs: Copy,
+{
+	type DivOutput = <Self as Div<Rhs>>::Output;
+	type RemOutput = <Self as Rem<Rhs>>::Output;
+
+	fn div_rem(self, rhs: Rhs) -> (Self::DivOutput, Self::RemOutput) {
+		(self / rhs, self % rhs)
+	}
+}

From b040a635ed3d51bc304f6f4e05b5f7229903f59b Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 12 Feb 2023 12:17:46 +0100
Subject: [PATCH 065/460] types: add types for block and section coordinates

---
 src/types.rs | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/src/types.rs b/src/types.rs
index 9f0cf0d..450293f 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -5,6 +5,47 @@ use std::{
 
 use itertools::iproduct;
 
+pub const BLOCKS_PER_CHUNK: u8 = 16;
+
+/// A block X coordinate relative to a chunk
+#[derive(Debug, Clone, Copy)]
+pub struct BlockX(pub u8);
+
+/// A block Y coordinate relative to a chunk section
+#[derive(Debug, Clone, Copy)]
+pub struct BlockY(pub u8);
+
+/// A block Z coordinate relative to a chunk
+#[derive(Debug, Clone, Copy)]
+pub struct BlockZ(pub u8);
+
+#[derive(Clone, Copy)]
+pub struct BlockCoords {
+	pub x: BlockX,
+	pub y: BlockY,
+	pub z: BlockZ,
+}
+
+impl BlockCoords {
+	pub fn offset(&self) -> usize {
+		const N: usize = BLOCKS_PER_CHUNK as usize;
+		let x = self.x.0 as usize;
+		let y = self.y.0 as usize;
+		let z = self.z.0 as usize;
+		((y * N) + z) * N + x
+	}
+}
+
+impl Debug for BlockCoords {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		write!(f, "({}, {}, {})", self.x.0, self.y.0, self.z.0)
+	}
+}
+
+/// A section Y coordinate
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+pub struct SectionY(pub i32);
+
 pub const CHUNKS_PER_REGION: u8 = 32;
 
 /// A chunk X coordinate relative to a region

From 2d782f25b1082f65a6ae147b0829f5fac6b879ad Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 12 Feb 2023 01:01:53 +0100
Subject: [PATCH 066/460] world: add types to wrap common parts of section data

---
 src/world/chunk.rs   | 111 +++++++++++++++++++++++++++++++++++++++++++
 src/world/mod.rs     |   2 +
 src/world/section.rs |  95 ++++++++++++++++++++++++++++++++++++
 3 files changed, 208 insertions(+)
 create mode 100644 src/world/chunk.rs
 create mode 100644 src/world/section.rs

diff --git a/src/world/chunk.rs b/src/world/chunk.rs
new file mode 100644
index 0000000..d5b30b6
--- /dev/null
+++ b/src/world/chunk.rs
@@ -0,0 +1,111 @@
+use std::collections::BTreeMap;
+
+use anyhow::{bail, Context, Result};
+
+use super::{
+	de,
+	section::{OldSection, PaletteSection, PaletteSectionBiomes},
+};
+use crate::types::*;
+
+pub enum Chunk<'a> {
+	V1_18 {
+		section_map: BTreeMap<SectionY, (PaletteSection<'a>, PaletteSectionBiomes<'a>)>,
+	},
+	V1_13 {
+		section_map: BTreeMap<SectionY, PaletteSection<'a>>,
+		biomes: &'a de::BiomesOld,
+	},
+	Old {
+		section_map: BTreeMap<SectionY, OldSection<'a>>,
+		biomes: &'a de::BiomesOld,
+	},
+	Empty,
+}
+
+impl<'a> Chunk<'a> {
+	pub fn new(data: &'a de::Chunk) -> Result<Self> {
+		let data_version = data.data_version.unwrap_or_default();
+
+		match &data.chunk {
+			de::ChunkVariants::V1_18 { sections } => Self::new_v1_18(data_version, sections),
+			de::ChunkVariants::Old { level } => Self::new_old(data_version, level),
+		}
+	}
+
+	fn new_v1_18(data_version: u32, sections: &'a Vec<de::SectionV1_18>) -> Result<Self> {
+		let mut section_map = BTreeMap::new();
+
+		for section in sections {
+			section_map.insert(
+				SectionY(section.y),
+				(
+					PaletteSection::new(
+						data_version,
+						section.block_states.data.as_ref(),
+						&section.block_states.palette,
+					)
+					.with_context(|| format!("Failed to load section at Y={}", section.y))?,
+					PaletteSectionBiomes::new(
+						section.biomes.data.as_ref(),
+						&section.biomes.palette,
+					)
+					.with_context(|| format!("Failed to load section biomes at Y={}", section.y))?,
+				),
+			);
+		}
+
+		Ok(Chunk::V1_18 { section_map })
+	}
+
+	fn new_old(data_version: u32, level: &'a de::LevelOld) -> Result<Self> {
+		let mut section_map_v1_13 = BTreeMap::new();
+		let mut section_map_old = BTreeMap::new();
+
+		for section in &level.sections {
+			match &section.section {
+				de::SectionOldVariants::V1_13 {
+					block_states,
+					palette,
+				} => {
+					section_map_v1_13.insert(
+						SectionY(section.y.into()),
+						PaletteSection::new(data_version, Some(block_states), palette)
+							.with_context(|| {
+								format!("Failed to load section at Y={}", section.y)
+							})?,
+					);
+				}
+				de::SectionOldVariants::Old { blocks, data } => {
+					section_map_old.insert(
+						SectionY(section.y.into()),
+						OldSection::new(blocks, data).with_context(|| {
+							format!("Failed to load section at Y={}", section.y)
+						})?,
+					);
+				}
+				de::SectionOldVariants::Empty {} => {}
+			}
+		}
+
+		// TODO Check biomes length
+		let biomes = level.biomes.as_ref().context("Invalid biome data");
+
+		Ok(
+			match (section_map_v1_13.is_empty(), section_map_old.is_empty()) {
+				(true, true) => Chunk::Empty,
+				(false, true) => Chunk::V1_13 {
+					section_map: section_map_v1_13,
+					biomes: biomes?,
+				},
+				(true, false) => Chunk::Old {
+					section_map: section_map_old,
+					biomes: biomes?,
+				},
+				(false, false) => {
+					bail!("Mixed section versions");
+				}
+			},
+		)
+	}
+}
diff --git a/src/world/mod.rs b/src/world/mod.rs
index 7bbc60f..ae071e0 100644
--- a/src/world/mod.rs
+++ b/src/world/mod.rs
@@ -1 +1,3 @@
+pub mod chunk;
 pub mod de;
+pub mod section;
diff --git a/src/world/section.rs b/src/world/section.rs
new file mode 100644
index 0000000..2ac3945
--- /dev/null
+++ b/src/world/section.rs
@@ -0,0 +1,95 @@
+use anyhow::{bail, Context, Result};
+
+use super::de;
+
+fn palette_bits(len: usize, min: u8, max: u8) -> Option<u8> {
+	let mut bits = min;
+	while (1 << bits) < len {
+		bits += 1;
+
+		if bits > max {
+			return None;
+		}
+	}
+
+	Some(bits)
+}
+
+#[derive(Debug)]
+pub struct PaletteSectionBiomes<'a> {
+	biomes: Option<&'a fastnbt::LongArray>,
+	palette: &'a Vec<String>,
+	bits: u8,
+}
+
+impl<'a> PaletteSectionBiomes<'a> {
+	pub fn new(biomes: Option<&'a fastnbt::LongArray>, palette: &'a Vec<String>) -> Result<Self> {
+		let bits = palette_bits(palette.len(), 1, 6).context("Unsupported block palette size")?;
+
+		if let Some(biomes) = biomes {
+			let biomes_per_word = 64 / bits as usize;
+			let expected_length = (64 + biomes_per_word - 1) / biomes_per_word;
+			if biomes.len() != expected_length {
+				bail!("Invalid section biome data");
+			}
+		}
+
+		Ok(PaletteSectionBiomes {
+			biomes,
+			palette,
+			bits,
+		})
+	}
+}
+
+#[derive(Debug)]
+pub struct PaletteSection<'a> {
+	block_states: Option<&'a fastnbt::LongArray>,
+	palette: &'a Vec<de::BlockStatePaletteEntry>,
+	bits: u8,
+	aligned_blocks: bool,
+}
+
+impl<'a> PaletteSection<'a> {
+	pub fn new(
+		data_version: u32,
+		block_states: Option<&'a fastnbt::LongArray>,
+		palette: &'a Vec<de::BlockStatePaletteEntry>,
+	) -> Result<Self> {
+		let aligned_blocks = data_version >= 2529;
+
+		let bits = palette_bits(palette.len(), 4, 12).context("Unsupported block palette size")?;
+
+		if let Some(block_states) = block_states {
+			let expected_length = if aligned_blocks {
+				let blocks_per_word = 64 / bits as usize;
+				(4096 + blocks_per_word - 1) / blocks_per_word
+			} else {
+				64 * bits as usize
+			};
+			if block_states.len() != expected_length {
+				bail!("Invalid section block data");
+			}
+		}
+
+		Ok(Self {
+			block_states,
+			palette,
+			bits,
+			aligned_blocks,
+		})
+	}
+}
+
+#[derive(Debug)]
+pub struct OldSection<'a> {
+	blocks: &'a fastnbt::ByteArray,
+	data: &'a fastnbt::ByteArray,
+}
+
+impl<'a> OldSection<'a> {
+	pub fn new(blocks: &'a fastnbt::ByteArray, data: &'a fastnbt::ByteArray) -> Result<Self> {
+		// TODO: Check lengths
+		Ok(Self { blocks, data })
+	}
+}

From c130f3cdae4b50f39072025da5ba81e249cb6b26 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 12 Feb 2023 16:19:41 +0100
Subject: [PATCH 067/460] world: add section iterator

An (empty for now) trait is introduced to abstract over the two section
types.
---
 src/world/chunk.rs   | 120 ++++++++++++++++++++++++++++++++++++++++++-
 src/world/section.rs |   6 +++
 2 files changed, 124 insertions(+), 2 deletions(-)

diff --git a/src/world/chunk.rs b/src/world/chunk.rs
index d5b30b6..5ccb8f9 100644
--- a/src/world/chunk.rs
+++ b/src/world/chunk.rs
@@ -1,10 +1,13 @@
-use std::collections::BTreeMap;
+use std::{
+	collections::{btree_map, BTreeMap},
+	iter::{self, FusedIterator},
+};
 
 use anyhow::{bail, Context, Result};
 
 use super::{
 	de,
-	section::{OldSection, PaletteSection, PaletteSectionBiomes},
+	section::{OldSection, PaletteSection, PaletteSectionBiomes, Section},
 };
 use crate::types::*;
 
@@ -23,6 +26,25 @@ pub enum Chunk<'a> {
 	Empty,
 }
 
+#[derive(Debug, Clone)]
+enum SectionIterInner<'a> {
+	V1_18 {
+		iter: btree_map::Iter<'a, SectionY, (PaletteSection<'a>, PaletteSectionBiomes<'a>)>,
+	},
+	V1_13 {
+		iter: btree_map::Iter<'a, SectionY, PaletteSection<'a>>,
+	},
+	Old {
+		iter: btree_map::Iter<'a, SectionY, OldSection<'a>>,
+	},
+	Empty,
+}
+
+#[derive(Debug, Clone)]
+pub struct SectionIter<'a> {
+	inner: SectionIterInner<'a>,
+}
+
 impl<'a> Chunk<'a> {
 	pub fn new(data: &'a de::Chunk) -> Result<Self> {
 		let data_version = data.data_version.unwrap_or_default();
@@ -108,4 +130,98 @@ impl<'a> Chunk<'a> {
 			},
 		)
 	}
+
+	pub fn sections(&self) -> SectionIter {
+		use SectionIterInner::*;
+		SectionIter {
+			inner: match self {
+				Chunk::V1_18 { section_map } => V1_18 {
+					iter: section_map.iter(),
+				},
+				Chunk::V1_13 { section_map, .. } => V1_13 {
+					iter: section_map.iter(),
+				},
+				Chunk::Old { section_map, .. } => Old {
+					iter: section_map.iter(),
+				},
+				Chunk::Empty => Empty,
+			},
+		}
+	}
 }
+
+trait SectionIterTrait<'a>:
+	Iterator<Item = (SectionY, &'a dyn Section)>
+	+ DoubleEndedIterator
+	+ ExactSizeIterator
+	+ FusedIterator
+{
+}
+
+impl<'a, T> SectionIterTrait<'a> for T where
+	T: Iterator<Item = (SectionY, &'a dyn Section)>
+		+ DoubleEndedIterator
+		+ ExactSizeIterator
+		+ FusedIterator
+{
+}
+
+impl<'a> SectionIter<'a> {
+	fn with_iter<F, T>(&mut self, f: F) -> T
+	where
+		F: FnOnce(&mut dyn SectionIterTrait<'a>) -> T,
+	{
+		match &mut self.inner {
+			SectionIterInner::V1_18 { iter } => f(
+				&mut iter.map(|(y, section)| -> (SectionY, &'a dyn Section) { (*y, &section.0) })
+			),
+			SectionIterInner::V1_13 { iter } => {
+				f(&mut iter.map(|(y, section)| -> (SectionY, &'a dyn Section) { (*y, section) }))
+			}
+			SectionIterInner::Old { iter } => {
+				f(&mut iter.map(|(y, section)| -> (SectionY, &'a dyn Section) { (*y, section) }))
+			}
+			SectionIterInner::Empty => f(&mut iter::empty()),
+		}
+	}
+}
+
+impl<'a> Iterator for SectionIter<'a> {
+	type Item = (SectionY, &'a dyn Section);
+
+	fn next(&mut self) -> Option<Self::Item> {
+		self.with_iter(|iter| iter.next())
+	}
+
+	fn size_hint(&self) -> (usize, Option<usize>) {
+		match &self.inner {
+			SectionIterInner::V1_18 { iter } => iter.size_hint(),
+			SectionIterInner::V1_13 { iter } => iter.size_hint(),
+			SectionIterInner::Old { iter } => iter.size_hint(),
+			SectionIterInner::Empty => (0, Some(0)),
+		}
+	}
+
+	fn last(mut self) -> Option<Self::Item> {
+		self.with_iter(|iter| iter.last())
+	}
+}
+
+impl<'a> DoubleEndedIterator for SectionIter<'a> {
+	fn next_back(&mut self) -> Option<Self::Item> {
+		self.with_iter(|iter| iter.next_back())
+	}
+}
+
+impl<'a> ExactSizeIterator for SectionIter<'a> {
+	fn len(&self) -> usize {
+		match &self.inner {
+			SectionIterInner::V1_18 { iter } => iter.len(),
+			SectionIterInner::V1_13 { iter } => iter.len(),
+			SectionIterInner::Old { iter } => iter.len(),
+			SectionIterInner::Empty => 0,
+		}
+	}
+}
+
+impl<'a> FusedIterator for SectionIter<'a> {}
diff --git a/src/world/section.rs b/src/world/section.rs
index 2ac3945..3aa5aca 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -15,6 +15,8 @@ fn palette_bits(len: usize, min: u8, max: u8) -> Option<u8> {
 	Some(bits)
 }
 
+pub trait Section {}
+
 #[derive(Debug)]
 pub struct PaletteSectionBiomes<'a> {
 	biomes: Option<&'a fastnbt::LongArray>,
@@ -81,6 +83,8 @@ impl<'a> PaletteSection<'a> {
 	}
 }
 
+impl<'a> Section for PaletteSection<'a> {}
+
 #[derive(Debug)]
 pub struct OldSection<'a> {
 	blocks: &'a fastnbt::ByteArray,
@@ -93,3 +97,5 @@ impl<'a> OldSection<'a> {
 		Ok(Self { blocks, data })
 	}
 }
+
+impl<'a> Section for OldSection<'a> {}

From 8add7679a30c96e0665ea6937b5bbf41ba1bd6f8 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 12 Feb 2023 17:56:44 +0100
Subject: [PATCH 068/460] types: add Eq to coordinate types

---
 src/types.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/types.rs b/src/types.rs
index 450293f..7487a1d 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -8,18 +8,18 @@ use itertools::iproduct;
 pub const BLOCKS_PER_CHUNK: u8 = 16;
 
 /// A block X coordinate relative to a chunk
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct BlockX(pub u8);
 
 /// A block Y coordinate relative to a chunk section
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct BlockY(pub u8);
 
 /// A block Z coordinate relative to a chunk
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct BlockZ(pub u8);
 
-#[derive(Clone, Copy)]
+#[derive(Clone, Copy, PartialEq, Eq)]
 pub struct BlockCoords {
 	pub x: BlockX,
 	pub y: BlockY,
@@ -49,15 +49,15 @@ pub struct SectionY(pub i32);
 pub const CHUNKS_PER_REGION: u8 = 32;
 
 /// A chunk X coordinate relative to a region
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct ChunkX(pub u8);
 
 /// A chunk Z coordinate relative to a region
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct ChunkZ(pub u8);
 
 /// A pair of chunk coordinates relative to a region
-#[derive(Clone, Copy)]
+#[derive(Clone, Copy, PartialEq, Eq)]
 pub struct ChunkCoords {
 	pub x: ChunkX,
 	pub z: ChunkZ,

From 3cee4a4247057dea550582a98a72d27ef4203bbb Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 12 Feb 2023 19:02:00 +0100
Subject: [PATCH 069/460] resource: port legacy block type mapping from old
 implementation

---
 src/resource/legacy_block_types.rs | 1050 ++++++++++++++++++++++++++++
 src/resource/mod.rs                |    3 +
 2 files changed, 1053 insertions(+)
 create mode 100644 src/resource/legacy_block_types.rs

diff --git a/src/resource/legacy_block_types.rs b/src/resource/legacy_block_types.rs
new file mode 100644
index 0000000..6dc7305
--- /dev/null
+++ b/src/resource/legacy_block_types.rs
@@ -0,0 +1,1050 @@
+const fn simple(id: &str) -> [&str; 16] {
+	[
+		id, id, id, id, id, id, id, id, id, id, id, id, id, id, id, id,
+	]
+}
+
+const DEF: &str = "minecraft:air";
+const EMPTY: [&str; 16] = simple(DEF);
+
+pub const LEGACY_BLOCK_TYPES: [[&str; 16]; 256] = [
+	/* 0 */
+	simple("minecraft:air"),
+	/* 1 */
+	[
+		"minecraft:stone",
+		"minecraft:granite",
+		"minecraft:polished_granite",
+		"minecraft:diorite",
+		"minecraft:polished_diorite",
+		"minecraft:andesite",
+		"minecraft:polished_andesite",
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+	],
+	/* 2 */
+	simple("minecraft:grass_block"),
+	/* 3 */
+	[
+		"minecraft:dirt",
+		"minecraft:coarse_dirt",
+		"minecraft:podzol",
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+	],
+	/* 4 */
+	simple("minecraft:cobblestone"),
+	/* 5 */
+	[
+		"minecraft:oak_planks",
+		"minecraft:spruce_planks",
+		"minecraft:birch_planks",
+		"minecraft:jungle_planks",
+		"minecraft:acacia_planks",
+		"minecraft:dark_oak_planks",
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+	],
+	/* 6 */
+	[
+		"minecraft:oak_sapling",
+		"minecraft:spruce_sapling",
+		"minecraft:birch_sapling",
+		"minecraft:jungle_sapling",
+		"minecraft:acacia_sapling",
+		"minecraft:dark_oak_sapling",
+		DEF,
+		DEF,
+		"minecraft:oak_sapling",
+		"minecraft:spruce_sapling",
+		"minecraft:birch_sapling",
+		"minecraft:jungle_sapling",
+		"minecraft:acacia_sapling",
+		"minecraft:dark_oak_sapling",
+		DEF,
+		DEF,
+	],
+	/* 7 */
+	simple("minecraft:bedrock"),
+	/* 8 */
+	simple("minecraft:water"),
+	/* 9 */
+	simple("minecraft:water"),
+	/* 10 */
+	simple("minecraft:lava"),
+	/* 11 */
+	simple("minecraft:lava"),
+	/* 12 */
+	[
+		"minecraft:sand",
+		"minecraft:red_sand",
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+	],
+	/* 13 */
+	simple("minecraft:gravel"),
+	/* 14 */
+	simple("minecraft:gold_ore"),
+	/* 15 */
+	simple("minecraft:iron_ore"),
+	/* 16 */
+	simple("minecraft:coal_ore"),
+	/* 17 */
+	[
+		"minecraft:oak_log",
+		"minecraft:spruce_log",
+		"minecraft:birch_log",
+		"minecraft:jungle_log",
+		"minecraft:oak_log",
+		"minecraft:spruce_log",
+		"minecraft:birch_log",
+		"minecraft:jungle_log",
+		"minecraft:oak_log",
+		"minecraft:spruce_log",
+		"minecraft:birch_log",
+		"minecraft:jungle_log",
+		"minecraft:oak_log",
+		"minecraft:spruce_log",
+		"minecraft:birch_log",
+		"minecraft:jungle_log",
+	],
+	/* 18 */
+	[
+		"minecraft:oak_leaves",
+		"minecraft:spruce_leaves",
+		"minecraft:birch_leaves",
+		"minecraft:jungle_leaves",
+		"minecraft:oak_leaves",
+		"minecraft:spruce_leaves",
+		"minecraft:birch_leaves",
+		"minecraft:jungle_leaves",
+		"minecraft:oak_leaves",
+		"minecraft:spruce_leaves",
+		"minecraft:birch_leaves",
+		"minecraft:jungle_leaves",
+		"minecraft:oak_leaves",
+		"minecraft:spruce_leaves",
+		"minecraft:birch_leaves",
+		"minecraft:jungle_leaves",
+	],
+	/* 19 */
+	simple("minecraft:sponge"),
+	/* 20 */
+	simple("minecraft:glass"),
+	/* 21 */
+	simple("minecraft:lapis_ore"),
+	/* 22 */
+	simple("minecraft:lapis_block"),
+	/* 23 */
+	simple("minecraft:dispenser"),
+	/* 24 */
+	simple("minecraft:sandstone"),
+	/* 25 */
+	simple("minecraft:note_block"),
+	/* 26 */
+	EMPTY, // bed
+	/* 27 */
+	simple("minecraft:powered_rail"),
+	/* 28 */
+	simple("minecraft:detector_rail"),
+	/* 29 */
+	simple("minecraft:sticky_piston"),
+	/* 30 */
+	simple("minecraft:cobweb"),
+	/* 31 */
+	[
+		"minecraft:grass",
+		"minecraft:fern",
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+	],
+	/* 32 */
+	simple("minecraft:dead_bush"),
+	/* 33 */
+	simple("minecraft:piston"),
+	/* 34 */
+	simple("minecraft:piston_head"),
+	/* 35 */
+	[
+		"minecraft:white_wool",
+		"minecraft:orange_wool",
+		"minecraft:magenta_wool",
+		"minecraft:light_blue_wool",
+		"minecraft:yellow_wool",
+		"minecraft:lime_wool",
+		"minecraft:pink_wool",
+		"minecraft:gray_wool",
+		"minecraft:light_gray_wool",
+		"minecraft:cyan_wool",
+		"minecraft:purple_wool",
+		"minecraft:blue_wool",
+		"minecraft:brown_wool",
+		"minecraft:green_wool",
+		"minecraft:red_wool",
+		"minecraft:black_wool",
+	],
+	/* 36 */
+	simple("minecraft:moving_piston"),
+	/* 37 */
+	simple("minecraft:dandelion"),
+	/* 38 */
+	[
+		"minecraft:poppy",
+		"minecraft:blue_orchid",
+		"minecraft:allium",
+		"minecraft:azure_bluet",
+		"minecraft:red_tulip",
+		"minecraft:orange_tulip",
+		"minecraft:white_tulip",
+		"minecraft:pink_tulip",
+		"minecraft:oxeye_daisy",
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+	],
+	/* 39 */
+	simple("minecraft:brown_mushroom"),
+	/* 40 */
+	simple("minecraft:red_mushroom"),
+	/* 41 */
+	simple("minecraft:gold_block"),
+	/* 42 */
+	simple("minecraft:iron_block"),
+	/* 43 */
+	[
+		"minecraft:smooth_stone_slab",
+		"minecraft:sandstone_slab",
+		"minecraft:oak_slab",
+		"minecraft:cobblestone_slab",
+		"minecraft:brick_slab",
+		"minecraft:stone_brick_slab",
+		"minecraft:nether_brick_slab",
+		"minecraft:quartz_slab",
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+	],
+	/* 44 */
+	[
+		"minecraft:smooth_stone_slab",
+		"minecraft:sandstone_slab",
+		"minecraft:oak_slab",
+		"minecraft:cobblestone_slab",
+		"minecraft:brick_slab",
+		"minecraft:stone_brick_slab",
+		"minecraft:nether_brick_slab",
+		"minecraft:quartz_slab",
+		"minecraft:stone_slab",
+		"minecraft:sandstone_slab",
+		"minecraft:oak_slab",
+		"minecraft:cobblestone_slab",
+		"minecraft:brick_slab",
+		"minecraft:stone_brick_slab",
+		"minecraft:nether_brick_slab",
+		"minecraft:quartz_slab",
+	],
+	/* 45 */
+	simple("minecraft:bricks"),
+	/* 46 */
+	simple("minecraft:tnt"),
+	/* 47 */
+	simple("minecraft:bookshelf"),
+	/* 48 */
+	simple("minecraft:mossy_cobblestone"),
+	/* 49 */
+	simple("minecraft:obsidian"),
+	/* 50 */
+	[
+		DEF,
+		"minecraft:wall_torch",
+		"minecraft:wall_torch",
+		"minecraft:wall_torch",
+		"minecraft:wall_torch",
+		"minecraft:torch",
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+	],
+	/* 51 */
+	simple("minecraft:fire"),
+	/* 52 */
+	simple("minecraft:spawner"),
+	/* 53 */
+	simple("minecraft:oak_stairs"),
+	/* 54 */
+	simple("minecraft:chest"),
+	/* 55 */
+	simple("minecraft:redstone_wire"),
+	/* 56 */
+	simple("minecraft:diamond_ore"),
+	/* 57 */
+	simple("minecraft:diamond_block"),
+	/* 58 */
+	simple("minecraft:crafting_table"),
+	/* 59 */
+	simple("minecraft:wheat"),
+	/* 60 */
+	simple("minecraft:farmland"),
+	/* 61 */
+	simple("minecraft:furnace"),
+	/* 62 */
+	simple("minecraft:furnace"),
+	/* 63 */
+	simple("minecraft:sign"),
+	/* 64 */
+	simple("minecraft:oak_door"),
+	/* 65 */
+	simple("minecraft:ladder"),
+	/* 66 */
+	simple("minecraft:rail"),
+	/* 67 */
+	simple("minecraft:cobblestone_stairs"),
+	/* 68 */
+	simple("minecraft:wall_sign"),
+	/* 69 */
+	simple("minecraft:lever"),
+	/* 70 */
+	simple("minecraft:stone_pressure_plate"),
+	/* 71 */
+	simple("minecraft:iron_door"),
+	/* 72 */
+	simple("minecraft:oak_pressure_plate"),
+	/* 73 */
+	simple("minecraft:redstone_ore"),
+	/* 74 */
+	simple("minecraft:redstone_ore"),
+	/* 75 */
+	[
+		DEF,
+		"minecraft:redstone_wall_torch",
+		"minecraft:redstone_wall_torch",
+		"minecraft:redstone_wall_torch",
+		"minecraft:redstone_wall_torch",
+		"minecraft:redstone_torch",
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+	],
+	/* 76 */
+	[
+		DEF,
+		"minecraft:redstone_wall_torch",
+		"minecraft:redstone_wall_torch",
+		"minecraft:redstone_wall_torch",
+		"minecraft:redstone_wall_torch",
+		"minecraft:redstone_torch",
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+	],
+	/* 77 */
+	simple("minecraft:stone_button"),
+	/* 78 */
+	simple("minecraft:snow"),
+	/* 79 */
+	simple("minecraft:ice"),
+	/* 80 */
+	simple("minecraft:snow_block"),
+	/* 81 */
+	simple("minecraft:cactus"),
+	/* 82 */
+	simple("minecraft:clay"),
+	/* 83 */
+	simple("minecraft:sugar_cane"),
+	/* 84 */
+	simple("minecraft:jukebox"),
+	/* 85 */
+	simple("minecraft:oak_fence"),
+	/* 86 */
+	simple("minecraft:pumpkin"),
+	/* 87 */
+	simple("minecraft:netherrack"),
+	/* 88 */
+	simple("minecraft:soul_sand"),
+	/* 89 */
+	simple("minecraft:glowstone"),
+	/* 90 */
+	simple("minecraft:nether_portal"),
+	/* 91 */
+	simple("minecraft:pumpkin"),
+	/* 92 */
+	simple("minecraft:cake"),
+	/* 93 */
+	simple("minecraft:repeater"),
+	/* 94 */
+	simple("minecraft:repeater"),
+	/* 95 */
+	[
+		"minecraft:white_stained_glass",
+		"minecraft:orange_stained_glass",
+		"minecraft:magenta_stained_glass",
+		"minecraft:light_blue_stained_glass",
+		"minecraft:yellow_stained_glass",
+		"minecraft:lime_stained_glass",
+		"minecraft:pink_stained_glass",
+		"minecraft:gray_stained_glass",
+		"minecraft:light_gray_stained_glass",
+		"minecraft:cyan_stained_glass",
+		"minecraft:purple_stained_glass",
+		"minecraft:blue_stained_glass",
+		"minecraft:brown_stained_glass",
+		"minecraft:green_stained_glass",
+		"minecraft:red_stained_glass",
+		"minecraft:black_stained_glass",
+	],
+	/* 96 */
+	simple("minecraft:oak_trapdoor"),
+	/* 97 */
+	[
+		"minecraft:infested_stone",
+		"minecraft:infested_cobblestone",
+		"minecraft:infested_stone_bricks",
+		"minecraft:infested_mossy_stone_bricks",
+		"minecraft:infested_cracked_stone_bricks",
+		"minecraft:infested_chiseled_stone_bricks",
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+	],
+	/* 98 */
+	[
+		"minecraft:stone_bricks",
+		"minecraft:mossy_stone_bricks",
+		"minecraft:cracked_stone_bricks",
+		"minecraft:chiseled_stone_bricks",
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+	],
+	/* 99 */
+	simple("minecraft:brown_mushroom_block"),
+	/* 100 */
+	simple("minecraft:red_mushroom_block"),
+	/* 101 */
+	simple("minecraft:iron_bars"),
+	/* 102 */
+	simple("minecraft:glass_pane"),
+	/* 103 */
+	simple("minecraft:melon"),
+	/* 104 */
+	simple("minecraft:pumpkin_stem"),
+	/* 105 */
+	simple("minecraft:melon_stem"),
+	/* 106 */
+	simple("minecraft:vine"),
+	/* 107 */
+	simple("minecraft:oak_fence_gate"),
+	/* 108 */
+	simple("minecraft:brick_stairs"),
+	/* 109 */
+	simple("minecraft:stone_brick_stairs"),
+	/* 110 */
+	simple("minecraft:mycelium"),
+	/* 111 */
+	simple("minecraft:lily_pad"),
+	/* 112 */
+	simple("minecraft:nether_bricks"),
+	/* 113 */
+	simple("minecraft:nether_brick_fence"),
+	/* 114 */
+	simple("minecraft:nether_brick_stairs"),
+	/* 115 */
+	simple("minecraft:nether_wart"),
+	/* 116 */
+	simple("minecraft:enchanting_table"),
+	/* 117 */
+	simple("minecraft:brewing_stand"),
+	/* 118 */
+	simple("minecraft:cauldron"),
+	/* 119 */
+	simple("minecraft:end_portal"),
+	/* 120 */
+	simple("minecraft:end_portal_frame"),
+	/* 121 */
+	simple("minecraft:end_stone"),
+	/* 122 */
+	simple("minecraft:dragon_egg"),
+	/* 123 */
+	simple("minecraft:redstone_lamp"),
+	/* 124 */
+	simple("minecraft:redstone_lamp"),
+	/* 125 */
+	[
+		"minecraft:oak_slab",
+		"minecraft:spruce_slab",
+		"minecraft:birch_slab",
+		"minecraft:jungle_slab",
+		"minecraft:acacia_slab",
+		"minecraft:dark_oak_slab",
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+	],
+	/* 126 */
+	[
+		"minecraft:oak_slab",
+		"minecraft:spruce_slab",
+		"minecraft:birch_slab",
+		"minecraft:jungle_slab",
+		"minecraft:acacia_slab",
+		"minecraft:dark_oak_slab",
+		DEF,
+		DEF,
+		"minecraft:oak_slab",
+		"minecraft:spruce_slab",
+		"minecraft:birch_slab",
+		"minecraft:jungle_slab",
+		"minecraft:acacia_slab",
+		"minecraft:dark_oak_slab",
+		DEF,
+		DEF,
+	],
+	/* 127 */
+	simple("minecraft:cocoa"),
+	/* 128 */
+	simple("minecraft:sandstone_stairs"),
+	/* 129 */
+	simple("minecraft:emerald_ore"),
+	/* 130 */
+	simple("minecraft:ender_chest"),
+	/* 131 */
+	simple("minecraft:tripwire_hook"),
+	/* 132 */
+	simple("minecraft:tripwire"),
+	/* 133 */
+	simple("minecraft:emerald_block"),
+	/* 134 */
+	simple("minecraft:spruce_stairs"),
+	/* 135 */
+	simple("minecraft:birch_stairs"),
+	/* 136 */
+	simple("minecraft:jungle_stairs"),
+	/* 137 */
+	simple("minecraft:command_block"),
+	/* 138 */
+	simple("minecraft:beacon"),
+	/* 139 */
+	[
+		"minecraft:cobblestone_wall",
+		"minecraft:mossy_cobblestone_wall",
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+	],
+	/* 140 */
+	simple("minecraft:flower_pot"),
+	/* 141 */
+	simple("minecraft:carrots"),
+	/* 142 */
+	simple("minecraft:potatoes"),
+	/* 143 */
+	EMPTY,
+	/* 144 */
+	EMPTY,
+	/* 145 */
+	[
+		"minecraft:anvil",
+		"minecraft:anvil",
+		"minecraft:anvil",
+		"minecraft:anvil",
+		"minecraft:chipped_anvil",
+		"minecraft:chipped_anvil",
+		"minecraft:chipped_anvil",
+		"minecraft:chipped_anvil",
+		"minecraft:damaged_anvil",
+		"minecraft:damaged_anvil",
+		"minecraft:damaged_anvil",
+		"minecraft:damaged_anvil",
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+	],
+	/* 146 */
+	simple("minecraft:trapped_chest"),
+	/* 147 */
+	simple("minecraft:light_weighted_pressure_plate"),
+	/* 148 */
+	simple("minecraft:heavy_weighted_pressure_plate"),
+	/* 149 */
+	simple("minecraft:comparator"),
+	/* 150 */
+	simple("minecraft:comparator"),
+	/* 151 */
+	simple("minecraft:daylight_detector"),
+	/* 152 */
+	simple("minecraft:redstone_block"),
+	/* 153 */
+	simple("minecraft:nether_quartz_ore"),
+	/* 154 */
+	simple("minecraft:hopper"),
+	/* 155 */
+	simple("minecraft:quartz_block"),
+	/* 156 */
+	simple("minecraft:quartz_stairs"),
+	/* 157 */
+	simple("minecraft:activator_rail"),
+	/* 158 */
+	simple("minecraft:dropper"),
+	/* 159 */
+	[
+		"minecraft:white_terracotta",
+		"minecraft:orange_terracotta",
+		"minecraft:magenta_terracotta",
+		"minecraft:light_blue_terracotta",
+		"minecraft:yellow_terracotta",
+		"minecraft:lime_terracotta",
+		"minecraft:pink_terracotta",
+		"minecraft:gray_terracotta",
+		"minecraft:light_gray_terracotta",
+		"minecraft:cyan_terracotta",
+		"minecraft:purple_terracotta",
+		"minecraft:blue_terracotta",
+		"minecraft:brown_terracotta",
+		"minecraft:green_terracotta",
+		"minecraft:red_terracotta",
+		"minecraft:black_terracotta",
+	],
+	/* 160 */
+	[
+		"minecraft:white_stained_glass_pane",
+		"minecraft:orange_stained_glass_pane",
+		"minecraft:magenta_stained_glass_pane",
+		"minecraft:light_blue_stained_glass_pane",
+		"minecraft:yellow_stained_glass_pane",
+		"minecraft:lime_stained_glass_pane",
+		"minecraft:pink_stained_glass_pane",
+		"minecraft:gray_stained_glass_pane",
+		"minecraft:light_gray_stained_glass_pane",
+		"minecraft:cyan_stained_glass_pane",
+		"minecraft:purple_stained_glass_pane",
+		"minecraft:blue_stained_glass_pane",
+		"minecraft:brown_stained_glass_pane",
+		"minecraft:green_stained_glass_pane",
+		"minecraft:red_stained_glass_pane",
+		"minecraft:black_stained_glass_pane",
+	],
+	/* 161 */
+	[
+		"minecraft:acacia_leaves",
+		"minecraft:dark_oak_leaves",
+		DEF,
+		DEF,
+		"minecraft:acacia_leaves",
+		"minecraft:dark_oak_leaves",
+		DEF,
+		DEF,
+		"minecraft:acacia_leaves",
+		"minecraft:dark_oak_leaves",
+		DEF,
+		DEF,
+		"minecraft:acacia_leaves",
+		"minecraft:dark_oak_leaves",
+		DEF,
+		DEF,
+	],
+	/* 162 */
+	[
+		"minecraft:acacia_log",
+		"minecraft:dark_oak_log",
+		DEF,
+		DEF,
+		"minecraft:acacia_log",
+		"minecraft:dark_oak_log",
+		DEF,
+		DEF,
+		"minecraft:acacia_log",
+		"minecraft:dark_oak_log",
+		DEF,
+		DEF,
+		"minecraft:acacia_log",
+		"minecraft:dark_oak_log",
+		DEF,
+		DEF,
+	],
+	/* 163 */
+	simple("minecraft:acacia_stairs"),
+	/* 164 */
+	simple("minecraft:dark_oak_stairs"),
+	/* 165 */
+	simple("minecraft:slime_block"),
+	/* 166 */
+	simple("minecraft:barrier"),
+	/* 167 */
+	simple("minecraft:iron_trapdoor"),
+	/* 168 */
+	[
+		"minecraft:prismarine",
+		"minecraft:prismarine_bricks",
+		"minecraft:dark_prismarine",
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+	],
+	/* 169 */
+	simple("minecraft:sea_lantern"),
+	/* 170 */
+	simple("minecraft:hay_block"),
+	/* 171 */
+	[
+		"minecraft:white_carpet",
+		"minecraft:orange_carpet",
+		"minecraft:magenta_carpet",
+		"minecraft:light_blue_carpet",
+		"minecraft:yellow_carpet",
+		"minecraft:lime_carpet",
+		"minecraft:pink_carpet",
+		"minecraft:gray_carpet",
+		"minecraft:light_gray_carpet",
+		"minecraft:cyan_carpet",
+		"minecraft:purple_carpet",
+		"minecraft:blue_carpet",
+		"minecraft:brown_carpet",
+		"minecraft:green_carpet",
+		"minecraft:red_carpet",
+		"minecraft:black_carpet",
+	],
+	/* 172 */
+	simple("minecraft:terracotta"),
+	/* 173 */
+	simple("minecraft:coal_block"),
+	/* 174 */
+	simple("minecraft:packed_ice"),
+	/* 175 */
+	[
+		"minecraft:sunflower",
+		"minecraft:lilac",
+		"minecraft:tall_grass",
+		"minecraft:large_fern",
+		"minecraft:rose_bush",
+		"minecraft:peony",
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+		DEF,
+	],
+	/* 176 */
+	EMPTY, // banner
+	/* 177 */
+	EMPTY, // wall banner
+	/* 178 */
+	simple("minecraft:daylight_detector"),
+	/* 179 */
+	simple("minecraft:red_sandstone"),
+	/* 180 */
+	simple("minecraft:red_sandstone_stairs"),
+	/* 181 */
+	simple("minecraft:red_sandstone_slab"),
+	/* 182 */
+	simple("minecraft:red_sandstone_slab"),
+	/* 183 */
+	simple("minecraft:spruce_fence_gate"),
+	/* 184 */
+	simple("minecraft:birch_fence_gate"),
+	/* 185 */
+	simple("minecraft:jungle_fence_gate"),
+	/* 186 */
+	simple("minecraft:dark_oak_fence_gate"),
+	/* 187 */
+	simple("minecraft:acacia_fence_gate"),
+	/* 188 */
+	simple("minecraft:spruce_fence"),
+	/* 189 */
+	simple("minecraft:birch_fence"),
+	/* 190 */
+	simple("minecraft:jungle_fence"),
+	/* 191 */
+	simple("minecraft:dark_oak_fence"),
+	/* 192 */
+	simple("minecraft:acacia_fence"),
+	/* 193 */
+	simple("minecraft:spruce_door"),
+	/* 194 */
+	simple("minecraft:birch_door"),
+	/* 195 */
+	simple("minecraft:jungle_door"),
+	/* 196 */
+	simple("minecraft:acacia_door"),
+	/* 197 */
+	simple("minecraft:dark_oak_door"),
+	/* 198 */
+	simple("minecraft:end_rod"),
+	/* 199 */
+	simple("minecraft:chorus_plant"),
+	/* 200 */
+	simple("minecraft:chorus_flower"),
+	/* 201 */
+	simple("minecraft:purpur_block"),
+	/* 202 */
+	simple("minecraft:purpur_pillar"),
+	/* 203 */
+	simple("minecraft:purpur_stairs"),
+	/* 204 */
+	simple("minecraft:purpur_slab"),
+	/* 205 */
+	simple("minecraft:purpur_slab"),
+	/* 206 */
+	simple("minecraft:end_stone_bricks"),
+	/* 207 */
+	simple("minecraft:beetroots"),
+	/* 208 */
+	simple("minecraft:grass_path"),
+	/* 209 */
+	simple("minecraft:end_gateway"),
+	/* 210 */
+	simple("minecraft:repeating_command_block"),
+	/* 211 */
+	simple("minecraft:chain_command_block"),
+	/* 212 */
+	simple("minecraft:frosted_ice"),
+	/* 213 */
+	simple("minecraft:magma_block"),
+	/* 214 */
+	simple("minecraft:nether_wart_block"),
+	/* 215 */
+	simple("minecraft:red_nether_bricks"),
+	/* 216 */
+	simple("minecraft:bone_block"),
+	/* 217 */
+	simple("minecraft:structure_void"),
+	/* 218 */
+	simple("minecraft:observer"),
+	/* 219 */
+	simple("minecraft:white_shulker_box"),
+	/* 220 */
+	simple("minecraft:orange_shulker_box"),
+	/* 221 */
+	simple("minecraft:magenta_shulker_box"),
+	/* 222 */
+	simple("minecraft:light_blue_shulker_box"),
+	/* 223 */
+	simple("minecraft:yellow_shulker_box"),
+	/* 224 */
+	simple("minecraft:lime_shulker_box"),
+	/* 225 */
+	simple("minecraft:pink_shulker_box"),
+	/* 226 */
+	simple("minecraft:gray_shulker_box"),
+	/* 227 */
+	simple("minecraft:light_gray_shulker_box"),
+	/* 228 */
+	simple("minecraft:cyan_shulker_box"),
+	/* 229 */
+	simple("minecraft:purple_shulker_box"),
+	/* 230 */
+	simple("minecraft:blue_shulker_box"),
+	/* 231 */
+	simple("minecraft:brown_shulker_box"),
+	/* 232 */
+	simple("minecraft:green_shulker_box"),
+	/* 233 */
+	simple("minecraft:red_shulker_box"),
+	/* 234 */
+	simple("minecraft:black_shulker_box"),
+	/* 235 */
+	simple("minecraft:white_glazed_terracotta"),
+	/* 236 */
+	simple("minecraft:orange_glazed_terracotta"),
+	/* 237 */
+	simple("minecraft:magenta_glazed_terracotta"),
+	/* 238 */
+	simple("minecraft:light_blue_glazed_terracotta"),
+	/* 239 */
+	simple("minecraft:yellow_glazed_terracotta"),
+	/* 240 */
+	simple("minecraft:lime_glazed_terracotta"),
+	/* 241 */
+	simple("minecraft:pink_glazed_terracotta"),
+	/* 242 */
+	simple("minecraft:gray_glazed_terracotta"),
+	/* 243 */
+	simple("minecraft:light_gray_glazed_terracotta"),
+	/* 244 */
+	simple("minecraft:cyan_glazed_terracotta"),
+	/* 245 */
+	simple("minecraft:purple_glazed_terracotta"),
+	/* 246 */
+	simple("minecraft:blue_glazed_terracotta"),
+	/* 247 */
+	simple("minecraft:brown_glazed_terracotta"),
+	/* 248 */
+	simple("minecraft:green_glazed_terracotta"),
+	/* 249 */
+	simple("minecraft:red_glazed_terracotta"),
+	/* 250 */
+	simple("minecraft:black_glazed_terracotta"),
+	/* 251 */
+	[
+		"minecraft:white_concrete",
+		"minecraft:orange_concrete",
+		"minecraft:magenta_concrete",
+		"minecraft:light_blue_concrete",
+		"minecraft:yellow_concrete",
+		"minecraft:lime_concrete",
+		"minecraft:pink_concrete",
+		"minecraft:gray_concrete",
+		"minecraft:light_gray_concrete",
+		"minecraft:cyan_concrete",
+		"minecraft:purple_concrete",
+		"minecraft:blue_concrete",
+		"minecraft:brown_concrete",
+		"minecraft:green_concrete",
+		"minecraft:red_concrete",
+		"minecraft:black_concrete",
+	],
+	/* 252 */
+	[
+		"minecraft:white_concrete_powder",
+		"minecraft:orange_concrete_powder",
+		"minecraft:magenta_concrete_powder",
+		"minecraft:light_blue_concrete_powder",
+		"minecraft:yellow_concrete_powder",
+		"minecraft:lime_concrete_powder",
+		"minecraft:pink_concrete_powder",
+		"minecraft:gray_concrete_powder",
+		"minecraft:light_gray_concrete_powder",
+		"minecraft:cyan_concrete_powder",
+		"minecraft:purple_concrete_powder",
+		"minecraft:blue_concrete_powder",
+		"minecraft:brown_concrete_powder",
+		"minecraft:green_concrete_powder",
+		"minecraft:red_concrete_powder",
+		"minecraft:black_concrete_powder",
+	],
+	/* 253 */
+	EMPTY,
+	/* 254 */
+	EMPTY,
+	/* 255 */
+	simple("minecraft:structure_block"),
+];
diff --git a/src/resource/mod.rs b/src/resource/mod.rs
index cadac86..3dbc10c 100644
--- a/src/resource/mod.rs
+++ b/src/resource/mod.rs
@@ -1,9 +1,12 @@
 mod block_types;
+mod legacy_block_types;
 
 use std::collections::HashMap;
 
 use enumflags2::{bitflags, BitFlags};
 
+pub use legacy_block_types::LEGACY_BLOCK_TYPES;
+
 #[bitflags]
 #[repr(u8)]
 #[derive(Debug, Clone, Copy, PartialEq)]

From b918ff61061d02e548b4f1e5631abef8f26fdfb4 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 12 Feb 2023 20:04:31 +0100
Subject: [PATCH 070/460] world/section: add method to get block ID at
 coordinate

---
 src/world/section.rs | 74 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 69 insertions(+), 5 deletions(-)

diff --git a/src/world/section.rs b/src/world/section.rs
index 3aa5aca..8c849f9 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -1,6 +1,7 @@
 use anyhow::{bail, Context, Result};
 
 use super::de;
+use crate::{resource, types::*};
 
 fn palette_bits(len: usize, min: u8, max: u8) -> Option<u8> {
 	let mut bits = min;
@@ -15,7 +16,9 @@ fn palette_bits(len: usize, min: u8, max: u8) -> Option<u8> {
 	Some(bits)
 }
 
-pub trait Section {}
+pub trait Section {
+	fn get_block_id(&self, coords: BlockCoords) -> Result<&str>;
+}
 
 #[derive(Debug)]
 pub struct PaletteSectionBiomes<'a> {
@@ -81,9 +84,48 @@ impl<'a> PaletteSection<'a> {
 			aligned_blocks,
 		})
 	}
+
+	fn get_palette_index(&self, coords: BlockCoords) -> usize {
+		let Some(block_states) = self.block_states else {
+			return 0;
+		};
+
+		let bits = self.bits as usize;
+		let mask = (1 << bits) - 1;
+
+		let offset = coords.offset();
+
+		let shifted = if self.aligned_blocks {
+			let blocks_per_word = 64 / bits;
+			let (word, shift) = offset.div_rem(blocks_per_word);
+			block_states[word] as u64 >> (shift * bits)
+		} else {
+			let bit_offset = offset * bits;
+			let (word, bit_shift) = bit_offset.div_rem(64);
+
+			if bit_shift + bits <= 64 {
+				block_states[word] as u64 >> bit_shift
+			} else {
+				let tmp = (block_states[word + 1] as u64 as u128) << 64
+					| block_states[word] as u64 as u128;
+				(tmp >> bit_shift) as u64
+			}
+		};
+
+		(shifted & mask) as usize
+	}
 }
 
-impl<'a> Section for PaletteSection<'a> {}
+impl<'a> Section for PaletteSection<'a> {
+	fn get_block_id(&self, coords: BlockCoords) -> Result<&str> {
+		let index = self.get_palette_index(coords);
+		let entry = self
+			.palette
+			.get(index)
+			.context("Palette index out of bounds")?;
+		Ok(&entry.name)
+	}
+}
 
 #[derive(Debug)]
 pub struct OldSection<'a> {
@@ -93,9 +135,31 @@ pub struct OldSection<'a> {
 
 impl<'a> OldSection<'a> {
 	pub fn new(blocks: &'a fastnbt::ByteArray, data: &'a fastnbt::ByteArray) -> Result<Self> {
-		// TODO: Check lengths
-		Ok(Self { blocks, data })
+		const N: usize = BLOCKS_PER_CHUNK as usize;
+		if blocks.len() != N * N * N {
+			bail!("Invalid section block data");
+		}
+		if data.len() != N * N * N / 2 {
+			bail!("Invalid section extra data");
+		}
+
+		Ok(OldSection { blocks, data })
 	}
 }
 
-impl<'a> Section for OldSection<'a> {}
+impl<'a> Section for OldSection<'a> {
+	fn get_block_id(&self, coords: BlockCoords) -> Result<&str> {
+		let offset = coords.offset();
+		let block = self.blocks[offset] as u8;
+
+		let (data_offset, data_nibble) = offset.div_rem(2);
+		let data_byte = self.data[data_offset] as u8;
+		let data = if data_nibble == 1 {
+			data_byte >> 4
+		} else {
+			data_byte & 0xf
+		};
+
+		Ok(resource::LEGACY_BLOCK_TYPES[block as usize][data as usize])
+	}
+}

From 65c39ea1530acfa66384460581af5fb09f6dc090 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 12 Feb 2023 20:17:20 +0100
Subject: [PATCH 071/460] types: make CHUNKS_PER_REGION and BLOCKS_PER_CHUNK
 usize

Having these as usize is more convenient.
---
 src/types.rs         | 16 +++++++++-------
 src/world/section.rs |  3 ++-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/types.rs b/src/types.rs
index 7487a1d..427faa4 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -5,7 +5,7 @@ use std::{
 
 use itertools::iproduct;
 
-pub const BLOCKS_PER_CHUNK: u8 = 16;
+pub const BLOCKS_PER_CHUNK: usize = 16;
 
 /// A block X coordinate relative to a chunk
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -28,7 +28,7 @@ pub struct BlockCoords {
 
 impl BlockCoords {
 	pub fn offset(&self) -> usize {
-		const N: usize = BLOCKS_PER_CHUNK as usize;
+		use BLOCKS_PER_CHUNK as N;
 		let x = self.x.0 as usize;
 		let y = self.y.0 as usize;
 		let z = self.z.0 as usize;
@@ -46,7 +46,7 @@ impl Debug for BlockCoords {
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub struct SectionY(pub i32);
 
-pub const CHUNKS_PER_REGION: u8 = 32;
+pub const CHUNKS_PER_REGION: usize = 32;
 
 /// A chunk X coordinate relative to a region
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -70,13 +70,15 @@ impl Debug for ChunkCoords {
 }
 
 #[derive(Debug, Clone, Copy, Default)]
-pub struct ChunkArray<T>(pub [[T; CHUNKS_PER_REGION as usize]; CHUNKS_PER_REGION as usize]);
+pub struct ChunkArray<T>(pub [[T; CHUNKS_PER_REGION]; CHUNKS_PER_REGION]);
 
 impl<T> ChunkArray<T> {
 	pub fn keys() -> impl Iterator<Item = ChunkCoords> {
-		iproduct!(0..CHUNKS_PER_REGION, 0..CHUNKS_PER_REGION).map(|(z, x)| ChunkCoords {
-			x: ChunkX(x),
-			z: ChunkZ(z),
+		iproduct!(0..(CHUNKS_PER_REGION as u8), 0..(CHUNKS_PER_REGION as u8)).map(|(z, x)| {
+			ChunkCoords {
+				x: ChunkX(x),
+				z: ChunkZ(z),
+			}
 		})
 	}
 
diff --git a/src/world/section.rs b/src/world/section.rs
index 8c849f9..281579b 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -135,7 +135,8 @@ pub struct OldSection<'a> {
 
 impl<'a> OldSection<'a> {
 	pub fn new(blocks: &'a fastnbt::ByteArray, data: &'a fastnbt::ByteArray) -> Result<Self> {
-		const N: usize = BLOCKS_PER_CHUNK as usize;
+		use BLOCKS_PER_CHUNK as N;
+
 		if blocks.len() != N * N * N {
 			bail!("Invalid section block data");
 		}

From c34f531546233e9360b68c1da6a272d847f4a354 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 12 Feb 2023 20:20:36 +0100
Subject: [PATCH 072/460] world/section: temporarily rename
 PaletteSectionBiomes fields

These fields are unused for now. Add an underscore to supress linter
warnings.
---
 src/world/section.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/world/section.rs b/src/world/section.rs
index 281579b..265b393 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -22,9 +22,9 @@ pub trait Section {
 
 #[derive(Debug)]
 pub struct PaletteSectionBiomes<'a> {
-	biomes: Option<&'a fastnbt::LongArray>,
-	palette: &'a Vec<String>,
-	bits: u8,
+	_biomes: Option<&'a fastnbt::LongArray>,
+	_palette: &'a Vec<String>,
+	_bits: u8,
 }
 
 impl<'a> PaletteSectionBiomes<'a> {
@@ -40,9 +40,9 @@ impl<'a> PaletteSectionBiomes<'a> {
 		}
 
 		Ok(PaletteSectionBiomes {
-			biomes,
-			palette,
-			bits,
+			_biomes: biomes,
+			_palette: palette,
+			_bits: bits,
 		})
 	}
 }

From 5ee114ed0aeb2ae71609a6e22234106d94c9f58c Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 12 Feb 2023 21:01:28 +0100
Subject: [PATCH 073/460] types: slightly simplify DivRev trait

---
 src/types.rs | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/types.rs b/src/types.rs
index 427faa4..71835dd 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -105,11 +105,12 @@ impl<T> IndexMut<ChunkCoords> for ChunkArray<T> {
 	}
 }
 
-pub trait DivRem<Rhs> {
-	type DivOutput;
-	type RemOutput;
-
-	fn div_rem(self, rhs: Rhs) -> (Self::DivOutput, Self::RemOutput);
+pub trait DivRem<Rhs>
+where
+	Self: Div<Rhs>,
+	Self: Rem<Rhs>,
+{
+	fn div_rem(self, rhs: Rhs) -> (<Self as Div<Rhs>>::Output, <Self as Rem<Rhs>>::Output);
 }
 
 impl<Lhs, Rhs> DivRem<Rhs> for Lhs
@@ -119,10 +120,7 @@ where
 	Self: Copy,
 	Rhs: Copy,
 {
-	type DivOutput = <Self as Div<Rhs>>::Output;
-	type RemOutput = <Self as Rem<Rhs>>::Output;
-
-	fn div_rem(self, rhs: Rhs) -> (Self::DivOutput, Self::RemOutput) {
+	fn div_rem(self, rhs: Rhs) -> (<Self as Div<Rhs>>::Output, <Self as Rem<Rhs>>::Output) {
 		(self / rhs, self % rhs)
 	}
 }

From 493608ebc8600ef2435f04b58c81fdd79bce5a79 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 12 Feb 2023 20:59:23 +0100
Subject: [PATCH 074/460] treewide: add more documentation

---
 src/types.rs         | 12 ++++++++++++
 src/world/chunk.rs   | 24 ++++++++++++++++++++++++
 src/world/section.rs | 17 +++++++++++++++++
 3 files changed, 53 insertions(+)

diff --git a/src/types.rs b/src/types.rs
index 71835dd..905f0c0 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -19,6 +19,7 @@ pub struct BlockY(pub u8);
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct BlockZ(pub u8);
 
+/// X, Y and Z coordinates of a block in a chunk section
 #[derive(Clone, Copy, PartialEq, Eq)]
 pub struct BlockCoords {
 	pub x: BlockX,
@@ -27,6 +28,11 @@ pub struct BlockCoords {
 }
 
 impl BlockCoords {
+	/// Computes a block's offset in various data structures
+	///
+	/// Many chunk data structures store block and biome data in the same
+	/// order. [BlockCoords::offset] computes the offset at which the data
+	/// for the block at a given coordinate is stored.
 	pub fn offset(&self) -> usize {
 		use BLOCKS_PER_CHUNK as N;
 		let x = self.x.0 as usize;
@@ -69,6 +75,9 @@ impl Debug for ChunkCoords {
 	}
 }
 
+/// Generic array for data stored per chunk of a region
+///
+/// Includes various convenient iteration functions.
 #[derive(Debug, Clone, Copy, Default)]
 pub struct ChunkArray<T>(pub [[T; CHUNKS_PER_REGION]; CHUNKS_PER_REGION]);
 
@@ -105,11 +114,14 @@ impl<T> IndexMut<ChunkCoords> for ChunkArray<T> {
 	}
 }
 
+/// Calculate division and remainder at the same time
 pub trait DivRem<Rhs>
 where
 	Self: Div<Rhs>,
 	Self: Rem<Rhs>,
 {
+	/// Returns the result of the division and remainder operations
+	/// with the same inputs
 	fn div_rem(self, rhs: Rhs) -> (<Self as Div<Rhs>>::Output, <Self as Rem<Rhs>>::Output);
 }
 
diff --git a/src/world/chunk.rs b/src/world/chunk.rs
index 5ccb8f9..e6b2aa1 100644
--- a/src/world/chunk.rs
+++ b/src/world/chunk.rs
@@ -11,41 +11,62 @@ use super::{
 };
 use crate::types::*;
 
+/// Chunk data structure wrapping a [de::Chunk] for convenient access to
+/// block and biome data
+#[derive(Debug)]
 pub enum Chunk<'a> {
+	/// Minecraft v1.18+ chunk with biome data moved into sections
 	V1_18 {
 		section_map: BTreeMap<SectionY, (PaletteSection<'a>, PaletteSectionBiomes<'a>)>,
 	},
+	/// Minecraft v1.13+ chunk
+	///
+	/// Block data is stored in an indexed format with variable bit width
+	/// (depending on the total numer of distinct block types used in a
+	/// section), and a palette mapping these indices to namespaced
+	/// block IDs
 	V1_13 {
 		section_map: BTreeMap<SectionY, PaletteSection<'a>>,
 		biomes: &'a de::BiomesOld,
 	},
+	/// Original pre-1.13 chunk
+	///
+	/// The original chunk format with fixed 8-bit numeric block IDs
 	Old {
 		section_map: BTreeMap<SectionY, OldSection<'a>>,
 		biomes: &'a de::BiomesOld,
 	},
+	/// Unpopulated chunk without any block data
 	Empty,
 }
 
+/// Inner data structure of [SectionIter]
 #[derive(Debug, Clone)]
 enum SectionIterInner<'a> {
+	/// Iterator over sections of [Chunk::V1_18]
 	V1_18 {
 		iter: btree_map::Iter<'a, SectionY, (PaletteSection<'a>, PaletteSectionBiomes<'a>)>,
 	},
+	/// Iterator over sections of [Chunk::V1_13]
 	V1_13 {
 		iter: btree_map::Iter<'a, SectionY, PaletteSection<'a>>,
 	},
+	/// Iterator over sections of [Chunk::Old]
 	Old {
 		iter: btree_map::Iter<'a, SectionY, OldSection<'a>>,
 	},
+	/// Empty iterator over an unpopulated chunk ([Chunk::Empty])
 	Empty,
 }
 
+/// Iterator over the sections of a [Chunk]
 #[derive(Debug, Clone)]
 pub struct SectionIter<'a> {
 	inner: SectionIterInner<'a>,
 }
 
 impl<'a> Chunk<'a> {
+	/// Creates a new [Chunk] from a deserialized [de::Chunk]
 	pub fn new(data: &'a de::Chunk) -> Result<Self> {
 		let data_version = data.data_version.unwrap_or_default();
 
@@ -55,6 +76,7 @@ impl<'a> Chunk<'a> {
 		}
 	}
 
+	/// [Chunk::new] implementation for Minecraft v1.18+ chunks
 	fn new_v1_18(data_version: u32, sections: &'a Vec<de::SectionV1_18>) -> Result<Self> {
 		let mut section_map = BTreeMap::new();
 
@@ -80,6 +102,7 @@ impl<'a> Chunk<'a> {
 		Ok(Chunk::V1_18 { section_map })
 	}
 
+	/// [Chunk::new] implementation for all pre-1.18 chunk variants
 	fn new_old(data_version: u32, level: &'a de::LevelOld) -> Result<Self> {
 		let mut section_map_v1_13 = BTreeMap::new();
 		let mut section_map_old = BTreeMap::new();
@@ -131,6 +154,7 @@ impl<'a> Chunk<'a> {
 		)
 	}
 
+	/// Returns an interator over the chunk's sections and their Y coordinates
 	pub fn sections(&self) -> SectionIter {
 		use SectionIterInner::*;
 		SectionIter {
diff --git a/src/world/section.rs b/src/world/section.rs
index 265b393..78201a1 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -3,6 +3,11 @@ use anyhow::{bail, Context, Result};
 use super::de;
 use crate::{resource, types::*};
 
+/// Determine the number of bits required for indexing into a palette of a given length
+///
+/// This is basically a base-2 logarithm, with clamping to a minimum value and
+/// check against a maximum value. If the result would be greater than the passed
+/// `max` value, [None] is returned.
 fn palette_bits(len: usize, min: u8, max: u8) -> Option<u8> {
 	let mut bits = min;
 	while (1 << bits) < len {
@@ -16,10 +21,16 @@ fn palette_bits(len: usize, min: u8, max: u8) -> Option<u8> {
 	Some(bits)
 }
 
+/// Trait for common functions of [PaletteSection] and [OldSection]
 pub trait Section {
 	fn get_block_id(&self, coords: BlockCoords) -> Result<&str>;
 }
 
+/// Minecraft v1.18+ section biome data
+///
+/// The biome data is part of the section structure in Minecraft v1.18+, with
+/// the biomes laid out as an array of indices into a palette, similar to the
+/// v1.13+ block data.
 #[derive(Debug)]
 pub struct PaletteSectionBiomes<'a> {
 	_biomes: Option<&'a fastnbt::LongArray>,
@@ -28,6 +39,7 @@ pub struct PaletteSectionBiomes<'a> {
 }
 
 impl<'a> PaletteSectionBiomes<'a> {
+	/// Constructs a new [PaletteSectionBiomes] from deserialized data structures
 	pub fn new(biomes: Option<&'a fastnbt::LongArray>, palette: &'a Vec<String>) -> Result<Self> {
 		let bits = palette_bits(palette.len(), 1, 6).context("Unsupported block palette size")?;
 
@@ -47,6 +59,7 @@ impl<'a> PaletteSectionBiomes<'a> {
 	}
 }
 
+/// Minecraft v1.13+ section block data
 #[derive(Debug)]
 pub struct PaletteSection<'a> {
 	block_states: Option<&'a fastnbt::LongArray>,
@@ -56,6 +69,7 @@ pub struct PaletteSection<'a> {
 }
 
 impl<'a> PaletteSection<'a> {
+	/// Constructs a new [PaletteSection] from deserialized data structures
 	pub fn new(
 		data_version: u32,
 		block_states: Option<&'a fastnbt::LongArray>,
@@ -85,6 +99,7 @@ impl<'a> PaletteSection<'a> {
 		})
 	}
 
+	/// Looks up the block type palette index at the given coordinates
 	fn get_palette_index(&self, coords: BlockCoords) -> usize {
 		let Some(block_states) = self.block_states else {
 			return 0;
@@ -127,6 +142,7 @@ impl<'a> Section for PaletteSection<'a> {
 	}
 }
 
+/// Pre-1.13 section block data
 #[derive(Debug)]
 pub struct OldSection<'a> {
 	blocks: &'a fastnbt::ByteArray,
@@ -134,6 +150,7 @@ pub struct OldSection<'a> {
 }
 
 impl<'a> OldSection<'a> {
+	/// Constructs a new [OldSection] from deserialized data structures
 	pub fn new(blocks: &'a fastnbt::ByteArray, data: &'a fastnbt::ByteArray) -> Result<Self> {
 		use BLOCKS_PER_CHUNK as N;
 

From 9146c06bec5363c0ca3f81036f10c0b4f0655b6d Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 12 Feb 2023 22:54:43 +0100
Subject: [PATCH 075/460] treewide: rename "old" data structures to "v0"

"v0" doesn't refer to a specific version of Minecraft; it is just the
oldest data format supported by MinedMap.
---
 src/world/chunk.rs   | 72 +++++++++++++++++++++-----------------------
 src/world/de.rs      | 26 ++++++++--------
 src/world/section.rs | 28 ++++++++---------
 3 files changed, 62 insertions(+), 64 deletions(-)

diff --git a/src/world/chunk.rs b/src/world/chunk.rs
index e6b2aa1..de0726b 100644
--- a/src/world/chunk.rs
+++ b/src/world/chunk.rs
@@ -7,7 +7,7 @@ use anyhow::{bail, Context, Result};
 
 use super::{
 	de,
-	section::{OldSection, PaletteSection, PaletteSectionBiomes, Section},
+	section::{BiomesV18, Section, SectionV0, SectionV1_13},
 };
 use crate::types::*;
 
@@ -17,7 +17,7 @@ use crate::types::*;
 pub enum Chunk<'a> {
 	/// Minecraft v1.18+ chunk with biome data moved into sections
 	V1_18 {
-		section_map: BTreeMap<SectionY, (PaletteSection<'a>, PaletteSectionBiomes<'a>)>,
+		section_map: BTreeMap<SectionY, (SectionV1_13<'a>, BiomesV18<'a>)>,
 	},
 	/// Minecraft v1.13+ chunk
 	///
@@ -26,15 +26,15 @@ pub enum Chunk<'a> {
 	/// section), and a palette mapping these indices to namespaced
 	/// block IDs
 	V1_13 {
-		section_map: BTreeMap<SectionY, PaletteSection<'a>>,
-		biomes: &'a de::BiomesOld,
+		section_map: BTreeMap<SectionY, SectionV1_13<'a>>,
+		biomes: &'a de::BiomesV0,
 	},
 	/// Original pre-1.13 chunk
 	///
 	/// The original chunk format with fixed 8-bit numeric block IDs
-	Old {
-		section_map: BTreeMap<SectionY, OldSection<'a>>,
-		biomes: &'a de::BiomesOld,
+	V0 {
+		section_map: BTreeMap<SectionY, SectionV0<'a>>,
+		biomes: &'a de::BiomesV0,
 	},
 	/// Unpopulated chunk without any block data
 	Empty,
@@ -45,15 +45,15 @@ pub enum Chunk<'a> {
 enum SectionIterInner<'a> {
 	/// Iterator over sections of [Chunk::V1_18]
 	V1_18 {
-		iter: btree_map::Iter<'a, SectionY, (PaletteSection<'a>, PaletteSectionBiomes<'a>)>,
+		iter: btree_map::Iter<'a, SectionY, (SectionV1_13<'a>, BiomesV18<'a>)>,
 	},
 	/// Iterator over sections of [Chunk::V1_13]
 	V1_13 {
-		iter: btree_map::Iter<'a, SectionY, PaletteSection<'a>>,
+		iter: btree_map::Iter<'a, SectionY, SectionV1_13<'a>>,
 	},
-	/// Iterator over sections of [Chunk::Old]
-	Old {
-		iter: btree_map::Iter<'a, SectionY, OldSection<'a>>,
+	/// Iterator over sections of [Chunk::V0]
+	V0 {
+		iter: btree_map::Iter<'a, SectionY, SectionV0<'a>>,
 	},
 	/// Empty iterator over an unpopulated chunk ([Chunk::Empty])
 	Empty,
@@ -72,7 +72,7 @@ impl<'a> Chunk<'a> {
 
 		match &data.chunk {
 			de::ChunkVariants::V1_18 { sections } => Self::new_v1_18(data_version, sections),
-			de::ChunkVariants::Old { level } => Self::new_old(data_version, level),
+			de::ChunkVariants::V0 { level } => Self::new_v0(data_version, level),
 		}
 	}
 
@@ -84,17 +84,16 @@ impl<'a> Chunk<'a> {
 			section_map.insert(
 				SectionY(section.y),
 				(
-					PaletteSection::new(
+					SectionV1_13::new(
 						data_version,
 						section.block_states.data.as_ref(),
 						&section.block_states.palette,
 					)
 					.with_context(|| format!("Failed to load section at Y={}", section.y))?,
-					PaletteSectionBiomes::new(
-						section.biomes.data.as_ref(),
-						&section.biomes.palette,
-					)
-					.with_context(|| format!("Failed to load section biomes at Y={}", section.y))?,
+					BiomesV18::new(section.biomes.data.as_ref(), &section.biomes.palette)
+						.with_context(|| {
+							format!("Failed to load section biomes at Y={}", section.y)
+						})?,
 				),
 			);
 		}
@@ -103,33 +102,32 @@ impl<'a> Chunk<'a> {
 	}
 
 	/// [Chunk::new] implementation for all pre-1.18 chunk variants
-	fn new_old(data_version: u32, level: &'a de::LevelOld) -> Result<Self> {
+	fn new_v0(data_version: u32, level: &'a de::LevelV0) -> Result<Self> {
 		let mut section_map_v1_13 = BTreeMap::new();
-		let mut section_map_old = BTreeMap::new();
+		let mut section_map_v0 = BTreeMap::new();
 
 		for section in &level.sections {
 			match &section.section {
-				de::SectionOldVariants::V1_13 {
+				de::SectionV0Variants::V1_13 {
 					block_states,
 					palette,
 				} => {
 					section_map_v1_13.insert(
 						SectionY(section.y.into()),
-						PaletteSection::new(data_version, Some(block_states), palette)
-							.with_context(|| {
-								format!("Failed to load section at Y={}", section.y)
-							})?,
+						SectionV1_13::new(data_version, Some(block_states), palette).with_context(
+							|| format!("Failed to load section at Y={}", section.y),
+						)?,
 					);
 				}
-				de::SectionOldVariants::Old { blocks, data } => {
-					section_map_old.insert(
+				de::SectionV0Variants::V0 { blocks, data } => {
+					section_map_v0.insert(
 						SectionY(section.y.into()),
-						OldSection::new(blocks, data).with_context(|| {
+						SectionV0::new(blocks, data).with_context(|| {
 							format!("Failed to load section at Y={}", section.y)
 						})?,
 					);
 				}
-				de::SectionOldVariants::Empty {} => {}
+				de::SectionV0Variants::Empty {} => {}
 			}
 		}
 
@@ -137,14 +135,14 @@ impl<'a> Chunk<'a> {
 		let biomes = level.biomes.as_ref().context("Invalid biome data");
 
 		Ok(
-			match (section_map_v1_13.is_empty(), section_map_old.is_empty()) {
+			match (section_map_v1_13.is_empty(), section_map_v0.is_empty()) {
 				(true, true) => Chunk::Empty,
 				(false, true) => Chunk::V1_13 {
 					section_map: section_map_v1_13,
 					biomes: biomes?,
 				},
-				(true, false) => Chunk::Old {
-					section_map: section_map_old,
+				(true, false) => Chunk::V0 {
+					section_map: section_map_v0,
 					biomes: biomes?,
 				},
 				(false, false) => {
@@ -165,7 +163,7 @@ impl<'a> Chunk<'a> {
 				Chunk::V1_13 { section_map, .. } => V1_13 {
 					iter: section_map.iter(),
 				},
-				Chunk::Old { section_map, .. } => Old {
+				Chunk::V0 { section_map, .. } => V0 {
 					iter: section_map.iter(),
 				},
 				Chunk::Empty => Empty,
@@ -202,7 +200,7 @@ impl<'a> SectionIter<'a> {
 			SectionIterInner::V1_13 { iter } => {
 				f(&mut iter.map(|(y, section)| -> (SectionY, &'a dyn Section) { (*y, section) }))
 			}
-			SectionIterInner::Old { iter } => {
+			SectionIterInner::V0 { iter } => {
 				f(&mut iter.map(|(y, section)| -> (SectionY, &'a dyn Section) { (*y, section) }))
 			}
 			SectionIterInner::Empty => f(&mut iter::empty()),
@@ -221,7 +219,7 @@ impl<'a> Iterator for SectionIter<'a> {
 		match &self.inner {
 			SectionIterInner::V1_18 { iter } => iter.size_hint(),
 			SectionIterInner::V1_13 { iter } => iter.size_hint(),
-			SectionIterInner::Old { iter } => iter.size_hint(),
+			SectionIterInner::V0 { iter } => iter.size_hint(),
 			SectionIterInner::Empty => (0, Some(0)),
 		}
 	}
@@ -242,7 +240,7 @@ impl<'a> ExactSizeIterator for SectionIter<'a> {
 		match &self.inner {
 			SectionIterInner::V1_18 { iter } => iter.len(),
 			SectionIterInner::V1_13 { iter } => iter.len(),
-			SectionIterInner::Old { iter } => iter.len(),
+			SectionIterInner::V0 { iter } => iter.len(),
 			SectionIterInner::Empty => 0,
 		}
 	}
diff --git a/src/world/de.rs b/src/world/de.rs
index ead4687..844bd29 100644
--- a/src/world/de.rs
+++ b/src/world/de.rs
@@ -34,37 +34,37 @@ pub struct SectionV1_18 {
 	pub block_light: Option<fastnbt::ByteArray>,
 }
 
-/// Version-specific part of a pre-1.18 [Section](SectionOld)
+/// Version-specific part of a pre-1.18 [Section](SectionV0)
 #[derive(Debug, Deserialize)]
 #[serde(untagged)]
-pub enum SectionOldVariants {
+pub enum SectionV0Variants {
 	#[serde(rename_all = "PascalCase")]
 	V1_13 {
 		block_states: fastnbt::LongArray,
 		palette: Vec<BlockStatePaletteEntry>,
 	},
 	#[serde(rename_all = "PascalCase")]
-	Old {
+	V0 {
 		blocks: fastnbt::ByteArray,
 		data: fastnbt::ByteArray,
 	},
 	Empty {},
 }
 
-/// Pre-1.18 section element found in the [Level](LevelOld) compound
+/// Pre-1.18 section element found in the [Level](LevelV0) compound
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "PascalCase")]
-pub struct SectionOld {
+pub struct SectionV0 {
 	pub y: i8,
 	pub block_light: Option<fastnbt::ByteArray>,
 	#[serde(flatten)]
-	pub section: SectionOldVariants,
+	pub section: SectionV0Variants,
 }
 
-/// Pre-1.18 biome fields found in the [Level](LevelOld) compound
+/// Pre-1.18 biome fields found in the [Level](LevelV0) compound
 #[derive(Debug, Deserialize)]
 #[serde(untagged)]
-pub enum BiomesOld {
+pub enum BiomesV0 {
 	IntArray(fastnbt::IntArray),
 	ByteArray(fastnbt::ByteArray),
 }
@@ -72,10 +72,10 @@ pub enum BiomesOld {
 /// `Level` compound element found in pre-1.18 [chunks](Chunk)
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "PascalCase")]
-pub struct LevelOld {
+pub struct LevelV0 {
 	#[serde(default)]
-	pub sections: Vec<SectionOld>,
-	pub biomes: Option<BiomesOld>,
+	pub sections: Vec<SectionV0>,
+	pub biomes: Option<BiomesV0>,
 }
 
 /// Version-specific part of a [Chunk] compound
@@ -86,8 +86,8 @@ pub enum ChunkVariants {
 		sections: Vec<SectionV1_18>,
 	},
 	#[serde(rename_all = "PascalCase")]
-	Old {
-		level: LevelOld,
+	V0 {
+		level: LevelV0,
 	},
 }
 
diff --git a/src/world/section.rs b/src/world/section.rs
index 78201a1..dbcf6ff 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -21,7 +21,7 @@ fn palette_bits(len: usize, min: u8, max: u8) -> Option<u8> {
 	Some(bits)
 }
 
-/// Trait for common functions of [PaletteSection] and [OldSection]
+/// Trait for common functions of [SectionV1_13] and [SectionV0]
 pub trait Section {
 	fn get_block_id(&self, coords: BlockCoords) -> Result<&str>;
 }
@@ -32,14 +32,14 @@ pub trait Section {
 /// the biomes laid out as an array of indices into a palette, similar to the
 /// v1.13+ block data.
 #[derive(Debug)]
-pub struct PaletteSectionBiomes<'a> {
+pub struct BiomesV18<'a> {
 	_biomes: Option<&'a fastnbt::LongArray>,
 	_palette: &'a Vec<String>,
 	_bits: u8,
 }
 
-impl<'a> PaletteSectionBiomes<'a> {
-	/// Constructs a new [PaletteSectionBiomes] from deserialized data structures
+impl<'a> BiomesV18<'a> {
+	/// Constructs a new [BiomesV18] from deserialized data structures
 	pub fn new(biomes: Option<&'a fastnbt::LongArray>, palette: &'a Vec<String>) -> Result<Self> {
 		let bits = palette_bits(palette.len(), 1, 6).context("Unsupported block palette size")?;
 
@@ -51,7 +51,7 @@ impl<'a> PaletteSectionBiomes<'a> {
 			}
 		}
 
-		Ok(PaletteSectionBiomes {
+		Ok(BiomesV18 {
 			_biomes: biomes,
 			_palette: palette,
 			_bits: bits,
@@ -61,15 +61,15 @@ impl<'a> PaletteSectionBiomes<'a> {
 
 /// Minecraft v1.13+ section block data
 #[derive(Debug)]
-pub struct PaletteSection<'a> {
+pub struct SectionV1_13<'a> {
 	block_states: Option<&'a fastnbt::LongArray>,
 	palette: &'a Vec<de::BlockStatePaletteEntry>,
 	bits: u8,
 	aligned_blocks: bool,
 }
 
-impl<'a> PaletteSection<'a> {
-	/// Constructs a new [PaletteSection] from deserialized data structures
+impl<'a> SectionV1_13<'a> {
+	/// Constructs a new [SectionV1_13] from deserialized data structures
 	pub fn new(
 		data_version: u32,
 		block_states: Option<&'a fastnbt::LongArray>,
@@ -131,7 +131,7 @@ impl<'a> PaletteSection<'a> {
 	}
 }
 
-impl<'a> Section for PaletteSection<'a> {
+impl<'a> Section for SectionV1_13<'a> {
 	fn get_block_id(&self, coords: BlockCoords) -> Result<&str> {
 		let index = self.get_palette_index(coords);
 		let entry = self
@@ -144,13 +144,13 @@ impl<'a> Section for PaletteSection<'a> {
 
 /// Pre-1.13 section block data
 #[derive(Debug)]
-pub struct OldSection<'a> {
+pub struct SectionV0<'a> {
 	blocks: &'a fastnbt::ByteArray,
 	data: &'a fastnbt::ByteArray,
 }
 
-impl<'a> OldSection<'a> {
-	/// Constructs a new [OldSection] from deserialized data structures
+impl<'a> SectionV0<'a> {
+	/// Constructs a new [SectionV0] from deserialized data structures
 	pub fn new(blocks: &'a fastnbt::ByteArray, data: &'a fastnbt::ByteArray) -> Result<Self> {
 		use BLOCKS_PER_CHUNK as N;
 
@@ -161,11 +161,11 @@ impl<'a> OldSection<'a> {
 			bail!("Invalid section extra data");
 		}
 
-		Ok(OldSection { blocks, data })
+		Ok(SectionV0 { blocks, data })
 	}
 }
 
-impl<'a> Section for OldSection<'a> {
+impl<'a> Section for SectionV0<'a> {
 	fn get_block_id(&self, coords: BlockCoords) -> Result<&str> {
 		let offset = coords.offset();
 		let block = self.blocks[offset] as u8;

From 1049aad03d849d3fc440ce2db70f8ca69314ff22 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 12 Feb 2023 22:59:28 +0100
Subject: [PATCH 076/460] Update dependencies

---
 Cargo.lock | 52 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8d40e13..cddf403 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "anyhow"
-version = "1.0.68"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61"
+checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
 
 [[package]]
 name = "bitflags"
@@ -34,9 +34,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "cc"
-version = "1.0.78"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d"
+checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
 
 [[package]]
 name = "cesu8"
@@ -167,24 +167,21 @@ dependencies = [
 
 [[package]]
 name = "heck"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "hermit-abi"
-version = "0.2.6"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
-dependencies = [
- "libc",
-]
+checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
 
 [[package]]
 name = "io-lifetimes"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
+checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3"
 dependencies = [
  "libc",
  "windows-sys",
@@ -192,9 +189,9 @@ dependencies = [
 
 [[package]]
 name = "is-terminal"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
+checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef"
 dependencies = [
  "hermit-abi",
  "io-lifetimes",
@@ -284,9 +281,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.50"
+version = "1.0.51"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ef7d57beacfaf2d8aee5937dab7b7f28de3cb8b1828479bb5de2a7106f2bae2"
+checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6"
 dependencies = [
  "unicode-ident",
 ]
@@ -302,9 +299,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.36.7"
+version = "0.36.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fdebc4b395b7fbb9ab11e462e20ed9051e7b16e42d24042c776eca0ac81b03"
+checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644"
 dependencies = [
  "bitflags",
  "errno",
@@ -325,9 +322,9 @@ dependencies = [
 
 [[package]]
 name = "serde_bytes"
-version = "0.11.8"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "718dc5fff5b36f99093fc49b280cfc96ce6fc824317783bff5a1fed0c7a64819"
+checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294"
 dependencies = [
  "serde",
 ]
@@ -414,9 +411,18 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows-sys"
-version = "0.42.0"
+version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
 dependencies = [
  "windows_aarch64_gnullvm",
  "windows_aarch64_msvc",

From 96736bd7ed41ee84d2cbfb69924062068ab59250 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 12 Feb 2023 23:07:55 +0100
Subject: [PATCH 077/460] Replace DivRem trait with num-integer crate

---
 Cargo.lock           | 26 ++++++++++++++++++++++++++
 Cargo.toml           |  1 +
 src/types.rs         | 25 +------------------------
 src/world/section.rs |  7 ++++---
 4 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cddf403..3efed67 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14,6 +14,12 @@ version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
 
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -231,6 +237,7 @@ dependencies = [
  "fastnbt",
  "flate2",
  "itertools",
+ "num-integer",
  "serde",
 ]
 
@@ -243,6 +250,25 @@ dependencies = [
  "adler",
 ]
 
+[[package]]
+name = "num-integer"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+dependencies = [
+ "autocfg",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.17.0"
diff --git a/Cargo.toml b/Cargo.toml
index 4c6ee7f..b5ef027 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,4 +15,5 @@ enumflags2 = "0.7.5"
 fastnbt = "2.3.2"
 flate2 = "1.0.25"
 itertools = "0.10.5"
+num-integer = "0.1.45"
 serde = "1.0.152"
diff --git a/src/types.rs b/src/types.rs
index 905f0c0..9a1c24f 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -1,6 +1,6 @@
 use std::{
 	fmt::Debug,
-	ops::{Div, Index, IndexMut, Rem},
+	ops::{Index, IndexMut},
 };
 
 use itertools::iproduct;
@@ -113,26 +113,3 @@ impl<T> IndexMut<ChunkCoords> for ChunkArray<T> {
 		&mut self.0[index.z.0 as usize][index.x.0 as usize]
 	}
 }
-
-/// Calculate division and remainder at the same time
-pub trait DivRem<Rhs>
-where
-	Self: Div<Rhs>,
-	Self: Rem<Rhs>,
-{
-	/// Returns the result of the division and remainder operations
-	/// with the same inputs
-	fn div_rem(self, rhs: Rhs) -> (<Self as Div<Rhs>>::Output, <Self as Rem<Rhs>>::Output);
-}
-
-impl<Lhs, Rhs> DivRem<Rhs> for Lhs
-where
-	Self: Div<Rhs>,
-	Self: Rem<Rhs>,
-	Self: Copy,
-	Rhs: Copy,
-{
-	fn div_rem(self, rhs: Rhs) -> (<Self as Div<Rhs>>::Output, <Self as Rem<Rhs>>::Output) {
-		(self / rhs, self % rhs)
-	}
-}
diff --git a/src/world/section.rs b/src/world/section.rs
index dbcf6ff..b8d4ae7 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -1,4 +1,5 @@
 use anyhow::{bail, Context, Result};
+use num_integer::div_rem;
 
 use super::de;
 use crate::{resource, types::*};
@@ -112,11 +113,11 @@ impl<'a> SectionV1_13<'a> {
 
 		let shifted = if self.aligned_blocks {
 			let blocks_per_word = 64 / bits;
-			let (word, shift) = offset.div_rem(blocks_per_word);
+			let (word, shift) = div_rem(offset, blocks_per_word);
 			block_states[word] as u64 >> (shift * bits)
 		} else {
 			let bit_offset = offset * bits;
-			let (word, bit_shift) = bit_offset.div_rem(64);
+			let (word, bit_shift) = div_rem(bit_offset, 64);
 
 			if bit_shift + bits <= 64 {
 				block_states[word] as u64 >> bit_shift
@@ -170,7 +171,7 @@ impl<'a> Section for SectionV0<'a> {
 		let offset = coords.offset();
 		let block = self.blocks[offset] as u8;
 
-		let (data_offset, data_nibble) = offset.div_rem(2);
+		let (data_offset, data_nibble) = div_rem(offset, 2);
 		let data_byte = self.data[data_offset] as u8;
 		let data = if data_nibble == 1 {
 			data_byte >> 4

From 9f8446885ee1f5ce8d77d76a3f778a62003820d4 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 12 Feb 2023 23:36:58 +0100
Subject: [PATCH 078/460] treewide: remove get_ prefix from function names

Follow the conventions of the std library.
---
 src/resource/mod.rs  |  2 +-
 src/world/section.rs | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/resource/mod.rs b/src/resource/mod.rs
index 3dbc10c..24549c3 100644
--- a/src/resource/mod.rs
+++ b/src/resource/mod.rs
@@ -28,7 +28,7 @@ pub struct BlockType {
 	pub color: BlockColor,
 }
 
-pub fn get_block_types() -> HashMap<String, BlockType> {
+pub fn block_types() -> HashMap<String, BlockType> {
 	block_types::BLOCK_TYPES
 		.iter()
 		.map(|(k, v)| (String::from(*k), *v))
diff --git a/src/world/section.rs b/src/world/section.rs
index b8d4ae7..e59daba 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -24,7 +24,7 @@ fn palette_bits(len: usize, min: u8, max: u8) -> Option<u8> {
 
 /// Trait for common functions of [SectionV1_13] and [SectionV0]
 pub trait Section {
-	fn get_block_id(&self, coords: BlockCoords) -> Result<&str>;
+	fn block_id_at(&self, coords: BlockCoords) -> Result<&str>;
 }
 
 /// Minecraft v1.18+ section biome data
@@ -101,7 +101,7 @@ impl<'a> SectionV1_13<'a> {
 	}
 
 	/// Looks up the block type palette index at the given coordinates
-	fn get_palette_index(&self, coords: BlockCoords) -> usize {
+	fn palette_index_at(&self, coords: BlockCoords) -> usize {
 		let Some(block_states) = self.block_states else {
 			return 0;
 		};
@@ -133,8 +133,8 @@ impl<'a> SectionV1_13<'a> {
 }
 
 impl<'a> Section for SectionV1_13<'a> {
-	fn get_block_id(&self, coords: BlockCoords) -> Result<&str> {
-		let index = self.get_palette_index(coords);
+	fn block_id_at(&self, coords: BlockCoords) -> Result<&str> {
+		let index = self.palette_index_at(coords);
 		let entry = self
 			.palette
 			.get(index)
@@ -167,7 +167,7 @@ impl<'a> SectionV0<'a> {
 }
 
 impl<'a> Section for SectionV0<'a> {
-	fn get_block_id(&self, coords: BlockCoords) -> Result<&str> {
+	fn block_id_at(&self, coords: BlockCoords) -> Result<&str> {
 		let offset = coords.offset();
 		let block = self.blocks[offset] as u8;
 

From 102baa91979269a4d66e8f0b6c6530d62747f198 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 13 Feb 2023 00:02:43 +0100
Subject: [PATCH 079/460] types: add iter() associated function to coordinate
 newtypes

---
 src/types.rs | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/types.rs b/src/types.rs
index 9a1c24f..765ed39 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -1,23 +1,43 @@
 use std::{
 	fmt::Debug,
+	iter::FusedIterator,
 	ops::{Index, IndexMut},
 };
 
 use itertools::iproduct;
 
+macro_rules! coord_impl {
+	($t:ident, $max:expr) => {
+		impl $t {
+			/// Returns an iterator over all possible values of the type
+			pub fn iter() -> impl Iterator<Item = $t>
+			       + DoubleEndedIterator
+			       + ExactSizeIterator
+			       + FusedIterator
+			       + Clone
+			       + Debug {
+				(0..$max as u8).map($t)
+			}
+		}
+	};
+}
+
 pub const BLOCKS_PER_CHUNK: usize = 16;
 
 /// A block X coordinate relative to a chunk
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct BlockX(pub u8);
+coord_impl!(BlockX, BLOCKS_PER_CHUNK);
 
 /// A block Y coordinate relative to a chunk section
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct BlockY(pub u8);
+coord_impl!(BlockY, BLOCKS_PER_CHUNK);
 
 /// A block Z coordinate relative to a chunk
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct BlockZ(pub u8);
+coord_impl!(BlockZ, BLOCKS_PER_CHUNK);
 
 /// X, Y and Z coordinates of a block in a chunk section
 #[derive(Clone, Copy, PartialEq, Eq)]
@@ -57,10 +77,12 @@ pub const CHUNKS_PER_REGION: usize = 32;
 /// A chunk X coordinate relative to a region
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct ChunkX(pub u8);
+coord_impl!(ChunkX, CHUNKS_PER_REGION);
 
 /// A chunk Z coordinate relative to a region
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub struct ChunkZ(pub u8);
+coord_impl!(ChunkZ, CHUNKS_PER_REGION);
 
 /// A pair of chunk coordinates relative to a region
 #[derive(Clone, Copy, PartialEq, Eq)]
@@ -83,12 +105,7 @@ pub struct ChunkArray<T>(pub [[T; CHUNKS_PER_REGION]; CHUNKS_PER_REGION]);
 
 impl<T> ChunkArray<T> {
 	pub fn keys() -> impl Iterator<Item = ChunkCoords> {
-		iproduct!(0..(CHUNKS_PER_REGION as u8), 0..(CHUNKS_PER_REGION as u8)).map(|(z, x)| {
-			ChunkCoords {
-				x: ChunkX(x),
-				z: ChunkZ(z),
-			}
-		})
+		iproduct!(ChunkZ::iter(), ChunkX::iter()).map(|(z, x)| ChunkCoords { x, z })
 	}
 
 	pub fn values(&self) -> impl Iterator<Item = &T> {

From db289bc077b10c9ba48b12b05dd48d103f1b79b3 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 13 Feb 2023 00:11:36 +0100
Subject: [PATCH 080/460] resource: rename BlockFlags to BlockFlag

The enum only holds a single flag at a time.
---
 resource/generate.py        |    2 +-
 src/resource/block_types.rs | 1806 +++++++++++++++++------------------
 src/resource/mod.rs         |    4 +-
 3 files changed, 906 insertions(+), 906 deletions(-)

diff --git a/resource/generate.py b/resource/generate.py
index 7e6ee09..d91df98 100755
--- a/resource/generate.py
+++ b/resource/generate.py
@@ -34,7 +34,7 @@ with open(sys.argv[2], 'w') as f:
 			flags.append('Spruce')
 		if info['water']:
 			flags.append('Water')
-		flags = 'make_bitflags!(BlockFlags::{' + '|'.join(flags) + '})'
+		flags = 'make_bitflags!(BlockFlag::{' + '|'.join(flags) + '})'
 
 		print('\t("%s", BlockType { flags: %s, color: BlockColor(%u, %u, %u) }),' % (
 			name,
diff --git a/src/resource/block_types.rs b/src/resource/block_types.rs
index 94d1e2b..5b975c2 100644
--- a/src/resource/block_types.rs
+++ b/src/resource/block_types.rs
@@ -6,6321 +6,6321 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 	(
 		"minecraft:acacia_button",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:acacia_door",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(167, 95, 60),
 		},
 	),
 	(
 		"minecraft:acacia_fence",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(168, 90, 50),
 		},
 	),
 	(
 		"minecraft:acacia_fence_gate",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(168, 90, 50),
 		},
 	),
 	(
 		"minecraft:acacia_leaves",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque|Foliage}),
+			flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
 			color: BlockColor(149, 148, 148),
 		},
 	),
 	(
 		"minecraft:acacia_log",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(150, 88, 55),
 		},
 	),
 	(
 		"minecraft:acacia_planks",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(168, 90, 50),
 		},
 	),
 	(
 		"minecraft:acacia_pressure_plate",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(168, 90, 50),
 		},
 	),
 	(
 		"minecraft:acacia_sapling",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(118, 117, 23),
 		},
 	),
 	(
 		"minecraft:acacia_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(168, 90, 50),
 		},
 	),
 	(
 		"minecraft:acacia_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(168, 90, 50),
 		},
 	),
 	(
 		"minecraft:acacia_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(168, 90, 50),
 		},
 	),
 	(
 		"minecraft:acacia_trapdoor",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(156, 87, 51),
 		},
 	),
 	(
 		"minecraft:acacia_wall_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:acacia_wood",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(103, 96, 86),
 		},
 	),
 	(
 		"minecraft:activator_rail",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(115, 87, 74),
 		},
 	),
 	(
 		"minecraft:air",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:allium",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:amethyst_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(133, 97, 191),
 		},
 	),
 	(
 		"minecraft:amethyst_cluster",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(163, 126, 207),
 		},
 	),
 	(
 		"minecraft:ancient_debris",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(94, 66, 58),
 		},
 	),
 	(
 		"minecraft:andesite",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(136, 136, 136),
 		},
 	),
 	(
 		"minecraft:andesite_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(136, 136, 136),
 		},
 	),
 	(
 		"minecraft:andesite_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(136, 136, 136),
 		},
 	),
 	(
 		"minecraft:andesite_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(136, 136, 136),
 		},
 	),
 	(
 		"minecraft:anvil",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(72, 72, 72),
 		},
 	),
 	(
 		"minecraft:attached_melon_stem",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque|Grass}),
+			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 			color: BlockColor(141, 142, 141),
 		},
 	),
 	(
 		"minecraft:attached_pumpkin_stem",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque|Grass}),
+			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 			color: BlockColor(139, 139, 139),
 		},
 	),
 	(
 		"minecraft:azalea",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(101, 124, 47),
 		},
 	),
 	(
 		"minecraft:azalea_leaves",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(90, 114, 44),
 		},
 	),
 	(
 		"minecraft:azure_bluet",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:bamboo",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(93, 144, 19),
 		},
 	),
 	(
 		"minecraft:bamboo_sapling",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:barrel",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(134, 100, 58),
 		},
 	),
 	(
 		"minecraft:barrier",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:basalt",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(80, 81, 86),
 		},
 	),
 	(
 		"minecraft:beacon",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(117, 220, 215),
 		},
 	),
 	(
 		"minecraft:bedrock",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(85, 85, 85),
 		},
 	),
 	(
 		"minecraft:bee_nest",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(202, 160, 74),
 		},
 	),
 	(
 		"minecraft:beehive",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(180, 146, 90),
 		},
 	),
 	(
 		"minecraft:beetroots",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(93, 91, 30),
 		},
 	),
 	(
 		"minecraft:bell",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(253, 235, 110),
 		},
 	),
 	(
 		"minecraft:big_dripleaf",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(111, 141, 51),
 		},
 	),
 	(
 		"minecraft:big_dripleaf_stem",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:birch_button",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:birch_door",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(220, 209, 176),
 		},
 	),
 	(
 		"minecraft:birch_fence",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(192, 175, 121),
 		},
 	),
 	(
 		"minecraft:birch_fence_gate",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(192, 175, 121),
 		},
 	),
 	(
 		"minecraft:birch_leaves",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque|Birch}),
+			flags: make_bitflags!(BlockFlag::{Opaque|Birch}),
 			color: BlockColor(130, 129, 130),
 		},
 	),
 	(
 		"minecraft:birch_log",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(193, 179, 135),
 		},
 	),
 	(
 		"minecraft:birch_planks",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(192, 175, 121),
 		},
 	),
 	(
 		"minecraft:birch_pressure_plate",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(192, 175, 121),
 		},
 	),
 	(
 		"minecraft:birch_sapling",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(127, 160, 79),
 		},
 	),
 	(
 		"minecraft:birch_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(192, 175, 121),
 		},
 	),
 	(
 		"minecraft:birch_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(192, 175, 121),
 		},
 	),
 	(
 		"minecraft:birch_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(192, 175, 121),
 		},
 	),
 	(
 		"minecraft:birch_trapdoor",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(207, 194, 157),
 		},
 	),
 	(
 		"minecraft:birch_wall_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:birch_wood",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(216, 215, 210),
 		},
 	),
 	(
 		"minecraft:black_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:black_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:black_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:black_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
 		"minecraft:black_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(20, 21, 25),
 		},
 	),
 	(
 		"minecraft:black_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(8, 10, 15),
 		},
 	),
 	(
 		"minecraft:black_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(25, 26, 31),
 		},
 	),
 	(
 		"minecraft:black_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(67, 30, 32),
 		},
 	),
 	(
 		"minecraft:black_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(25, 25, 29),
 		},
 	),
 	(
 		"minecraft:black_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(25, 25, 25),
 		},
 	),
 	(
 		"minecraft:black_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(24, 24, 24),
 		},
 	),
 	(
 		"minecraft:black_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(37, 22, 16),
 		},
 	),
 	(
 		"minecraft:black_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:black_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(20, 21, 25),
 		},
 	),
 	(
 		"minecraft:blackstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(42, 36, 41),
 		},
 	),
 	(
 		"minecraft:blackstone_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(42, 36, 41),
 		},
 	),
 	(
 		"minecraft:blackstone_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(42, 36, 41),
 		},
 	),
 	(
 		"minecraft:blackstone_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(42, 36, 41),
 		},
 	),
 	(
 		"minecraft:blast_furnace",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(80, 80, 81),
 		},
 	),
 	(
 		"minecraft:blue_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:blue_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:blue_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:blue_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
 		"minecraft:blue_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(53, 57, 157),
 		},
 	),
 	(
 		"minecraft:blue_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(44, 46, 143),
 		},
 	),
 	(
 		"minecraft:blue_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(70, 73, 166),
 		},
 	),
 	(
 		"minecraft:blue_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(47, 64, 139),
 		},
 	),
 	(
 		"minecraft:blue_ice",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(116, 167, 253),
 		},
 	),
 	(
 		"minecraft:blue_orchid",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:blue_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(43, 45, 140),
 		},
 	),
 	(
 		"minecraft:blue_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(51, 76, 178),
 		},
 	),
 	(
 		"minecraft:blue_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(48, 73, 171),
 		},
 	),
 	(
 		"minecraft:blue_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(74, 59, 91),
 		},
 	),
 	(
 		"minecraft:blue_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:blue_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(53, 57, 157),
 		},
 	),
 	(
 		"minecraft:bone_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(209, 206, 179),
 		},
 	),
 	(
 		"minecraft:bookshelf",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(162, 130, 78),
 		},
 	),
 	(
 		"minecraft:brain_coral",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:brain_coral_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(207, 91, 159),
 		},
 	),
 	(
 		"minecraft:brain_coral_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:brain_coral_wall_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:brewing_stand",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(123, 101, 81),
 		},
 	),
 	(
 		"minecraft:brick_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(150, 97, 83),
 		},
 	),
 	(
 		"minecraft:brick_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(150, 97, 83),
 		},
 	),
 	(
 		"minecraft:brick_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(150, 97, 83),
 		},
 	),
 	(
 		"minecraft:bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(150, 97, 83),
 		},
 	),
 	(
 		"minecraft:brown_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:brown_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:brown_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:brown_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
 		"minecraft:brown_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(114, 71, 40),
 		},
 	),
 	(
 		"minecraft:brown_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(96, 59, 31),
 		},
 	),
 	(
 		"minecraft:brown_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(125, 84, 53),
 		},
 	),
 	(
 		"minecraft:brown_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(119, 106, 85),
 		},
 	),
 	(
 		"minecraft:brown_mushroom",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:brown_mushroom_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(149, 111, 81),
 		},
 	),
 	(
 		"minecraft:brown_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(106, 66, 35),
 		},
 	),
 	(
 		"minecraft:brown_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(102, 76, 51),
 		},
 	),
 	(
 		"minecraft:brown_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(97, 73, 48),
 		},
 	),
 	(
 		"minecraft:brown_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(77, 51, 35),
 		},
 	),
 	(
 		"minecraft:brown_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:brown_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(114, 71, 40),
 		},
 	),
 	(
 		"minecraft:bubble_column",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque|Water}),
+			flags: make_bitflags!(BlockFlag::{Opaque|Water}),
 			color: BlockColor(177, 177, 177),
 		},
 	),
 	(
 		"minecraft:bubble_coral",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:bubble_coral_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(165, 26, 162),
 		},
 	),
 	(
 		"minecraft:bubble_coral_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:bubble_coral_wall_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:budding_amethyst",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(132, 96, 186),
 		},
 	),
 	(
 		"minecraft:cactus",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(85, 127, 43),
 		},
 	),
 	(
 		"minecraft:cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
 		"minecraft:calcite",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(223, 224, 220),
 		},
 	),
 	(
 		"minecraft:campfire",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(110, 88, 54),
 		},
 	),
 	(
 		"minecraft:candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
 		"minecraft:carrots",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(81, 124, 37),
 		},
 	),
 	(
 		"minecraft:cartography_table",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(103, 87, 67),
 		},
 	),
 	(
 		"minecraft:carved_pumpkin",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(198, 118, 24),
 		},
 	),
 	(
 		"minecraft:cauldron",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(73, 72, 74),
 		},
 	),
 	(
 		"minecraft:cave_air",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:cave_vines",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(90, 109, 40),
 		},
 	),
 	(
 		"minecraft:cave_vines_plant",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(88, 101, 38),
 		},
 	),
 	(
 		"minecraft:chain",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:chain_command_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(131, 161, 147),
 		},
 	),
 	(
 		"minecraft:chest",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(162, 130, 78),
 		},
 	),
 	(
 		"minecraft:chipped_anvil",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(72, 72, 72),
 		},
 	),
 	(
 		"minecraft:chiseled_deepslate",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(54, 54, 54),
 		},
 	),
 	(
 		"minecraft:chiseled_nether_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(47, 23, 28),
 		},
 	),
 	(
 		"minecraft:chiseled_polished_blackstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(53, 48, 56),
 		},
 	),
 	(
 		"minecraft:chiseled_quartz_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(231, 226, 218),
 		},
 	),
 	(
 		"minecraft:chiseled_red_sandstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(181, 97, 31),
 		},
 	),
 	(
 		"minecraft:chiseled_sandstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(223, 214, 170),
 		},
 	),
 	(
 		"minecraft:chiseled_stone_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(119, 118, 119),
 		},
 	),
 	(
 		"minecraft:chorus_flower",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(151, 120, 151),
 		},
 	),
 	(
 		"minecraft:chorus_plant",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(93, 57, 93),
 		},
 	),
 	(
 		"minecraft:clay",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(160, 166, 179),
 		},
 	),
 	(
 		"minecraft:coal_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(16, 15, 15),
 		},
 	),
 	(
 		"minecraft:coal_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(105, 105, 105),
 		},
 	),
 	(
 		"minecraft:coarse_dirt",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(119, 85, 59),
 		},
 	),
 	(
 		"minecraft:cobbled_deepslate",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(77, 77, 80),
 		},
 	),
 	(
 		"minecraft:cobbled_deepslate_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(77, 77, 80),
 		},
 	),
 	(
 		"minecraft:cobbled_deepslate_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(77, 77, 80),
 		},
 	),
 	(
 		"minecraft:cobbled_deepslate_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(77, 77, 80),
 		},
 	),
 	(
 		"minecraft:cobblestone",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(127, 127, 127),
 		},
 	),
 	(
 		"minecraft:cobblestone_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(127, 127, 127),
 		},
 	),
 	(
 		"minecraft:cobblestone_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(127, 127, 127),
 		},
 	),
 	(
 		"minecraft:cobblestone_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(127, 127, 127),
 		},
 	),
 	(
 		"minecraft:cobweb",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(228, 233, 234),
 		},
 	),
 	(
 		"minecraft:cocoa",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(156, 94, 43),
 		},
 	),
 	(
 		"minecraft:command_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(181, 136, 108),
 		},
 	),
 	(
 		"minecraft:comparator",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(166, 161, 159),
 		},
 	),
 	(
 		"minecraft:composter",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(88, 61, 23),
 		},
 	),
 	(
 		"minecraft:conduit",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(159, 139, 113),
 		},
 	),
 	(
 		"minecraft:copper_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(192, 107, 79),
 		},
 	),
 	(
 		"minecraft:copper_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(124, 125, 120),
 		},
 	),
 	(
 		"minecraft:cornflower",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:cracked_deepslate_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(64, 64, 65),
 		},
 	),
 	(
 		"minecraft:cracked_deepslate_tiles",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(52, 52, 52),
 		},
 	),
 	(
 		"minecraft:cracked_nether_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(40, 20, 23),
 		},
 	),
 	(
 		"minecraft:cracked_polished_blackstone_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(44, 37, 43),
 		},
 	),
 	(
 		"minecraft:cracked_stone_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(118, 117, 118),
 		},
 	),
 	(
 		"minecraft:crafting_table",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(119, 73, 42),
 		},
 	),
 	(
 		"minecraft:creeper_head",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:creeper_wall_head",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:crimson_button",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:crimson_door",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(114, 54, 79),
 		},
 	),
 	(
 		"minecraft:crimson_fence",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(101, 48, 70),
 		},
 	),
 	(
 		"minecraft:crimson_fence_gate",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(101, 48, 70),
 		},
 	),
 	(
 		"minecraft:crimson_fungus",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:crimson_hyphae",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(92, 25, 29),
 		},
 	),
 	(
 		"minecraft:crimson_nylium",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(130, 31, 31),
 		},
 	),
 	(
 		"minecraft:crimson_planks",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(101, 48, 70),
 		},
 	),
 	(
 		"minecraft:crimson_pressure_plate",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(101, 48, 70),
 		},
 	),
 	(
 		"minecraft:crimson_roots",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(126, 8, 41),
 		},
 	),
 	(
 		"minecraft:crimson_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(101, 48, 70),
 		},
 	),
 	(
 		"minecraft:crimson_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(101, 48, 70),
 		},
 	),
 	(
 		"minecraft:crimson_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(101, 48, 70),
 		},
 	),
 	(
 		"minecraft:crimson_stem",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(112, 49, 70),
 		},
 	),
 	(
 		"minecraft:crimson_trapdoor",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(103, 50, 72),
 		},
 	),
 	(
 		"minecraft:crimson_wall_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:crying_obsidian",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(32, 10, 60),
 		},
 	),
 	(
 		"minecraft:cut_copper",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(191, 106, 80),
 		},
 	),
 	(
 		"minecraft:cut_copper_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(191, 106, 80),
 		},
 	),
 	(
 		"minecraft:cut_copper_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(191, 106, 80),
 		},
 	),
 	(
 		"minecraft:cut_red_sandstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(181, 97, 31),
 		},
 	),
 	(
 		"minecraft:cut_red_sandstone_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(181, 97, 31),
 		},
 	),
 	(
 		"minecraft:cut_sandstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(223, 214, 170),
 		},
 	),
 	(
 		"minecraft:cut_sandstone_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(223, 214, 170),
 		},
 	),
 	(
 		"minecraft:cyan_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:cyan_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:cyan_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:cyan_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
 		"minecraft:cyan_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(21, 137, 145),
 		},
 	),
 	(
 		"minecraft:cyan_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(21, 119, 136),
 		},
 	),
 	(
 		"minecraft:cyan_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(36, 147, 157),
 		},
 	),
 	(
 		"minecraft:cyan_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(52, 118, 125),
 		},
 	),
 	(
 		"minecraft:cyan_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(20, 121, 135),
 		},
 	),
 	(
 		"minecraft:cyan_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(76, 127, 153),
 		},
 	),
 	(
 		"minecraft:cyan_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(73, 122, 147),
 		},
 	),
 	(
 		"minecraft:cyan_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(86, 91, 91),
 		},
 	),
 	(
 		"minecraft:cyan_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:cyan_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(21, 137, 145),
 		},
 	),
 	(
 		"minecraft:damaged_anvil",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(72, 72, 72),
 		},
 	),
 	(
 		"minecraft:dandelion",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:dark_oak_button",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:dark_oak_door",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(76, 51, 25),
 		},
 	),
 	(
 		"minecraft:dark_oak_fence",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(66, 43, 20),
 		},
 	),
 	(
 		"minecraft:dark_oak_fence_gate",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(66, 43, 20),
 		},
 	),
 	(
 		"minecraft:dark_oak_leaves",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque|Foliage}),
+			flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
 			color: BlockColor(150, 150, 150),
 		},
 	),
 	(
 		"minecraft:dark_oak_log",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(67, 45, 22),
 		},
 	),
 	(
 		"minecraft:dark_oak_planks",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(66, 43, 20),
 		},
 	),
 	(
 		"minecraft:dark_oak_pressure_plate",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(66, 43, 20),
 		},
 	),
 	(
 		"minecraft:dark_oak_sapling",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(61, 90, 30),
 		},
 	),
 	(
 		"minecraft:dark_oak_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(66, 43, 20),
 		},
 	),
 	(
 		"minecraft:dark_oak_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(66, 43, 20),
 		},
 	),
 	(
 		"minecraft:dark_oak_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(66, 43, 20),
 		},
 	),
 	(
 		"minecraft:dark_oak_trapdoor",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(75, 49, 23),
 		},
 	),
 	(
 		"minecraft:dark_oak_wall_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:dark_oak_wood",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(60, 46, 26),
 		},
 	),
 	(
 		"minecraft:dark_prismarine",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(51, 91, 75),
 		},
 	),
 	(
 		"minecraft:dark_prismarine_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(51, 91, 75),
 		},
 	),
 	(
 		"minecraft:dark_prismarine_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(51, 91, 75),
 		},
 	),
 	(
 		"minecraft:daylight_detector",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(130, 116, 94),
 		},
 	),
 	(
 		"minecraft:dead_brain_coral",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:dead_brain_coral_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(124, 117, 114),
 		},
 	),
 	(
 		"minecraft:dead_brain_coral_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:dead_brain_coral_wall_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:dead_bubble_coral",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:dead_bubble_coral_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(131, 123, 119),
 		},
 	),
 	(
 		"minecraft:dead_bubble_coral_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:dead_bubble_coral_wall_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:dead_bush",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(107, 78, 40),
 		},
 	),
 	(
 		"minecraft:dead_fire_coral",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:dead_fire_coral_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(131, 123, 119),
 		},
 	),
 	(
 		"minecraft:dead_fire_coral_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:dead_fire_coral_wall_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:dead_horn_coral",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:dead_horn_coral_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(133, 126, 122),
 		},
 	),
 	(
 		"minecraft:dead_horn_coral_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:dead_horn_coral_wall_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:dead_tube_coral",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:dead_tube_coral_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(130, 123, 119),
 		},
 	),
 	(
 		"minecraft:dead_tube_coral_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:dead_tube_coral_wall_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:deepslate",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(80, 80, 82),
 		},
 	),
 	(
 		"minecraft:deepslate_brick_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(70, 70, 71),
 		},
 	),
 	(
 		"minecraft:deepslate_brick_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(70, 70, 71),
 		},
 	),
 	(
 		"minecraft:deepslate_brick_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(70, 70, 71),
 		},
 	),
 	(
 		"minecraft:deepslate_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(70, 70, 71),
 		},
 	),
 	(
 		"minecraft:deepslate_coal_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(74, 74, 76),
 		},
 	),
 	(
 		"minecraft:deepslate_copper_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(92, 93, 89),
 		},
 	),
 	(
 		"minecraft:deepslate_diamond_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(83, 106, 106),
 		},
 	),
 	(
 		"minecraft:deepslate_emerald_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(78, 104, 87),
 		},
 	),
 	(
 		"minecraft:deepslate_gold_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(115, 102, 78),
 		},
 	),
 	(
 		"minecraft:deepslate_iron_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(106, 99, 94),
 		},
 	),
 	(
 		"minecraft:deepslate_lapis_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(79, 90, 115),
 		},
 	),
 	(
 		"minecraft:deepslate_redstone_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(104, 73, 74),
 		},
 	),
 	(
 		"minecraft:deepslate_tile_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(54, 54, 55),
 		},
 	),
 	(
 		"minecraft:deepslate_tile_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(54, 54, 55),
 		},
 	),
 	(
 		"minecraft:deepslate_tile_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(54, 54, 55),
 		},
 	),
 	(
 		"minecraft:deepslate_tiles",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(54, 54, 55),
 		},
 	),
 	(
 		"minecraft:detector_rail",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(123, 104, 90),
 		},
 	),
 	(
 		"minecraft:diamond_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(98, 237, 228),
 		},
 	),
 	(
 		"minecraft:diamond_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(121, 141, 140),
 		},
 	),
 	(
 		"minecraft:diorite",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(188, 188, 188),
 		},
 	),
 	(
 		"minecraft:diorite_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(188, 188, 188),
 		},
 	),
 	(
 		"minecraft:diorite_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(188, 188, 188),
 		},
 	),
 	(
 		"minecraft:diorite_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(188, 188, 188),
 		},
 	),
 	(
 		"minecraft:dirt",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(134, 96, 67),
 		},
 	),
 	(
 		"minecraft:dirt_path",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(148, 121, 65),
 		},
 	),
 	(
 		"minecraft:dispenser",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(110, 109, 109),
 		},
 	),
 	(
 		"minecraft:dragon_egg",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(12, 9, 15),
 		},
 	),
 	(
 		"minecraft:dragon_head",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:dragon_wall_head",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:dried_kelp_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(50, 58, 38),
 		},
 	),
 	(
 		"minecraft:dripstone_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(134, 107, 92),
 		},
 	),
 	(
 		"minecraft:dropper",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(110, 109, 109),
 		},
 	),
 	(
 		"minecraft:emerald_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(42, 203, 87),
 		},
 	),
 	(
 		"minecraft:emerald_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(108, 136, 115),
 		},
 	),
 	(
 		"minecraft:enchanting_table",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(128, 75, 85),
 		},
 	),
 	(
 		"minecraft:end_gateway",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(15, 10, 24),
 		},
 	),
 	(
 		"minecraft:end_portal",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(15, 10, 24),
 		},
 	),
 	(
 		"minecraft:end_portal_frame",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(91, 120, 97),
 		},
 	),
 	(
 		"minecraft:end_rod",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:end_stone",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(219, 222, 158),
 		},
 	),
 	(
 		"minecraft:end_stone_brick_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(218, 224, 162),
 		},
 	),
 	(
 		"minecraft:end_stone_brick_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(218, 224, 162),
 		},
 	),
 	(
 		"minecraft:end_stone_brick_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(218, 224, 162),
 		},
 	),
 	(
 		"minecraft:end_stone_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(218, 224, 162),
 		},
 	),
 	(
 		"minecraft:ender_chest",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(15, 10, 24),
 		},
 	),
 	(
 		"minecraft:exposed_copper",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(161, 125, 103),
 		},
 	),
 	(
 		"minecraft:exposed_cut_copper",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(154, 121, 101),
 		},
 	),
 	(
 		"minecraft:exposed_cut_copper_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(154, 121, 101),
 		},
 	),
 	(
 		"minecraft:exposed_cut_copper_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(154, 121, 101),
 		},
 	),
 	(
 		"minecraft:farmland",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(81, 44, 15),
 		},
 	),
 	(
 		"minecraft:fern",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:fire",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(211, 140, 53),
 		},
 	),
 	(
 		"minecraft:fire_coral",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:fire_coral_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(163, 35, 46),
 		},
 	),
 	(
 		"minecraft:fire_coral_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:fire_coral_wall_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:fletching_table",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(197, 180, 133),
 		},
 	),
 	(
 		"minecraft:flower_pot",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(124, 68, 53),
 		},
 	),
 	(
 		"minecraft:flowering_azalea",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(112, 121, 64),
 		},
 	),
 	(
 		"minecraft:flowering_azalea_leaves",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(99, 111, 60),
 		},
 	),
 	(
 		"minecraft:frosted_ice",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(140, 181, 252),
 		},
 	),
 	(
 		"minecraft:furnace",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(110, 109, 109),
 		},
 	),
 	(
 		"minecraft:gilded_blackstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(55, 42, 38),
 		},
 	),
 	(
 		"minecraft:glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(175, 213, 219),
 		},
 	),
 	(
 		"minecraft:glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(170, 210, 217),
 		},
 	),
 	(
 		"minecraft:glow_item_frame",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:glow_lichen",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:glowstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(171, 131, 84),
 		},
 	),
 	(
 		"minecraft:gold_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(246, 208, 61),
 		},
 	),
 	(
 		"minecraft:gold_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(145, 133, 106),
 		},
 	),
 	(
 		"minecraft:granite",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(149, 103, 85),
 		},
 	),
 	(
 		"minecraft:granite_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(149, 103, 85),
 		},
 	),
 	(
 		"minecraft:granite_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(149, 103, 85),
 		},
 	),
 	(
 		"minecraft:granite_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(149, 103, 85),
 		},
 	),
 	(
 		"minecraft:grass",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:grass_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque|Grass}),
+			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 			color: BlockColor(147, 147, 147),
 		},
 	),
 	(
 		"minecraft:grass_path",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(148, 121, 65),
 		},
 	),
 	(
 		"minecraft:gravel",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(131, 127, 126),
 		},
 	),
 	(
 		"minecraft:gray_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:gray_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:gray_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:gray_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
 		"minecraft:gray_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(62, 68, 71),
 		},
 	),
 	(
 		"minecraft:gray_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(54, 57, 61),
 		},
 	),
 	(
 		"minecraft:gray_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(76, 81, 84),
 		},
 	),
 	(
 		"minecraft:gray_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(83, 90, 93),
 		},
 	),
 	(
 		"minecraft:gray_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(55, 58, 62),
 		},
 	),
 	(
 		"minecraft:gray_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(76, 76, 76),
 		},
 	),
 	(
 		"minecraft:gray_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(73, 73, 73),
 		},
 	),
 	(
 		"minecraft:gray_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(57, 42, 35),
 		},
 	),
 	(
 		"minecraft:gray_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:gray_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(62, 68, 71),
 		},
 	),
 	(
 		"minecraft:green_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:green_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:green_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:green_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
 		"minecraft:green_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(84, 109, 27),
 		},
 	),
 	(
 		"minecraft:green_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(73, 91, 36),
 		},
 	),
 	(
 		"minecraft:green_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(97, 119, 44),
 		},
 	),
 	(
 		"minecraft:green_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(117, 142, 67),
 		},
 	),
 	(
 		"minecraft:green_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(79, 100, 31),
 		},
 	),
 	(
 		"minecraft:green_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(102, 127, 51),
 		},
 	),
 	(
 		"minecraft:green_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(97, 122, 48),
 		},
 	),
 	(
 		"minecraft:green_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(76, 83, 42),
 		},
 	),
 	(
 		"minecraft:green_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:green_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(84, 109, 27),
 		},
 	),
 	(
 		"minecraft:grindstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(142, 142, 142),
 		},
 	),
 	(
 		"minecraft:hanging_roots",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(161, 115, 91),
 		},
 	),
 	(
 		"minecraft:hay_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(165, 139, 12),
 		},
 	),
 	(
 		"minecraft:heavy_weighted_pressure_plate",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(220, 220, 220),
 		},
 	),
 	(
 		"minecraft:honey_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(251, 185, 52),
 		},
 	),
 	(
 		"minecraft:honeycomb_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(229, 148, 29),
 		},
 	),
 	(
 		"minecraft:hopper",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(75, 74, 75),
 		},
 	),
 	(
 		"minecraft:horn_coral",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:horn_coral_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(216, 199, 66),
 		},
 	),
 	(
 		"minecraft:horn_coral_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:horn_coral_wall_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:ice",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(145, 183, 253),
 		},
 	),
 	(
 		"minecraft:infested_chiseled_stone_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(119, 118, 119),
 		},
 	),
 	(
 		"minecraft:infested_cobblestone",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(127, 127, 127),
 		},
 	),
 	(
 		"minecraft:infested_cracked_stone_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(118, 117, 118),
 		},
 	),
 	(
 		"minecraft:infested_deepslate",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(80, 80, 82),
 		},
 	),
 	(
 		"minecraft:infested_mossy_stone_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(115, 121, 105),
 		},
 	),
 	(
 		"minecraft:infested_stone",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(125, 125, 125),
 		},
 	),
 	(
 		"minecraft:infested_stone_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(122, 121, 122),
 		},
 	),
 	(
 		"minecraft:iron_bars",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(136, 139, 135),
 		},
 	),
 	(
 		"minecraft:iron_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(220, 220, 220),
 		},
 	),
 	(
 		"minecraft:iron_door",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(194, 193, 193),
 		},
 	),
 	(
 		"minecraft:iron_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(136, 129, 122),
 		},
 	),
 	(
 		"minecraft:iron_trapdoor",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(202, 202, 202),
 		},
 	),
 	(
 		"minecraft:item_frame",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:jack_o_lantern",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(214, 152, 52),
 		},
 	),
 	(
 		"minecraft:jigsaw",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(80, 69, 81),
 		},
 	),
 	(
 		"minecraft:jukebox",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(93, 64, 47),
 		},
 	),
 	(
 		"minecraft:jungle_button",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:jungle_door",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(163, 119, 84),
 		},
 	),
 	(
 		"minecraft:jungle_fence",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(160, 115, 80),
 		},
 	),
 	(
 		"minecraft:jungle_fence_gate",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(160, 115, 80),
 		},
 	),
 	(
 		"minecraft:jungle_leaves",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque|Foliage}),
+			flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
 			color: BlockColor(156, 154, 143),
 		},
 	),
 	(
 		"minecraft:jungle_log",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(149, 109, 70),
 		},
 	),
 	(
 		"minecraft:jungle_planks",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(160, 115, 80),
 		},
 	),
 	(
 		"minecraft:jungle_pressure_plate",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(160, 115, 80),
 		},
 	),
 	(
 		"minecraft:jungle_sapling",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(47, 81, 16),
 		},
 	),
 	(
 		"minecraft:jungle_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(160, 115, 80),
 		},
 	),
 	(
 		"minecraft:jungle_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(160, 115, 80),
 		},
 	),
 	(
 		"minecraft:jungle_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(160, 115, 80),
 		},
 	),
 	(
 		"minecraft:jungle_trapdoor",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(152, 110, 77),
 		},
 	),
 	(
 		"minecraft:jungle_wall_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:jungle_wood",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(85, 67, 25),
 		},
 	),
 	(
 		"minecraft:kelp",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:kelp_plant",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(86, 130, 42),
 		},
 	),
 	(
 		"minecraft:ladder",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:lantern",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(106, 91, 83),
 		},
 	),
 	(
 		"minecraft:lapis_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(30, 67, 140),
 		},
 	),
 	(
 		"minecraft:lapis_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(107, 117, 141),
 		},
 	),
 	(
 		"minecraft:large_amethyst_bud",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:large_fern",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque|Grass}),
+			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 			color: BlockColor(125, 125, 125),
 		},
 	),
 	(
 		"minecraft:lava",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(212, 90, 18),
 		},
 	),
 	(
 		"minecraft:lava_cauldron",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(73, 72, 74),
 		},
 	),
 	(
 		"minecraft:lectern",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(173, 137, 83),
 		},
 	),
 	(
 		"minecraft:lever",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:light",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:light_blue_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:light_blue_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:light_blue_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:light_blue_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
 		"minecraft:light_blue_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(58, 175, 217),
 		},
 	),
 	(
 		"minecraft:light_blue_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(35, 137, 198),
 		},
 	),
 	(
 		"minecraft:light_blue_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(74, 180, 213),
 		},
 	),
 	(
 		"minecraft:light_blue_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(94, 164, 208),
 		},
 	),
 	(
 		"minecraft:light_blue_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(49, 163, 212),
 		},
 	),
 	(
 		"minecraft:light_blue_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(102, 153, 216),
 		},
 	),
 	(
 		"minecraft:light_blue_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(97, 147, 208),
 		},
 	),
 	(
 		"minecraft:light_blue_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(113, 108, 137),
 		},
 	),
 	(
 		"minecraft:light_blue_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:light_blue_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(58, 175, 217),
 		},
 	),
 	(
 		"minecraft:light_gray_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:light_gray_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:light_gray_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:light_gray_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
 		"minecraft:light_gray_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(142, 142, 134),
 		},
 	),
 	(
 		"minecraft:light_gray_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(125, 125, 115),
 		},
 	),
 	(
 		"minecraft:light_gray_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(154, 154, 148),
 		},
 	),
 	(
 		"minecraft:light_gray_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(144, 166, 167),
 		},
 	),
 	(
 		"minecraft:light_gray_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(124, 124, 115),
 		},
 	),
 	(
 		"minecraft:light_gray_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(153, 153, 153),
 		},
 	),
 	(
 		"minecraft:light_gray_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(147, 147, 147),
 		},
 	),
 	(
 		"minecraft:light_gray_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(135, 106, 97),
 		},
 	),
 	(
 		"minecraft:light_gray_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:light_gray_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(142, 142, 134),
 		},
 	),
 	(
 		"minecraft:light_weighted_pressure_plate",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(246, 208, 61),
 		},
 	),
 	(
 		"minecraft:lightning_rod",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:lilac",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(154, 125, 147),
 		},
 	),
 	(
 		"minecraft:lily_of_the_valley",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:lily_pad",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque|Grass}),
+			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 			color: BlockColor(133, 133, 133),
 		},
 	),
 	(
 		"minecraft:lime_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:lime_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:lime_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:lime_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
 		"minecraft:lime_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(112, 185, 25),
 		},
 	),
 	(
 		"minecraft:lime_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(94, 168, 24),
 		},
 	),
 	(
 		"minecraft:lime_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(125, 189, 41),
 		},
 	),
 	(
 		"minecraft:lime_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(162, 197, 55),
 		},
 	),
 	(
 		"minecraft:lime_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(99, 172, 23),
 		},
 	),
 	(
 		"minecraft:lime_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(127, 204, 25),
 		},
 	),
 	(
 		"minecraft:lime_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(122, 196, 24),
 		},
 	),
 	(
 		"minecraft:lime_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(103, 117, 52),
 		},
 	),
 	(
 		"minecraft:lime_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:lime_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(112, 185, 25),
 		},
 	),
 	(
 		"minecraft:lodestone",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(147, 149, 152),
 		},
 	),
 	(
 		"minecraft:loom",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(142, 119, 91),
 		},
 	),
 	(
 		"minecraft:magenta_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:magenta_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:magenta_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:magenta_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
 		"minecraft:magenta_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(189, 68, 179),
 		},
 	),
 	(
 		"minecraft:magenta_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(169, 48, 159),
 		},
 	),
 	(
 		"minecraft:magenta_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(192, 83, 184),
 		},
 	),
 	(
 		"minecraft:magenta_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(208, 100, 191),
 		},
 	),
 	(
 		"minecraft:magenta_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(173, 54, 163),
 		},
 	),
 	(
 		"minecraft:magenta_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(178, 76, 216),
 		},
 	),
 	(
 		"minecraft:magenta_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(171, 73, 208),
 		},
 	),
 	(
 		"minecraft:magenta_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(149, 88, 108),
 		},
 	),
 	(
 		"minecraft:magenta_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:magenta_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(189, 68, 179),
 		},
 	),
 	(
 		"minecraft:magma_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(142, 63, 31),
 		},
 	),
 	(
 		"minecraft:medium_amethyst_bud",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:melon",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(111, 144, 30),
 		},
 	),
 	(
 		"minecraft:melon_stem",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque|Grass}),
+			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 			color: BlockColor(153, 153, 153),
 		},
 	),
 	(
 		"minecraft:moss_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(89, 109, 45),
 		},
 	),
 	(
 		"minecraft:moss_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(89, 109, 45),
 		},
 	),
 	(
 		"minecraft:mossy_cobblestone",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(110, 118, 94),
 		},
 	),
 	(
 		"minecraft:mossy_cobblestone_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(110, 118, 94),
 		},
 	),
 	(
 		"minecraft:mossy_cobblestone_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(110, 118, 94),
 		},
 	),
 	(
 		"minecraft:mossy_cobblestone_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(110, 118, 94),
 		},
 	),
 	(
 		"minecraft:mossy_stone_brick_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(115, 121, 105),
 		},
 	),
 	(
 		"minecraft:mossy_stone_brick_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(115, 121, 105),
 		},
 	),
 	(
 		"minecraft:mossy_stone_brick_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(115, 121, 105),
 		},
 	),
 	(
 		"minecraft:mossy_stone_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(115, 121, 105),
 		},
 	),
 	(
 		"minecraft:moving_piston",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:mushroom_stem",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(203, 196, 185),
 		},
 	),
 	(
 		"minecraft:mycelium",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(111, 98, 101),
 		},
 	),
 	(
 		"minecraft:nether_brick_fence",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(44, 21, 26),
 		},
 	),
 	(
 		"minecraft:nether_brick_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(44, 21, 26),
 		},
 	),
 	(
 		"minecraft:nether_brick_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(44, 21, 26),
 		},
 	),
 	(
 		"minecraft:nether_brick_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(44, 21, 26),
 		},
 	),
 	(
 		"minecraft:nether_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(44, 21, 26),
 		},
 	),
 	(
 		"minecraft:nether_gold_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(115, 54, 42),
 		},
 	),
 	(
 		"minecraft:nether_portal",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(89, 11, 192),
 		},
 	),
 	(
 		"minecraft:nether_quartz_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(117, 65, 62),
 		},
 	),
 	(
 		"minecraft:nether_sprouts",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(19, 151, 133),
 		},
 	),
 	(
 		"minecraft:nether_wart",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(111, 18, 19),
 		},
 	),
 	(
 		"minecraft:nether_wart_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(114, 2, 2),
 		},
 	),
 	(
 		"minecraft:netherite_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(66, 61, 63),
 		},
 	),
 	(
 		"minecraft:netherrack",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(97, 38, 38),
 		},
 	),
 	(
 		"minecraft:note_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(88, 58, 40),
 		},
 	),
 	(
 		"minecraft:oak_button",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:oak_door",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(140, 110, 66),
 		},
 	),
 	(
 		"minecraft:oak_fence",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(162, 130, 78),
 		},
 	),
 	(
 		"minecraft:oak_fence_gate",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(162, 130, 78),
 		},
 	),
 	(
 		"minecraft:oak_leaves",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque|Foliage}),
+			flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
 			color: BlockColor(144, 144, 144),
 		},
 	),
 	(
 		"minecraft:oak_log",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(151, 121, 73),
 		},
 	),
 	(
 		"minecraft:oak_planks",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(162, 130, 78),
 		},
 	),
 	(
 		"minecraft:oak_pressure_plate",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(162, 130, 78),
 		},
 	),
 	(
 		"minecraft:oak_sapling",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(77, 106, 40),
 		},
 	),
 	(
 		"minecraft:oak_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(162, 130, 78),
 		},
 	),
 	(
 		"minecraft:oak_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(162, 130, 78),
 		},
 	),
 	(
 		"minecraft:oak_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(162, 130, 78),
 		},
 	),
 	(
 		"minecraft:oak_trapdoor",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(124, 99, 56),
 		},
 	),
 	(
 		"minecraft:oak_wall_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:oak_wood",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(109, 85, 50),
 		},
 	),
 	(
 		"minecraft:observer",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(98, 98, 98),
 		},
 	),
 	(
 		"minecraft:obsidian",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(15, 10, 24),
 		},
 	),
 	(
 		"minecraft:orange_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:orange_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:orange_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:orange_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
 		"minecraft:orange_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(240, 118, 19),
 		},
 	),
 	(
 		"minecraft:orange_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(224, 97, 0),
 		},
 	),
 	(
 		"minecraft:orange_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(227, 131, 31),
 		},
 	),
 	(
 		"minecraft:orange_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(154, 147, 91),
 		},
 	),
 	(
 		"minecraft:orange_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(234, 106, 8),
 		},
 	),
 	(
 		"minecraft:orange_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(216, 127, 51),
 		},
 	),
 	(
 		"minecraft:orange_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(208, 122, 48),
 		},
 	),
 	(
 		"minecraft:orange_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(161, 83, 37),
 		},
 	),
 	(
 		"minecraft:orange_tulip",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:orange_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:orange_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(240, 118, 19),
 		},
 	),
 	(
 		"minecraft:oxeye_daisy",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:oxidized_copper",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(82, 162, 132),
 		},
 	),
 	(
 		"minecraft:oxidized_cut_copper",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(79, 153, 126),
 		},
 	),
 	(
 		"minecraft:oxidized_cut_copper_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(79, 153, 126),
 		},
 	),
 	(
 		"minecraft:oxidized_cut_copper_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(79, 153, 126),
 		},
 	),
 	(
 		"minecraft:packed_ice",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(141, 180, 250),
 		},
 	),
 	(
 		"minecraft:peony",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(129, 126, 139),
 		},
 	),
 	(
 		"minecraft:petrified_oak_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(162, 130, 78),
 		},
 	),
 	(
 		"minecraft:pink_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:pink_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:pink_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:pink_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
 		"minecraft:pink_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(237, 141, 172),
 		},
 	),
 	(
 		"minecraft:pink_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(213, 101, 142),
 		},
 	),
 	(
 		"minecraft:pink_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(228, 153, 181),
 		},
 	),
 	(
 		"minecraft:pink_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(235, 154, 181),
 		},
 	),
 	(
 		"minecraft:pink_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(230, 121, 157),
 		},
 	),
 	(
 		"minecraft:pink_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(242, 127, 165),
 		},
 	),
 	(
 		"minecraft:pink_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(233, 122, 159),
 		},
 	),
 	(
 		"minecraft:pink_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(161, 78, 78),
 		},
 	),
 	(
 		"minecraft:pink_tulip",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:pink_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:pink_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(237, 141, 172),
 		},
 	),
 	(
 		"minecraft:piston",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(110, 104, 96),
 		},
 	),
 	(
 		"minecraft:piston_head",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(154, 127, 87),
 		},
 	),
 	(
 		"minecraft:player_head",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:player_wall_head",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:podzol",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(91, 63, 24),
 		},
 	),
 	(
 		"minecraft:pointed_dripstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(129, 102, 89),
 		},
 	),
 	(
 		"minecraft:polished_andesite",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(132, 134, 133),
 		},
 	),
 	(
 		"minecraft:polished_andesite_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(132, 134, 133),
 		},
 	),
 	(
 		"minecraft:polished_andesite_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(132, 134, 133),
 		},
 	),
 	(
 		"minecraft:polished_basalt",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(99, 98, 100),
 		},
 	),
 	(
 		"minecraft:polished_blackstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(53, 48, 56),
 		},
 	),
 	(
 		"minecraft:polished_blackstone_brick_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(48, 42, 49),
 		},
 	),
 	(
 		"minecraft:polished_blackstone_brick_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(48, 42, 49),
 		},
 	),
 	(
 		"minecraft:polished_blackstone_brick_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(48, 42, 49),
 		},
 	),
 	(
 		"minecraft:polished_blackstone_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(48, 42, 49),
 		},
 	),
 	(
 		"minecraft:polished_blackstone_button",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:polished_blackstone_pressure_plate",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(53, 48, 56),
 		},
 	),
 	(
 		"minecraft:polished_blackstone_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(53, 48, 56),
 		},
 	),
 	(
 		"minecraft:polished_blackstone_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(53, 48, 56),
 		},
 	),
 	(
 		"minecraft:polished_blackstone_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(53, 48, 56),
 		},
 	),
 	(
 		"minecraft:polished_deepslate",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(72, 72, 73),
 		},
 	),
 	(
 		"minecraft:polished_deepslate_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(72, 72, 73),
 		},
 	),
 	(
 		"minecraft:polished_deepslate_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(72, 72, 73),
 		},
 	),
 	(
 		"minecraft:polished_deepslate_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(72, 72, 73),
 		},
 	),
 	(
 		"minecraft:polished_diorite",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(192, 193, 194),
 		},
 	),
 	(
 		"minecraft:polished_diorite_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(192, 193, 194),
 		},
 	),
 	(
 		"minecraft:polished_diorite_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(192, 193, 194),
 		},
 	),
 	(
 		"minecraft:polished_granite",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(154, 106, 89),
 		},
 	),
 	(
 		"minecraft:polished_granite_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(154, 106, 89),
 		},
 	),
 	(
 		"minecraft:polished_granite_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(154, 106, 89),
 		},
 	),
 	(
 		"minecraft:poppy",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:potatoes",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(84, 135, 47),
 		},
 	),
 	(
 		"minecraft:potted_acacia_sapling",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(118, 117, 23),
 		},
 	),
 	(
 		"minecraft:potted_allium",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(158, 137, 183),
 		},
 	),
 	(
 		"minecraft:potted_azalea_bush",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(101, 124, 47),
 		},
 	),
 	(
 		"minecraft:potted_azure_bluet",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(169, 204, 127),
 		},
 	),
 	(
 		"minecraft:potted_bamboo",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(93, 144, 19),
 		},
 	),
 	(
 		"minecraft:potted_birch_sapling",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(127, 160, 79),
 		},
 	),
 	(
 		"minecraft:potted_blue_orchid",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(47, 162, 168),
 		},
 	),
 	(
 		"minecraft:potted_brown_mushroom",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(153, 116, 92),
 		},
 	),
 	(
 		"minecraft:potted_cactus",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(85, 127, 43),
 		},
 	),
 	(
 		"minecraft:potted_cornflower",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(79, 121, 146),
 		},
 	),
 	(
 		"minecraft:potted_crimson_fungus",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(141, 44, 29),
 		},
 	),
 	(
 		"minecraft:potted_crimson_roots",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(127, 8, 41),
 		},
 	),
 	(
 		"minecraft:potted_dandelion",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(147, 172, 43),
 		},
 	),
 	(
 		"minecraft:potted_dark_oak_sapling",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(61, 90, 30),
 		},
 	),
 	(
 		"minecraft:potted_dead_bush",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(107, 78, 40),
 		},
 	),
 	(
 		"minecraft:potted_fern",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque|Grass}),
+			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 			color: BlockColor(124, 124, 124),
 		},
 	),
 	(
 		"minecraft:potted_flowering_azalea_bush",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(112, 121, 64),
 		},
 	),
 	(
 		"minecraft:potted_jungle_sapling",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(47, 81, 16),
 		},
 	),
 	(
 		"minecraft:potted_lily_of_the_valley",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(123, 174, 95),
 		},
 	),
 	(
 		"minecraft:potted_oak_sapling",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(77, 106, 40),
 		},
 	),
 	(
 		"minecraft:potted_orange_tulip",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(93, 142, 30),
 		},
 	),
 	(
 		"minecraft:potted_oxeye_daisy",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(179, 202, 143),
 		},
 	),
 	(
 		"minecraft:potted_pink_tulip",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(99, 157, 78),
 		},
 	),
 	(
 		"minecraft:potted_poppy",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(128, 64, 37),
 		},
 	),
 	(
 		"minecraft:potted_red_mushroom",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(216, 75, 67),
 		},
 	),
 	(
 		"minecraft:potted_red_tulip",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(89, 128, 32),
 		},
 	),
 	(
 		"minecraft:potted_spruce_sapling",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(44, 60, 36),
 		},
 	),
 	(
 		"minecraft:potted_warped_fungus",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(74, 109, 87),
 		},
 	),
 	(
 		"minecraft:potted_warped_roots",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(20, 136, 123),
 		},
 	),
 	(
 		"minecraft:potted_white_tulip",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(93, 164, 71),
 		},
 	),
 	(
 		"minecraft:potted_wither_rose",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(41, 44, 23),
 		},
 	),
 	(
 		"minecraft:powder_snow",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 253, 253),
 		},
 	),
 	(
 		"minecraft:powder_snow_cauldron",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(73, 72, 74),
 		},
 	),
 	(
 		"minecraft:powered_rail",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(137, 109, 74),
 		},
 	),
 	(
 		"minecraft:prismarine",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(99, 156, 151),
 		},
 	),
 	(
 		"minecraft:prismarine_brick_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(99, 171, 158),
 		},
 	),
 	(
 		"minecraft:prismarine_brick_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(99, 171, 158),
 		},
 	),
 	(
 		"minecraft:prismarine_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(99, 171, 158),
 		},
 	),
 	(
 		"minecraft:prismarine_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(99, 156, 151),
 		},
 	),
 	(
 		"minecraft:prismarine_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(99, 156, 151),
 		},
 	),
 	(
 		"minecraft:prismarine_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(99, 156, 151),
 		},
 	),
 	(
 		"minecraft:pumpkin",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(198, 118, 24),
 		},
 	),
 	(
 		"minecraft:pumpkin_stem",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque|Grass}),
+			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 			color: BlockColor(154, 154, 154),
 		},
 	),
 	(
 		"minecraft:purple_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:purple_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:purple_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:purple_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
 		"minecraft:purple_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(121, 42, 172),
 		},
 	),
 	(
 		"minecraft:purple_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(100, 31, 156),
 		},
 	),
 	(
 		"minecraft:purple_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(131, 55, 177),
 		},
 	),
 	(
 		"minecraft:purple_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(109, 48, 152),
 		},
 	),
 	(
 		"minecraft:purple_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(103, 32, 156),
 		},
 	),
 	(
 		"minecraft:purple_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(127, 63, 178),
 		},
 	),
 	(
 		"minecraft:purple_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(122, 61, 171),
 		},
 	),
 	(
 		"minecraft:purple_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(118, 70, 86),
 		},
 	),
 	(
 		"minecraft:purple_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:purple_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(121, 42, 172),
 		},
 	),
 	(
 		"minecraft:purpur_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(169, 125, 169),
 		},
 	),
 	(
 		"minecraft:purpur_pillar",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(171, 129, 171),
 		},
 	),
 	(
 		"minecraft:purpur_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(169, 125, 169),
 		},
 	),
 	(
 		"minecraft:purpur_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(169, 125, 169),
 		},
 	),
 	(
 		"minecraft:quartz_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(235, 229, 222),
 		},
 	),
 	(
 		"minecraft:quartz_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(234, 229, 221),
 		},
 	),
 	(
 		"minecraft:quartz_pillar",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(235, 230, 224),
 		},
 	),
 	(
 		"minecraft:quartz_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(235, 229, 222),
 		},
 	),
 	(
 		"minecraft:quartz_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(235, 229, 222),
 		},
 	),
 	(
 		"minecraft:rail",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(125, 111, 88),
 		},
 	),
 	(
 		"minecraft:raw_copper_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(154, 105, 79),
 		},
 	),
 	(
 		"minecraft:raw_gold_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(221, 169, 46),
 		},
 	),
 	(
 		"minecraft:raw_iron_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(166, 135, 107),
 		},
 	),
 	(
 		"minecraft:red_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:red_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:red_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:red_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
 		"minecraft:red_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(160, 39, 34),
 		},
 	),
 	(
 		"minecraft:red_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(142, 32, 32),
 		},
 	),
 	(
 		"minecraft:red_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(168, 54, 50),
 		},
 	),
 	(
 		"minecraft:red_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(181, 59, 53),
 		},
 	),
 	(
 		"minecraft:red_mushroom",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:red_mushroom_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(200, 46, 45),
 		},
 	),
 	(
 		"minecraft:red_nether_brick_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(69, 7, 9),
 		},
 	),
 	(
 		"minecraft:red_nether_brick_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(69, 7, 9),
 		},
 	),
 	(
 		"minecraft:red_nether_brick_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(69, 7, 9),
 		},
 	),
 	(
 		"minecraft:red_nether_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(69, 7, 9),
 		},
 	),
 	(
 		"minecraft:red_sand",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(190, 102, 33),
 		},
 	),
 	(
 		"minecraft:red_sandstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(181, 97, 31),
 		},
 	),
 	(
 		"minecraft:red_sandstone_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(181, 97, 31),
 		},
 	),
 	(
 		"minecraft:red_sandstone_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(181, 97, 31),
 		},
 	),
 	(
 		"minecraft:red_sandstone_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(181, 97, 31),
 		},
 	),
 	(
 		"minecraft:red_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(140, 31, 30),
 		},
 	),
 	(
 		"minecraft:red_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(153, 51, 51),
 		},
 	),
 	(
 		"minecraft:red_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(147, 48, 48),
 		},
 	),
 	(
 		"minecraft:red_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(143, 61, 46),
 		},
 	),
 	(
 		"minecraft:red_tulip",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:red_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:red_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(160, 39, 34),
 		},
 	),
 	(
 		"minecraft:redstone_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(175, 24, 5),
 		},
 	),
 	(
 		"minecraft:redstone_lamp",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(95, 54, 30),
 		},
 	),
 	(
 		"minecraft:redstone_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(140, 109, 109),
 		},
 	),
 	(
 		"minecraft:redstone_torch",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:redstone_wall_torch",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:redstone_wire",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(175, 24, 5),
 		},
 	),
 	(
 		"minecraft:repeater",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(160, 157, 156),
 		},
 	),
 	(
 		"minecraft:repeating_command_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(129, 111, 176),
 		},
 	),
 	(
 		"minecraft:respawn_anchor",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(75, 26, 144),
 		},
 	),
 	(
 		"minecraft:rooted_dirt",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(144, 103, 76),
 		},
 	),
 	(
 		"minecraft:rose_bush",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(131, 66, 37),
 		},
 	),
 	(
 		"minecraft:sand",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(219, 207, 163),
 		},
 	),
 	(
 		"minecraft:sandstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(223, 214, 170),
 		},
 	),
 	(
 		"minecraft:sandstone_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(223, 214, 170),
 		},
 	),
 	(
 		"minecraft:sandstone_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(223, 214, 170),
 		},
 	),
 	(
 		"minecraft:sandstone_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(223, 214, 170),
 		},
 	),
 	(
 		"minecraft:scaffolding",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(174, 134, 80),
 		},
 	),
 	(
 		"minecraft:sculk_sensor",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(7, 70, 84),
 		},
 	),
 	(
 		"minecraft:sea_lantern",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(172, 199, 190),
 		},
 	),
 	(
 		"minecraft:sea_pickle",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(90, 97, 39),
 		},
 	),
 	(
 		"minecraft:seagrass",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:shroomlight",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(240, 146, 70),
 		},
 	),
 	(
 		"minecraft:shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(139, 96, 139),
 		},
 	),
 	(
 		"minecraft:sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(162, 130, 78),
 		},
 	),
 	(
 		"minecraft:skeleton_skull",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:skeleton_wall_skull",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:slime_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(111, 192, 91),
 		},
 	),
 	(
 		"minecraft:small_amethyst_bud",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:small_dripleaf",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:smithing_table",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(57, 58, 70),
 		},
 	),
 	(
 		"minecraft:smoker",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(85, 83, 81),
 		},
 	),
 	(
 		"minecraft:smooth_basalt",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(72, 72, 78),
 		},
 	),
 	(
 		"minecraft:smooth_quartz",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(235, 229, 222),
 		},
 	),
 	(
 		"minecraft:smooth_quartz_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(235, 229, 222),
 		},
 	),
 	(
 		"minecraft:smooth_quartz_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(235, 229, 222),
 		},
 	),
 	(
 		"minecraft:smooth_red_sandstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(181, 97, 31),
 		},
 	),
 	(
 		"minecraft:smooth_red_sandstone_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(181, 97, 31),
 		},
 	),
 	(
 		"minecraft:smooth_red_sandstone_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(181, 97, 31),
 		},
 	),
 	(
 		"minecraft:smooth_sandstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(223, 214, 170),
 		},
 	),
 	(
 		"minecraft:smooth_sandstone_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(223, 214, 170),
 		},
 	),
 	(
 		"minecraft:smooth_sandstone_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(223, 214, 170),
 		},
 	),
 	(
 		"minecraft:smooth_stone",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(158, 158, 158),
 		},
 	),
 	(
 		"minecraft:smooth_stone_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(158, 158, 158),
 		},
 	),
 	(
 		"minecraft:snow",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(249, 254, 254),
 		},
 	),
 	(
 		"minecraft:snow_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(249, 254, 254),
 		},
 	),
 	(
 		"minecraft:soul_campfire",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(80, 204, 208),
 		},
 	),
 	(
 		"minecraft:soul_fire",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(51, 192, 197),
 		},
 	),
 	(
 		"minecraft:soul_lantern",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(71, 99, 114),
 		},
 	),
 	(
 		"minecraft:soul_sand",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(81, 62, 50),
 		},
 	),
 	(
 		"minecraft:soul_soil",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(75, 57, 46),
 		},
 	),
 	(
 		"minecraft:soul_torch",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:soul_wall_torch",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:spawner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(36, 46, 62),
 		},
 	),
 	(
 		"minecraft:sponge",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(195, 192, 74),
 		},
 	),
 	(
 		"minecraft:spore_blossom",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(206, 96, 158),
 		},
 	),
 	(
 		"minecraft:spruce_button",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:spruce_door",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(106, 80, 48),
 		},
 	),
 	(
 		"minecraft:spruce_fence",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(114, 84, 48),
 		},
 	),
 	(
 		"minecraft:spruce_fence_gate",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(114, 84, 48),
 		},
 	),
 	(
 		"minecraft:spruce_leaves",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque|Spruce}),
+			flags: make_bitflags!(BlockFlag::{Opaque|Spruce}),
 			color: BlockColor(126, 126, 126),
 		},
 	),
 	(
 		"minecraft:spruce_log",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(108, 80, 46),
 		},
 	),
 	(
 		"minecraft:spruce_planks",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(114, 84, 48),
 		},
 	),
 	(
 		"minecraft:spruce_pressure_plate",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(114, 84, 48),
 		},
 	),
 	(
 		"minecraft:spruce_sapling",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(44, 60, 36),
 		},
 	),
 	(
 		"minecraft:spruce_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(114, 84, 48),
 		},
 	),
 	(
 		"minecraft:spruce_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(114, 84, 48),
 		},
 	),
 	(
 		"minecraft:spruce_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(114, 84, 48),
 		},
 	),
 	(
 		"minecraft:spruce_trapdoor",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(103, 79, 47),
 		},
 	),
 	(
 		"minecraft:spruce_wall_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:spruce_wood",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(58, 37, 16),
 		},
 	),
 	(
 		"minecraft:sticky_piston",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(110, 104, 96),
 		},
 	),
 	(
 		"minecraft:stone",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(125, 125, 125),
 		},
 	),
 	(
 		"minecraft:stone_brick_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(122, 121, 122),
 		},
 	),
 	(
 		"minecraft:stone_brick_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(122, 121, 122),
 		},
 	),
 	(
 		"minecraft:stone_brick_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(122, 121, 122),
 		},
 	),
 	(
 		"minecraft:stone_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(122, 121, 122),
 		},
 	),
 	(
 		"minecraft:stone_button",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:stone_pressure_plate",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(125, 125, 125),
 		},
 	),
 	(
 		"minecraft:stone_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(125, 125, 125),
 		},
 	),
 	(
 		"minecraft:stone_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(125, 125, 125),
 		},
 	),
 	(
 		"minecraft:stonecutter",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(123, 118, 111),
 		},
 	),
 	(
 		"minecraft:stripped_acacia_log",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(166, 91, 51),
 		},
 	),
 	(
 		"minecraft:stripped_acacia_wood",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(174, 92, 59),
 		},
 	),
 	(
 		"minecraft:stripped_birch_log",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(191, 171, 116),
 		},
 	),
 	(
 		"minecraft:stripped_birch_wood",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(196, 176, 118),
 		},
 	),
 	(
 		"minecraft:stripped_crimson_hyphae",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(137, 57, 90),
 		},
 	),
 	(
 		"minecraft:stripped_crimson_stem",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(121, 56, 82),
 		},
 	),
 	(
 		"minecraft:stripped_dark_oak_log",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(65, 44, 22),
 		},
 	),
 	(
 		"minecraft:stripped_dark_oak_wood",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(72, 56, 36),
 		},
 	),
 	(
 		"minecraft:stripped_jungle_log",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(165, 122, 81),
 		},
 	),
 	(
 		"minecraft:stripped_jungle_wood",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(171, 132, 84),
 		},
 	),
 	(
 		"minecraft:stripped_oak_log",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(160, 129, 77),
 		},
 	),
 	(
 		"minecraft:stripped_oak_wood",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(177, 144, 86),
 		},
 	),
 	(
 		"minecraft:stripped_spruce_log",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(105, 80, 46),
 		},
 	),
 	(
 		"minecraft:stripped_spruce_wood",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(115, 89, 52),
 		},
 	),
 	(
 		"minecraft:stripped_warped_hyphae",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(57, 150, 147),
 		},
 	),
 	(
 		"minecraft:stripped_warped_stem",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(52, 128, 124),
 		},
 	),
 	(
 		"minecraft:structure_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(88, 74, 90),
 		},
 	),
 	(
 		"minecraft:structure_void",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:sugar_cane",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(148, 192, 101),
 		},
 	),
 	(
 		"minecraft:sunflower",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(246, 196, 54),
 		},
 	),
 	(
 		"minecraft:sweet_berry_bush",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(68, 77, 50),
 		},
 	),
 	(
 		"minecraft:tall_grass",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque|Grass}),
+			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 			color: BlockColor(151, 149, 151),
 		},
 	),
 	(
 		"minecraft:tall_seagrass",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(59, 139, 14),
 		},
 	),
 	(
 		"minecraft:target",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(226, 170, 157),
 		},
 	),
 	(
 		"minecraft:terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(152, 94, 67),
 		},
 	),
 	(
 		"minecraft:tinted_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(44, 38, 46),
 		},
 	),
 	(
 		"minecraft:tnt",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(142, 62, 53),
 		},
 	),
 	(
 		"minecraft:torch",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:trapped_chest",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(162, 130, 78),
 		},
 	),
 	(
 		"minecraft:tripwire",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:tripwire_hook",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:tube_coral",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:tube_coral_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(49, 87, 206),
 		},
 	),
 	(
 		"minecraft:tube_coral_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:tube_coral_wall_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:tuff",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(108, 109, 102),
 		},
 	),
 	(
 		"minecraft:turtle_egg",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(228, 226, 191),
 		},
 	),
 	(
 		"minecraft:twisting_vines",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(20, 143, 124),
 		},
 	),
 	(
 		"minecraft:twisting_vines_plant",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(20, 135, 122),
 		},
 	),
 	(
 		"minecraft:vine",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque|Grass}),
+			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 			color: BlockColor(116, 116, 116),
 		},
 	),
 	(
 		"minecraft:void_air",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:wall_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:wall_torch",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:warped_button",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:warped_door",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(44, 126, 120),
 		},
 	),
 	(
 		"minecraft:warped_fence",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(43, 104, 99),
 		},
 	),
 	(
 		"minecraft:warped_fence_gate",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(43, 104, 99),
 		},
 	),
 	(
 		"minecraft:warped_fungus",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:warped_hyphae",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(58, 58, 77),
 		},
 	),
 	(
 		"minecraft:warped_nylium",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(43, 114, 101),
 		},
 	),
 	(
 		"minecraft:warped_planks",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(43, 104, 99),
 		},
 	),
 	(
 		"minecraft:warped_pressure_plate",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(43, 104, 99),
 		},
 	),
 	(
 		"minecraft:warped_roots",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(20, 138, 124),
 		},
 	),
 	(
 		"minecraft:warped_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(43, 104, 99),
 		},
 	),
 	(
 		"minecraft:warped_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(43, 104, 99),
 		},
 	),
 	(
 		"minecraft:warped_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(43, 104, 99),
 		},
 	),
 	(
 		"minecraft:warped_stem",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(53, 109, 110),
 		},
 	),
 	(
 		"minecraft:warped_trapdoor",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(47, 119, 111),
 		},
 	),
 	(
 		"minecraft:warped_wall_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:warped_wart_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(22, 119, 121),
 		},
 	),
 	(
 		"minecraft:water",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque|Water}),
+			flags: make_bitflags!(BlockFlag::{Opaque|Water}),
 			color: BlockColor(177, 177, 177),
 		},
 	),
 	(
 		"minecraft:water_cauldron",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(73, 72, 74),
 		},
 	),
 	(
 		"minecraft:waxed_copper_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(192, 107, 79),
 		},
 	),
 	(
 		"minecraft:waxed_cut_copper",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(191, 106, 80),
 		},
 	),
 	(
 		"minecraft:waxed_cut_copper_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(191, 106, 80),
 		},
 	),
 	(
 		"minecraft:waxed_cut_copper_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(191, 106, 80),
 		},
 	),
 	(
 		"minecraft:waxed_exposed_copper",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(161, 125, 103),
 		},
 	),
 	(
 		"minecraft:waxed_exposed_cut_copper",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(154, 121, 101),
 		},
 	),
 	(
 		"minecraft:waxed_exposed_cut_copper_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(154, 121, 101),
 		},
 	),
 	(
 		"minecraft:waxed_exposed_cut_copper_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(154, 121, 101),
 		},
 	),
 	(
 		"minecraft:waxed_oxidized_copper",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(82, 162, 132),
 		},
 	),
 	(
 		"minecraft:waxed_oxidized_cut_copper",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(79, 153, 126),
 		},
 	),
 	(
 		"minecraft:waxed_oxidized_cut_copper_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(79, 153, 126),
 		},
 	),
 	(
 		"minecraft:waxed_oxidized_cut_copper_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(79, 153, 126),
 		},
 	),
 	(
 		"minecraft:waxed_weathered_copper",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(108, 153, 110),
 		},
 	),
 	(
 		"minecraft:waxed_weathered_cut_copper",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(109, 145, 107),
 		},
 	),
 	(
 		"minecraft:waxed_weathered_cut_copper_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(109, 145, 107),
 		},
 	),
 	(
 		"minecraft:waxed_weathered_cut_copper_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(109, 145, 107),
 		},
 	),
 	(
 		"minecraft:weathered_copper",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(108, 153, 110),
 		},
 	),
 	(
 		"minecraft:weathered_cut_copper",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(109, 145, 107),
 		},
 	),
 	(
 		"minecraft:weathered_cut_copper_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(109, 145, 107),
 		},
 	),
 	(
 		"minecraft:weathered_cut_copper_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(109, 145, 107),
 		},
 	),
 	(
 		"minecraft:weeping_vines",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(104, 1, 0),
 		},
 	),
 	(
 		"minecraft:weeping_vines_plant",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(132, 16, 12),
 		},
 	),
 	(
 		"minecraft:wet_sponge",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(171, 181, 70),
 		},
 	),
 	(
 		"minecraft:wheat",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(166, 151, 73),
 		},
 	),
 	(
 		"minecraft:white_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:white_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:white_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:white_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
 		"minecraft:white_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(233, 236, 236),
 		},
 	),
 	(
 		"minecraft:white_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(207, 213, 214),
 		},
 	),
 	(
 		"minecraft:white_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(225, 227, 227),
 		},
 	),
 	(
 		"minecraft:white_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(188, 212, 202),
 		},
 	),
 	(
 		"minecraft:white_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(215, 220, 221),
 		},
 	),
 	(
 		"minecraft:white_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(255, 255, 255),
 		},
 	),
 	(
 		"minecraft:white_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(246, 246, 246),
 		},
 	),
 	(
 		"minecraft:white_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(209, 178, 161),
 		},
 	),
 	(
 		"minecraft:white_tulip",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:white_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:white_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(233, 236, 236),
 		},
 	),
 	(
 		"minecraft:wither_rose",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:wither_skeleton_skull",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:wither_skeleton_wall_skull",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:yellow_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:yellow_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:yellow_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:yellow_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
 		"minecraft:yellow_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 197, 39),
 		},
 	),
 	(
 		"minecraft:yellow_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(240, 175, 21),
 		},
 	),
 	(
 		"minecraft:yellow_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(232, 199, 54),
 		},
 	),
 	(
 		"minecraft:yellow_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(234, 192, 88),
 		},
 	),
 	(
 		"minecraft:yellow_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 188, 29),
 		},
 	),
 	(
 		"minecraft:yellow_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(229, 229, 51),
 		},
 	),
 	(
 		"minecraft:yellow_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(221, 221, 48),
 		},
 	),
 	(
 		"minecraft:yellow_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(186, 133, 35),
 		},
 	),
 	(
 		"minecraft:yellow_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:yellow_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{Opaque}),
+			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 197, 39),
 		},
 	),
 	(
 		"minecraft:zombie_head",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
 		"minecraft:zombie_wall_head",
 		BlockType {
-			flags: make_bitflags!(BlockFlags::{}),
+			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
diff --git a/src/resource/mod.rs b/src/resource/mod.rs
index 24549c3..d4a42a9 100644
--- a/src/resource/mod.rs
+++ b/src/resource/mod.rs
@@ -10,7 +10,7 @@ pub use legacy_block_types::LEGACY_BLOCK_TYPES;
 #[bitflags]
 #[repr(u8)]
 #[derive(Debug, Clone, Copy, PartialEq)]
-pub enum BlockFlags {
+pub enum BlockFlag {
 	Opaque,
 	Grass,
 	Foliage,
@@ -24,7 +24,7 @@ pub struct BlockColor(pub u8, pub u8, pub u8);
 
 #[derive(Debug, Clone, Copy)]
 pub struct BlockType {
-	pub flags: BitFlags<BlockFlags>,
+	pub flags: BitFlags<BlockFlag>,
 	pub color: BlockColor,
 }
 

From 2a941e5283a298478e39d6fe40cfb148140a0999 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 15 Feb 2023 00:19:08 +0100
Subject: [PATCH 081/460] resource: add BlockTypeMap type for convenience

---
 src/resource/mod.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/resource/mod.rs b/src/resource/mod.rs
index d4a42a9..79020ba 100644
--- a/src/resource/mod.rs
+++ b/src/resource/mod.rs
@@ -28,7 +28,9 @@ pub struct BlockType {
 	pub color: BlockColor,
 }
 
-pub fn block_types() -> HashMap<String, BlockType> {
+pub type BlockTypeMap = HashMap<String, BlockType>;
+
+pub fn block_types() -> BlockTypeMap {
 	block_types::BLOCK_TYPES
 		.iter()
 		.map(|(k, v)| (String::from(*k), *v))

From 339e0b6a05d933fa4ddf7e28919b0d58d1bd74f4 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 15 Feb 2023 00:20:15 +0100
Subject: [PATCH 082/460] resource: add BlockType::is() method to check for
 flags

---
 src/resource/mod.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/resource/mod.rs b/src/resource/mod.rs
index 79020ba..290dcce 100644
--- a/src/resource/mod.rs
+++ b/src/resource/mod.rs
@@ -28,6 +28,12 @@ pub struct BlockType {
 	pub color: BlockColor,
 }
 
+impl BlockType {
+	pub fn is(&self, flag: BlockFlag) -> bool {
+		self.flags.contains(flag)
+	}
+}
+
 pub type BlockTypeMap = HashMap<String, BlockType>;
 
 pub fn block_types() -> BlockTypeMap {

From 921a218d561095d4d077c34edb8f276984f8605a Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 15 Feb 2023 00:33:58 +0100
Subject: [PATCH 083/460] types: split BlockCoords into SectionBlockCoords and
 LayerBlockCoords

---
 src/types.rs         | 28 ++++++++++++++++++++--------
 src/world/section.rs |  8 ++++----
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/types.rs b/src/types.rs
index 765ed39..39b106f 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -39,15 +39,27 @@ coord_impl!(BlockY, BLOCKS_PER_CHUNK);
 pub struct BlockZ(pub u8);
 coord_impl!(BlockZ, BLOCKS_PER_CHUNK);
 
-/// X, Y and Z coordinates of a block in a chunk section
+/// X and Z coordinates of a block in a chunk
 #[derive(Clone, Copy, PartialEq, Eq)]
-pub struct BlockCoords {
+pub struct LayerBlockCoords {
 	pub x: BlockX,
-	pub y: BlockY,
 	pub z: BlockZ,
 }
 
-impl BlockCoords {
+impl Debug for LayerBlockCoords {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		write!(f, "({}, {})", self.x.0, self.z.0)
+	}
+}
+
+/// X, Y and Z coordinates of a block in a chunk section
+#[derive(Clone, Copy, PartialEq, Eq)]
+pub struct SectionBlockCoords {
+	pub xz: LayerBlockCoords,
+	pub y: BlockY,
+}
+
+impl SectionBlockCoords {
 	/// Computes a block's offset in various data structures
 	///
 	/// Many chunk data structures store block and biome data in the same
@@ -55,16 +67,16 @@ impl BlockCoords {
 	/// for the block at a given coordinate is stored.
 	pub fn offset(&self) -> usize {
 		use BLOCKS_PER_CHUNK as N;
-		let x = self.x.0 as usize;
+		let x = self.xz.x.0 as usize;
 		let y = self.y.0 as usize;
-		let z = self.z.0 as usize;
+		let z = self.xz.z.0 as usize;
 		((y * N) + z) * N + x
 	}
 }
 
-impl Debug for BlockCoords {
+impl Debug for SectionBlockCoords {
 	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-		write!(f, "({}, {}, {})", self.x.0, self.y.0, self.z.0)
+		write!(f, "({}, {}, {})", self.xz.x.0, self.y.0, self.xz.z.0)
 	}
 }
 
diff --git a/src/world/section.rs b/src/world/section.rs
index e59daba..cee8b2a 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -24,7 +24,7 @@ fn palette_bits(len: usize, min: u8, max: u8) -> Option<u8> {
 
 /// Trait for common functions of [SectionV1_13] and [SectionV0]
 pub trait Section {
-	fn block_id_at(&self, coords: BlockCoords) -> Result<&str>;
+	fn block_id_at(&self, coords: SectionBlockCoords) -> Result<&str>;
 }
 
 /// Minecraft v1.18+ section biome data
@@ -101,7 +101,7 @@ impl<'a> SectionV1_13<'a> {
 	}
 
 	/// Looks up the block type palette index at the given coordinates
-	fn palette_index_at(&self, coords: BlockCoords) -> usize {
+	fn palette_index_at(&self, coords: SectionBlockCoords) -> usize {
 		let Some(block_states) = self.block_states else {
 			return 0;
 		};
@@ -133,7 +133,7 @@ impl<'a> SectionV1_13<'a> {
 }
 
 impl<'a> Section for SectionV1_13<'a> {
-	fn block_id_at(&self, coords: BlockCoords) -> Result<&str> {
+	fn block_id_at(&self, coords: SectionBlockCoords) -> Result<&str> {
 		let index = self.palette_index_at(coords);
 		let entry = self
 			.palette
@@ -167,7 +167,7 @@ impl<'a> SectionV0<'a> {
 }
 
 impl<'a> Section for SectionV0<'a> {
-	fn block_id_at(&self, coords: BlockCoords) -> Result<&str> {
+	fn block_id_at(&self, coords: SectionBlockCoords) -> Result<&str> {
 		let offset = coords.offset();
 		let block = self.blocks[offset] as u8;
 

From 789a4002c772320bad4a25ca85eac0dbf0eba43a Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 15 Feb 2023 00:47:59 +0100
Subject: [PATCH 084/460] types: add Clone + Debug to ChunkArray iterators

Added for consistency with LayerBlockArray.
---
 src/types.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/types.rs b/src/types.rs
index 39b106f..3a0bb22 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -116,15 +116,15 @@ impl Debug for ChunkCoords {
 pub struct ChunkArray<T>(pub [[T; CHUNKS_PER_REGION]; CHUNKS_PER_REGION]);
 
 impl<T> ChunkArray<T> {
-	pub fn keys() -> impl Iterator<Item = ChunkCoords> {
+	pub fn keys() -> impl Iterator<Item = ChunkCoords> + Clone + Debug {
 		iproduct!(ChunkZ::iter(), ChunkX::iter()).map(|(z, x)| ChunkCoords { x, z })
 	}
 
-	pub fn values(&self) -> impl Iterator<Item = &T> {
+	pub fn values(&self) -> impl Iterator<Item = &T> + Clone + Debug {
 		Self::keys().map(|k| &self[k])
 	}
 
-	pub fn iter(&self) -> impl Iterator<Item = (ChunkCoords, &T)> {
+	pub fn iter(&self) -> impl Iterator<Item = (ChunkCoords, &T)> + Clone + Debug {
 		Self::keys().map(|k| (k, &self[k]))
 	}
 }

From 3ef48783b7754a03284f47d34f2a4fc5ae7b5c5d Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 15 Feb 2023 00:38:12 +0100
Subject: [PATCH 085/460] types: introduce LayerBlockArray

A LayerBlockArray is a generic array of data stored for each block of a
chunk layer. It provides the same methods as a ChunkArray.
---
 src/types.rs | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/src/types.rs b/src/types.rs
index 3a0bb22..a742977 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -52,6 +52,40 @@ impl Debug for LayerBlockCoords {
 	}
 }
 
+/// Generic array for data stored per block of a chunk layer
+///
+/// Includes various convenient iteration functions.
+#[derive(Debug, Clone, Copy, Default)]
+pub struct LayerBlockArray<T>(pub [[T; BLOCKS_PER_CHUNK]; BLOCKS_PER_CHUNK]);
+
+impl<T> LayerBlockArray<T> {
+	pub fn keys() -> impl Iterator<Item = LayerBlockCoords> + Clone + Debug {
+		iproduct!(BlockZ::iter(), BlockX::iter()).map(|(z, x)| LayerBlockCoords { x, z })
+	}
+
+	pub fn values(&self) -> impl Iterator<Item = &T> + Clone + Debug {
+		Self::keys().map(|k| &self[k])
+	}
+
+	pub fn iter(&self) -> impl Iterator<Item = (LayerBlockCoords, &T)> + Clone + Debug {
+		Self::keys().map(|k| (k, &self[k]))
+	}
+}
+
+impl<T> Index<LayerBlockCoords> for LayerBlockArray<T> {
+	type Output = T;
+
+	fn index(&self, index: LayerBlockCoords) -> &Self::Output {
+		&self.0[index.z.0 as usize][index.x.0 as usize]
+	}
+}
+
+impl<T> IndexMut<LayerBlockCoords> for LayerBlockArray<T> {
+	fn index_mut(&mut self, index: LayerBlockCoords) -> &mut Self::Output {
+		&mut self.0[index.z.0 as usize][index.x.0 as usize]
+	}
+}
+
 /// X, Y and Z coordinates of a block in a chunk section
 #[derive(Clone, Copy, PartialEq, Eq)]
 pub struct SectionBlockCoords {

From decb5c67a6016a794490fabeb20c38047c8d99bd Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 18 Feb 2023 10:55:28 +0100
Subject: [PATCH 086/460] world/section: to not use u128 type

Getting the block index for unaligned blocks can be done just fine with
only u64.
---
 src/world/section.rs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/world/section.rs b/src/world/section.rs
index cee8b2a..d02d1be 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -119,13 +119,11 @@ impl<'a> SectionV1_13<'a> {
 			let bit_offset = offset * bits;
 			let (word, bit_shift) = div_rem(bit_offset, 64);
 
-			if bit_shift + bits <= 64 {
-				block_states[word] as u64 >> bit_shift
-			} else {
-				let tmp = (block_states[word + 1] as u64 as u128) << 64
-					| block_states[word] as u64 as u128;
-				(tmp >> bit_shift) as u64
+			let mut tmp = (block_states[word] as u64) >> bit_shift;
+			if bit_shift + bits > 64 {
+				tmp |= (block_states[word + 1] as u64) << (64 - bit_shift);
 			}
+			tmp
 		};
 
 		(shifted & mask) as usize

From 2530a557a90b5848b31c002d34a806f52adcb60d Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 18 Feb 2023 11:07:29 +0100
Subject: [PATCH 087/460] types: fix dangling doc reference

---
 src/types.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/types.rs b/src/types.rs
index a742977..a8c26e6 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -97,8 +97,8 @@ impl SectionBlockCoords {
 	/// Computes a block's offset in various data structures
 	///
 	/// Many chunk data structures store block and biome data in the same
-	/// order. [BlockCoords::offset] computes the offset at which the data
-	/// for the block at a given coordinate is stored.
+	/// order. This method computes the offset at which the data for the
+	/// block at a given coordinate is stored.
 	pub fn offset(&self) -> usize {
 		use BLOCKS_PER_CHUNK as N;
 		let x = self.xz.x.0 as usize;

From f48aa877d23f46c3f4b57e1ff145d580f717ff3a Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 18 Feb 2023 11:51:24 +0100
Subject: [PATCH 088/460] world: implement top_layer function

Implement one of the core functions of MinedMap: finding the topmost
visible block at each coordinate.
---
 src/main.rs        |  19 ++++++-
 src/world/layer.rs | 130 +++++++++++++++++++++++++++++++++++++++++++++
 src/world/mod.rs   |   1 +
 3 files changed, 148 insertions(+), 2 deletions(-)
 create mode 100644 src/world/layer.rs

diff --git a/src/main.rs b/src/main.rs
index 2f104ed..63711c1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,6 +3,8 @@ use std::path::PathBuf;
 use anyhow::Result;
 use clap::Parser;
 
+use minedmap::{resource, world};
+
 #[derive(Debug, Parser)]
 struct Args {
 	/// Filename to dump
@@ -12,9 +14,22 @@ struct Args {
 fn main() -> Result<()> {
 	let args = Args::parse();
 
+	let block_types = resource::block_types();
+
 	minedmap::io::region::from_file(args.file.as_path())?.foreach_chunk(
-		|coords, value: minedmap::world::de::Chunk| {
-			println!("Chunk {:?}: {:#?}", coords, value);
+		|coords, data: world::de::Chunk| {
+			let chunk = match world::chunk::Chunk::new(&data) {
+				Ok(chunk) => chunk,
+				Err(err) => {
+					eprintln!("Chunk {:?}: {}", coords, err);
+					return;
+				}
+			};
+
+			match world::layer::top_layer(&chunk, &block_types) {
+				Ok(_) => {}
+				Err(err) => println!("{:?}", err),
+			}
 		},
 	)
 }
diff --git a/src/world/layer.rs b/src/world/layer.rs
new file mode 100644
index 0000000..d57c51f
--- /dev/null
+++ b/src/world/layer.rs
@@ -0,0 +1,130 @@
+use anyhow::{Context, Result};
+use itertools::iproduct;
+
+use super::chunk::Chunk;
+use crate::{
+	resource::{BlockFlag, BlockType, BlockTypeMap},
+	types::*,
+};
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct BlockHeight(i32);
+
+impl BlockHeight {
+	/// Constructs a new [BlockHeight] from section and block Y indices
+	///
+	/// Returns an error if the resulting coordindate does not fit into
+	/// an [i32].
+	pub fn new(section: SectionY, block: BlockY) -> Result<Self> {
+		let height = section
+			.0
+			.checked_mul(BLOCKS_PER_CHUNK as i32)
+			.and_then(|y| y.checked_add_unsigned(block.0.into()))
+			.context("Block height out of bounds")?;
+		Ok(BlockHeight(height))
+	}
+}
+
+#[derive(Debug, Clone, Copy)]
+pub struct BlockInfo {
+	block_type: BlockType,
+	y: BlockHeight,
+	depth: Option<BlockHeight>,
+}
+
+/// Helper methods for [BlockInfo]
+trait OptionBlockInfoExt {
+	/// Checks if a [BlockInfo] has been filled in completely
+	///
+	/// Helper used by [top_layer]
+	fn done(&self) -> bool;
+
+	/// Fills in a [BlockInfo] based on a [BlockType]
+	///
+	/// Only fills in data if the block is part of the visible top layer
+	/// of the rendered map.
+	///
+	/// Must be called on an incomplete [BlockInfo] entry. Returns `true`
+	/// if the entry has been filled in completely.
+	fn fill(&mut self, y: BlockHeight, block_type: BlockType) -> bool;
+}
+
+impl OptionBlockInfoExt for Option<BlockInfo> {
+	fn done(&self) -> bool {
+		let Some(info) = self else {
+			return false;
+		};
+
+		info.depth.is_some()
+	}
+
+	fn fill(&mut self, y: BlockHeight, block_type: BlockType) -> bool {
+		if !block_type.is(BlockFlag::Opaque) {
+			return false;
+		}
+
+		if self.is_none() {
+			*self = Some(BlockInfo {
+				block_type,
+				y,
+				depth: None,
+			});
+		}
+
+		if block_type.is(BlockFlag::Water) {
+			return false;
+		}
+
+		let info = self.as_mut().unwrap();
+		info.depth = Some(y);
+
+		true
+	}
+}
+
+pub type BlockInfoArray = LayerBlockArray<Option<BlockInfo>>;
+
+/// Fills in a [BlockInfoArray] with the information of the chunk's top
+/// block layer
+///
+/// For each (X, Z) coordinate pair, the topmost opaque block is
+/// determined as the block that should be visible on the rendered
+/// map. For water blocks, the height of the first non-water block
+/// is additionally filled in as the water depth.
+pub fn top_layer(chunk: &Chunk, block_types: &BlockTypeMap) -> Result<BlockInfoArray> {
+	use BLOCKS_PER_CHUNK as N;
+
+	let mut done = 0;
+	let mut ret = BlockInfoArray::default();
+
+	for ((section_y, section), y, xz) in iproduct!(
+		chunk.sections().rev(),
+		BlockY::iter().rev(),
+		BlockInfoArray::keys()
+	) {
+		let entry = &mut ret[xz];
+		if entry.done() {
+			continue;
+		}
+
+		let coords = SectionBlockCoords { xz, y };
+		let block_id = section.block_id_at(coords)?;
+		let Some(&block_type) = block_types.get(block_id) else {
+			eprintln!("Unknown block type: {}", block_id);
+			continue;
+		};
+		let height = BlockHeight::new(section_y, y)?;
+		if !entry.fill(height, block_type) {
+			continue;
+		}
+
+		assert!(entry.done());
+
+		done += 1;
+		if done == N * N {
+			break;
+		}
+	}
+
+	Ok(ret)
+}
diff --git a/src/world/mod.rs b/src/world/mod.rs
index ae071e0..9879066 100644
--- a/src/world/mod.rs
+++ b/src/world/mod.rs
@@ -1,3 +1,4 @@
 pub mod chunk;
 pub mod de;
+pub mod layer;
 pub mod section;

From f3a671145851de11ab3dac802012aa7399dee037 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 25 Feb 2023 13:30:58 +0100
Subject: [PATCH 089/460] Update dependencies

---
 Cargo.lock | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3efed67..7d96fbc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -58,9 +58,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.1.4"
+version = "4.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76"
+checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3"
 dependencies = [
  "bitflags",
  "clap_derive",
@@ -86,9 +86,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade"
+checksum = "350b9cf31731f9957399229e9b2adc51eeabdfbe9d71d9a0552275fd12710d09"
 dependencies = [
  "os_str_bytes",
 ]
@@ -195,9 +195,9 @@ dependencies = [
 
 [[package]]
 name = "is-terminal"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef"
+checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857"
 dependencies = [
  "hermit-abi",
  "io-lifetimes",
@@ -271,9 +271,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.17.0"
+version = "1.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
+checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
 
 [[package]]
 name = "os_str_bytes"
@@ -374,9 +374,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "syn"
-version = "1.0.107"
+version = "1.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
  "proc-macro2",
  "quote",

From 2d0f2fb8651de1507f5221d74a2ca68819b83f3c Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 25 Feb 2023 17:46:00 +0100
Subject: [PATCH 090/460] main: iterate over regions of a Minecraft save dir

---
 src/main.rs | 80 +++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 68 insertions(+), 12 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 63711c1..c10cd4a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,23 +1,42 @@
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
-use anyhow::Result;
+use anyhow::{Context, Result};
 use clap::Parser;
 
 use minedmap::{resource, world};
 
 #[derive(Debug, Parser)]
 struct Args {
-	/// Filename to dump
-	file: PathBuf,
+	/// Minecraft save directory
+	savedir: PathBuf,
 }
 
-fn main() -> Result<()> {
-	let args = Args::parse();
+/// Type with methods for processing the regions of a Minecraft save directory
+struct RegionProcessor {
+	block_types: resource::BlockTypeMap,
+}
 
-	let block_types = resource::block_types();
+impl RegionProcessor {
+	fn new() -> Self {
+		RegionProcessor {
+			block_types: resource::block_types(),
+		}
+	}
 
-	minedmap::io::region::from_file(args.file.as_path())?.foreach_chunk(
-		|coords, data: world::de::Chunk| {
+	/// Parses a filename in the format r.X.Z.mca into the contained X and Z values
+	fn parse_region_filename(path: &Path) -> Option<(i32, i32)> {
+		let file_name = path.file_name()?.to_str()?;
+		let parts: Vec<_> = file_name.split('.').collect();
+		let &["r", x, z, "mca"] = parts.as_slice() else {
+			return None;
+		};
+
+		Some((x.parse().ok()?, z.parse().ok()?))
+	}
+
+	/// Processes a single region file
+	fn process_region(&self, path: &Path, _x: i32, _z: i32) -> Result<()> {
+		minedmap::io::region::from_file(path)?.foreach_chunk(|coords, data: world::de::Chunk| {
 			let chunk = match world::chunk::Chunk::new(&data) {
 				Ok(chunk) => chunk,
 				Err(err) => {
@@ -26,10 +45,47 @@ fn main() -> Result<()> {
 				}
 			};
 
-			match world::layer::top_layer(&chunk, &block_types) {
+			match world::layer::top_layer(&chunk, &self.block_types) {
 				Ok(_) => {}
 				Err(err) => println!("{:?}", err),
 			}
-		},
-	)
+		})
+	}
+
+	/// Iterates over all region files of a Minecraft save directory
+	fn process_region_dir(&self, regiondir: &Path) -> Result<()> {
+		let read_dir = regiondir
+			.read_dir()
+			.with_context(|| format!("Failed to read directory {}", regiondir.display()))?;
+
+		for entry in read_dir.filter_map(|entry| entry.ok()).filter(|entry| {
+			// We are only interested in regular files
+			entry
+				.file_type()
+				.map(|file_type| file_type.is_file())
+				.unwrap_or_default()
+		}) {
+			let path = entry.path();
+			let Some((x, z)) = Self::parse_region_filename(&path) else {
+			continue;
+		};
+
+			if let Err(err) = self.process_region(&path, x, z) {
+				eprintln!("Failed to process region r.{}.{}.mca: {}", x, z, err);
+			}
+		}
+
+		Ok(())
+	}
+}
+
+fn main() -> Result<()> {
+	let args = Args::parse();
+
+	let regiondir: PathBuf = [&args.savedir, Path::new("region")].iter().collect();
+
+	let region_processor = RegionProcessor::new();
+	region_processor.process_region_dir(&regiondir)?;
+
+	Ok(())
 }

From 551056803d45a7f152307f9592e1719b7a85c7c4 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 25 Feb 2023 23:23:00 +0100
Subject: [PATCH 091/460] Add Serialize/Deserialize impls to various types

We want to be able to store this data to disk temporarily.
---
 src/resource/mod.rs | 23 +++++++++++++++++++++--
 src/types.rs        |  5 +++--
 src/world/layer.rs  |  5 +++--
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/resource/mod.rs b/src/resource/mod.rs
index 290dcce..7f3a499 100644
--- a/src/resource/mod.rs
+++ b/src/resource/mod.rs
@@ -6,6 +6,7 @@ use std::collections::HashMap;
 use enumflags2::{bitflags, BitFlags};
 
 pub use legacy_block_types::LEGACY_BLOCK_TYPES;
+use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 
 #[bitflags]
 #[repr(u8)]
@@ -19,11 +20,29 @@ pub enum BlockFlag {
 	Water,
 }
 
-#[derive(Debug, Clone, Copy)]
+fn serialize_block_flags<S>(flags: &BitFlags<BlockFlag>, serializer: S) -> Result<S::Ok, S::Error>
+where
+	S: Serializer,
+{
+	flags.bits().serialize(serializer)
+}
+fn deserialize_block_flags<'de, D>(deserializer: D) -> Result<BitFlags<BlockFlag>, D::Error>
+where
+	D: Deserializer<'de>,
+{
+	let bits = u8::deserialize(deserializer)?;
+	BitFlags::<BlockFlag>::from_bits(bits).map_err(de::Error::custom)
+}
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 pub struct BlockColor(pub u8, pub u8, pub u8);
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 pub struct BlockType {
+	#[serde(
+		serialize_with = "serialize_block_flags",
+		deserialize_with = "deserialize_block_flags"
+	)]
 	pub flags: BitFlags<BlockFlag>,
 	pub color: BlockColor,
 }
diff --git a/src/types.rs b/src/types.rs
index a8c26e6..2598485 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -5,6 +5,7 @@ use std::{
 };
 
 use itertools::iproduct;
+use serde::{Deserialize, Serialize};
 
 macro_rules! coord_impl {
 	($t:ident, $max:expr) => {
@@ -55,7 +56,7 @@ impl Debug for LayerBlockCoords {
 /// Generic array for data stored per block of a chunk layer
 ///
 /// Includes various convenient iteration functions.
-#[derive(Debug, Clone, Copy, Default)]
+#[derive(Debug, Clone, Copy, Default, Serialize, Deserialize)]
 pub struct LayerBlockArray<T>(pub [[T; BLOCKS_PER_CHUNK]; BLOCKS_PER_CHUNK]);
 
 impl<T> LayerBlockArray<T> {
@@ -146,7 +147,7 @@ impl Debug for ChunkCoords {
 /// Generic array for data stored per chunk of a region
 ///
 /// Includes various convenient iteration functions.
-#[derive(Debug, Clone, Copy, Default)]
+#[derive(Debug, Clone, Copy, Default, Serialize, Deserialize)]
 pub struct ChunkArray<T>(pub [[T; CHUNKS_PER_REGION]; CHUNKS_PER_REGION]);
 
 impl<T> ChunkArray<T> {
diff --git a/src/world/layer.rs b/src/world/layer.rs
index d57c51f..16260c4 100644
--- a/src/world/layer.rs
+++ b/src/world/layer.rs
@@ -1,5 +1,6 @@
 use anyhow::{Context, Result};
 use itertools::iproduct;
+use serde::{Deserialize, Serialize};
 
 use super::chunk::Chunk;
 use crate::{
@@ -7,7 +8,7 @@ use crate::{
 	types::*,
 };
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
 pub struct BlockHeight(i32);
 
 impl BlockHeight {
@@ -25,7 +26,7 @@ impl BlockHeight {
 	}
 }
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 pub struct BlockInfo {
 	block_type: BlockType,
 	y: BlockHeight,

From b2d849081d42b61d772a8c06f75666b4acfef9f8 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 26 Feb 2023 01:01:37 +0100
Subject: [PATCH 092/460] io/region: allow stopping foreach_chunk early

Errors returned from the callback stop the loop early.
---
 src/bin/regiondump.rs | 1 +
 src/io/region.rs      | 4 ++--
 src/main.rs           | 5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/bin/regiondump.rs b/src/bin/regiondump.rs
index 5663a80..f3b7210 100644
--- a/src/bin/regiondump.rs
+++ b/src/bin/regiondump.rs
@@ -15,6 +15,7 @@ fn main() -> Result<()> {
 	minedmap::io::region::from_file(args.file.as_path())?.foreach_chunk(
 		|coords, value: fastnbt::Value| {
 			println!("Chunk {:?}: {:#x?}", coords, value);
+			Ok(())
 		},
 	)
 }
diff --git a/src/io/region.rs b/src/io/region.rs
index 93ff42b..e5c2528 100644
--- a/src/io/region.rs
+++ b/src/io/region.rs
@@ -73,7 +73,7 @@ impl<R: Read + Seek> Region<R> {
 	where
 		R: Read + Seek,
 		T: DeserializeOwned,
-		F: FnMut(ChunkCoords, T),
+		F: FnMut(ChunkCoords, T) -> Result<()>,
 	{
 		let Region { mut reader } = self;
 
@@ -119,7 +119,7 @@ impl<R: Read + Seek> Region<R> {
 			let chunk = decode_chunk(&buffer)
 				.with_context(|| format!("Failed to decode data for chunk {:?}", coords))?;
 
-			f(coords, chunk);
+			f(coords, chunk)?;
 		}
 
 		Ok(())
diff --git a/src/main.rs b/src/main.rs
index c10cd4a..32aca9a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -41,14 +41,15 @@ impl RegionProcessor {
 				Ok(chunk) => chunk,
 				Err(err) => {
 					eprintln!("Chunk {:?}: {}", coords, err);
-					return;
+					return Ok(());
 				}
 			};
 
 			match world::layer::top_layer(&chunk, &self.block_types) {
 				Ok(_) => {}
 				Err(err) => println!("{:?}", err),
-			}
+			};
+			Ok(())
 		})
 	}
 

From fd0c9fbf1b82dd6dcfb730c929ec049cbc3e7b84 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 26 Feb 2023 01:11:59 +0100
Subject: [PATCH 093/460] main: improve process_region() error handling

---
 src/main.rs | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 32aca9a..7b9e573 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -37,19 +37,14 @@ impl RegionProcessor {
 	/// Processes a single region file
 	fn process_region(&self, path: &Path, _x: i32, _z: i32) -> Result<()> {
 		minedmap::io::region::from_file(path)?.foreach_chunk(|coords, data: world::de::Chunk| {
-			let chunk = match world::chunk::Chunk::new(&data) {
-				Ok(chunk) => chunk,
-				Err(err) => {
-					eprintln!("Chunk {:?}: {}", coords, err);
-					return Ok(());
-				}
-			};
+			(|| -> Result<()> {
+				let chunk = world::chunk::Chunk::new(&data)?;
 
-			match world::layer::top_layer(&chunk, &self.block_types) {
-				Ok(_) => {}
-				Err(err) => println!("{:?}", err),
-			};
-			Ok(())
+				let _top_layer = world::layer::top_layer(&chunk, &self.block_types)?;
+
+				Ok(())
+			})()
+			.with_context(|| format!("Failed to process chunk {:?}", coords))
 		})
 	}
 

From f47b38b2ca48b310faeb650fb5ff39181d5a4590 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 26 Feb 2023 13:29:04 +0100
Subject: [PATCH 094/460] world/layer: return boxed BlockInfoArray from
 top_layer()

Avoid copying around large structures, and allow creating
arrays of BlockInfoArrays without overflowing the stack.
---
 src/world/layer.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/world/layer.rs b/src/world/layer.rs
index 16260c4..f8a7302 100644
--- a/src/world/layer.rs
+++ b/src/world/layer.rs
@@ -92,11 +92,11 @@ pub type BlockInfoArray = LayerBlockArray<Option<BlockInfo>>;
 /// determined as the block that should be visible on the rendered
 /// map. For water blocks, the height of the first non-water block
 /// is additionally filled in as the water depth.
-pub fn top_layer(chunk: &Chunk, block_types: &BlockTypeMap) -> Result<BlockInfoArray> {
+pub fn top_layer(chunk: &Chunk, block_types: &BlockTypeMap) -> Result<Box<BlockInfoArray>> {
 	use BLOCKS_PER_CHUNK as N;
 
 	let mut done = 0;
-	let mut ret = BlockInfoArray::default();
+	let mut ret = Box::<BlockInfoArray>::default();
 
 	for ((section_y, section), y, xz) in iproduct!(
 		chunk.sections().rev(),

From 21fd3a42ca29f7d6b1124799db1b79c34993a8c9 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 28 Feb 2023 00:44:49 +0100
Subject: [PATCH 095/460] io: add storage helper

Use bincode+zstd to serialize data structures for temporary storage.
---
 Cargo.lock        | 59 +++++++++++++++++++++++++++++++++++++++++++++++
 Cargo.toml        |  2 ++
 src/io/mod.rs     |  1 +
 src/io/storage.rs | 22 ++++++++++++++++++
 4 files changed, 84 insertions(+)
 create mode 100644 src/io/storage.rs

diff --git a/Cargo.lock b/Cargo.lock
index 7d96fbc..5adcd72 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20,6 +20,15 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
+[[package]]
+name = "bincode"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -43,6 +52,9 @@ name = "cc"
 version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+dependencies = [
+ "jobserver",
+]
 
 [[package]]
 name = "cesu8"
@@ -214,6 +226,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "jobserver"
+version = "0.1.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "libc"
 version = "0.2.139"
@@ -231,6 +252,7 @@ name = "minedmap"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "bincode",
  "bytemuck",
  "clap",
  "enumflags2",
@@ -239,6 +261,7 @@ dependencies = [
  "itertools",
  "num-integer",
  "serde",
+ "zstd",
 ]
 
 [[package]]
@@ -281,6 +304,12 @@ version = "6.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
 
+[[package]]
+name = "pkg-config"
+version = "0.3.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -500,3 +529,33 @@ name = "windows_x86_64_msvc"
 version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
+
+[[package]]
+name = "zstd"
+version = "0.12.3+zstd.1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806"
+dependencies = [
+ "zstd-safe",
+]
+
+[[package]]
+name = "zstd-safe"
+version = "6.0.4+zstd.1.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7afb4b54b8910cf5447638cb54bf4e8a65cbedd783af98b98c62ffe91f185543"
+dependencies = [
+ "libc",
+ "zstd-sys",
+]
+
+[[package]]
+name = "zstd-sys"
+version = "2.0.7+zstd.1.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+]
diff --git a/Cargo.toml b/Cargo.toml
index b5ef027..6f40d32 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,6 +9,7 @@ default-run = "minedmap"
 
 [dependencies]
 anyhow = "1.0.68"
+bincode = "1.3.3"
 bytemuck = "1.13.0"
 clap = { version = "4.1.4", features = ["derive"] }
 enumflags2 = "0.7.5"
@@ -17,3 +18,4 @@ flate2 = "1.0.25"
 itertools = "0.10.5"
 num-integer = "0.1.45"
 serde = "1.0.152"
+zstd = "0.12.3"
diff --git a/src/io/mod.rs b/src/io/mod.rs
index f109d15..4098f3b 100644
--- a/src/io/mod.rs
+++ b/src/io/mod.rs
@@ -1,2 +1,3 @@
 pub mod data;
 pub mod region;
+pub mod storage;
diff --git a/src/io/storage.rs b/src/io/storage.rs
new file mode 100644
index 0000000..86430b3
--- /dev/null
+++ b/src/io/storage.rs
@@ -0,0 +1,22 @@
+use std::{
+	fs::File,
+	io::{BufWriter, Write},
+	path::Path,
+};
+
+use anyhow::{Context, Result};
+use serde::Serialize;
+
+pub fn write<T: Serialize>(path: &Path, value: &T) -> Result<()> {
+	(|| -> Result<()> {
+		let file = File::create(path)?;
+		let writer = BufWriter::new(file);
+		let mut compressor = zstd::Encoder::new(writer, 1)?;
+		bincode::serialize_into(&mut compressor, value)?;
+		let writer = compressor.finish()?;
+		let mut file = writer.into_inner()?;
+		file.flush()?;
+		Ok(())
+	})()
+	.with_context(|| format!("Failed to write file {}", path.display()))
+}

From 768ab13205565ba1921bac0d0b190571870550ed Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 28 Feb 2023 23:54:21 +0100
Subject: [PATCH 096/460] main: rename savedir argument to input_dir

---
 src/main.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 7b9e573..03a10dc 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -8,7 +8,7 @@ use minedmap::{resource, world};
 #[derive(Debug, Parser)]
 struct Args {
 	/// Minecraft save directory
-	savedir: PathBuf,
+	input_dir: PathBuf,
 }
 
 /// Type with methods for processing the regions of a Minecraft save directory
@@ -78,7 +78,7 @@ impl RegionProcessor {
 fn main() -> Result<()> {
 	let args = Args::parse();
 
-	let regiondir: PathBuf = [&args.savedir, Path::new("region")].iter().collect();
+	let regiondir: PathBuf = [&args.input_dir, Path::new("region")].iter().collect();
 
 	let region_processor = RegionProcessor::new();
 	region_processor.process_region_dir(&regiondir)?;

From b68f04496c8c51e6ad9e89e8e5b24f3a2b7b4ce3 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 28 Feb 2023 23:57:48 +0100
Subject: [PATCH 097/460] main: introduce RegionCoords type alias

---
 src/main.rs | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 03a10dc..243c615 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -11,6 +11,8 @@ struct Args {
 	input_dir: PathBuf,
 }
 
+type RegionCoords = (i32, i32);
+
 /// Type with methods for processing the regions of a Minecraft save directory
 struct RegionProcessor {
 	block_types: resource::BlockTypeMap,
@@ -24,7 +26,7 @@ impl RegionProcessor {
 	}
 
 	/// Parses a filename in the format r.X.Z.mca into the contained X and Z values
-	fn parse_region_filename(path: &Path) -> Option<(i32, i32)> {
+	fn parse_region_filename(path: &Path) -> Option<RegionCoords> {
 		let file_name = path.file_name()?.to_str()?;
 		let parts: Vec<_> = file_name.split('.').collect();
 		let &["r", x, z, "mca"] = parts.as_slice() else {
@@ -35,17 +37,19 @@ impl RegionProcessor {
 	}
 
 	/// Processes a single region file
-	fn process_region(&self, path: &Path, _x: i32, _z: i32) -> Result<()> {
-		minedmap::io::region::from_file(path)?.foreach_chunk(|coords, data: world::de::Chunk| {
-			(|| -> Result<()> {
-				let chunk = world::chunk::Chunk::new(&data)?;
+	fn process_region(&self, path: &Path, _coords: RegionCoords) -> Result<()> {
+		minedmap::io::region::from_file(path)?.foreach_chunk(
+			|chunk_coords, data: world::de::Chunk| {
+				(|| -> Result<()> {
+					let chunk = world::chunk::Chunk::new(&data)?;
 
-				let _top_layer = world::layer::top_layer(&chunk, &self.block_types)?;
+					let _top_layer = world::layer::top_layer(&chunk, &self.block_types)?;
 
-				Ok(())
-			})()
-			.with_context(|| format!("Failed to process chunk {:?}", coords))
-		})
+					Ok(())
+				})()
+				.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))
+			},
+		)
 	}
 
 	/// Iterates over all region files of a Minecraft save directory
@@ -62,12 +66,15 @@ impl RegionProcessor {
 				.unwrap_or_default()
 		}) {
 			let path = entry.path();
-			let Some((x, z)) = Self::parse_region_filename(&path) else {
+			let Some(coords) = Self::parse_region_filename(&path) else {
 			continue;
 		};
 
-			if let Err(err) = self.process_region(&path, x, z) {
-				eprintln!("Failed to process region r.{}.{}.mca: {}", x, z, err);
+			if let Err(err) = self.process_region(&path, coords) {
+				eprintln!(
+					"Failed to process region r.{}.{}.mca: {}",
+					coords.0, coords.1, err,
+				);
 			}
 		}
 

From 04ab8c321f5035d44283ade2837f67fecff91382 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 1 Mar 2023 00:00:40 +0100
Subject: [PATCH 098/460] main: fix formatting

rustfmt still doesn't handle let-else...
---
 src/main.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 243c615..17c3898 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -67,8 +67,8 @@ impl RegionProcessor {
 		}) {
 			let path = entry.path();
 			let Some(coords) = Self::parse_region_filename(&path) else {
-			continue;
-		};
+				continue;
+			};
 
 			if let Err(err) = self.process_region(&path, coords) {
 				eprintln!(

From 447a9482fe2c1090403af01d5546b262404620c6 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 1 Mar 2023 00:02:23 +0100
Subject: [PATCH 099/460] main: create output directory for processed data
 files

---
 src/main.rs | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 17c3898..cdca041 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,7 @@
-use std::path::{Path, PathBuf};
+use std::{
+	fs,
+	path::{Path, PathBuf},
+};
 
 use anyhow::{Context, Result};
 use clap::Parser;
@@ -9,6 +12,8 @@ use minedmap::{resource, world};
 struct Args {
 	/// Minecraft save directory
 	input_dir: PathBuf,
+	/// MinedMap data directory
+	output_dir: PathBuf,
 }
 
 type RegionCoords = (i32, i32);
@@ -16,12 +21,14 @@ type RegionCoords = (i32, i32);
 /// Type with methods for processing the regions of a Minecraft save directory
 struct RegionProcessor {
 	block_types: resource::BlockTypeMap,
+	processed_dir: PathBuf,
 }
 
 impl RegionProcessor {
-	fn new() -> Self {
+	fn new(output_dir: &Path) -> Self {
 		RegionProcessor {
 			block_types: resource::block_types(),
+			processed_dir: [output_dir, Path::new("processed")].iter().collect(),
 		}
 	}
 
@@ -58,6 +65,13 @@ impl RegionProcessor {
 			.read_dir()
 			.with_context(|| format!("Failed to read directory {}", regiondir.display()))?;
 
+		fs::create_dir_all(&self.processed_dir).with_context(|| {
+			format!(
+				"Failed to create directory {}",
+				self.processed_dir.display(),
+			)
+		})?;
+
 		for entry in read_dir.filter_map(|entry| entry.ok()).filter(|entry| {
 			// We are only interested in regular files
 			entry
@@ -87,7 +101,7 @@ fn main() -> Result<()> {
 
 	let regiondir: PathBuf = [&args.input_dir, Path::new("region")].iter().collect();
 
-	let region_processor = RegionProcessor::new();
+	let region_processor = RegionProcessor::new(&args.output_dir);
 	region_processor.process_region_dir(&regiondir)?;
 
 	Ok(())

From d77dcce77801b4ac66f02cc04713f2dd6277ce4f Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 1 Mar 2023 00:02:47 +0100
Subject: [PATCH 100/460] main: print message when processing region

---
 src/main.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main.rs b/src/main.rs
index cdca041..10e9445 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -44,7 +44,9 @@ impl RegionProcessor {
 	}
 
 	/// Processes a single region file
-	fn process_region(&self, path: &Path, _coords: RegionCoords) -> Result<()> {
+	fn process_region(&self, path: &Path, coords: RegionCoords) -> Result<()> {
+		println!("Processing region r.{}.{}.mca", coords.0, coords.1);
+
 		minedmap::io::region::from_file(path)?.foreach_chunk(
 			|chunk_coords, data: world::de::Chunk| {
 				(|| -> Result<()> {

From 18cecb947e95cb2279b238db188a48e907d0b31e Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 1 Mar 2023 00:09:11 +0100
Subject: [PATCH 101/460] main: factor out process_chunk() method

---
 src/main.rs | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 10e9445..9d08dba 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -43,20 +43,22 @@ impl RegionProcessor {
 		Some((x.parse().ok()?, z.parse().ok()?))
 	}
 
+	/// Processes a single chunk
+	fn process_chunk(&self, data: world::de::Chunk) -> Result<Box<world::layer::BlockInfoArray>> {
+		let chunk = world::chunk::Chunk::new(&data)?;
+		world::layer::top_layer(&chunk, &self.block_types)
+	}
+
 	/// Processes a single region file
 	fn process_region(&self, path: &Path, coords: RegionCoords) -> Result<()> {
 		println!("Processing region r.{}.{}.mca", coords.0, coords.1);
 
 		minedmap::io::region::from_file(path)?.foreach_chunk(
 			|chunk_coords, data: world::de::Chunk| {
-				(|| -> Result<()> {
-					let chunk = world::chunk::Chunk::new(&data)?;
-
-					let _top_layer = world::layer::top_layer(&chunk, &self.block_types)?;
-
-					Ok(())
-				})()
-				.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))
+				let _processed_chunk = self
+					.process_chunk(data)
+					.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))?;
+				Ok(())
 			},
 		)
 	}

From e02a1fc0c986eca9d3db6fbbab0e9d0c85511c74 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 1 Mar 2023 00:11:42 +0100
Subject: [PATCH 102/460] main: collect processed chunks in array

---
 src/main.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 9d08dba..8ba8efc 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,7 +6,7 @@ use std::{
 use anyhow::{Context, Result};
 use clap::Parser;
 
-use minedmap::{resource, world};
+use minedmap::{resource, types::*, world};
 
 #[derive(Debug, Parser)]
 struct Args {
@@ -53,11 +53,15 @@ impl RegionProcessor {
 	fn process_region(&self, path: &Path, coords: RegionCoords) -> Result<()> {
 		println!("Processing region r.{}.{}.mca", coords.0, coords.1);
 
+		let mut processed_data: ChunkArray<Option<Box<world::layer::BlockInfoArray>>> =
+			Default::default();
+
 		minedmap::io::region::from_file(path)?.foreach_chunk(
 			|chunk_coords, data: world::de::Chunk| {
-				let _processed_chunk = self
+				let processed_chunk = self
 					.process_chunk(data)
 					.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))?;
+				processed_data[chunk_coords] = Some(processed_chunk);
 				Ok(())
 			},
 		)

From 194715ad09e59c3c58eab42882669b9afc355eac Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 1 Mar 2023 00:13:06 +0100
Subject: [PATCH 103/460] main: store processed region data

---
 src/main.rs | 38 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 8ba8efc..76cebde 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,7 +6,7 @@ use std::{
 use anyhow::{Context, Result};
 use clap::Parser;
 
-use minedmap::{resource, types::*, world};
+use minedmap::{io::storage, resource, types::*, world};
 
 #[derive(Debug, Parser)]
 struct Args {
@@ -43,12 +43,42 @@ impl RegionProcessor {
 		Some((x.parse().ok()?, z.parse().ok()?))
 	}
 
+	fn processed_path(&self, coords: RegionCoords, temp: bool) -> PathBuf {
+		let filename = format!(
+			"r.{}.{}.bin{}",
+			coords.0,
+			coords.1,
+			if temp { ".tmp" } else { "" },
+		);
+		[&self.processed_dir, Path::new(&filename)].iter().collect()
+	}
+
 	/// Processes a single chunk
 	fn process_chunk(&self, data: world::de::Chunk) -> Result<Box<world::layer::BlockInfoArray>> {
 		let chunk = world::chunk::Chunk::new(&data)?;
 		world::layer::top_layer(&chunk, &self.block_types)
 	}
 
+	fn save_region(
+		&self,
+		region: RegionCoords,
+		processed_data: &ChunkArray<Option<Box<world::layer::BlockInfoArray>>>,
+	) -> Result<()> {
+		let tmp_path = self.processed_path(region, true);
+		storage::write(&tmp_path, processed_data)?;
+
+		let output_path = self.processed_path(region, false);
+		fs::rename(&tmp_path, &output_path).with_context(|| {
+			format!(
+				"Failed to rename {} to {}",
+				tmp_path.display(),
+				output_path.display(),
+			)
+		})?;
+
+		Ok(())
+	}
+
 	/// Processes a single region file
 	fn process_region(&self, path: &Path, coords: RegionCoords) -> Result<()> {
 		println!("Processing region r.{}.{}.mca", coords.0, coords.1);
@@ -64,7 +94,11 @@ impl RegionProcessor {
 				processed_data[chunk_coords] = Some(processed_chunk);
 				Ok(())
 			},
-		)
+		)?;
+
+		self.save_region(coords, &processed_data)?;
+
+		Ok(())
 	}
 
 	/// Iterates over all region files of a Minecraft save directory

From ca6afa0cf981b2c36632ca6e621612b8b9be5676 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 1 Mar 2023 19:16:09 +0100
Subject: [PATCH 104/460] main: return list of region coordinates from
 process_region_dir()

---
 src/main.rs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 76cebde..cf1f003 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -102,7 +102,9 @@ impl RegionProcessor {
 	}
 
 	/// Iterates over all region files of a Minecraft save directory
-	fn process_region_dir(&self, regiondir: &Path) -> Result<()> {
+	///
+	/// Returns a list of the coordinates of all processed regions
+	fn process_region_dir(&self, regiondir: &Path) -> Result<Vec<RegionCoords>> {
 		let read_dir = regiondir
 			.read_dir()
 			.with_context(|| format!("Failed to read directory {}", regiondir.display()))?;
@@ -114,6 +116,8 @@ impl RegionProcessor {
 			)
 		})?;
 
+		let mut ret = Vec::new();
+
 		for entry in read_dir.filter_map(|entry| entry.ok()).filter(|entry| {
 			// We are only interested in regular files
 			entry
@@ -132,9 +136,11 @@ impl RegionProcessor {
 					coords.0, coords.1, err,
 				);
 			}
+
+			ret.push(coords);
 		}
 
-		Ok(())
+		Ok(ret)
 	}
 }
 

From ea604b88f20044212c6b1a61e5e766ec0efa675a Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 1 Mar 2023 19:17:04 +0100
Subject: [PATCH 105/460] main: rename regiondir variable to region_dir

For consistency with other _dir variables.
---
 src/main.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index cf1f003..23f6609 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -104,10 +104,10 @@ impl RegionProcessor {
 	/// Iterates over all region files of a Minecraft save directory
 	///
 	/// Returns a list of the coordinates of all processed regions
-	fn process_region_dir(&self, regiondir: &Path) -> Result<Vec<RegionCoords>> {
-		let read_dir = regiondir
+	fn process_region_dir(&self, region_dir: &Path) -> Result<Vec<RegionCoords>> {
+		let read_dir = region_dir
 			.read_dir()
-			.with_context(|| format!("Failed to read directory {}", regiondir.display()))?;
+			.with_context(|| format!("Failed to read directory {}", region_dir.display()))?;
 
 		fs::create_dir_all(&self.processed_dir).with_context(|| {
 			format!(
@@ -147,10 +147,10 @@ impl RegionProcessor {
 fn main() -> Result<()> {
 	let args = Args::parse();
 
-	let regiondir: PathBuf = [&args.input_dir, Path::new("region")].iter().collect();
+	let region_dir: PathBuf = [&args.input_dir, Path::new("region")].iter().collect();
 
 	let region_processor = RegionProcessor::new(&args.output_dir);
-	region_processor.process_region_dir(&regiondir)?;
+	region_processor.process_region_dir(&region_dir)?;
 
 	Ok(())
 }

From a2ba7e4738d14339696f092a25f9bb8f556188c9 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 1 Mar 2023 19:17:50 +0100
Subject: [PATCH 106/460] main: build processed_dir path outside of
 RegionProcessor::new()

---
 src/main.rs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 23f6609..841c177 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -19,16 +19,16 @@ struct Args {
 type RegionCoords = (i32, i32);
 
 /// Type with methods for processing the regions of a Minecraft save directory
-struct RegionProcessor {
+struct RegionProcessor<'a> {
 	block_types: resource::BlockTypeMap,
-	processed_dir: PathBuf,
+	processed_dir: &'a Path,
 }
 
-impl RegionProcessor {
-	fn new(output_dir: &Path) -> Self {
+impl<'a> RegionProcessor<'a> {
+	fn new(processed_dir: &'a Path) -> Self {
 		RegionProcessor {
 			block_types: resource::block_types(),
-			processed_dir: [output_dir, Path::new("processed")].iter().collect(),
+			processed_dir,
 		}
 	}
 
@@ -148,8 +148,9 @@ fn main() -> Result<()> {
 	let args = Args::parse();
 
 	let region_dir: PathBuf = [&args.input_dir, Path::new("region")].iter().collect();
+	let processed_dir: PathBuf = [&args.output_dir, Path::new("processed")].iter().collect();
 
-	let region_processor = RegionProcessor::new(&args.output_dir);
+	let region_processor = RegionProcessor::new(&processed_dir);
 	region_processor.process_region_dir(&region_dir)?;
 
 	Ok(())

From c5ca1d9821196929ece96f4ad6acf3696f1d1d4f Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 1 Mar 2023 19:27:09 +0100
Subject: [PATCH 107/460] main: pass region_dir to RegionProcessor::new(),
 consume when processing

---
 src/main.rs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 841c177..32c2659 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -21,13 +21,15 @@ type RegionCoords = (i32, i32);
 /// Type with methods for processing the regions of a Minecraft save directory
 struct RegionProcessor<'a> {
 	block_types: resource::BlockTypeMap,
+	region_dir: &'a Path,
 	processed_dir: &'a Path,
 }
 
 impl<'a> RegionProcessor<'a> {
-	fn new(processed_dir: &'a Path) -> Self {
+	fn new(region_dir: &'a Path, processed_dir: &'a Path) -> Self {
 		RegionProcessor {
 			block_types: resource::block_types(),
+			region_dir,
 			processed_dir,
 		}
 	}
@@ -104,10 +106,11 @@ impl<'a> RegionProcessor<'a> {
 	/// Iterates over all region files of a Minecraft save directory
 	///
 	/// Returns a list of the coordinates of all processed regions
-	fn process_region_dir(&self, region_dir: &Path) -> Result<Vec<RegionCoords>> {
-		let read_dir = region_dir
+	fn run(self) -> Result<Vec<RegionCoords>> {
+		let read_dir = self
+			.region_dir
 			.read_dir()
-			.with_context(|| format!("Failed to read directory {}", region_dir.display()))?;
+			.with_context(|| format!("Failed to read directory {}", self.region_dir.display()))?;
 
 		fs::create_dir_all(&self.processed_dir).with_context(|| {
 			format!(
@@ -150,8 +153,7 @@ fn main() -> Result<()> {
 	let region_dir: PathBuf = [&args.input_dir, Path::new("region")].iter().collect();
 	let processed_dir: PathBuf = [&args.output_dir, Path::new("processed")].iter().collect();
 
-	let region_processor = RegionProcessor::new(&processed_dir);
-	region_processor.process_region_dir(&region_dir)?;
+	RegionProcessor::new(&region_dir, &processed_dir).run()?;
 
 	Ok(())
 }

From 73b13c1afb124ba97a7bca39379cd08053186640 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 1 Mar 2023 21:01:25 +0100
Subject: [PATCH 108/460] main: move path handling to separate struct

---
 src/main.rs | 69 ++++++++++++++++++++++++++++++++---------------------
 1 file changed, 42 insertions(+), 27 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 32c2659..9183ad7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -18,19 +18,44 @@ struct Args {
 
 type RegionCoords = (i32, i32);
 
+struct Paths {
+	region_dir: PathBuf,
+	processed_dir: PathBuf,
+}
+
+impl Paths {
+	fn new(args: Args) -> Self {
+		let region_dir = [&args.input_dir, Path::new("region")].iter().collect();
+		let processed_dir = [&args.output_dir, Path::new("processed")].iter().collect();
+
+		Paths {
+			region_dir,
+			processed_dir,
+		}
+	}
+
+	fn processed_path(&self, coords: RegionCoords, temp: bool) -> PathBuf {
+		let filename = format!(
+			"r.{}.{}.bin{}",
+			coords.0,
+			coords.1,
+			if temp { ".tmp" } else { "" },
+		);
+		[&self.processed_dir, Path::new(&filename)].iter().collect()
+	}
+}
+
 /// Type with methods for processing the regions of a Minecraft save directory
 struct RegionProcessor<'a> {
 	block_types: resource::BlockTypeMap,
-	region_dir: &'a Path,
-	processed_dir: &'a Path,
+	paths: &'a Paths,
 }
 
 impl<'a> RegionProcessor<'a> {
-	fn new(region_dir: &'a Path, processed_dir: &'a Path) -> Self {
+	fn new(paths: &'a Paths) -> Self {
 		RegionProcessor {
 			block_types: resource::block_types(),
-			region_dir,
-			processed_dir,
+			paths,
 		}
 	}
 
@@ -45,16 +70,6 @@ impl<'a> RegionProcessor<'a> {
 		Some((x.parse().ok()?, z.parse().ok()?))
 	}
 
-	fn processed_path(&self, coords: RegionCoords, temp: bool) -> PathBuf {
-		let filename = format!(
-			"r.{}.{}.bin{}",
-			coords.0,
-			coords.1,
-			if temp { ".tmp" } else { "" },
-		);
-		[&self.processed_dir, Path::new(&filename)].iter().collect()
-	}
-
 	/// Processes a single chunk
 	fn process_chunk(&self, data: world::de::Chunk) -> Result<Box<world::layer::BlockInfoArray>> {
 		let chunk = world::chunk::Chunk::new(&data)?;
@@ -66,10 +81,10 @@ impl<'a> RegionProcessor<'a> {
 		region: RegionCoords,
 		processed_data: &ChunkArray<Option<Box<world::layer::BlockInfoArray>>>,
 	) -> Result<()> {
-		let tmp_path = self.processed_path(region, true);
+		let tmp_path = self.paths.processed_path(region, true);
 		storage::write(&tmp_path, processed_data)?;
 
-		let output_path = self.processed_path(region, false);
+		let output_path = self.paths.processed_path(region, false);
 		fs::rename(&tmp_path, &output_path).with_context(|| {
 			format!(
 				"Failed to rename {} to {}",
@@ -107,15 +122,17 @@ impl<'a> RegionProcessor<'a> {
 	///
 	/// Returns a list of the coordinates of all processed regions
 	fn run(self) -> Result<Vec<RegionCoords>> {
-		let read_dir = self
-			.region_dir
-			.read_dir()
-			.with_context(|| format!("Failed to read directory {}", self.region_dir.display()))?;
+		let read_dir = self.paths.region_dir.read_dir().with_context(|| {
+			format!(
+				"Failed to read directory {}",
+				self.paths.region_dir.display()
+			)
+		})?;
 
-		fs::create_dir_all(&self.processed_dir).with_context(|| {
+		fs::create_dir_all(&self.paths.processed_dir).with_context(|| {
 			format!(
 				"Failed to create directory {}",
-				self.processed_dir.display(),
+				self.paths.processed_dir.display(),
 			)
 		})?;
 
@@ -149,11 +166,9 @@ impl<'a> RegionProcessor<'a> {
 
 fn main() -> Result<()> {
 	let args = Args::parse();
+	let paths = Paths::new(args);
 
-	let region_dir: PathBuf = [&args.input_dir, Path::new("region")].iter().collect();
-	let processed_dir: PathBuf = [&args.output_dir, Path::new("processed")].iter().collect();
-
-	RegionProcessor::new(&region_dir, &processed_dir).run()?;
+	RegionProcessor::new(&paths).run()?;
 
 	Ok(())
 }

From 0673c89bd8109a3695d4930ff837b4e00a6fe0be Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 1 Mar 2023 21:45:05 +0100
Subject: [PATCH 109/460] main: add stub tile renderer struct

This only prints messages so far.
---
 src/main.rs | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/main.rs b/src/main.rs
index 9183ad7..30b3b18 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -21,16 +21,19 @@ type RegionCoords = (i32, i32);
 struct Paths {
 	region_dir: PathBuf,
 	processed_dir: PathBuf,
+	map_dir: PathBuf,
 }
 
 impl Paths {
 	fn new(args: Args) -> Self {
 		let region_dir = [&args.input_dir, Path::new("region")].iter().collect();
 		let processed_dir = [&args.output_dir, Path::new("processed")].iter().collect();
+		let map_dir = [&args.output_dir, Path::new("map/0")].iter().collect();
 
 		Paths {
 			region_dir,
 			processed_dir,
+			map_dir,
 		}
 	}
 
@@ -164,11 +167,43 @@ impl<'a> RegionProcessor<'a> {
 	}
 }
 
+struct TileRenderer<'a> {
+	paths: &'a Paths,
+}
+
+impl<'a> TileRenderer<'a> {
+	fn new(paths: &'a Paths) -> Self {
+		TileRenderer { paths }
+	}
+
+	fn render_tile(&self, coords: RegionCoords) -> Result<()> {
+		println!("Rendering tile r.{}.{}.png", coords.0, coords.1);
+
+		Ok(())
+	}
+
+	fn run(self, regions: &[RegionCoords]) -> Result<()> {
+		fs::create_dir_all(&self.paths.map_dir).with_context(|| {
+			format!(
+				"Failed to create directory {}",
+				self.paths.map_dir.display(),
+			)
+		})?;
+
+		for &coords in regions {
+			self.render_tile(coords)?;
+		}
+
+		Ok(())
+	}
+}
+
 fn main() -> Result<()> {
 	let args = Args::parse();
 	let paths = Paths::new(args);
 
-	RegionProcessor::new(&paths).run()?;
+	let regions = RegionProcessor::new(&paths).run()?;
+	TileRenderer::new(&paths).run(&regions)?;
 
 	Ok(())
 }

From cbbc6d8f3529675c72232f82d2946de5a7a5deb2 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 1 Mar 2023 21:54:40 +0100
Subject: [PATCH 110/460] resource: make BlockTypeMap return BlockType without
 reference

---
 src/resource/mod.rs | 19 ++++++++++++++-----
 src/world/layer.rs  |  2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/resource/mod.rs b/src/resource/mod.rs
index 7f3a499..3d1dc96 100644
--- a/src/resource/mod.rs
+++ b/src/resource/mod.rs
@@ -53,11 +53,20 @@ impl BlockType {
 	}
 }
 
-pub type BlockTypeMap = HashMap<String, BlockType>;
+pub struct BlockTypeMap(HashMap<String, BlockType>);
+
+impl BlockTypeMap {
+	#[inline]
+	pub fn get(&self, id: &str) -> Option<BlockType> {
+		self.0.get(id).copied()
+	}
+}
 
 pub fn block_types() -> BlockTypeMap {
-	block_types::BLOCK_TYPES
-		.iter()
-		.map(|(k, v)| (String::from(*k), *v))
-		.collect()
+	BlockTypeMap(
+		block_types::BLOCK_TYPES
+			.iter()
+			.map(|(k, v)| (String::from(*k), *v))
+			.collect(),
+	)
 }
diff --git a/src/world/layer.rs b/src/world/layer.rs
index f8a7302..2232af8 100644
--- a/src/world/layer.rs
+++ b/src/world/layer.rs
@@ -110,7 +110,7 @@ pub fn top_layer(chunk: &Chunk, block_types: &BlockTypeMap) -> Result<Box<BlockI
 
 		let coords = SectionBlockCoords { xz, y };
 		let block_id = section.block_id_at(coords)?;
-		let Some(&block_type) = block_types.get(block_id) else {
+		let Some(block_type) = block_types.get(block_id) else {
 			eprintln!("Unknown block type: {}", block_id);
 			continue;
 		};

From 483cdf48c8a085d8c540a8be5d6a0293a98733e0 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 1 Mar 2023 22:01:30 +0100
Subject: [PATCH 111/460] resource: update block_types with Minecraft 1.19.2
 data

An older Minecraft version had been used to generate the data for the
Rust rewrite by accident.
---
 src/resource/block_types.rs | 255 +++++++++++++++++++++++++++++++++++-
 1 file changed, 250 insertions(+), 5 deletions(-)

diff --git a/src/resource/block_types.rs b/src/resource/block_types.rs
index 5b975c2..ea32d9a 100644
--- a/src/resource/block_types.rs
+++ b/src/resource/block_types.rs
@@ -707,7 +707,7 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 		"minecraft:brewing_stand",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(123, 101, 81),
+			color: BlockColor(122, 100, 80),
 		},
 	),
 	(
@@ -1169,7 +1169,7 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 		"minecraft:cocoa",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(156, 94, 43),
+			color: BlockColor(154, 91, 40),
 		},
 	),
 	(
@@ -2264,6 +2264,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: BlockColor(99, 111, 60),
 		},
 	),
+	(
+		"minecraft:frogspawn",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(105, 90, 82),
+		},
+	),
 	(
 		"minecraft:frosted_ice",
 		BlockType {
@@ -3426,6 +3433,118 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: BlockColor(142, 63, 31),
 		},
 	),
+	(
+		"minecraft:mangrove_button",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:mangrove_door",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(112, 48, 46),
+		},
+	),
+	(
+		"minecraft:mangrove_fence",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(117, 54, 48),
+		},
+	),
+	(
+		"minecraft:mangrove_fence_gate",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(117, 54, 48),
+		},
+	),
+	(
+		"minecraft:mangrove_leaves",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
+			color: BlockColor(129, 128, 128),
+		},
+	),
+	(
+		"minecraft:mangrove_log",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(102, 48, 42),
+		},
+	),
+	(
+		"minecraft:mangrove_planks",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(117, 54, 48),
+		},
+	),
+	(
+		"minecraft:mangrove_pressure_plate",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(117, 54, 48),
+		},
+	),
+	(
+		"minecraft:mangrove_propagule",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(96, 174, 83),
+		},
+	),
+	(
+		"minecraft:mangrove_roots",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(74, 59, 38),
+		},
+	),
+	(
+		"minecraft:mangrove_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(117, 54, 48),
+		},
+	),
+	(
+		"minecraft:mangrove_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(117, 54, 48),
+		},
+	),
+	(
+		"minecraft:mangrove_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(117, 54, 48),
+		},
+	),
+	(
+		"minecraft:mangrove_trapdoor",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(110, 46, 42),
+		},
+	),
+	(
+		"minecraft:mangrove_wall_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: BlockColor(0, 0, 0),
+		},
+	),
+	(
+		"minecraft:mangrove_wood",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(83, 66, 41),
+		},
+	),
 	(
 		"minecraft:medium_amethyst_bud",
 		BlockType {
@@ -3524,6 +3643,48 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: BlockColor(0, 0, 0),
 		},
 	),
+	(
+		"minecraft:mud",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(60, 57, 60),
+		},
+	),
+	(
+		"minecraft:mud_brick_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(137, 103, 79),
+		},
+	),
+	(
+		"minecraft:mud_brick_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(137, 103, 79),
+		},
+	),
+	(
+		"minecraft:mud_brick_wall",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(137, 103, 79),
+		},
+	),
+	(
+		"minecraft:mud_bricks",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(137, 103, 79),
+		},
+	),
+	(
+		"minecraft:muddy_mangrove_roots",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(70, 58, 45),
+		},
+	),
 	(
 		"minecraft:mushroom_stem",
 		BlockType {
@@ -3755,6 +3916,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: BlockColor(15, 10, 24),
 		},
 	),
+	(
+		"minecraft:ochre_froglight",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(250, 245, 206),
+		},
+	),
 	(
 		"minecraft:orange_banner",
 		BlockType {
@@ -3902,6 +4070,20 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: BlockColor(141, 180, 250),
 		},
 	),
+	(
+		"minecraft:packed_mud",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(142, 106, 79),
+		},
+	),
+	(
+		"minecraft:pearlescent_froglight",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(245, 240, 239),
+		},
+	),
 	(
 		"minecraft:peony",
 		BlockType {
@@ -4025,14 +4207,14 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 		"minecraft:piston",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(110, 104, 96),
+			color: BlockColor(109, 104, 96),
 		},
 	),
 	(
 		"minecraft:piston_head",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(154, 127, 87),
+			color: BlockColor(153, 127, 85),
 		},
 	),
 	(
@@ -4378,6 +4560,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: BlockColor(123, 174, 95),
 		},
 	),
+	(
+		"minecraft:potted_mangrove_propagule",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(96, 174, 83),
+		},
+	),
 	(
 		"minecraft:potted_oak_sapling",
 		BlockType {
@@ -4959,6 +5148,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: BlockColor(175, 24, 5),
 		},
 	),
+	(
+		"minecraft:reinforced_deepslate",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(80, 82, 78),
+		},
+	),
 	(
 		"minecraft:repeater",
 		BlockType {
@@ -5036,6 +5232,20 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: BlockColor(174, 134, 80),
 		},
 	),
+	(
+		"minecraft:sculk",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(12, 29, 36),
+		},
+	),
+	(
+		"minecraft:sculk_catalyst",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(15, 31, 38),
+		},
+	),
 	(
 		"minecraft:sculk_sensor",
 		BlockType {
@@ -5043,6 +5253,20 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: BlockColor(7, 70, 84),
 		},
 	),
+	(
+		"minecraft:sculk_shrieker",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(198, 205, 169),
+		},
+	),
+	(
+		"minecraft:sculk_vein",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(7, 48, 57),
+		},
+	),
 	(
 		"minecraft:sea_lantern",
 		BlockType {
@@ -5411,7 +5635,7 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 		"minecraft:sticky_piston",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(110, 104, 96),
+			color: BlockColor(109, 104, 96),
 		},
 	),
 	(
@@ -5554,6 +5778,20 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: BlockColor(171, 132, 84),
 		},
 	),
+	(
+		"minecraft:stripped_mangrove_log",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(109, 43, 43),
+		},
+	),
+	(
+		"minecraft:stripped_mangrove_wood",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(119, 54, 47),
+		},
+	),
 	(
 		"minecraft:stripped_oak_log",
 		BlockType {
@@ -5757,6 +5995,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: BlockColor(20, 135, 122),
 		},
 	),
+	(
+		"minecraft:verdant_froglight",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: BlockColor(229, 244, 228),
+		},
+	),
 	(
 		"minecraft:vine",
 		BlockType {

From 95e4e459748c19ae27f3987f26a661c582f6da2d Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 1 Mar 2023 21:58:43 +0100
Subject: [PATCH 112/460] resource: remove "minecraft:" prefix from hash keys

Shorter keys mean less data to hash.
---
 resource/extract.py         |    2 +-
 src/resource/block_types.rs | 1876 +++++++++++++++++------------------
 src/resource/mod.rs         |    3 +-
 3 files changed, 941 insertions(+), 940 deletions(-)

diff --git a/resource/extract.py b/resource/extract.py
index 4e992c2..281f3a7 100755
--- a/resource/extract.py
+++ b/resource/extract.py
@@ -35,7 +35,7 @@ with open(sys.argv[1]) as f:
 output = {}
 
 for name, info in blocks.items():
-	id = 'minecraft:' + name
+	id = name
 
 	output[id] = {
 		'color': {'r': 0, 'g': 0, 'b': 0},
diff --git a/src/resource/block_types.rs b/src/resource/block_types.rs
index ea32d9a..6afed2a 100644
--- a/src/resource/block_types.rs
+++ b/src/resource/block_types.rs
@@ -4,6566 +4,6566 @@ use super::*;
 
 pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 	(
-		"minecraft:acacia_button",
+		"acacia_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:acacia_door",
+		"acacia_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(167, 95, 60),
 		},
 	),
 	(
-		"minecraft:acacia_fence",
+		"acacia_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(168, 90, 50),
 		},
 	),
 	(
-		"minecraft:acacia_fence_gate",
+		"acacia_fence_gate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(168, 90, 50),
 		},
 	),
 	(
-		"minecraft:acacia_leaves",
+		"acacia_leaves",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
 			color: BlockColor(149, 148, 148),
 		},
 	),
 	(
-		"minecraft:acacia_log",
+		"acacia_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(150, 88, 55),
 		},
 	),
 	(
-		"minecraft:acacia_planks",
+		"acacia_planks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(168, 90, 50),
 		},
 	),
 	(
-		"minecraft:acacia_pressure_plate",
+		"acacia_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(168, 90, 50),
 		},
 	),
 	(
-		"minecraft:acacia_sapling",
+		"acacia_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(118, 117, 23),
 		},
 	),
 	(
-		"minecraft:acacia_sign",
+		"acacia_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(168, 90, 50),
 		},
 	),
 	(
-		"minecraft:acacia_slab",
+		"acacia_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(168, 90, 50),
 		},
 	),
 	(
-		"minecraft:acacia_stairs",
+		"acacia_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(168, 90, 50),
 		},
 	),
 	(
-		"minecraft:acacia_trapdoor",
+		"acacia_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(156, 87, 51),
 		},
 	),
 	(
-		"minecraft:acacia_wall_sign",
+		"acacia_wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:acacia_wood",
+		"acacia_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(103, 96, 86),
 		},
 	),
 	(
-		"minecraft:activator_rail",
+		"activator_rail",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(115, 87, 74),
 		},
 	),
 	(
-		"minecraft:air",
+		"air",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:allium",
+		"allium",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:amethyst_block",
+		"amethyst_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(133, 97, 191),
 		},
 	),
 	(
-		"minecraft:amethyst_cluster",
+		"amethyst_cluster",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(163, 126, 207),
 		},
 	),
 	(
-		"minecraft:ancient_debris",
+		"ancient_debris",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(94, 66, 58),
 		},
 	),
 	(
-		"minecraft:andesite",
+		"andesite",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(136, 136, 136),
 		},
 	),
 	(
-		"minecraft:andesite_slab",
+		"andesite_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(136, 136, 136),
 		},
 	),
 	(
-		"minecraft:andesite_stairs",
+		"andesite_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(136, 136, 136),
 		},
 	),
 	(
-		"minecraft:andesite_wall",
+		"andesite_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(136, 136, 136),
 		},
 	),
 	(
-		"minecraft:anvil",
+		"anvil",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(72, 72, 72),
 		},
 	),
 	(
-		"minecraft:attached_melon_stem",
+		"attached_melon_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 			color: BlockColor(141, 142, 141),
 		},
 	),
 	(
-		"minecraft:attached_pumpkin_stem",
+		"attached_pumpkin_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 			color: BlockColor(139, 139, 139),
 		},
 	),
 	(
-		"minecraft:azalea",
+		"azalea",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(101, 124, 47),
 		},
 	),
 	(
-		"minecraft:azalea_leaves",
+		"azalea_leaves",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(90, 114, 44),
 		},
 	),
 	(
-		"minecraft:azure_bluet",
+		"azure_bluet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:bamboo",
+		"bamboo",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(93, 144, 19),
 		},
 	),
 	(
-		"minecraft:bamboo_sapling",
+		"bamboo_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:barrel",
+		"barrel",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(134, 100, 58),
 		},
 	),
 	(
-		"minecraft:barrier",
+		"barrier",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:basalt",
+		"basalt",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(80, 81, 86),
 		},
 	),
 	(
-		"minecraft:beacon",
+		"beacon",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(117, 220, 215),
 		},
 	),
 	(
-		"minecraft:bedrock",
+		"bedrock",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(85, 85, 85),
 		},
 	),
 	(
-		"minecraft:bee_nest",
+		"bee_nest",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(202, 160, 74),
 		},
 	),
 	(
-		"minecraft:beehive",
+		"beehive",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(180, 146, 90),
 		},
 	),
 	(
-		"minecraft:beetroots",
+		"beetroots",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(93, 91, 30),
 		},
 	),
 	(
-		"minecraft:bell",
+		"bell",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(253, 235, 110),
 		},
 	),
 	(
-		"minecraft:big_dripleaf",
+		"big_dripleaf",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(111, 141, 51),
 		},
 	),
 	(
-		"minecraft:big_dripleaf_stem",
+		"big_dripleaf_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:birch_button",
+		"birch_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:birch_door",
+		"birch_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(220, 209, 176),
 		},
 	),
 	(
-		"minecraft:birch_fence",
+		"birch_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(192, 175, 121),
 		},
 	),
 	(
-		"minecraft:birch_fence_gate",
+		"birch_fence_gate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(192, 175, 121),
 		},
 	),
 	(
-		"minecraft:birch_leaves",
+		"birch_leaves",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Birch}),
 			color: BlockColor(130, 129, 130),
 		},
 	),
 	(
-		"minecraft:birch_log",
+		"birch_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(193, 179, 135),
 		},
 	),
 	(
-		"minecraft:birch_planks",
+		"birch_planks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(192, 175, 121),
 		},
 	),
 	(
-		"minecraft:birch_pressure_plate",
+		"birch_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(192, 175, 121),
 		},
 	),
 	(
-		"minecraft:birch_sapling",
+		"birch_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(127, 160, 79),
 		},
 	),
 	(
-		"minecraft:birch_sign",
+		"birch_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(192, 175, 121),
 		},
 	),
 	(
-		"minecraft:birch_slab",
+		"birch_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(192, 175, 121),
 		},
 	),
 	(
-		"minecraft:birch_stairs",
+		"birch_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(192, 175, 121),
 		},
 	),
 	(
-		"minecraft:birch_trapdoor",
+		"birch_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(207, 194, 157),
 		},
 	),
 	(
-		"minecraft:birch_wall_sign",
+		"birch_wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:birch_wood",
+		"birch_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(216, 215, 210),
 		},
 	),
 	(
-		"minecraft:black_banner",
+		"black_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:black_bed",
+		"black_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:black_candle",
+		"black_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:black_candle_cake",
+		"black_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
-		"minecraft:black_carpet",
+		"black_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(20, 21, 25),
 		},
 	),
 	(
-		"minecraft:black_concrete",
+		"black_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(8, 10, 15),
 		},
 	),
 	(
-		"minecraft:black_concrete_powder",
+		"black_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(25, 26, 31),
 		},
 	),
 	(
-		"minecraft:black_glazed_terracotta",
+		"black_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(67, 30, 32),
 		},
 	),
 	(
-		"minecraft:black_shulker_box",
+		"black_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(25, 25, 29),
 		},
 	),
 	(
-		"minecraft:black_stained_glass",
+		"black_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(25, 25, 25),
 		},
 	),
 	(
-		"minecraft:black_stained_glass_pane",
+		"black_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(24, 24, 24),
 		},
 	),
 	(
-		"minecraft:black_terracotta",
+		"black_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(37, 22, 16),
 		},
 	),
 	(
-		"minecraft:black_wall_banner",
+		"black_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:black_wool",
+		"black_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(20, 21, 25),
 		},
 	),
 	(
-		"minecraft:blackstone",
+		"blackstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(42, 36, 41),
 		},
 	),
 	(
-		"minecraft:blackstone_slab",
+		"blackstone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(42, 36, 41),
 		},
 	),
 	(
-		"minecraft:blackstone_stairs",
+		"blackstone_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(42, 36, 41),
 		},
 	),
 	(
-		"minecraft:blackstone_wall",
+		"blackstone_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(42, 36, 41),
 		},
 	),
 	(
-		"minecraft:blast_furnace",
+		"blast_furnace",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(80, 80, 81),
 		},
 	),
 	(
-		"minecraft:blue_banner",
+		"blue_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:blue_bed",
+		"blue_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:blue_candle",
+		"blue_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:blue_candle_cake",
+		"blue_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
-		"minecraft:blue_carpet",
+		"blue_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(53, 57, 157),
 		},
 	),
 	(
-		"minecraft:blue_concrete",
+		"blue_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(44, 46, 143),
 		},
 	),
 	(
-		"minecraft:blue_concrete_powder",
+		"blue_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(70, 73, 166),
 		},
 	),
 	(
-		"minecraft:blue_glazed_terracotta",
+		"blue_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(47, 64, 139),
 		},
 	),
 	(
-		"minecraft:blue_ice",
+		"blue_ice",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(116, 167, 253),
 		},
 	),
 	(
-		"minecraft:blue_orchid",
+		"blue_orchid",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:blue_shulker_box",
+		"blue_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(43, 45, 140),
 		},
 	),
 	(
-		"minecraft:blue_stained_glass",
+		"blue_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(51, 76, 178),
 		},
 	),
 	(
-		"minecraft:blue_stained_glass_pane",
+		"blue_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(48, 73, 171),
 		},
 	),
 	(
-		"minecraft:blue_terracotta",
+		"blue_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(74, 59, 91),
 		},
 	),
 	(
-		"minecraft:blue_wall_banner",
+		"blue_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:blue_wool",
+		"blue_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(53, 57, 157),
 		},
 	),
 	(
-		"minecraft:bone_block",
+		"bone_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(209, 206, 179),
 		},
 	),
 	(
-		"minecraft:bookshelf",
+		"bookshelf",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(162, 130, 78),
 		},
 	),
 	(
-		"minecraft:brain_coral",
+		"brain_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:brain_coral_block",
+		"brain_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(207, 91, 159),
 		},
 	),
 	(
-		"minecraft:brain_coral_fan",
+		"brain_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:brain_coral_wall_fan",
+		"brain_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:brewing_stand",
+		"brewing_stand",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(122, 100, 80),
 		},
 	),
 	(
-		"minecraft:brick_slab",
+		"brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(150, 97, 83),
 		},
 	),
 	(
-		"minecraft:brick_stairs",
+		"brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(150, 97, 83),
 		},
 	),
 	(
-		"minecraft:brick_wall",
+		"brick_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(150, 97, 83),
 		},
 	),
 	(
-		"minecraft:bricks",
+		"bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(150, 97, 83),
 		},
 	),
 	(
-		"minecraft:brown_banner",
+		"brown_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:brown_bed",
+		"brown_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:brown_candle",
+		"brown_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:brown_candle_cake",
+		"brown_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
-		"minecraft:brown_carpet",
+		"brown_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(114, 71, 40),
 		},
 	),
 	(
-		"minecraft:brown_concrete",
+		"brown_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(96, 59, 31),
 		},
 	),
 	(
-		"minecraft:brown_concrete_powder",
+		"brown_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(125, 84, 53),
 		},
 	),
 	(
-		"minecraft:brown_glazed_terracotta",
+		"brown_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(119, 106, 85),
 		},
 	),
 	(
-		"minecraft:brown_mushroom",
+		"brown_mushroom",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:brown_mushroom_block",
+		"brown_mushroom_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(149, 111, 81),
 		},
 	),
 	(
-		"minecraft:brown_shulker_box",
+		"brown_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(106, 66, 35),
 		},
 	),
 	(
-		"minecraft:brown_stained_glass",
+		"brown_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(102, 76, 51),
 		},
 	),
 	(
-		"minecraft:brown_stained_glass_pane",
+		"brown_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(97, 73, 48),
 		},
 	),
 	(
-		"minecraft:brown_terracotta",
+		"brown_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(77, 51, 35),
 		},
 	),
 	(
-		"minecraft:brown_wall_banner",
+		"brown_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:brown_wool",
+		"brown_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(114, 71, 40),
 		},
 	),
 	(
-		"minecraft:bubble_column",
+		"bubble_column",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Water}),
 			color: BlockColor(177, 177, 177),
 		},
 	),
 	(
-		"minecraft:bubble_coral",
+		"bubble_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:bubble_coral_block",
+		"bubble_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(165, 26, 162),
 		},
 	),
 	(
-		"minecraft:bubble_coral_fan",
+		"bubble_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:bubble_coral_wall_fan",
+		"bubble_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:budding_amethyst",
+		"budding_amethyst",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(132, 96, 186),
 		},
 	),
 	(
-		"minecraft:cactus",
+		"cactus",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(85, 127, 43),
 		},
 	),
 	(
-		"minecraft:cake",
+		"cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
-		"minecraft:calcite",
+		"calcite",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(223, 224, 220),
 		},
 	),
 	(
-		"minecraft:campfire",
+		"campfire",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(110, 88, 54),
 		},
 	),
 	(
-		"minecraft:candle",
+		"candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:candle_cake",
+		"candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
-		"minecraft:carrots",
+		"carrots",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(81, 124, 37),
 		},
 	),
 	(
-		"minecraft:cartography_table",
+		"cartography_table",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(103, 87, 67),
 		},
 	),
 	(
-		"minecraft:carved_pumpkin",
+		"carved_pumpkin",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(198, 118, 24),
 		},
 	),
 	(
-		"minecraft:cauldron",
+		"cauldron",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(73, 72, 74),
 		},
 	),
 	(
-		"minecraft:cave_air",
+		"cave_air",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:cave_vines",
+		"cave_vines",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(90, 109, 40),
 		},
 	),
 	(
-		"minecraft:cave_vines_plant",
+		"cave_vines_plant",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(88, 101, 38),
 		},
 	),
 	(
-		"minecraft:chain",
+		"chain",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:chain_command_block",
+		"chain_command_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(131, 161, 147),
 		},
 	),
 	(
-		"minecraft:chest",
+		"chest",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(162, 130, 78),
 		},
 	),
 	(
-		"minecraft:chipped_anvil",
+		"chipped_anvil",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(72, 72, 72),
 		},
 	),
 	(
-		"minecraft:chiseled_deepslate",
+		"chiseled_deepslate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(54, 54, 54),
 		},
 	),
 	(
-		"minecraft:chiseled_nether_bricks",
+		"chiseled_nether_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(47, 23, 28),
 		},
 	),
 	(
-		"minecraft:chiseled_polished_blackstone",
+		"chiseled_polished_blackstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(53, 48, 56),
 		},
 	),
 	(
-		"minecraft:chiseled_quartz_block",
+		"chiseled_quartz_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(231, 226, 218),
 		},
 	),
 	(
-		"minecraft:chiseled_red_sandstone",
+		"chiseled_red_sandstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(181, 97, 31),
 		},
 	),
 	(
-		"minecraft:chiseled_sandstone",
+		"chiseled_sandstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(223, 214, 170),
 		},
 	),
 	(
-		"minecraft:chiseled_stone_bricks",
+		"chiseled_stone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(119, 118, 119),
 		},
 	),
 	(
-		"minecraft:chorus_flower",
+		"chorus_flower",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(151, 120, 151),
 		},
 	),
 	(
-		"minecraft:chorus_plant",
+		"chorus_plant",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(93, 57, 93),
 		},
 	),
 	(
-		"minecraft:clay",
+		"clay",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(160, 166, 179),
 		},
 	),
 	(
-		"minecraft:coal_block",
+		"coal_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(16, 15, 15),
 		},
 	),
 	(
-		"minecraft:coal_ore",
+		"coal_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(105, 105, 105),
 		},
 	),
 	(
-		"minecraft:coarse_dirt",
+		"coarse_dirt",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(119, 85, 59),
 		},
 	),
 	(
-		"minecraft:cobbled_deepslate",
+		"cobbled_deepslate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(77, 77, 80),
 		},
 	),
 	(
-		"minecraft:cobbled_deepslate_slab",
+		"cobbled_deepslate_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(77, 77, 80),
 		},
 	),
 	(
-		"minecraft:cobbled_deepslate_stairs",
+		"cobbled_deepslate_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(77, 77, 80),
 		},
 	),
 	(
-		"minecraft:cobbled_deepslate_wall",
+		"cobbled_deepslate_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(77, 77, 80),
 		},
 	),
 	(
-		"minecraft:cobblestone",
+		"cobblestone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(127, 127, 127),
 		},
 	),
 	(
-		"minecraft:cobblestone_slab",
+		"cobblestone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(127, 127, 127),
 		},
 	),
 	(
-		"minecraft:cobblestone_stairs",
+		"cobblestone_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(127, 127, 127),
 		},
 	),
 	(
-		"minecraft:cobblestone_wall",
+		"cobblestone_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(127, 127, 127),
 		},
 	),
 	(
-		"minecraft:cobweb",
+		"cobweb",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(228, 233, 234),
 		},
 	),
 	(
-		"minecraft:cocoa",
+		"cocoa",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(154, 91, 40),
 		},
 	),
 	(
-		"minecraft:command_block",
+		"command_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(181, 136, 108),
 		},
 	),
 	(
-		"minecraft:comparator",
+		"comparator",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(166, 161, 159),
 		},
 	),
 	(
-		"minecraft:composter",
+		"composter",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(88, 61, 23),
 		},
 	),
 	(
-		"minecraft:conduit",
+		"conduit",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(159, 139, 113),
 		},
 	),
 	(
-		"minecraft:copper_block",
+		"copper_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(192, 107, 79),
 		},
 	),
 	(
-		"minecraft:copper_ore",
+		"copper_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(124, 125, 120),
 		},
 	),
 	(
-		"minecraft:cornflower",
+		"cornflower",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:cracked_deepslate_bricks",
+		"cracked_deepslate_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(64, 64, 65),
 		},
 	),
 	(
-		"minecraft:cracked_deepslate_tiles",
+		"cracked_deepslate_tiles",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(52, 52, 52),
 		},
 	),
 	(
-		"minecraft:cracked_nether_bricks",
+		"cracked_nether_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(40, 20, 23),
 		},
 	),
 	(
-		"minecraft:cracked_polished_blackstone_bricks",
+		"cracked_polished_blackstone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(44, 37, 43),
 		},
 	),
 	(
-		"minecraft:cracked_stone_bricks",
+		"cracked_stone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(118, 117, 118),
 		},
 	),
 	(
-		"minecraft:crafting_table",
+		"crafting_table",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(119, 73, 42),
 		},
 	),
 	(
-		"minecraft:creeper_head",
+		"creeper_head",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:creeper_wall_head",
+		"creeper_wall_head",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:crimson_button",
+		"crimson_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:crimson_door",
+		"crimson_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(114, 54, 79),
 		},
 	),
 	(
-		"minecraft:crimson_fence",
+		"crimson_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(101, 48, 70),
 		},
 	),
 	(
-		"minecraft:crimson_fence_gate",
+		"crimson_fence_gate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(101, 48, 70),
 		},
 	),
 	(
-		"minecraft:crimson_fungus",
+		"crimson_fungus",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:crimson_hyphae",
+		"crimson_hyphae",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(92, 25, 29),
 		},
 	),
 	(
-		"minecraft:crimson_nylium",
+		"crimson_nylium",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(130, 31, 31),
 		},
 	),
 	(
-		"minecraft:crimson_planks",
+		"crimson_planks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(101, 48, 70),
 		},
 	),
 	(
-		"minecraft:crimson_pressure_plate",
+		"crimson_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(101, 48, 70),
 		},
 	),
 	(
-		"minecraft:crimson_roots",
+		"crimson_roots",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(126, 8, 41),
 		},
 	),
 	(
-		"minecraft:crimson_sign",
+		"crimson_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(101, 48, 70),
 		},
 	),
 	(
-		"minecraft:crimson_slab",
+		"crimson_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(101, 48, 70),
 		},
 	),
 	(
-		"minecraft:crimson_stairs",
+		"crimson_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(101, 48, 70),
 		},
 	),
 	(
-		"minecraft:crimson_stem",
+		"crimson_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(112, 49, 70),
 		},
 	),
 	(
-		"minecraft:crimson_trapdoor",
+		"crimson_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(103, 50, 72),
 		},
 	),
 	(
-		"minecraft:crimson_wall_sign",
+		"crimson_wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:crying_obsidian",
+		"crying_obsidian",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(32, 10, 60),
 		},
 	),
 	(
-		"minecraft:cut_copper",
+		"cut_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(191, 106, 80),
 		},
 	),
 	(
-		"minecraft:cut_copper_slab",
+		"cut_copper_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(191, 106, 80),
 		},
 	),
 	(
-		"minecraft:cut_copper_stairs",
+		"cut_copper_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(191, 106, 80),
 		},
 	),
 	(
-		"minecraft:cut_red_sandstone",
+		"cut_red_sandstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(181, 97, 31),
 		},
 	),
 	(
-		"minecraft:cut_red_sandstone_slab",
+		"cut_red_sandstone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(181, 97, 31),
 		},
 	),
 	(
-		"minecraft:cut_sandstone",
+		"cut_sandstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(223, 214, 170),
 		},
 	),
 	(
-		"minecraft:cut_sandstone_slab",
+		"cut_sandstone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(223, 214, 170),
 		},
 	),
 	(
-		"minecraft:cyan_banner",
+		"cyan_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:cyan_bed",
+		"cyan_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:cyan_candle",
+		"cyan_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:cyan_candle_cake",
+		"cyan_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
-		"minecraft:cyan_carpet",
+		"cyan_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(21, 137, 145),
 		},
 	),
 	(
-		"minecraft:cyan_concrete",
+		"cyan_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(21, 119, 136),
 		},
 	),
 	(
-		"minecraft:cyan_concrete_powder",
+		"cyan_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(36, 147, 157),
 		},
 	),
 	(
-		"minecraft:cyan_glazed_terracotta",
+		"cyan_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(52, 118, 125),
 		},
 	),
 	(
-		"minecraft:cyan_shulker_box",
+		"cyan_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(20, 121, 135),
 		},
 	),
 	(
-		"minecraft:cyan_stained_glass",
+		"cyan_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(76, 127, 153),
 		},
 	),
 	(
-		"minecraft:cyan_stained_glass_pane",
+		"cyan_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(73, 122, 147),
 		},
 	),
 	(
-		"minecraft:cyan_terracotta",
+		"cyan_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(86, 91, 91),
 		},
 	),
 	(
-		"minecraft:cyan_wall_banner",
+		"cyan_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:cyan_wool",
+		"cyan_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(21, 137, 145),
 		},
 	),
 	(
-		"minecraft:damaged_anvil",
+		"damaged_anvil",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(72, 72, 72),
 		},
 	),
 	(
-		"minecraft:dandelion",
+		"dandelion",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:dark_oak_button",
+		"dark_oak_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:dark_oak_door",
+		"dark_oak_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(76, 51, 25),
 		},
 	),
 	(
-		"minecraft:dark_oak_fence",
+		"dark_oak_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(66, 43, 20),
 		},
 	),
 	(
-		"minecraft:dark_oak_fence_gate",
+		"dark_oak_fence_gate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(66, 43, 20),
 		},
 	),
 	(
-		"minecraft:dark_oak_leaves",
+		"dark_oak_leaves",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
 			color: BlockColor(150, 150, 150),
 		},
 	),
 	(
-		"minecraft:dark_oak_log",
+		"dark_oak_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(67, 45, 22),
 		},
 	),
 	(
-		"minecraft:dark_oak_planks",
+		"dark_oak_planks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(66, 43, 20),
 		},
 	),
 	(
-		"minecraft:dark_oak_pressure_plate",
+		"dark_oak_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(66, 43, 20),
 		},
 	),
 	(
-		"minecraft:dark_oak_sapling",
+		"dark_oak_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(61, 90, 30),
 		},
 	),
 	(
-		"minecraft:dark_oak_sign",
+		"dark_oak_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(66, 43, 20),
 		},
 	),
 	(
-		"minecraft:dark_oak_slab",
+		"dark_oak_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(66, 43, 20),
 		},
 	),
 	(
-		"minecraft:dark_oak_stairs",
+		"dark_oak_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(66, 43, 20),
 		},
 	),
 	(
-		"minecraft:dark_oak_trapdoor",
+		"dark_oak_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(75, 49, 23),
 		},
 	),
 	(
-		"minecraft:dark_oak_wall_sign",
+		"dark_oak_wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:dark_oak_wood",
+		"dark_oak_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(60, 46, 26),
 		},
 	),
 	(
-		"minecraft:dark_prismarine",
+		"dark_prismarine",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(51, 91, 75),
 		},
 	),
 	(
-		"minecraft:dark_prismarine_slab",
+		"dark_prismarine_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(51, 91, 75),
 		},
 	),
 	(
-		"minecraft:dark_prismarine_stairs",
+		"dark_prismarine_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(51, 91, 75),
 		},
 	),
 	(
-		"minecraft:daylight_detector",
+		"daylight_detector",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(130, 116, 94),
 		},
 	),
 	(
-		"minecraft:dead_brain_coral",
+		"dead_brain_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:dead_brain_coral_block",
+		"dead_brain_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(124, 117, 114),
 		},
 	),
 	(
-		"minecraft:dead_brain_coral_fan",
+		"dead_brain_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:dead_brain_coral_wall_fan",
+		"dead_brain_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:dead_bubble_coral",
+		"dead_bubble_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:dead_bubble_coral_block",
+		"dead_bubble_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(131, 123, 119),
 		},
 	),
 	(
-		"minecraft:dead_bubble_coral_fan",
+		"dead_bubble_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:dead_bubble_coral_wall_fan",
+		"dead_bubble_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:dead_bush",
+		"dead_bush",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(107, 78, 40),
 		},
 	),
 	(
-		"minecraft:dead_fire_coral",
+		"dead_fire_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:dead_fire_coral_block",
+		"dead_fire_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(131, 123, 119),
 		},
 	),
 	(
-		"minecraft:dead_fire_coral_fan",
+		"dead_fire_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:dead_fire_coral_wall_fan",
+		"dead_fire_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:dead_horn_coral",
+		"dead_horn_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:dead_horn_coral_block",
+		"dead_horn_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(133, 126, 122),
 		},
 	),
 	(
-		"minecraft:dead_horn_coral_fan",
+		"dead_horn_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:dead_horn_coral_wall_fan",
+		"dead_horn_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:dead_tube_coral",
+		"dead_tube_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:dead_tube_coral_block",
+		"dead_tube_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(130, 123, 119),
 		},
 	),
 	(
-		"minecraft:dead_tube_coral_fan",
+		"dead_tube_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:dead_tube_coral_wall_fan",
+		"dead_tube_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:deepslate",
+		"deepslate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(80, 80, 82),
 		},
 	),
 	(
-		"minecraft:deepslate_brick_slab",
+		"deepslate_brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(70, 70, 71),
 		},
 	),
 	(
-		"minecraft:deepslate_brick_stairs",
+		"deepslate_brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(70, 70, 71),
 		},
 	),
 	(
-		"minecraft:deepslate_brick_wall",
+		"deepslate_brick_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(70, 70, 71),
 		},
 	),
 	(
-		"minecraft:deepslate_bricks",
+		"deepslate_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(70, 70, 71),
 		},
 	),
 	(
-		"minecraft:deepslate_coal_ore",
+		"deepslate_coal_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(74, 74, 76),
 		},
 	),
 	(
-		"minecraft:deepslate_copper_ore",
+		"deepslate_copper_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(92, 93, 89),
 		},
 	),
 	(
-		"minecraft:deepslate_diamond_ore",
+		"deepslate_diamond_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(83, 106, 106),
 		},
 	),
 	(
-		"minecraft:deepslate_emerald_ore",
+		"deepslate_emerald_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(78, 104, 87),
 		},
 	),
 	(
-		"minecraft:deepslate_gold_ore",
+		"deepslate_gold_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(115, 102, 78),
 		},
 	),
 	(
-		"minecraft:deepslate_iron_ore",
+		"deepslate_iron_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(106, 99, 94),
 		},
 	),
 	(
-		"minecraft:deepslate_lapis_ore",
+		"deepslate_lapis_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(79, 90, 115),
 		},
 	),
 	(
-		"minecraft:deepslate_redstone_ore",
+		"deepslate_redstone_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(104, 73, 74),
 		},
 	),
 	(
-		"minecraft:deepslate_tile_slab",
+		"deepslate_tile_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(54, 54, 55),
 		},
 	),
 	(
-		"minecraft:deepslate_tile_stairs",
+		"deepslate_tile_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(54, 54, 55),
 		},
 	),
 	(
-		"minecraft:deepslate_tile_wall",
+		"deepslate_tile_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(54, 54, 55),
 		},
 	),
 	(
-		"minecraft:deepslate_tiles",
+		"deepslate_tiles",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(54, 54, 55),
 		},
 	),
 	(
-		"minecraft:detector_rail",
+		"detector_rail",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(123, 104, 90),
 		},
 	),
 	(
-		"minecraft:diamond_block",
+		"diamond_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(98, 237, 228),
 		},
 	),
 	(
-		"minecraft:diamond_ore",
+		"diamond_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(121, 141, 140),
 		},
 	),
 	(
-		"minecraft:diorite",
+		"diorite",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(188, 188, 188),
 		},
 	),
 	(
-		"minecraft:diorite_slab",
+		"diorite_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(188, 188, 188),
 		},
 	),
 	(
-		"minecraft:diorite_stairs",
+		"diorite_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(188, 188, 188),
 		},
 	),
 	(
-		"minecraft:diorite_wall",
+		"diorite_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(188, 188, 188),
 		},
 	),
 	(
-		"minecraft:dirt",
+		"dirt",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(134, 96, 67),
 		},
 	),
 	(
-		"minecraft:dirt_path",
+		"dirt_path",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(148, 121, 65),
 		},
 	),
 	(
-		"minecraft:dispenser",
+		"dispenser",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(110, 109, 109),
 		},
 	),
 	(
-		"minecraft:dragon_egg",
+		"dragon_egg",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(12, 9, 15),
 		},
 	),
 	(
-		"minecraft:dragon_head",
+		"dragon_head",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:dragon_wall_head",
+		"dragon_wall_head",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:dried_kelp_block",
+		"dried_kelp_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(50, 58, 38),
 		},
 	),
 	(
-		"minecraft:dripstone_block",
+		"dripstone_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(134, 107, 92),
 		},
 	),
 	(
-		"minecraft:dropper",
+		"dropper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(110, 109, 109),
 		},
 	),
 	(
-		"minecraft:emerald_block",
+		"emerald_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(42, 203, 87),
 		},
 	),
 	(
-		"minecraft:emerald_ore",
+		"emerald_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(108, 136, 115),
 		},
 	),
 	(
-		"minecraft:enchanting_table",
+		"enchanting_table",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(128, 75, 85),
 		},
 	),
 	(
-		"minecraft:end_gateway",
+		"end_gateway",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(15, 10, 24),
 		},
 	),
 	(
-		"minecraft:end_portal",
+		"end_portal",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(15, 10, 24),
 		},
 	),
 	(
-		"minecraft:end_portal_frame",
+		"end_portal_frame",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(91, 120, 97),
 		},
 	),
 	(
-		"minecraft:end_rod",
+		"end_rod",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:end_stone",
+		"end_stone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(219, 222, 158),
 		},
 	),
 	(
-		"minecraft:end_stone_brick_slab",
+		"end_stone_brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(218, 224, 162),
 		},
 	),
 	(
-		"minecraft:end_stone_brick_stairs",
+		"end_stone_brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(218, 224, 162),
 		},
 	),
 	(
-		"minecraft:end_stone_brick_wall",
+		"end_stone_brick_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(218, 224, 162),
 		},
 	),
 	(
-		"minecraft:end_stone_bricks",
+		"end_stone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(218, 224, 162),
 		},
 	),
 	(
-		"minecraft:ender_chest",
+		"ender_chest",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(15, 10, 24),
 		},
 	),
 	(
-		"minecraft:exposed_copper",
+		"exposed_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(161, 125, 103),
 		},
 	),
 	(
-		"minecraft:exposed_cut_copper",
+		"exposed_cut_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(154, 121, 101),
 		},
 	),
 	(
-		"minecraft:exposed_cut_copper_slab",
+		"exposed_cut_copper_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(154, 121, 101),
 		},
 	),
 	(
-		"minecraft:exposed_cut_copper_stairs",
+		"exposed_cut_copper_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(154, 121, 101),
 		},
 	),
 	(
-		"minecraft:farmland",
+		"farmland",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(81, 44, 15),
 		},
 	),
 	(
-		"minecraft:fern",
+		"fern",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:fire",
+		"fire",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(211, 140, 53),
 		},
 	),
 	(
-		"minecraft:fire_coral",
+		"fire_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:fire_coral_block",
+		"fire_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(163, 35, 46),
 		},
 	),
 	(
-		"minecraft:fire_coral_fan",
+		"fire_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:fire_coral_wall_fan",
+		"fire_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:fletching_table",
+		"fletching_table",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(197, 180, 133),
 		},
 	),
 	(
-		"minecraft:flower_pot",
+		"flower_pot",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(124, 68, 53),
 		},
 	),
 	(
-		"minecraft:flowering_azalea",
+		"flowering_azalea",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(112, 121, 64),
 		},
 	),
 	(
-		"minecraft:flowering_azalea_leaves",
+		"flowering_azalea_leaves",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(99, 111, 60),
 		},
 	),
 	(
-		"minecraft:frogspawn",
+		"frogspawn",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(105, 90, 82),
 		},
 	),
 	(
-		"minecraft:frosted_ice",
+		"frosted_ice",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(140, 181, 252),
 		},
 	),
 	(
-		"minecraft:furnace",
+		"furnace",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(110, 109, 109),
 		},
 	),
 	(
-		"minecraft:gilded_blackstone",
+		"gilded_blackstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(55, 42, 38),
 		},
 	),
 	(
-		"minecraft:glass",
+		"glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(175, 213, 219),
 		},
 	),
 	(
-		"minecraft:glass_pane",
+		"glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(170, 210, 217),
 		},
 	),
 	(
-		"minecraft:glow_item_frame",
+		"glow_item_frame",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:glow_lichen",
+		"glow_lichen",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:glowstone",
+		"glowstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(171, 131, 84),
 		},
 	),
 	(
-		"minecraft:gold_block",
+		"gold_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(246, 208, 61),
 		},
 	),
 	(
-		"minecraft:gold_ore",
+		"gold_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(145, 133, 106),
 		},
 	),
 	(
-		"minecraft:granite",
+		"granite",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(149, 103, 85),
 		},
 	),
 	(
-		"minecraft:granite_slab",
+		"granite_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(149, 103, 85),
 		},
 	),
 	(
-		"minecraft:granite_stairs",
+		"granite_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(149, 103, 85),
 		},
 	),
 	(
-		"minecraft:granite_wall",
+		"granite_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(149, 103, 85),
 		},
 	),
 	(
-		"minecraft:grass",
+		"grass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:grass_block",
+		"grass_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 			color: BlockColor(147, 147, 147),
 		},
 	),
 	(
-		"minecraft:grass_path",
+		"grass_path",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(148, 121, 65),
 		},
 	),
 	(
-		"minecraft:gravel",
+		"gravel",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(131, 127, 126),
 		},
 	),
 	(
-		"minecraft:gray_banner",
+		"gray_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:gray_bed",
+		"gray_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:gray_candle",
+		"gray_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:gray_candle_cake",
+		"gray_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
-		"minecraft:gray_carpet",
+		"gray_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(62, 68, 71),
 		},
 	),
 	(
-		"minecraft:gray_concrete",
+		"gray_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(54, 57, 61),
 		},
 	),
 	(
-		"minecraft:gray_concrete_powder",
+		"gray_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(76, 81, 84),
 		},
 	),
 	(
-		"minecraft:gray_glazed_terracotta",
+		"gray_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(83, 90, 93),
 		},
 	),
 	(
-		"minecraft:gray_shulker_box",
+		"gray_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(55, 58, 62),
 		},
 	),
 	(
-		"minecraft:gray_stained_glass",
+		"gray_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(76, 76, 76),
 		},
 	),
 	(
-		"minecraft:gray_stained_glass_pane",
+		"gray_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(73, 73, 73),
 		},
 	),
 	(
-		"minecraft:gray_terracotta",
+		"gray_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(57, 42, 35),
 		},
 	),
 	(
-		"minecraft:gray_wall_banner",
+		"gray_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:gray_wool",
+		"gray_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(62, 68, 71),
 		},
 	),
 	(
-		"minecraft:green_banner",
+		"green_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:green_bed",
+		"green_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:green_candle",
+		"green_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:green_candle_cake",
+		"green_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
-		"minecraft:green_carpet",
+		"green_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(84, 109, 27),
 		},
 	),
 	(
-		"minecraft:green_concrete",
+		"green_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(73, 91, 36),
 		},
 	),
 	(
-		"minecraft:green_concrete_powder",
+		"green_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(97, 119, 44),
 		},
 	),
 	(
-		"minecraft:green_glazed_terracotta",
+		"green_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(117, 142, 67),
 		},
 	),
 	(
-		"minecraft:green_shulker_box",
+		"green_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(79, 100, 31),
 		},
 	),
 	(
-		"minecraft:green_stained_glass",
+		"green_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(102, 127, 51),
 		},
 	),
 	(
-		"minecraft:green_stained_glass_pane",
+		"green_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(97, 122, 48),
 		},
 	),
 	(
-		"minecraft:green_terracotta",
+		"green_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(76, 83, 42),
 		},
 	),
 	(
-		"minecraft:green_wall_banner",
+		"green_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:green_wool",
+		"green_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(84, 109, 27),
 		},
 	),
 	(
-		"minecraft:grindstone",
+		"grindstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(142, 142, 142),
 		},
 	),
 	(
-		"minecraft:hanging_roots",
+		"hanging_roots",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(161, 115, 91),
 		},
 	),
 	(
-		"minecraft:hay_block",
+		"hay_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(165, 139, 12),
 		},
 	),
 	(
-		"minecraft:heavy_weighted_pressure_plate",
+		"heavy_weighted_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(220, 220, 220),
 		},
 	),
 	(
-		"minecraft:honey_block",
+		"honey_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(251, 185, 52),
 		},
 	),
 	(
-		"minecraft:honeycomb_block",
+		"honeycomb_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(229, 148, 29),
 		},
 	),
 	(
-		"minecraft:hopper",
+		"hopper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(75, 74, 75),
 		},
 	),
 	(
-		"minecraft:horn_coral",
+		"horn_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:horn_coral_block",
+		"horn_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(216, 199, 66),
 		},
 	),
 	(
-		"minecraft:horn_coral_fan",
+		"horn_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:horn_coral_wall_fan",
+		"horn_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:ice",
+		"ice",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(145, 183, 253),
 		},
 	),
 	(
-		"minecraft:infested_chiseled_stone_bricks",
+		"infested_chiseled_stone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(119, 118, 119),
 		},
 	),
 	(
-		"minecraft:infested_cobblestone",
+		"infested_cobblestone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(127, 127, 127),
 		},
 	),
 	(
-		"minecraft:infested_cracked_stone_bricks",
+		"infested_cracked_stone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(118, 117, 118),
 		},
 	),
 	(
-		"minecraft:infested_deepslate",
+		"infested_deepslate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(80, 80, 82),
 		},
 	),
 	(
-		"minecraft:infested_mossy_stone_bricks",
+		"infested_mossy_stone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(115, 121, 105),
 		},
 	),
 	(
-		"minecraft:infested_stone",
+		"infested_stone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(125, 125, 125),
 		},
 	),
 	(
-		"minecraft:infested_stone_bricks",
+		"infested_stone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(122, 121, 122),
 		},
 	),
 	(
-		"minecraft:iron_bars",
+		"iron_bars",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(136, 139, 135),
 		},
 	),
 	(
-		"minecraft:iron_block",
+		"iron_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(220, 220, 220),
 		},
 	),
 	(
-		"minecraft:iron_door",
+		"iron_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(194, 193, 193),
 		},
 	),
 	(
-		"minecraft:iron_ore",
+		"iron_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(136, 129, 122),
 		},
 	),
 	(
-		"minecraft:iron_trapdoor",
+		"iron_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(202, 202, 202),
 		},
 	),
 	(
-		"minecraft:item_frame",
+		"item_frame",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:jack_o_lantern",
+		"jack_o_lantern",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(214, 152, 52),
 		},
 	),
 	(
-		"minecraft:jigsaw",
+		"jigsaw",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(80, 69, 81),
 		},
 	),
 	(
-		"minecraft:jukebox",
+		"jukebox",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(93, 64, 47),
 		},
 	),
 	(
-		"minecraft:jungle_button",
+		"jungle_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:jungle_door",
+		"jungle_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(163, 119, 84),
 		},
 	),
 	(
-		"minecraft:jungle_fence",
+		"jungle_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(160, 115, 80),
 		},
 	),
 	(
-		"minecraft:jungle_fence_gate",
+		"jungle_fence_gate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(160, 115, 80),
 		},
 	),
 	(
-		"minecraft:jungle_leaves",
+		"jungle_leaves",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
 			color: BlockColor(156, 154, 143),
 		},
 	),
 	(
-		"minecraft:jungle_log",
+		"jungle_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(149, 109, 70),
 		},
 	),
 	(
-		"minecraft:jungle_planks",
+		"jungle_planks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(160, 115, 80),
 		},
 	),
 	(
-		"minecraft:jungle_pressure_plate",
+		"jungle_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(160, 115, 80),
 		},
 	),
 	(
-		"minecraft:jungle_sapling",
+		"jungle_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(47, 81, 16),
 		},
 	),
 	(
-		"minecraft:jungle_sign",
+		"jungle_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(160, 115, 80),
 		},
 	),
 	(
-		"minecraft:jungle_slab",
+		"jungle_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(160, 115, 80),
 		},
 	),
 	(
-		"minecraft:jungle_stairs",
+		"jungle_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(160, 115, 80),
 		},
 	),
 	(
-		"minecraft:jungle_trapdoor",
+		"jungle_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(152, 110, 77),
 		},
 	),
 	(
-		"minecraft:jungle_wall_sign",
+		"jungle_wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:jungle_wood",
+		"jungle_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(85, 67, 25),
 		},
 	),
 	(
-		"minecraft:kelp",
+		"kelp",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:kelp_plant",
+		"kelp_plant",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(86, 130, 42),
 		},
 	),
 	(
-		"minecraft:ladder",
+		"ladder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:lantern",
+		"lantern",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(106, 91, 83),
 		},
 	),
 	(
-		"minecraft:lapis_block",
+		"lapis_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(30, 67, 140),
 		},
 	),
 	(
-		"minecraft:lapis_ore",
+		"lapis_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(107, 117, 141),
 		},
 	),
 	(
-		"minecraft:large_amethyst_bud",
+		"large_amethyst_bud",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:large_fern",
+		"large_fern",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 			color: BlockColor(125, 125, 125),
 		},
 	),
 	(
-		"minecraft:lava",
+		"lava",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(212, 90, 18),
 		},
 	),
 	(
-		"minecraft:lava_cauldron",
+		"lava_cauldron",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(73, 72, 74),
 		},
 	),
 	(
-		"minecraft:lectern",
+		"lectern",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(173, 137, 83),
 		},
 	),
 	(
-		"minecraft:lever",
+		"lever",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:light",
+		"light",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:light_blue_banner",
+		"light_blue_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:light_blue_bed",
+		"light_blue_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:light_blue_candle",
+		"light_blue_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:light_blue_candle_cake",
+		"light_blue_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
-		"minecraft:light_blue_carpet",
+		"light_blue_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(58, 175, 217),
 		},
 	),
 	(
-		"minecraft:light_blue_concrete",
+		"light_blue_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(35, 137, 198),
 		},
 	),
 	(
-		"minecraft:light_blue_concrete_powder",
+		"light_blue_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(74, 180, 213),
 		},
 	),
 	(
-		"minecraft:light_blue_glazed_terracotta",
+		"light_blue_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(94, 164, 208),
 		},
 	),
 	(
-		"minecraft:light_blue_shulker_box",
+		"light_blue_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(49, 163, 212),
 		},
 	),
 	(
-		"minecraft:light_blue_stained_glass",
+		"light_blue_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(102, 153, 216),
 		},
 	),
 	(
-		"minecraft:light_blue_stained_glass_pane",
+		"light_blue_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(97, 147, 208),
 		},
 	),
 	(
-		"minecraft:light_blue_terracotta",
+		"light_blue_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(113, 108, 137),
 		},
 	),
 	(
-		"minecraft:light_blue_wall_banner",
+		"light_blue_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:light_blue_wool",
+		"light_blue_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(58, 175, 217),
 		},
 	),
 	(
-		"minecraft:light_gray_banner",
+		"light_gray_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:light_gray_bed",
+		"light_gray_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:light_gray_candle",
+		"light_gray_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:light_gray_candle_cake",
+		"light_gray_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
-		"minecraft:light_gray_carpet",
+		"light_gray_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(142, 142, 134),
 		},
 	),
 	(
-		"minecraft:light_gray_concrete",
+		"light_gray_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(125, 125, 115),
 		},
 	),
 	(
-		"minecraft:light_gray_concrete_powder",
+		"light_gray_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(154, 154, 148),
 		},
 	),
 	(
-		"minecraft:light_gray_glazed_terracotta",
+		"light_gray_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(144, 166, 167),
 		},
 	),
 	(
-		"minecraft:light_gray_shulker_box",
+		"light_gray_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(124, 124, 115),
 		},
 	),
 	(
-		"minecraft:light_gray_stained_glass",
+		"light_gray_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(153, 153, 153),
 		},
 	),
 	(
-		"minecraft:light_gray_stained_glass_pane",
+		"light_gray_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(147, 147, 147),
 		},
 	),
 	(
-		"minecraft:light_gray_terracotta",
+		"light_gray_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(135, 106, 97),
 		},
 	),
 	(
-		"minecraft:light_gray_wall_banner",
+		"light_gray_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:light_gray_wool",
+		"light_gray_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(142, 142, 134),
 		},
 	),
 	(
-		"minecraft:light_weighted_pressure_plate",
+		"light_weighted_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(246, 208, 61),
 		},
 	),
 	(
-		"minecraft:lightning_rod",
+		"lightning_rod",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:lilac",
+		"lilac",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(154, 125, 147),
 		},
 	),
 	(
-		"minecraft:lily_of_the_valley",
+		"lily_of_the_valley",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:lily_pad",
+		"lily_pad",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 			color: BlockColor(133, 133, 133),
 		},
 	),
 	(
-		"minecraft:lime_banner",
+		"lime_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:lime_bed",
+		"lime_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:lime_candle",
+		"lime_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:lime_candle_cake",
+		"lime_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
-		"minecraft:lime_carpet",
+		"lime_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(112, 185, 25),
 		},
 	),
 	(
-		"minecraft:lime_concrete",
+		"lime_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(94, 168, 24),
 		},
 	),
 	(
-		"minecraft:lime_concrete_powder",
+		"lime_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(125, 189, 41),
 		},
 	),
 	(
-		"minecraft:lime_glazed_terracotta",
+		"lime_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(162, 197, 55),
 		},
 	),
 	(
-		"minecraft:lime_shulker_box",
+		"lime_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(99, 172, 23),
 		},
 	),
 	(
-		"minecraft:lime_stained_glass",
+		"lime_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(127, 204, 25),
 		},
 	),
 	(
-		"minecraft:lime_stained_glass_pane",
+		"lime_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(122, 196, 24),
 		},
 	),
 	(
-		"minecraft:lime_terracotta",
+		"lime_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(103, 117, 52),
 		},
 	),
 	(
-		"minecraft:lime_wall_banner",
+		"lime_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:lime_wool",
+		"lime_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(112, 185, 25),
 		},
 	),
 	(
-		"minecraft:lodestone",
+		"lodestone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(147, 149, 152),
 		},
 	),
 	(
-		"minecraft:loom",
+		"loom",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(142, 119, 91),
 		},
 	),
 	(
-		"minecraft:magenta_banner",
+		"magenta_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:magenta_bed",
+		"magenta_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:magenta_candle",
+		"magenta_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:magenta_candle_cake",
+		"magenta_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
-		"minecraft:magenta_carpet",
+		"magenta_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(189, 68, 179),
 		},
 	),
 	(
-		"minecraft:magenta_concrete",
+		"magenta_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(169, 48, 159),
 		},
 	),
 	(
-		"minecraft:magenta_concrete_powder",
+		"magenta_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(192, 83, 184),
 		},
 	),
 	(
-		"minecraft:magenta_glazed_terracotta",
+		"magenta_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(208, 100, 191),
 		},
 	),
 	(
-		"minecraft:magenta_shulker_box",
+		"magenta_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(173, 54, 163),
 		},
 	),
 	(
-		"minecraft:magenta_stained_glass",
+		"magenta_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(178, 76, 216),
 		},
 	),
 	(
-		"minecraft:magenta_stained_glass_pane",
+		"magenta_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(171, 73, 208),
 		},
 	),
 	(
-		"minecraft:magenta_terracotta",
+		"magenta_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(149, 88, 108),
 		},
 	),
 	(
-		"minecraft:magenta_wall_banner",
+		"magenta_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:magenta_wool",
+		"magenta_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(189, 68, 179),
 		},
 	),
 	(
-		"minecraft:magma_block",
+		"magma_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(142, 63, 31),
 		},
 	),
 	(
-		"minecraft:mangrove_button",
+		"mangrove_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:mangrove_door",
+		"mangrove_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(112, 48, 46),
 		},
 	),
 	(
-		"minecraft:mangrove_fence",
+		"mangrove_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(117, 54, 48),
 		},
 	),
 	(
-		"minecraft:mangrove_fence_gate",
+		"mangrove_fence_gate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(117, 54, 48),
 		},
 	),
 	(
-		"minecraft:mangrove_leaves",
+		"mangrove_leaves",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
 			color: BlockColor(129, 128, 128),
 		},
 	),
 	(
-		"minecraft:mangrove_log",
+		"mangrove_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(102, 48, 42),
 		},
 	),
 	(
-		"minecraft:mangrove_planks",
+		"mangrove_planks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(117, 54, 48),
 		},
 	),
 	(
-		"minecraft:mangrove_pressure_plate",
+		"mangrove_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(117, 54, 48),
 		},
 	),
 	(
-		"minecraft:mangrove_propagule",
+		"mangrove_propagule",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(96, 174, 83),
 		},
 	),
 	(
-		"minecraft:mangrove_roots",
+		"mangrove_roots",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(74, 59, 38),
 		},
 	),
 	(
-		"minecraft:mangrove_sign",
+		"mangrove_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(117, 54, 48),
 		},
 	),
 	(
-		"minecraft:mangrove_slab",
+		"mangrove_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(117, 54, 48),
 		},
 	),
 	(
-		"minecraft:mangrove_stairs",
+		"mangrove_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(117, 54, 48),
 		},
 	),
 	(
-		"minecraft:mangrove_trapdoor",
+		"mangrove_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(110, 46, 42),
 		},
 	),
 	(
-		"minecraft:mangrove_wall_sign",
+		"mangrove_wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:mangrove_wood",
+		"mangrove_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(83, 66, 41),
 		},
 	),
 	(
-		"minecraft:medium_amethyst_bud",
+		"medium_amethyst_bud",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:melon",
+		"melon",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(111, 144, 30),
 		},
 	),
 	(
-		"minecraft:melon_stem",
+		"melon_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 			color: BlockColor(153, 153, 153),
 		},
 	),
 	(
-		"minecraft:moss_block",
+		"moss_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(89, 109, 45),
 		},
 	),
 	(
-		"minecraft:moss_carpet",
+		"moss_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(89, 109, 45),
 		},
 	),
 	(
-		"minecraft:mossy_cobblestone",
+		"mossy_cobblestone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(110, 118, 94),
 		},
 	),
 	(
-		"minecraft:mossy_cobblestone_slab",
+		"mossy_cobblestone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(110, 118, 94),
 		},
 	),
 	(
-		"minecraft:mossy_cobblestone_stairs",
+		"mossy_cobblestone_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(110, 118, 94),
 		},
 	),
 	(
-		"minecraft:mossy_cobblestone_wall",
+		"mossy_cobblestone_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(110, 118, 94),
 		},
 	),
 	(
-		"minecraft:mossy_stone_brick_slab",
+		"mossy_stone_brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(115, 121, 105),
 		},
 	),
 	(
-		"minecraft:mossy_stone_brick_stairs",
+		"mossy_stone_brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(115, 121, 105),
 		},
 	),
 	(
-		"minecraft:mossy_stone_brick_wall",
+		"mossy_stone_brick_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(115, 121, 105),
 		},
 	),
 	(
-		"minecraft:mossy_stone_bricks",
+		"mossy_stone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(115, 121, 105),
 		},
 	),
 	(
-		"minecraft:moving_piston",
+		"moving_piston",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:mud",
+		"mud",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(60, 57, 60),
 		},
 	),
 	(
-		"minecraft:mud_brick_slab",
+		"mud_brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(137, 103, 79),
 		},
 	),
 	(
-		"minecraft:mud_brick_stairs",
+		"mud_brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(137, 103, 79),
 		},
 	),
 	(
-		"minecraft:mud_brick_wall",
+		"mud_brick_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(137, 103, 79),
 		},
 	),
 	(
-		"minecraft:mud_bricks",
+		"mud_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(137, 103, 79),
 		},
 	),
 	(
-		"minecraft:muddy_mangrove_roots",
+		"muddy_mangrove_roots",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(70, 58, 45),
 		},
 	),
 	(
-		"minecraft:mushroom_stem",
+		"mushroom_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(203, 196, 185),
 		},
 	),
 	(
-		"minecraft:mycelium",
+		"mycelium",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(111, 98, 101),
 		},
 	),
 	(
-		"minecraft:nether_brick_fence",
+		"nether_brick_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(44, 21, 26),
 		},
 	),
 	(
-		"minecraft:nether_brick_slab",
+		"nether_brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(44, 21, 26),
 		},
 	),
 	(
-		"minecraft:nether_brick_stairs",
+		"nether_brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(44, 21, 26),
 		},
 	),
 	(
-		"minecraft:nether_brick_wall",
+		"nether_brick_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(44, 21, 26),
 		},
 	),
 	(
-		"minecraft:nether_bricks",
+		"nether_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(44, 21, 26),
 		},
 	),
 	(
-		"minecraft:nether_gold_ore",
+		"nether_gold_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(115, 54, 42),
 		},
 	),
 	(
-		"minecraft:nether_portal",
+		"nether_portal",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(89, 11, 192),
 		},
 	),
 	(
-		"minecraft:nether_quartz_ore",
+		"nether_quartz_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(117, 65, 62),
 		},
 	),
 	(
-		"minecraft:nether_sprouts",
+		"nether_sprouts",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(19, 151, 133),
 		},
 	),
 	(
-		"minecraft:nether_wart",
+		"nether_wart",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(111, 18, 19),
 		},
 	),
 	(
-		"minecraft:nether_wart_block",
+		"nether_wart_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(114, 2, 2),
 		},
 	),
 	(
-		"minecraft:netherite_block",
+		"netherite_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(66, 61, 63),
 		},
 	),
 	(
-		"minecraft:netherrack",
+		"netherrack",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(97, 38, 38),
 		},
 	),
 	(
-		"minecraft:note_block",
+		"note_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(88, 58, 40),
 		},
 	),
 	(
-		"minecraft:oak_button",
+		"oak_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:oak_door",
+		"oak_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(140, 110, 66),
 		},
 	),
 	(
-		"minecraft:oak_fence",
+		"oak_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(162, 130, 78),
 		},
 	),
 	(
-		"minecraft:oak_fence_gate",
+		"oak_fence_gate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(162, 130, 78),
 		},
 	),
 	(
-		"minecraft:oak_leaves",
+		"oak_leaves",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
 			color: BlockColor(144, 144, 144),
 		},
 	),
 	(
-		"minecraft:oak_log",
+		"oak_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(151, 121, 73),
 		},
 	),
 	(
-		"minecraft:oak_planks",
+		"oak_planks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(162, 130, 78),
 		},
 	),
 	(
-		"minecraft:oak_pressure_plate",
+		"oak_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(162, 130, 78),
 		},
 	),
 	(
-		"minecraft:oak_sapling",
+		"oak_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(77, 106, 40),
 		},
 	),
 	(
-		"minecraft:oak_sign",
+		"oak_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(162, 130, 78),
 		},
 	),
 	(
-		"minecraft:oak_slab",
+		"oak_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(162, 130, 78),
 		},
 	),
 	(
-		"minecraft:oak_stairs",
+		"oak_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(162, 130, 78),
 		},
 	),
 	(
-		"minecraft:oak_trapdoor",
+		"oak_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(124, 99, 56),
 		},
 	),
 	(
-		"minecraft:oak_wall_sign",
+		"oak_wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:oak_wood",
+		"oak_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(109, 85, 50),
 		},
 	),
 	(
-		"minecraft:observer",
+		"observer",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(98, 98, 98),
 		},
 	),
 	(
-		"minecraft:obsidian",
+		"obsidian",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(15, 10, 24),
 		},
 	),
 	(
-		"minecraft:ochre_froglight",
+		"ochre_froglight",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(250, 245, 206),
 		},
 	),
 	(
-		"minecraft:orange_banner",
+		"orange_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:orange_bed",
+		"orange_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:orange_candle",
+		"orange_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:orange_candle_cake",
+		"orange_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
-		"minecraft:orange_carpet",
+		"orange_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(240, 118, 19),
 		},
 	),
 	(
-		"minecraft:orange_concrete",
+		"orange_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(224, 97, 0),
 		},
 	),
 	(
-		"minecraft:orange_concrete_powder",
+		"orange_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(227, 131, 31),
 		},
 	),
 	(
-		"minecraft:orange_glazed_terracotta",
+		"orange_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(154, 147, 91),
 		},
 	),
 	(
-		"minecraft:orange_shulker_box",
+		"orange_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(234, 106, 8),
 		},
 	),
 	(
-		"minecraft:orange_stained_glass",
+		"orange_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(216, 127, 51),
 		},
 	),
 	(
-		"minecraft:orange_stained_glass_pane",
+		"orange_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(208, 122, 48),
 		},
 	),
 	(
-		"minecraft:orange_terracotta",
+		"orange_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(161, 83, 37),
 		},
 	),
 	(
-		"minecraft:orange_tulip",
+		"orange_tulip",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:orange_wall_banner",
+		"orange_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:orange_wool",
+		"orange_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(240, 118, 19),
 		},
 	),
 	(
-		"minecraft:oxeye_daisy",
+		"oxeye_daisy",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:oxidized_copper",
+		"oxidized_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(82, 162, 132),
 		},
 	),
 	(
-		"minecraft:oxidized_cut_copper",
+		"oxidized_cut_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(79, 153, 126),
 		},
 	),
 	(
-		"minecraft:oxidized_cut_copper_slab",
+		"oxidized_cut_copper_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(79, 153, 126),
 		},
 	),
 	(
-		"minecraft:oxidized_cut_copper_stairs",
+		"oxidized_cut_copper_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(79, 153, 126),
 		},
 	),
 	(
-		"minecraft:packed_ice",
+		"packed_ice",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(141, 180, 250),
 		},
 	),
 	(
-		"minecraft:packed_mud",
+		"packed_mud",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(142, 106, 79),
 		},
 	),
 	(
-		"minecraft:pearlescent_froglight",
+		"pearlescent_froglight",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(245, 240, 239),
 		},
 	),
 	(
-		"minecraft:peony",
+		"peony",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(129, 126, 139),
 		},
 	),
 	(
-		"minecraft:petrified_oak_slab",
+		"petrified_oak_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(162, 130, 78),
 		},
 	),
 	(
-		"minecraft:pink_banner",
+		"pink_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:pink_bed",
+		"pink_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:pink_candle",
+		"pink_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:pink_candle_cake",
+		"pink_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
-		"minecraft:pink_carpet",
+		"pink_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(237, 141, 172),
 		},
 	),
 	(
-		"minecraft:pink_concrete",
+		"pink_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(213, 101, 142),
 		},
 	),
 	(
-		"minecraft:pink_concrete_powder",
+		"pink_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(228, 153, 181),
 		},
 	),
 	(
-		"minecraft:pink_glazed_terracotta",
+		"pink_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(235, 154, 181),
 		},
 	),
 	(
-		"minecraft:pink_shulker_box",
+		"pink_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(230, 121, 157),
 		},
 	),
 	(
-		"minecraft:pink_stained_glass",
+		"pink_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(242, 127, 165),
 		},
 	),
 	(
-		"minecraft:pink_stained_glass_pane",
+		"pink_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(233, 122, 159),
 		},
 	),
 	(
-		"minecraft:pink_terracotta",
+		"pink_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(161, 78, 78),
 		},
 	),
 	(
-		"minecraft:pink_tulip",
+		"pink_tulip",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:pink_wall_banner",
+		"pink_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:pink_wool",
+		"pink_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(237, 141, 172),
 		},
 	),
 	(
-		"minecraft:piston",
+		"piston",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(109, 104, 96),
 		},
 	),
 	(
-		"minecraft:piston_head",
+		"piston_head",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(153, 127, 85),
 		},
 	),
 	(
-		"minecraft:player_head",
+		"player_head",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:player_wall_head",
+		"player_wall_head",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:podzol",
+		"podzol",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(91, 63, 24),
 		},
 	),
 	(
-		"minecraft:pointed_dripstone",
+		"pointed_dripstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(129, 102, 89),
 		},
 	),
 	(
-		"minecraft:polished_andesite",
+		"polished_andesite",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(132, 134, 133),
 		},
 	),
 	(
-		"minecraft:polished_andesite_slab",
+		"polished_andesite_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(132, 134, 133),
 		},
 	),
 	(
-		"minecraft:polished_andesite_stairs",
+		"polished_andesite_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(132, 134, 133),
 		},
 	),
 	(
-		"minecraft:polished_basalt",
+		"polished_basalt",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(99, 98, 100),
 		},
 	),
 	(
-		"minecraft:polished_blackstone",
+		"polished_blackstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(53, 48, 56),
 		},
 	),
 	(
-		"minecraft:polished_blackstone_brick_slab",
+		"polished_blackstone_brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(48, 42, 49),
 		},
 	),
 	(
-		"minecraft:polished_blackstone_brick_stairs",
+		"polished_blackstone_brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(48, 42, 49),
 		},
 	),
 	(
-		"minecraft:polished_blackstone_brick_wall",
+		"polished_blackstone_brick_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(48, 42, 49),
 		},
 	),
 	(
-		"minecraft:polished_blackstone_bricks",
+		"polished_blackstone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(48, 42, 49),
 		},
 	),
 	(
-		"minecraft:polished_blackstone_button",
+		"polished_blackstone_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:polished_blackstone_pressure_plate",
+		"polished_blackstone_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(53, 48, 56),
 		},
 	),
 	(
-		"minecraft:polished_blackstone_slab",
+		"polished_blackstone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(53, 48, 56),
 		},
 	),
 	(
-		"minecraft:polished_blackstone_stairs",
+		"polished_blackstone_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(53, 48, 56),
 		},
 	),
 	(
-		"minecraft:polished_blackstone_wall",
+		"polished_blackstone_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(53, 48, 56),
 		},
 	),
 	(
-		"minecraft:polished_deepslate",
+		"polished_deepslate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(72, 72, 73),
 		},
 	),
 	(
-		"minecraft:polished_deepslate_slab",
+		"polished_deepslate_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(72, 72, 73),
 		},
 	),
 	(
-		"minecraft:polished_deepslate_stairs",
+		"polished_deepslate_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(72, 72, 73),
 		},
 	),
 	(
-		"minecraft:polished_deepslate_wall",
+		"polished_deepslate_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(72, 72, 73),
 		},
 	),
 	(
-		"minecraft:polished_diorite",
+		"polished_diorite",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(192, 193, 194),
 		},
 	),
 	(
-		"minecraft:polished_diorite_slab",
+		"polished_diorite_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(192, 193, 194),
 		},
 	),
 	(
-		"minecraft:polished_diorite_stairs",
+		"polished_diorite_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(192, 193, 194),
 		},
 	),
 	(
-		"minecraft:polished_granite",
+		"polished_granite",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(154, 106, 89),
 		},
 	),
 	(
-		"minecraft:polished_granite_slab",
+		"polished_granite_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(154, 106, 89),
 		},
 	),
 	(
-		"minecraft:polished_granite_stairs",
+		"polished_granite_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(154, 106, 89),
 		},
 	),
 	(
-		"minecraft:poppy",
+		"poppy",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:potatoes",
+		"potatoes",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(84, 135, 47),
 		},
 	),
 	(
-		"minecraft:potted_acacia_sapling",
+		"potted_acacia_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(118, 117, 23),
 		},
 	),
 	(
-		"minecraft:potted_allium",
+		"potted_allium",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(158, 137, 183),
 		},
 	),
 	(
-		"minecraft:potted_azalea_bush",
+		"potted_azalea_bush",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(101, 124, 47),
 		},
 	),
 	(
-		"minecraft:potted_azure_bluet",
+		"potted_azure_bluet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(169, 204, 127),
 		},
 	),
 	(
-		"minecraft:potted_bamboo",
+		"potted_bamboo",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(93, 144, 19),
 		},
 	),
 	(
-		"minecraft:potted_birch_sapling",
+		"potted_birch_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(127, 160, 79),
 		},
 	),
 	(
-		"minecraft:potted_blue_orchid",
+		"potted_blue_orchid",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(47, 162, 168),
 		},
 	),
 	(
-		"minecraft:potted_brown_mushroom",
+		"potted_brown_mushroom",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(153, 116, 92),
 		},
 	),
 	(
-		"minecraft:potted_cactus",
+		"potted_cactus",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(85, 127, 43),
 		},
 	),
 	(
-		"minecraft:potted_cornflower",
+		"potted_cornflower",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(79, 121, 146),
 		},
 	),
 	(
-		"minecraft:potted_crimson_fungus",
+		"potted_crimson_fungus",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(141, 44, 29),
 		},
 	),
 	(
-		"minecraft:potted_crimson_roots",
+		"potted_crimson_roots",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(127, 8, 41),
 		},
 	),
 	(
-		"minecraft:potted_dandelion",
+		"potted_dandelion",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(147, 172, 43),
 		},
 	),
 	(
-		"minecraft:potted_dark_oak_sapling",
+		"potted_dark_oak_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(61, 90, 30),
 		},
 	),
 	(
-		"minecraft:potted_dead_bush",
+		"potted_dead_bush",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(107, 78, 40),
 		},
 	),
 	(
-		"minecraft:potted_fern",
+		"potted_fern",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 			color: BlockColor(124, 124, 124),
 		},
 	),
 	(
-		"minecraft:potted_flowering_azalea_bush",
+		"potted_flowering_azalea_bush",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(112, 121, 64),
 		},
 	),
 	(
-		"minecraft:potted_jungle_sapling",
+		"potted_jungle_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(47, 81, 16),
 		},
 	),
 	(
-		"minecraft:potted_lily_of_the_valley",
+		"potted_lily_of_the_valley",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(123, 174, 95),
 		},
 	),
 	(
-		"minecraft:potted_mangrove_propagule",
+		"potted_mangrove_propagule",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(96, 174, 83),
 		},
 	),
 	(
-		"minecraft:potted_oak_sapling",
+		"potted_oak_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(77, 106, 40),
 		},
 	),
 	(
-		"minecraft:potted_orange_tulip",
+		"potted_orange_tulip",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(93, 142, 30),
 		},
 	),
 	(
-		"minecraft:potted_oxeye_daisy",
+		"potted_oxeye_daisy",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(179, 202, 143),
 		},
 	),
 	(
-		"minecraft:potted_pink_tulip",
+		"potted_pink_tulip",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(99, 157, 78),
 		},
 	),
 	(
-		"minecraft:potted_poppy",
+		"potted_poppy",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(128, 64, 37),
 		},
 	),
 	(
-		"minecraft:potted_red_mushroom",
+		"potted_red_mushroom",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(216, 75, 67),
 		},
 	),
 	(
-		"minecraft:potted_red_tulip",
+		"potted_red_tulip",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(89, 128, 32),
 		},
 	),
 	(
-		"minecraft:potted_spruce_sapling",
+		"potted_spruce_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(44, 60, 36),
 		},
 	),
 	(
-		"minecraft:potted_warped_fungus",
+		"potted_warped_fungus",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(74, 109, 87),
 		},
 	),
 	(
-		"minecraft:potted_warped_roots",
+		"potted_warped_roots",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(20, 136, 123),
 		},
 	),
 	(
-		"minecraft:potted_white_tulip",
+		"potted_white_tulip",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(93, 164, 71),
 		},
 	),
 	(
-		"minecraft:potted_wither_rose",
+		"potted_wither_rose",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(41, 44, 23),
 		},
 	),
 	(
-		"minecraft:powder_snow",
+		"powder_snow",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 253, 253),
 		},
 	),
 	(
-		"minecraft:powder_snow_cauldron",
+		"powder_snow_cauldron",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(73, 72, 74),
 		},
 	),
 	(
-		"minecraft:powered_rail",
+		"powered_rail",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(137, 109, 74),
 		},
 	),
 	(
-		"minecraft:prismarine",
+		"prismarine",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(99, 156, 151),
 		},
 	),
 	(
-		"minecraft:prismarine_brick_slab",
+		"prismarine_brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(99, 171, 158),
 		},
 	),
 	(
-		"minecraft:prismarine_brick_stairs",
+		"prismarine_brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(99, 171, 158),
 		},
 	),
 	(
-		"minecraft:prismarine_bricks",
+		"prismarine_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(99, 171, 158),
 		},
 	),
 	(
-		"minecraft:prismarine_slab",
+		"prismarine_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(99, 156, 151),
 		},
 	),
 	(
-		"minecraft:prismarine_stairs",
+		"prismarine_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(99, 156, 151),
 		},
 	),
 	(
-		"minecraft:prismarine_wall",
+		"prismarine_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(99, 156, 151),
 		},
 	),
 	(
-		"minecraft:pumpkin",
+		"pumpkin",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(198, 118, 24),
 		},
 	),
 	(
-		"minecraft:pumpkin_stem",
+		"pumpkin_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 			color: BlockColor(154, 154, 154),
 		},
 	),
 	(
-		"minecraft:purple_banner",
+		"purple_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:purple_bed",
+		"purple_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:purple_candle",
+		"purple_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:purple_candle_cake",
+		"purple_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
-		"minecraft:purple_carpet",
+		"purple_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(121, 42, 172),
 		},
 	),
 	(
-		"minecraft:purple_concrete",
+		"purple_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(100, 31, 156),
 		},
 	),
 	(
-		"minecraft:purple_concrete_powder",
+		"purple_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(131, 55, 177),
 		},
 	),
 	(
-		"minecraft:purple_glazed_terracotta",
+		"purple_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(109, 48, 152),
 		},
 	),
 	(
-		"minecraft:purple_shulker_box",
+		"purple_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(103, 32, 156),
 		},
 	),
 	(
-		"minecraft:purple_stained_glass",
+		"purple_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(127, 63, 178),
 		},
 	),
 	(
-		"minecraft:purple_stained_glass_pane",
+		"purple_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(122, 61, 171),
 		},
 	),
 	(
-		"minecraft:purple_terracotta",
+		"purple_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(118, 70, 86),
 		},
 	),
 	(
-		"minecraft:purple_wall_banner",
+		"purple_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:purple_wool",
+		"purple_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(121, 42, 172),
 		},
 	),
 	(
-		"minecraft:purpur_block",
+		"purpur_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(169, 125, 169),
 		},
 	),
 	(
-		"minecraft:purpur_pillar",
+		"purpur_pillar",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(171, 129, 171),
 		},
 	),
 	(
-		"minecraft:purpur_slab",
+		"purpur_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(169, 125, 169),
 		},
 	),
 	(
-		"minecraft:purpur_stairs",
+		"purpur_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(169, 125, 169),
 		},
 	),
 	(
-		"minecraft:quartz_block",
+		"quartz_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(235, 229, 222),
 		},
 	),
 	(
-		"minecraft:quartz_bricks",
+		"quartz_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(234, 229, 221),
 		},
 	),
 	(
-		"minecraft:quartz_pillar",
+		"quartz_pillar",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(235, 230, 224),
 		},
 	),
 	(
-		"minecraft:quartz_slab",
+		"quartz_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(235, 229, 222),
 		},
 	),
 	(
-		"minecraft:quartz_stairs",
+		"quartz_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(235, 229, 222),
 		},
 	),
 	(
-		"minecraft:rail",
+		"rail",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(125, 111, 88),
 		},
 	),
 	(
-		"minecraft:raw_copper_block",
+		"raw_copper_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(154, 105, 79),
 		},
 	),
 	(
-		"minecraft:raw_gold_block",
+		"raw_gold_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(221, 169, 46),
 		},
 	),
 	(
-		"minecraft:raw_iron_block",
+		"raw_iron_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(166, 135, 107),
 		},
 	),
 	(
-		"minecraft:red_banner",
+		"red_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:red_bed",
+		"red_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:red_candle",
+		"red_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:red_candle_cake",
+		"red_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
-		"minecraft:red_carpet",
+		"red_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(160, 39, 34),
 		},
 	),
 	(
-		"minecraft:red_concrete",
+		"red_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(142, 32, 32),
 		},
 	),
 	(
-		"minecraft:red_concrete_powder",
+		"red_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(168, 54, 50),
 		},
 	),
 	(
-		"minecraft:red_glazed_terracotta",
+		"red_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(181, 59, 53),
 		},
 	),
 	(
-		"minecraft:red_mushroom",
+		"red_mushroom",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:red_mushroom_block",
+		"red_mushroom_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(200, 46, 45),
 		},
 	),
 	(
-		"minecraft:red_nether_brick_slab",
+		"red_nether_brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(69, 7, 9),
 		},
 	),
 	(
-		"minecraft:red_nether_brick_stairs",
+		"red_nether_brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(69, 7, 9),
 		},
 	),
 	(
-		"minecraft:red_nether_brick_wall",
+		"red_nether_brick_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(69, 7, 9),
 		},
 	),
 	(
-		"minecraft:red_nether_bricks",
+		"red_nether_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(69, 7, 9),
 		},
 	),
 	(
-		"minecraft:red_sand",
+		"red_sand",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(190, 102, 33),
 		},
 	),
 	(
-		"minecraft:red_sandstone",
+		"red_sandstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(181, 97, 31),
 		},
 	),
 	(
-		"minecraft:red_sandstone_slab",
+		"red_sandstone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(181, 97, 31),
 		},
 	),
 	(
-		"minecraft:red_sandstone_stairs",
+		"red_sandstone_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(181, 97, 31),
 		},
 	),
 	(
-		"minecraft:red_sandstone_wall",
+		"red_sandstone_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(181, 97, 31),
 		},
 	),
 	(
-		"minecraft:red_shulker_box",
+		"red_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(140, 31, 30),
 		},
 	),
 	(
-		"minecraft:red_stained_glass",
+		"red_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(153, 51, 51),
 		},
 	),
 	(
-		"minecraft:red_stained_glass_pane",
+		"red_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(147, 48, 48),
 		},
 	),
 	(
-		"minecraft:red_terracotta",
+		"red_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(143, 61, 46),
 		},
 	),
 	(
-		"minecraft:red_tulip",
+		"red_tulip",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:red_wall_banner",
+		"red_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:red_wool",
+		"red_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(160, 39, 34),
 		},
 	),
 	(
-		"minecraft:redstone_block",
+		"redstone_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(175, 24, 5),
 		},
 	),
 	(
-		"minecraft:redstone_lamp",
+		"redstone_lamp",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(95, 54, 30),
 		},
 	),
 	(
-		"minecraft:redstone_ore",
+		"redstone_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(140, 109, 109),
 		},
 	),
 	(
-		"minecraft:redstone_torch",
+		"redstone_torch",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:redstone_wall_torch",
+		"redstone_wall_torch",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:redstone_wire",
+		"redstone_wire",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(175, 24, 5),
 		},
 	),
 	(
-		"minecraft:reinforced_deepslate",
+		"reinforced_deepslate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(80, 82, 78),
 		},
 	),
 	(
-		"minecraft:repeater",
+		"repeater",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(160, 157, 156),
 		},
 	),
 	(
-		"minecraft:repeating_command_block",
+		"repeating_command_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(129, 111, 176),
 		},
 	),
 	(
-		"minecraft:respawn_anchor",
+		"respawn_anchor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(75, 26, 144),
 		},
 	),
 	(
-		"minecraft:rooted_dirt",
+		"rooted_dirt",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(144, 103, 76),
 		},
 	),
 	(
-		"minecraft:rose_bush",
+		"rose_bush",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(131, 66, 37),
 		},
 	),
 	(
-		"minecraft:sand",
+		"sand",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(219, 207, 163),
 		},
 	),
 	(
-		"minecraft:sandstone",
+		"sandstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(223, 214, 170),
 		},
 	),
 	(
-		"minecraft:sandstone_slab",
+		"sandstone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(223, 214, 170),
 		},
 	),
 	(
-		"minecraft:sandstone_stairs",
+		"sandstone_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(223, 214, 170),
 		},
 	),
 	(
-		"minecraft:sandstone_wall",
+		"sandstone_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(223, 214, 170),
 		},
 	),
 	(
-		"minecraft:scaffolding",
+		"scaffolding",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(174, 134, 80),
 		},
 	),
 	(
-		"minecraft:sculk",
+		"sculk",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(12, 29, 36),
 		},
 	),
 	(
-		"minecraft:sculk_catalyst",
+		"sculk_catalyst",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(15, 31, 38),
 		},
 	),
 	(
-		"minecraft:sculk_sensor",
+		"sculk_sensor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(7, 70, 84),
 		},
 	),
 	(
-		"minecraft:sculk_shrieker",
+		"sculk_shrieker",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(198, 205, 169),
 		},
 	),
 	(
-		"minecraft:sculk_vein",
+		"sculk_vein",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(7, 48, 57),
 		},
 	),
 	(
-		"minecraft:sea_lantern",
+		"sea_lantern",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(172, 199, 190),
 		},
 	),
 	(
-		"minecraft:sea_pickle",
+		"sea_pickle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(90, 97, 39),
 		},
 	),
 	(
-		"minecraft:seagrass",
+		"seagrass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:shroomlight",
+		"shroomlight",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(240, 146, 70),
 		},
 	),
 	(
-		"minecraft:shulker_box",
+		"shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(139, 96, 139),
 		},
 	),
 	(
-		"minecraft:sign",
+		"sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(162, 130, 78),
 		},
 	),
 	(
-		"minecraft:skeleton_skull",
+		"skeleton_skull",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:skeleton_wall_skull",
+		"skeleton_wall_skull",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:slime_block",
+		"slime_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(111, 192, 91),
 		},
 	),
 	(
-		"minecraft:small_amethyst_bud",
+		"small_amethyst_bud",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:small_dripleaf",
+		"small_dripleaf",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:smithing_table",
+		"smithing_table",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(57, 58, 70),
 		},
 	),
 	(
-		"minecraft:smoker",
+		"smoker",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(85, 83, 81),
 		},
 	),
 	(
-		"minecraft:smooth_basalt",
+		"smooth_basalt",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(72, 72, 78),
 		},
 	),
 	(
-		"minecraft:smooth_quartz",
+		"smooth_quartz",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(235, 229, 222),
 		},
 	),
 	(
-		"minecraft:smooth_quartz_slab",
+		"smooth_quartz_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(235, 229, 222),
 		},
 	),
 	(
-		"minecraft:smooth_quartz_stairs",
+		"smooth_quartz_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(235, 229, 222),
 		},
 	),
 	(
-		"minecraft:smooth_red_sandstone",
+		"smooth_red_sandstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(181, 97, 31),
 		},
 	),
 	(
-		"minecraft:smooth_red_sandstone_slab",
+		"smooth_red_sandstone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(181, 97, 31),
 		},
 	),
 	(
-		"minecraft:smooth_red_sandstone_stairs",
+		"smooth_red_sandstone_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(181, 97, 31),
 		},
 	),
 	(
-		"minecraft:smooth_sandstone",
+		"smooth_sandstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(223, 214, 170),
 		},
 	),
 	(
-		"minecraft:smooth_sandstone_slab",
+		"smooth_sandstone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(223, 214, 170),
 		},
 	),
 	(
-		"minecraft:smooth_sandstone_stairs",
+		"smooth_sandstone_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(223, 214, 170),
 		},
 	),
 	(
-		"minecraft:smooth_stone",
+		"smooth_stone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(158, 158, 158),
 		},
 	),
 	(
-		"minecraft:smooth_stone_slab",
+		"smooth_stone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(158, 158, 158),
 		},
 	),
 	(
-		"minecraft:snow",
+		"snow",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(249, 254, 254),
 		},
 	),
 	(
-		"minecraft:snow_block",
+		"snow_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(249, 254, 254),
 		},
 	),
 	(
-		"minecraft:soul_campfire",
+		"soul_campfire",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(80, 204, 208),
 		},
 	),
 	(
-		"minecraft:soul_fire",
+		"soul_fire",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(51, 192, 197),
 		},
 	),
 	(
-		"minecraft:soul_lantern",
+		"soul_lantern",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(71, 99, 114),
 		},
 	),
 	(
-		"minecraft:soul_sand",
+		"soul_sand",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(81, 62, 50),
 		},
 	),
 	(
-		"minecraft:soul_soil",
+		"soul_soil",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(75, 57, 46),
 		},
 	),
 	(
-		"minecraft:soul_torch",
+		"soul_torch",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:soul_wall_torch",
+		"soul_wall_torch",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:spawner",
+		"spawner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(36, 46, 62),
 		},
 	),
 	(
-		"minecraft:sponge",
+		"sponge",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(195, 192, 74),
 		},
 	),
 	(
-		"minecraft:spore_blossom",
+		"spore_blossom",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(206, 96, 158),
 		},
 	),
 	(
-		"minecraft:spruce_button",
+		"spruce_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:spruce_door",
+		"spruce_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(106, 80, 48),
 		},
 	),
 	(
-		"minecraft:spruce_fence",
+		"spruce_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(114, 84, 48),
 		},
 	),
 	(
-		"minecraft:spruce_fence_gate",
+		"spruce_fence_gate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(114, 84, 48),
 		},
 	),
 	(
-		"minecraft:spruce_leaves",
+		"spruce_leaves",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Spruce}),
 			color: BlockColor(126, 126, 126),
 		},
 	),
 	(
-		"minecraft:spruce_log",
+		"spruce_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(108, 80, 46),
 		},
 	),
 	(
-		"minecraft:spruce_planks",
+		"spruce_planks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(114, 84, 48),
 		},
 	),
 	(
-		"minecraft:spruce_pressure_plate",
+		"spruce_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(114, 84, 48),
 		},
 	),
 	(
-		"minecraft:spruce_sapling",
+		"spruce_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(44, 60, 36),
 		},
 	),
 	(
-		"minecraft:spruce_sign",
+		"spruce_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(114, 84, 48),
 		},
 	),
 	(
-		"minecraft:spruce_slab",
+		"spruce_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(114, 84, 48),
 		},
 	),
 	(
-		"minecraft:spruce_stairs",
+		"spruce_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(114, 84, 48),
 		},
 	),
 	(
-		"minecraft:spruce_trapdoor",
+		"spruce_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(103, 79, 47),
 		},
 	),
 	(
-		"minecraft:spruce_wall_sign",
+		"spruce_wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:spruce_wood",
+		"spruce_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(58, 37, 16),
 		},
 	),
 	(
-		"minecraft:sticky_piston",
+		"sticky_piston",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(109, 104, 96),
 		},
 	),
 	(
-		"minecraft:stone",
+		"stone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(125, 125, 125),
 		},
 	),
 	(
-		"minecraft:stone_brick_slab",
+		"stone_brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(122, 121, 122),
 		},
 	),
 	(
-		"minecraft:stone_brick_stairs",
+		"stone_brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(122, 121, 122),
 		},
 	),
 	(
-		"minecraft:stone_brick_wall",
+		"stone_brick_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(122, 121, 122),
 		},
 	),
 	(
-		"minecraft:stone_bricks",
+		"stone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(122, 121, 122),
 		},
 	),
 	(
-		"minecraft:stone_button",
+		"stone_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:stone_pressure_plate",
+		"stone_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(125, 125, 125),
 		},
 	),
 	(
-		"minecraft:stone_slab",
+		"stone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(125, 125, 125),
 		},
 	),
 	(
-		"minecraft:stone_stairs",
+		"stone_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(125, 125, 125),
 		},
 	),
 	(
-		"minecraft:stonecutter",
+		"stonecutter",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(123, 118, 111),
 		},
 	),
 	(
-		"minecraft:stripped_acacia_log",
+		"stripped_acacia_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(166, 91, 51),
 		},
 	),
 	(
-		"minecraft:stripped_acacia_wood",
+		"stripped_acacia_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(174, 92, 59),
 		},
 	),
 	(
-		"minecraft:stripped_birch_log",
+		"stripped_birch_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(191, 171, 116),
 		},
 	),
 	(
-		"minecraft:stripped_birch_wood",
+		"stripped_birch_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(196, 176, 118),
 		},
 	),
 	(
-		"minecraft:stripped_crimson_hyphae",
+		"stripped_crimson_hyphae",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(137, 57, 90),
 		},
 	),
 	(
-		"minecraft:stripped_crimson_stem",
+		"stripped_crimson_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(121, 56, 82),
 		},
 	),
 	(
-		"minecraft:stripped_dark_oak_log",
+		"stripped_dark_oak_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(65, 44, 22),
 		},
 	),
 	(
-		"minecraft:stripped_dark_oak_wood",
+		"stripped_dark_oak_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(72, 56, 36),
 		},
 	),
 	(
-		"minecraft:stripped_jungle_log",
+		"stripped_jungle_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(165, 122, 81),
 		},
 	),
 	(
-		"minecraft:stripped_jungle_wood",
+		"stripped_jungle_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(171, 132, 84),
 		},
 	),
 	(
-		"minecraft:stripped_mangrove_log",
+		"stripped_mangrove_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(109, 43, 43),
 		},
 	),
 	(
-		"minecraft:stripped_mangrove_wood",
+		"stripped_mangrove_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(119, 54, 47),
 		},
 	),
 	(
-		"minecraft:stripped_oak_log",
+		"stripped_oak_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(160, 129, 77),
 		},
 	),
 	(
-		"minecraft:stripped_oak_wood",
+		"stripped_oak_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(177, 144, 86),
 		},
 	),
 	(
-		"minecraft:stripped_spruce_log",
+		"stripped_spruce_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(105, 80, 46),
 		},
 	),
 	(
-		"minecraft:stripped_spruce_wood",
+		"stripped_spruce_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(115, 89, 52),
 		},
 	),
 	(
-		"minecraft:stripped_warped_hyphae",
+		"stripped_warped_hyphae",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(57, 150, 147),
 		},
 	),
 	(
-		"minecraft:stripped_warped_stem",
+		"stripped_warped_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(52, 128, 124),
 		},
 	),
 	(
-		"minecraft:structure_block",
+		"structure_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(88, 74, 90),
 		},
 	),
 	(
-		"minecraft:structure_void",
+		"structure_void",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:sugar_cane",
+		"sugar_cane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(148, 192, 101),
 		},
 	),
 	(
-		"minecraft:sunflower",
+		"sunflower",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(246, 196, 54),
 		},
 	),
 	(
-		"minecraft:sweet_berry_bush",
+		"sweet_berry_bush",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(68, 77, 50),
 		},
 	),
 	(
-		"minecraft:tall_grass",
+		"tall_grass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 			color: BlockColor(151, 149, 151),
 		},
 	),
 	(
-		"minecraft:tall_seagrass",
+		"tall_seagrass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(59, 139, 14),
 		},
 	),
 	(
-		"minecraft:target",
+		"target",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(226, 170, 157),
 		},
 	),
 	(
-		"minecraft:terracotta",
+		"terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(152, 94, 67),
 		},
 	),
 	(
-		"minecraft:tinted_glass",
+		"tinted_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(44, 38, 46),
 		},
 	),
 	(
-		"minecraft:tnt",
+		"tnt",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(142, 62, 53),
 		},
 	),
 	(
-		"minecraft:torch",
+		"torch",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:trapped_chest",
+		"trapped_chest",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(162, 130, 78),
 		},
 	),
 	(
-		"minecraft:tripwire",
+		"tripwire",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:tripwire_hook",
+		"tripwire_hook",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:tube_coral",
+		"tube_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:tube_coral_block",
+		"tube_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(49, 87, 206),
 		},
 	),
 	(
-		"minecraft:tube_coral_fan",
+		"tube_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:tube_coral_wall_fan",
+		"tube_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:tuff",
+		"tuff",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(108, 109, 102),
 		},
 	),
 	(
-		"minecraft:turtle_egg",
+		"turtle_egg",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(228, 226, 191),
 		},
 	),
 	(
-		"minecraft:twisting_vines",
+		"twisting_vines",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(20, 143, 124),
 		},
 	),
 	(
-		"minecraft:twisting_vines_plant",
+		"twisting_vines_plant",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(20, 135, 122),
 		},
 	),
 	(
-		"minecraft:verdant_froglight",
+		"verdant_froglight",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(229, 244, 228),
 		},
 	),
 	(
-		"minecraft:vine",
+		"vine",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 			color: BlockColor(116, 116, 116),
 		},
 	),
 	(
-		"minecraft:void_air",
+		"void_air",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:wall_sign",
+		"wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:wall_torch",
+		"wall_torch",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:warped_button",
+		"warped_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:warped_door",
+		"warped_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(44, 126, 120),
 		},
 	),
 	(
-		"minecraft:warped_fence",
+		"warped_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(43, 104, 99),
 		},
 	),
 	(
-		"minecraft:warped_fence_gate",
+		"warped_fence_gate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(43, 104, 99),
 		},
 	),
 	(
-		"minecraft:warped_fungus",
+		"warped_fungus",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:warped_hyphae",
+		"warped_hyphae",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(58, 58, 77),
 		},
 	),
 	(
-		"minecraft:warped_nylium",
+		"warped_nylium",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(43, 114, 101),
 		},
 	),
 	(
-		"minecraft:warped_planks",
+		"warped_planks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(43, 104, 99),
 		},
 	),
 	(
-		"minecraft:warped_pressure_plate",
+		"warped_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(43, 104, 99),
 		},
 	),
 	(
-		"minecraft:warped_roots",
+		"warped_roots",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(20, 138, 124),
 		},
 	),
 	(
-		"minecraft:warped_sign",
+		"warped_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(43, 104, 99),
 		},
 	),
 	(
-		"minecraft:warped_slab",
+		"warped_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(43, 104, 99),
 		},
 	),
 	(
-		"minecraft:warped_stairs",
+		"warped_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(43, 104, 99),
 		},
 	),
 	(
-		"minecraft:warped_stem",
+		"warped_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(53, 109, 110),
 		},
 	),
 	(
-		"minecraft:warped_trapdoor",
+		"warped_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(47, 119, 111),
 		},
 	),
 	(
-		"minecraft:warped_wall_sign",
+		"warped_wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:warped_wart_block",
+		"warped_wart_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(22, 119, 121),
 		},
 	),
 	(
-		"minecraft:water",
+		"water",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Water}),
 			color: BlockColor(177, 177, 177),
 		},
 	),
 	(
-		"minecraft:water_cauldron",
+		"water_cauldron",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(73, 72, 74),
 		},
 	),
 	(
-		"minecraft:waxed_copper_block",
+		"waxed_copper_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(192, 107, 79),
 		},
 	),
 	(
-		"minecraft:waxed_cut_copper",
+		"waxed_cut_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(191, 106, 80),
 		},
 	),
 	(
-		"minecraft:waxed_cut_copper_slab",
+		"waxed_cut_copper_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(191, 106, 80),
 		},
 	),
 	(
-		"minecraft:waxed_cut_copper_stairs",
+		"waxed_cut_copper_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(191, 106, 80),
 		},
 	),
 	(
-		"minecraft:waxed_exposed_copper",
+		"waxed_exposed_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(161, 125, 103),
 		},
 	),
 	(
-		"minecraft:waxed_exposed_cut_copper",
+		"waxed_exposed_cut_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(154, 121, 101),
 		},
 	),
 	(
-		"minecraft:waxed_exposed_cut_copper_slab",
+		"waxed_exposed_cut_copper_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(154, 121, 101),
 		},
 	),
 	(
-		"minecraft:waxed_exposed_cut_copper_stairs",
+		"waxed_exposed_cut_copper_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(154, 121, 101),
 		},
 	),
 	(
-		"minecraft:waxed_oxidized_copper",
+		"waxed_oxidized_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(82, 162, 132),
 		},
 	),
 	(
-		"minecraft:waxed_oxidized_cut_copper",
+		"waxed_oxidized_cut_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(79, 153, 126),
 		},
 	),
 	(
-		"minecraft:waxed_oxidized_cut_copper_slab",
+		"waxed_oxidized_cut_copper_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(79, 153, 126),
 		},
 	),
 	(
-		"minecraft:waxed_oxidized_cut_copper_stairs",
+		"waxed_oxidized_cut_copper_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(79, 153, 126),
 		},
 	),
 	(
-		"minecraft:waxed_weathered_copper",
+		"waxed_weathered_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(108, 153, 110),
 		},
 	),
 	(
-		"minecraft:waxed_weathered_cut_copper",
+		"waxed_weathered_cut_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(109, 145, 107),
 		},
 	),
 	(
-		"minecraft:waxed_weathered_cut_copper_slab",
+		"waxed_weathered_cut_copper_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(109, 145, 107),
 		},
 	),
 	(
-		"minecraft:waxed_weathered_cut_copper_stairs",
+		"waxed_weathered_cut_copper_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(109, 145, 107),
 		},
 	),
 	(
-		"minecraft:weathered_copper",
+		"weathered_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(108, 153, 110),
 		},
 	),
 	(
-		"minecraft:weathered_cut_copper",
+		"weathered_cut_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(109, 145, 107),
 		},
 	),
 	(
-		"minecraft:weathered_cut_copper_slab",
+		"weathered_cut_copper_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(109, 145, 107),
 		},
 	),
 	(
-		"minecraft:weathered_cut_copper_stairs",
+		"weathered_cut_copper_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(109, 145, 107),
 		},
 	),
 	(
-		"minecraft:weeping_vines",
+		"weeping_vines",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(104, 1, 0),
 		},
 	),
 	(
-		"minecraft:weeping_vines_plant",
+		"weeping_vines_plant",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(132, 16, 12),
 		},
 	),
 	(
-		"minecraft:wet_sponge",
+		"wet_sponge",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(171, 181, 70),
 		},
 	),
 	(
-		"minecraft:wheat",
+		"wheat",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(166, 151, 73),
 		},
 	),
 	(
-		"minecraft:white_banner",
+		"white_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:white_bed",
+		"white_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:white_candle",
+		"white_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:white_candle_cake",
+		"white_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
-		"minecraft:white_carpet",
+		"white_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(233, 236, 236),
 		},
 	),
 	(
-		"minecraft:white_concrete",
+		"white_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(207, 213, 214),
 		},
 	),
 	(
-		"minecraft:white_concrete_powder",
+		"white_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(225, 227, 227),
 		},
 	),
 	(
-		"minecraft:white_glazed_terracotta",
+		"white_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(188, 212, 202),
 		},
 	),
 	(
-		"minecraft:white_shulker_box",
+		"white_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(215, 220, 221),
 		},
 	),
 	(
-		"minecraft:white_stained_glass",
+		"white_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(255, 255, 255),
 		},
 	),
 	(
-		"minecraft:white_stained_glass_pane",
+		"white_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(246, 246, 246),
 		},
 	),
 	(
-		"minecraft:white_terracotta",
+		"white_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(209, 178, 161),
 		},
 	),
 	(
-		"minecraft:white_tulip",
+		"white_tulip",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:white_wall_banner",
+		"white_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:white_wool",
+		"white_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(233, 236, 236),
 		},
 	),
 	(
-		"minecraft:wither_rose",
+		"wither_rose",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:wither_skeleton_skull",
+		"wither_skeleton_skull",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:wither_skeleton_wall_skull",
+		"wither_skeleton_wall_skull",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:yellow_banner",
+		"yellow_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:yellow_bed",
+		"yellow_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:yellow_candle",
+		"yellow_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:yellow_candle_cake",
+		"yellow_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 222, 214),
 		},
 	),
 	(
-		"minecraft:yellow_carpet",
+		"yellow_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 197, 39),
 		},
 	),
 	(
-		"minecraft:yellow_concrete",
+		"yellow_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(240, 175, 21),
 		},
 	),
 	(
-		"minecraft:yellow_concrete_powder",
+		"yellow_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(232, 199, 54),
 		},
 	),
 	(
-		"minecraft:yellow_glazed_terracotta",
+		"yellow_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(234, 192, 88),
 		},
 	),
 	(
-		"minecraft:yellow_shulker_box",
+		"yellow_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 188, 29),
 		},
 	),
 	(
-		"minecraft:yellow_stained_glass",
+		"yellow_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(229, 229, 51),
 		},
 	),
 	(
-		"minecraft:yellow_stained_glass_pane",
+		"yellow_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(221, 221, 48),
 		},
 	),
 	(
-		"minecraft:yellow_terracotta",
+		"yellow_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(186, 133, 35),
 		},
 	),
 	(
-		"minecraft:yellow_wall_banner",
+		"yellow_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:yellow_wool",
+		"yellow_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
 			color: BlockColor(248, 197, 39),
 		},
 	),
 	(
-		"minecraft:zombie_head",
+		"zombie_head",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
 		},
 	),
 	(
-		"minecraft:zombie_wall_head",
+		"zombie_wall_head",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
 			color: BlockColor(0, 0, 0),
diff --git a/src/resource/mod.rs b/src/resource/mod.rs
index 3d1dc96..1664d8b 100644
--- a/src/resource/mod.rs
+++ b/src/resource/mod.rs
@@ -58,7 +58,8 @@ pub struct BlockTypeMap(HashMap<String, BlockType>);
 impl BlockTypeMap {
 	#[inline]
 	pub fn get(&self, id: &str) -> Option<BlockType> {
-		self.0.get(id).copied()
+		let suffix = id.strip_prefix("minecraft:")?;
+		self.0.get(suffix).copied()
 	}
 }
 

From 4c2fd6c1a9d89b5ede1a74b53edae8b81b2b7b93 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 1 Mar 2023 22:45:56 +0100
Subject: [PATCH 113/460] resource: rename BlockTypeMap to BlockTypes

The block_types() function it turned into a Default implementation.
---
 src/main.rs         |  4 ++--
 src/resource/mod.rs | 25 ++++++++++++++-----------
 src/world/layer.rs  |  4 ++--
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 30b3b18..493b54f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -50,14 +50,14 @@ impl Paths {
 
 /// Type with methods for processing the regions of a Minecraft save directory
 struct RegionProcessor<'a> {
-	block_types: resource::BlockTypeMap,
+	block_types: resource::BlockTypes,
 	paths: &'a Paths,
 }
 
 impl<'a> RegionProcessor<'a> {
 	fn new(paths: &'a Paths) -> Self {
 		RegionProcessor {
-			block_types: resource::block_types(),
+			block_types: resource::BlockTypes::default(),
 			paths,
 		}
 	}
diff --git a/src/resource/mod.rs b/src/resource/mod.rs
index 1664d8b..ee409e6 100644
--- a/src/resource/mod.rs
+++ b/src/resource/mod.rs
@@ -53,21 +53,24 @@ impl BlockType {
 	}
 }
 
-pub struct BlockTypeMap(HashMap<String, BlockType>);
+#[derive(Debug)]
+pub struct BlockTypes(HashMap<String, BlockType>);
 
-impl BlockTypeMap {
+impl Default for BlockTypes {
+	fn default() -> Self {
+		BlockTypes(
+			block_types::BLOCK_TYPES
+				.iter()
+				.map(|(k, v)| (String::from(*k), *v))
+				.collect(),
+		)
+	}
+}
+
+impl BlockTypes {
 	#[inline]
 	pub fn get(&self, id: &str) -> Option<BlockType> {
 		let suffix = id.strip_prefix("minecraft:")?;
 		self.0.get(suffix).copied()
 	}
 }
-
-pub fn block_types() -> BlockTypeMap {
-	BlockTypeMap(
-		block_types::BLOCK_TYPES
-			.iter()
-			.map(|(k, v)| (String::from(*k), *v))
-			.collect(),
-	)
-}
diff --git a/src/world/layer.rs b/src/world/layer.rs
index 2232af8..0039136 100644
--- a/src/world/layer.rs
+++ b/src/world/layer.rs
@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 
 use super::chunk::Chunk;
 use crate::{
-	resource::{BlockFlag, BlockType, BlockTypeMap},
+	resource::{BlockFlag, BlockType, BlockTypes},
 	types::*,
 };
 
@@ -92,7 +92,7 @@ pub type BlockInfoArray = LayerBlockArray<Option<BlockInfo>>;
 /// determined as the block that should be visible on the rendered
 /// map. For water blocks, the height of the first non-water block
 /// is additionally filled in as the water depth.
-pub fn top_layer(chunk: &Chunk, block_types: &BlockTypeMap) -> Result<Box<BlockInfoArray>> {
+pub fn top_layer(chunk: &Chunk, block_types: &BlockTypes) -> Result<Box<BlockInfoArray>> {
 	use BLOCKS_PER_CHUNK as N;
 
 	let mut done = 0;

From 89af4aaee29b6a45f114bbc81f606ce12aa1f1a7 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 2 Mar 2023 00:03:39 +0100
Subject: [PATCH 114/460] resource: extend BlockTypes with legacy block type
 data

Allow to directly map from id/data values to BlockType.
---
 src/resource/mod.rs | 34 ++++++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/resource/mod.rs b/src/resource/mod.rs
index ee409e6..812a0e7 100644
--- a/src/resource/mod.rs
+++ b/src/resource/mod.rs
@@ -54,16 +54,29 @@ impl BlockType {
 }
 
 #[derive(Debug)]
-pub struct BlockTypes(HashMap<String, BlockType>);
+pub struct BlockTypes {
+	block_type_map: HashMap<String, BlockType>,
+	legacy_block_types: Box<[[BlockType; 16]; 256]>,
+}
 
 impl Default for BlockTypes {
 	fn default() -> Self {
-		BlockTypes(
-			block_types::BLOCK_TYPES
-				.iter()
-				.map(|(k, v)| (String::from(*k), *v))
-				.collect(),
-		)
+		let block_type_map: HashMap<_, _> = block_types::BLOCK_TYPES
+			.iter()
+			.map(|(k, v)| (String::from(*k), *v))
+			.collect();
+		let legacy_block_types = Box::new(LEGACY_BLOCK_TYPES.map(|inner| {
+			inner.map(|id| {
+				*id.strip_prefix("minecraft:")
+					.and_then(|suffix| block_type_map.get(suffix))
+					.expect("Unknown legacy block type")
+			})
+		}));
+
+		BlockTypes {
+			block_type_map,
+			legacy_block_types,
+		}
 	}
 }
 
@@ -71,6 +84,11 @@ impl BlockTypes {
 	#[inline]
 	pub fn get(&self, id: &str) -> Option<BlockType> {
 		let suffix = id.strip_prefix("minecraft:")?;
-		self.0.get(suffix).copied()
+		self.block_type_map.get(suffix).copied()
+	}
+
+	#[inline]
+	pub fn get_legacy(&self, id: u8, data: u8) -> Option<BlockType> {
+		Some(self.legacy_block_types[id as usize][data as usize])
 	}
 }

From f2ab424590c4772c83a7864e8ddd14aebeca6280 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 1 Mar 2023 23:14:57 +0100
Subject: [PATCH 115/460] world: store BlockTypes in section types

Prepare for sections returning BlockType data directly instead of block IDs.
---
 src/main.rs          |  2 +-
 src/world/chunk.rs   | 30 ++++++++++++++++++++----------
 src/world/section.rs | 21 ++++++++++++++++++---
 3 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 493b54f..c351230 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -75,7 +75,7 @@ impl<'a> RegionProcessor<'a> {
 
 	/// Processes a single chunk
 	fn process_chunk(&self, data: world::de::Chunk) -> Result<Box<world::layer::BlockInfoArray>> {
-		let chunk = world::chunk::Chunk::new(&data)?;
+		let chunk = world::chunk::Chunk::new(&data, &self.block_types)?;
 		world::layer::top_layer(&chunk, &self.block_types)
 	}
 
diff --git a/src/world/chunk.rs b/src/world/chunk.rs
index de0726b..45b3476 100644
--- a/src/world/chunk.rs
+++ b/src/world/chunk.rs
@@ -9,7 +9,7 @@ use super::{
 	de,
 	section::{BiomesV18, Section, SectionV0, SectionV1_13},
 };
-use crate::types::*;
+use crate::{resource::BlockTypes, types::*};
 
 /// Chunk data structure wrapping a [de::Chunk] for convenient access to
 /// block and biome data
@@ -67,17 +67,23 @@ pub struct SectionIter<'a> {
 
 impl<'a> Chunk<'a> {
 	/// Creates a new [Chunk] from a deserialized [de::Chunk]
-	pub fn new(data: &'a de::Chunk) -> Result<Self> {
+	pub fn new(data: &'a de::Chunk, block_types: &'a BlockTypes) -> Result<Self> {
 		let data_version = data.data_version.unwrap_or_default();
 
 		match &data.chunk {
-			de::ChunkVariants::V1_18 { sections } => Self::new_v1_18(data_version, sections),
-			de::ChunkVariants::V0 { level } => Self::new_v0(data_version, level),
+			de::ChunkVariants::V1_18 { sections } => {
+				Self::new_v1_18(data_version, sections, block_types)
+			}
+			de::ChunkVariants::V0 { level } => Self::new_v0(data_version, level, block_types),
 		}
 	}
 
 	/// [Chunk::new] implementation for Minecraft v1.18+ chunks
-	fn new_v1_18(data_version: u32, sections: &'a Vec<de::SectionV1_18>) -> Result<Self> {
+	fn new_v1_18(
+		data_version: u32,
+		sections: &'a Vec<de::SectionV1_18>,
+		block_types: &'a BlockTypes,
+	) -> Result<Self> {
 		let mut section_map = BTreeMap::new();
 
 		for section in sections {
@@ -88,6 +94,7 @@ impl<'a> Chunk<'a> {
 						data_version,
 						section.block_states.data.as_ref(),
 						&section.block_states.palette,
+						block_types,
 					)
 					.with_context(|| format!("Failed to load section at Y={}", section.y))?,
 					BiomesV18::new(section.biomes.data.as_ref(), &section.biomes.palette)
@@ -102,7 +109,11 @@ impl<'a> Chunk<'a> {
 	}
 
 	/// [Chunk::new] implementation for all pre-1.18 chunk variants
-	fn new_v0(data_version: u32, level: &'a de::LevelV0) -> Result<Self> {
+	fn new_v0(
+		data_version: u32,
+		level: &'a de::LevelV0,
+		block_types: &'a BlockTypes,
+	) -> Result<Self> {
 		let mut section_map_v1_13 = BTreeMap::new();
 		let mut section_map_v0 = BTreeMap::new();
 
@@ -114,15 +125,14 @@ impl<'a> Chunk<'a> {
 				} => {
 					section_map_v1_13.insert(
 						SectionY(section.y.into()),
-						SectionV1_13::new(data_version, Some(block_states), palette).with_context(
-							|| format!("Failed to load section at Y={}", section.y),
-						)?,
+						SectionV1_13::new(data_version, Some(block_states), palette, block_types)
+							.with_context(|| format!("Failed to load section at Y={}", section.y))?,
 					);
 				}
 				de::SectionV0Variants::V0 { blocks, data } => {
 					section_map_v0.insert(
 						SectionY(section.y.into()),
-						SectionV0::new(blocks, data).with_context(|| {
+						SectionV0::new(blocks, data, block_types).with_context(|| {
 							format!("Failed to load section at Y={}", section.y)
 						})?,
 					);
diff --git a/src/world/section.rs b/src/world/section.rs
index d02d1be..9cf733a 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -2,7 +2,10 @@ use anyhow::{bail, Context, Result};
 use num_integer::div_rem;
 
 use super::de;
-use crate::{resource, types::*};
+use crate::{
+	resource::{self, BlockTypes},
+	types::*,
+};
 
 /// Determine the number of bits required for indexing into a palette of a given length
 ///
@@ -65,6 +68,7 @@ impl<'a> BiomesV18<'a> {
 pub struct SectionV1_13<'a> {
 	block_states: Option<&'a fastnbt::LongArray>,
 	palette: &'a Vec<de::BlockStatePaletteEntry>,
+	_block_types: &'a BlockTypes,
 	bits: u8,
 	aligned_blocks: bool,
 }
@@ -75,6 +79,7 @@ impl<'a> SectionV1_13<'a> {
 		data_version: u32,
 		block_states: Option<&'a fastnbt::LongArray>,
 		palette: &'a Vec<de::BlockStatePaletteEntry>,
+		block_types: &'a BlockTypes,
 	) -> Result<Self> {
 		let aligned_blocks = data_version >= 2529;
 
@@ -95,6 +100,7 @@ impl<'a> SectionV1_13<'a> {
 		Ok(Self {
 			block_states,
 			palette,
+			_block_types: block_types,
 			bits,
 			aligned_blocks,
 		})
@@ -146,11 +152,16 @@ impl<'a> Section for SectionV1_13<'a> {
 pub struct SectionV0<'a> {
 	blocks: &'a fastnbt::ByteArray,
 	data: &'a fastnbt::ByteArray,
+	_block_types: &'a BlockTypes,
 }
 
 impl<'a> SectionV0<'a> {
 	/// Constructs a new [SectionV0] from deserialized data structures
-	pub fn new(blocks: &'a fastnbt::ByteArray, data: &'a fastnbt::ByteArray) -> Result<Self> {
+	pub fn new(
+		blocks: &'a fastnbt::ByteArray,
+		data: &'a fastnbt::ByteArray,
+		block_types: &'a BlockTypes,
+	) -> Result<Self> {
 		use BLOCKS_PER_CHUNK as N;
 
 		if blocks.len() != N * N * N {
@@ -160,7 +171,11 @@ impl<'a> SectionV0<'a> {
 			bail!("Invalid section extra data");
 		}
 
-		Ok(SectionV0 { blocks, data })
+		Ok(SectionV0 {
+			blocks,
+			data,
+			_block_types: block_types,
+		})
 	}
 }
 

From 5c82b80924d4c2b093ad8b71faffeb7df851c4f0 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 2 Mar 2023 00:19:01 +0100
Subject: [PATCH 116/460] world/section: replace block_id_at() method with
 block_at()

Directly return a BlockType, preparing for early lookup of palettes.
---
 src/main.rs          |  2 +-
 src/world/layer.rs   |  8 +++-----
 src/world/section.rs | 25 +++++++++++++++----------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index c351230..80f2b25 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -76,7 +76,7 @@ impl<'a> RegionProcessor<'a> {
 	/// Processes a single chunk
 	fn process_chunk(&self, data: world::de::Chunk) -> Result<Box<world::layer::BlockInfoArray>> {
 		let chunk = world::chunk::Chunk::new(&data, &self.block_types)?;
-		world::layer::top_layer(&chunk, &self.block_types)
+		world::layer::top_layer(&chunk)
 	}
 
 	fn save_region(
diff --git a/src/world/layer.rs b/src/world/layer.rs
index 0039136..a5d8383 100644
--- a/src/world/layer.rs
+++ b/src/world/layer.rs
@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 
 use super::chunk::Chunk;
 use crate::{
-	resource::{BlockFlag, BlockType, BlockTypes},
+	resource::{BlockFlag, BlockType},
 	types::*,
 };
 
@@ -92,7 +92,7 @@ pub type BlockInfoArray = LayerBlockArray<Option<BlockInfo>>;
 /// determined as the block that should be visible on the rendered
 /// map. For water blocks, the height of the first non-water block
 /// is additionally filled in as the water depth.
-pub fn top_layer(chunk: &Chunk, block_types: &BlockTypes) -> Result<Box<BlockInfoArray>> {
+pub fn top_layer(chunk: &Chunk) -> Result<Box<BlockInfoArray>> {
 	use BLOCKS_PER_CHUNK as N;
 
 	let mut done = 0;
@@ -109,9 +109,7 @@ pub fn top_layer(chunk: &Chunk, block_types: &BlockTypes) -> Result<Box<BlockInf
 		}
 
 		let coords = SectionBlockCoords { xz, y };
-		let block_id = section.block_id_at(coords)?;
-		let Some(block_type) = block_types.get(block_id) else {
-			eprintln!("Unknown block type: {}", block_id);
+		let Some(block_type) = section.block_at(coords)? else {
 			continue;
 		};
 		let height = BlockHeight::new(section_y, y)?;
diff --git a/src/world/section.rs b/src/world/section.rs
index 9cf733a..471f5d0 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -3,7 +3,7 @@ use num_integer::div_rem;
 
 use super::de;
 use crate::{
-	resource::{self, BlockTypes},
+	resource::{BlockType, BlockTypes},
 	types::*,
 };
 
@@ -27,7 +27,7 @@ fn palette_bits(len: usize, min: u8, max: u8) -> Option<u8> {
 
 /// Trait for common functions of [SectionV1_13] and [SectionV0]
 pub trait Section {
-	fn block_id_at(&self, coords: SectionBlockCoords) -> Result<&str>;
+	fn block_at(&self, coords: SectionBlockCoords) -> Result<Option<BlockType>>;
 }
 
 /// Minecraft v1.18+ section biome data
@@ -68,7 +68,7 @@ impl<'a> BiomesV18<'a> {
 pub struct SectionV1_13<'a> {
 	block_states: Option<&'a fastnbt::LongArray>,
 	palette: &'a Vec<de::BlockStatePaletteEntry>,
-	_block_types: &'a BlockTypes,
+	block_types: &'a BlockTypes,
 	bits: u8,
 	aligned_blocks: bool,
 }
@@ -100,7 +100,7 @@ impl<'a> SectionV1_13<'a> {
 		Ok(Self {
 			block_states,
 			palette,
-			_block_types: block_types,
+			block_types,
 			bits,
 			aligned_blocks,
 		})
@@ -137,13 +137,18 @@ impl<'a> SectionV1_13<'a> {
 }
 
 impl<'a> Section for SectionV1_13<'a> {
-	fn block_id_at(&self, coords: SectionBlockCoords) -> Result<&str> {
+	fn block_at(&self, coords: SectionBlockCoords) -> Result<Option<BlockType>> {
 		let index = self.palette_index_at(coords);
 		let entry = self
 			.palette
 			.get(index)
 			.context("Palette index out of bounds")?;
-		Ok(&entry.name)
+
+		let block_type = self.block_types.get(&entry.name);
+		if block_type.is_none() {
+			eprintln!("Unknown block type: {}", entry.name);
+		}
+		Ok(block_type)
 	}
 }
 
@@ -152,7 +157,7 @@ impl<'a> Section for SectionV1_13<'a> {
 pub struct SectionV0<'a> {
 	blocks: &'a fastnbt::ByteArray,
 	data: &'a fastnbt::ByteArray,
-	_block_types: &'a BlockTypes,
+	block_types: &'a BlockTypes,
 }
 
 impl<'a> SectionV0<'a> {
@@ -174,13 +179,13 @@ impl<'a> SectionV0<'a> {
 		Ok(SectionV0 {
 			blocks,
 			data,
-			_block_types: block_types,
+			block_types,
 		})
 	}
 }
 
 impl<'a> Section for SectionV0<'a> {
-	fn block_id_at(&self, coords: SectionBlockCoords) -> Result<&str> {
+	fn block_at(&self, coords: SectionBlockCoords) -> Result<Option<BlockType>> {
 		let offset = coords.offset();
 		let block = self.blocks[offset] as u8;
 
@@ -192,6 +197,6 @@ impl<'a> Section for SectionV0<'a> {
 			data_byte & 0xf
 		};
 
-		Ok(resource::LEGACY_BLOCK_TYPES[block as usize][data as usize])
+		Ok(self.block_types.get_legacy(block, data))
 	}
 }

From 04bc3e5d53050cb861117ce4403a751bb08dea12 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 2 Mar 2023 00:37:25 +0100
Subject: [PATCH 117/460] world/section: perform palette lookups early

Look up block types for all palette entries once during section
construction, rather than on block_at(), reducing the number of HashMap
lookups by ~1000.
---
 src/world/section.rs | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/world/section.rs b/src/world/section.rs
index 471f5d0..8c98a68 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -67,8 +67,7 @@ impl<'a> BiomesV18<'a> {
 #[derive(Debug)]
 pub struct SectionV1_13<'a> {
 	block_states: Option<&'a fastnbt::LongArray>,
-	palette: &'a Vec<de::BlockStatePaletteEntry>,
-	block_types: &'a BlockTypes,
+	palette: Vec<Option<BlockType>>,
 	bits: u8,
 	aligned_blocks: bool,
 }
@@ -97,10 +96,20 @@ impl<'a> SectionV1_13<'a> {
 			}
 		}
 
+		let palette_types = palette
+			.iter()
+			.map(|entry| {
+				let block_type = block_types.get(&entry.name);
+				if block_type.is_none() {
+					eprintln!("Unknown block type: {}", entry.name);
+				}
+				block_type
+			})
+			.collect();
+
 		Ok(Self {
 			block_states,
-			palette,
-			block_types,
+			palette: palette_types,
 			bits,
 			aligned_blocks,
 		})
@@ -139,16 +148,10 @@ impl<'a> SectionV1_13<'a> {
 impl<'a> Section for SectionV1_13<'a> {
 	fn block_at(&self, coords: SectionBlockCoords) -> Result<Option<BlockType>> {
 		let index = self.palette_index_at(coords);
-		let entry = self
+		Ok(*self
 			.palette
 			.get(index)
-			.context("Palette index out of bounds")?;
-
-		let block_type = self.block_types.get(&entry.name);
-		if block_type.is_none() {
-			eprintln!("Unknown block type: {}", entry.name);
-		}
-		Ok(block_type)
+			.context("Palette index out of bounds")?)
 	}
 }
 

From ed5fb9a6cfb3f2d3851c1717e4b1a16ea9851410 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 2 Mar 2023 00:41:39 +0100
Subject: [PATCH 118/460] resource: remove LEGACY_BLOCK_TYPES reexport

As the array is only used internally now, we can also remove the
"minecraft:" prefix from the entries.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
---
 src/resource/legacy_block_types.rs | 1046 ++++++++++++++--------------
 src/resource/mod.rs                |    9 +-
 2 files changed, 510 insertions(+), 545 deletions(-)

diff --git a/src/resource/legacy_block_types.rs b/src/resource/legacy_block_types.rs
index 6dc7305..c5d9462 100644
--- a/src/resource/legacy_block_types.rs
+++ b/src/resource/legacy_block_types.rs
@@ -4,21 +4,21 @@ const fn simple(id: &str) -> [&str; 16] {
 	]
 }
 
-const DEF: &str = "minecraft:air";
+const DEF: &str = "air";
 const EMPTY: [&str; 16] = simple(DEF);
 
 pub const LEGACY_BLOCK_TYPES: [[&str; 16]; 256] = [
 	/* 0 */
-	simple("minecraft:air"),
+	simple("air"),
 	/* 1 */
 	[
-		"minecraft:stone",
-		"minecraft:granite",
-		"minecraft:polished_granite",
-		"minecraft:diorite",
-		"minecraft:polished_diorite",
-		"minecraft:andesite",
-		"minecraft:polished_andesite",
+		"stone",
+		"granite",
+		"polished_granite",
+		"diorite",
+		"polished_diorite",
+		"andesite",
+		"polished_andesite",
 		DEF,
 		DEF,
 		DEF,
@@ -30,12 +30,12 @@ pub const LEGACY_BLOCK_TYPES: [[&str; 16]; 256] = [
 		DEF,
 	],
 	/* 2 */
-	simple("minecraft:grass_block"),
+	simple("grass_block"),
 	/* 3 */
 	[
-		"minecraft:dirt",
-		"minecraft:coarse_dirt",
-		"minecraft:podzol",
+		"dirt",
+		"coarse_dirt",
+		"podzol",
 		DEF,
 		DEF,
 		DEF,
@@ -51,15 +51,15 @@ pub const LEGACY_BLOCK_TYPES: [[&str; 16]; 256] = [
 		DEF,
 	],
 	/* 4 */
-	simple("minecraft:cobblestone"),
+	simple("cobblestone"),
 	/* 5 */
 	[
-		"minecraft:oak_planks",
-		"minecraft:spruce_planks",
-		"minecraft:birch_planks",
-		"minecraft:jungle_planks",
-		"minecraft:acacia_planks",
-		"minecraft:dark_oak_planks",
+		"oak_planks",
+		"spruce_planks",
+		"birch_planks",
+		"jungle_planks",
+		"acacia_planks",
+		"dark_oak_planks",
 		DEF,
 		DEF,
 		DEF,
@@ -73,181 +73,151 @@ pub const LEGACY_BLOCK_TYPES: [[&str; 16]; 256] = [
 	],
 	/* 6 */
 	[
-		"minecraft:oak_sapling",
-		"minecraft:spruce_sapling",
-		"minecraft:birch_sapling",
-		"minecraft:jungle_sapling",
-		"minecraft:acacia_sapling",
-		"minecraft:dark_oak_sapling",
+		"oak_sapling",
+		"spruce_sapling",
+		"birch_sapling",
+		"jungle_sapling",
+		"acacia_sapling",
+		"dark_oak_sapling",
 		DEF,
 		DEF,
-		"minecraft:oak_sapling",
-		"minecraft:spruce_sapling",
-		"minecraft:birch_sapling",
-		"minecraft:jungle_sapling",
-		"minecraft:acacia_sapling",
-		"minecraft:dark_oak_sapling",
+		"oak_sapling",
+		"spruce_sapling",
+		"birch_sapling",
+		"jungle_sapling",
+		"acacia_sapling",
+		"dark_oak_sapling",
 		DEF,
 		DEF,
 	],
 	/* 7 */
-	simple("minecraft:bedrock"),
+	simple("bedrock"),
 	/* 8 */
-	simple("minecraft:water"),
+	simple("water"),
 	/* 9 */
-	simple("minecraft:water"),
+	simple("water"),
 	/* 10 */
-	simple("minecraft:lava"),
+	simple("lava"),
 	/* 11 */
-	simple("minecraft:lava"),
+	simple("lava"),
 	/* 12 */
 	[
-		"minecraft:sand",
-		"minecraft:red_sand",
-		DEF,
-		DEF,
-		DEF,
-		DEF,
-		DEF,
-		DEF,
-		DEF,
-		DEF,
-		DEF,
-		DEF,
-		DEF,
-		DEF,
-		DEF,
-		DEF,
+		"sand", "red_sand", DEF, DEF, DEF, DEF, DEF, DEF, DEF, DEF, DEF, DEF, DEF, DEF, DEF, DEF,
 	],
 	/* 13 */
-	simple("minecraft:gravel"),
+	simple("gravel"),
 	/* 14 */
-	simple("minecraft:gold_ore"),
+	simple("gold_ore"),
 	/* 15 */
-	simple("minecraft:iron_ore"),
+	simple("iron_ore"),
 	/* 16 */
-	simple("minecraft:coal_ore"),
+	simple("coal_ore"),
 	/* 17 */
 	[
-		"minecraft:oak_log",
-		"minecraft:spruce_log",
-		"minecraft:birch_log",
-		"minecraft:jungle_log",
-		"minecraft:oak_log",
-		"minecraft:spruce_log",
-		"minecraft:birch_log",
-		"minecraft:jungle_log",
-		"minecraft:oak_log",
-		"minecraft:spruce_log",
-		"minecraft:birch_log",
-		"minecraft:jungle_log",
-		"minecraft:oak_log",
-		"minecraft:spruce_log",
-		"minecraft:birch_log",
-		"minecraft:jungle_log",
+		"oak_log",
+		"spruce_log",
+		"birch_log",
+		"jungle_log",
+		"oak_log",
+		"spruce_log",
+		"birch_log",
+		"jungle_log",
+		"oak_log",
+		"spruce_log",
+		"birch_log",
+		"jungle_log",
+		"oak_log",
+		"spruce_log",
+		"birch_log",
+		"jungle_log",
 	],
 	/* 18 */
 	[
-		"minecraft:oak_leaves",
-		"minecraft:spruce_leaves",
-		"minecraft:birch_leaves",
-		"minecraft:jungle_leaves",
-		"minecraft:oak_leaves",
-		"minecraft:spruce_leaves",
-		"minecraft:birch_leaves",
-		"minecraft:jungle_leaves",
-		"minecraft:oak_leaves",
-		"minecraft:spruce_leaves",
-		"minecraft:birch_leaves",
-		"minecraft:jungle_leaves",
-		"minecraft:oak_leaves",
-		"minecraft:spruce_leaves",
-		"minecraft:birch_leaves",
-		"minecraft:jungle_leaves",
+		"oak_leaves",
+		"spruce_leaves",
+		"birch_leaves",
+		"jungle_leaves",
+		"oak_leaves",
+		"spruce_leaves",
+		"birch_leaves",
+		"jungle_leaves",
+		"oak_leaves",
+		"spruce_leaves",
+		"birch_leaves",
+		"jungle_leaves",
+		"oak_leaves",
+		"spruce_leaves",
+		"birch_leaves",
+		"jungle_leaves",
 	],
 	/* 19 */
-	simple("minecraft:sponge"),
+	simple("sponge"),
 	/* 20 */
-	simple("minecraft:glass"),
+	simple("glass"),
 	/* 21 */
-	simple("minecraft:lapis_ore"),
+	simple("lapis_ore"),
 	/* 22 */
-	simple("minecraft:lapis_block"),
+	simple("lapis_block"),
 	/* 23 */
-	simple("minecraft:dispenser"),
+	simple("dispenser"),
 	/* 24 */
-	simple("minecraft:sandstone"),
+	simple("sandstone"),
 	/* 25 */
-	simple("minecraft:note_block"),
+	simple("note_block"),
 	/* 26 */
 	EMPTY, // bed
 	/* 27 */
-	simple("minecraft:powered_rail"),
+	simple("powered_rail"),
 	/* 28 */
-	simple("minecraft:detector_rail"),
+	simple("detector_rail"),
 	/* 29 */
-	simple("minecraft:sticky_piston"),
+	simple("sticky_piston"),
 	/* 30 */
-	simple("minecraft:cobweb"),
+	simple("cobweb"),
 	/* 31 */
 	[
-		"minecraft:grass",
-		"minecraft:fern",
-		DEF,
-		DEF,
-		DEF,
-		DEF,
-		DEF,
-		DEF,
-		DEF,
-		DEF,
-		DEF,
-		DEF,
-		DEF,
-		DEF,
-		DEF,
-		DEF,
+		"grass", "fern", DEF, DEF, DEF, DEF, DEF, DEF, DEF, DEF, DEF, DEF, DEF, DEF, DEF, DEF,
 	],
 	/* 32 */
-	simple("minecraft:dead_bush"),
+	simple("dead_bush"),
 	/* 33 */
-	simple("minecraft:piston"),
+	simple("piston"),
 	/* 34 */
-	simple("minecraft:piston_head"),
+	simple("piston_head"),
 	/* 35 */
 	[
-		"minecraft:white_wool",
-		"minecraft:orange_wool",
-		"minecraft:magenta_wool",
-		"minecraft:light_blue_wool",
-		"minecraft:yellow_wool",
-		"minecraft:lime_wool",
-		"minecraft:pink_wool",
-		"minecraft:gray_wool",
-		"minecraft:light_gray_wool",
-		"minecraft:cyan_wool",
-		"minecraft:purple_wool",
-		"minecraft:blue_wool",
-		"minecraft:brown_wool",
-		"minecraft:green_wool",
-		"minecraft:red_wool",
-		"minecraft:black_wool",
+		"white_wool",
+		"orange_wool",
+		"magenta_wool",
+		"light_blue_wool",
+		"yellow_wool",
+		"lime_wool",
+		"pink_wool",
+		"gray_wool",
+		"light_gray_wool",
+		"cyan_wool",
+		"purple_wool",
+		"blue_wool",
+		"brown_wool",
+		"green_wool",
+		"red_wool",
+		"black_wool",
 	],
 	/* 36 */
-	simple("minecraft:moving_piston"),
+	simple("moving_piston"),
 	/* 37 */
-	simple("minecraft:dandelion"),
+	simple("dandelion"),
 	/* 38 */
 	[
-		"minecraft:poppy",
-		"minecraft:blue_orchid",
-		"minecraft:allium",
-		"minecraft:azure_bluet",
-		"minecraft:red_tulip",
-		"minecraft:orange_tulip",
-		"minecraft:white_tulip",
-		"minecraft:pink_tulip",
-		"minecraft:oxeye_daisy",
+		"poppy",
+		"blue_orchid",
+		"allium",
+		"azure_bluet",
+		"red_tulip",
+		"orange_tulip",
+		"white_tulip",
+		"pink_tulip",
+		"oxeye_daisy",
 		DEF,
 		DEF,
 		DEF,
@@ -257,23 +227,23 @@ pub const LEGACY_BLOCK_TYPES: [[&str; 16]; 256] = [
 		DEF,
 	],
 	/* 39 */
-	simple("minecraft:brown_mushroom"),
+	simple("brown_mushroom"),
 	/* 40 */
-	simple("minecraft:red_mushroom"),
+	simple("red_mushroom"),
 	/* 41 */
-	simple("minecraft:gold_block"),
+	simple("gold_block"),
 	/* 42 */
-	simple("minecraft:iron_block"),
+	simple("iron_block"),
 	/* 43 */
 	[
-		"minecraft:smooth_stone_slab",
-		"minecraft:sandstone_slab",
-		"minecraft:oak_slab",
-		"minecraft:cobblestone_slab",
-		"minecraft:brick_slab",
-		"minecraft:stone_brick_slab",
-		"minecraft:nether_brick_slab",
-		"minecraft:quartz_slab",
+		"smooth_stone_slab",
+		"sandstone_slab",
+		"oak_slab",
+		"cobblestone_slab",
+		"brick_slab",
+		"stone_brick_slab",
+		"nether_brick_slab",
+		"quartz_slab",
 		DEF,
 		DEF,
 		DEF,
@@ -285,41 +255,41 @@ pub const LEGACY_BLOCK_TYPES: [[&str; 16]; 256] = [
 	],
 	/* 44 */
 	[
-		"minecraft:smooth_stone_slab",
-		"minecraft:sandstone_slab",
-		"minecraft:oak_slab",
-		"minecraft:cobblestone_slab",
-		"minecraft:brick_slab",
-		"minecraft:stone_brick_slab",
-		"minecraft:nether_brick_slab",
-		"minecraft:quartz_slab",
-		"minecraft:stone_slab",
-		"minecraft:sandstone_slab",
-		"minecraft:oak_slab",
-		"minecraft:cobblestone_slab",
-		"minecraft:brick_slab",
-		"minecraft:stone_brick_slab",
-		"minecraft:nether_brick_slab",
-		"minecraft:quartz_slab",
+		"smooth_stone_slab",
+		"sandstone_slab",
+		"oak_slab",
+		"cobblestone_slab",
+		"brick_slab",
+		"stone_brick_slab",
+		"nether_brick_slab",
+		"quartz_slab",
+		"stone_slab",
+		"sandstone_slab",
+		"oak_slab",
+		"cobblestone_slab",
+		"brick_slab",
+		"stone_brick_slab",
+		"nether_brick_slab",
+		"quartz_slab",
 	],
 	/* 45 */
-	simple("minecraft:bricks"),
+	simple("bricks"),
 	/* 46 */
-	simple("minecraft:tnt"),
+	simple("tnt"),
 	/* 47 */
-	simple("minecraft:bookshelf"),
+	simple("bookshelf"),
 	/* 48 */
-	simple("minecraft:mossy_cobblestone"),
+	simple("mossy_cobblestone"),
 	/* 49 */
-	simple("minecraft:obsidian"),
+	simple("obsidian"),
 	/* 50 */
 	[
 		DEF,
-		"minecraft:wall_torch",
-		"minecraft:wall_torch",
-		"minecraft:wall_torch",
-		"minecraft:wall_torch",
-		"minecraft:torch",
+		"wall_torch",
+		"wall_torch",
+		"wall_torch",
+		"wall_torch",
+		"torch",
 		DEF,
 		DEF,
 		DEF,
@@ -332,61 +302,61 @@ pub const LEGACY_BLOCK_TYPES: [[&str; 16]; 256] = [
 		DEF,
 	],
 	/* 51 */
-	simple("minecraft:fire"),
+	simple("fire"),
 	/* 52 */
-	simple("minecraft:spawner"),
+	simple("spawner"),
 	/* 53 */
-	simple("minecraft:oak_stairs"),
+	simple("oak_stairs"),
 	/* 54 */
-	simple("minecraft:chest"),
+	simple("chest"),
 	/* 55 */
-	simple("minecraft:redstone_wire"),
+	simple("redstone_wire"),
 	/* 56 */
-	simple("minecraft:diamond_ore"),
+	simple("diamond_ore"),
 	/* 57 */
-	simple("minecraft:diamond_block"),
+	simple("diamond_block"),
 	/* 58 */
-	simple("minecraft:crafting_table"),
+	simple("crafting_table"),
 	/* 59 */
-	simple("minecraft:wheat"),
+	simple("wheat"),
 	/* 60 */
-	simple("minecraft:farmland"),
+	simple("farmland"),
 	/* 61 */
-	simple("minecraft:furnace"),
+	simple("furnace"),
 	/* 62 */
-	simple("minecraft:furnace"),
+	simple("furnace"),
 	/* 63 */
-	simple("minecraft:sign"),
+	simple("sign"),
 	/* 64 */
-	simple("minecraft:oak_door"),
+	simple("oak_door"),
 	/* 65 */
-	simple("minecraft:ladder"),
+	simple("ladder"),
 	/* 66 */
-	simple("minecraft:rail"),
+	simple("rail"),
 	/* 67 */
-	simple("minecraft:cobblestone_stairs"),
+	simple("cobblestone_stairs"),
 	/* 68 */
-	simple("minecraft:wall_sign"),
+	simple("wall_sign"),
 	/* 69 */
-	simple("minecraft:lever"),
+	simple("lever"),
 	/* 70 */
-	simple("minecraft:stone_pressure_plate"),
+	simple("stone_pressure_plate"),
 	/* 71 */
-	simple("minecraft:iron_door"),
+	simple("iron_door"),
 	/* 72 */
-	simple("minecraft:oak_pressure_plate"),
+	simple("oak_pressure_plate"),
 	/* 73 */
-	simple("minecraft:redstone_ore"),
+	simple("redstone_ore"),
 	/* 74 */
-	simple("minecraft:redstone_ore"),
+	simple("redstone_ore"),
 	/* 75 */
 	[
 		DEF,
-		"minecraft:redstone_wall_torch",
-		"minecraft:redstone_wall_torch",
-		"minecraft:redstone_wall_torch",
-		"minecraft:redstone_wall_torch",
-		"minecraft:redstone_torch",
+		"redstone_wall_torch",
+		"redstone_wall_torch",
+		"redstone_wall_torch",
+		"redstone_wall_torch",
+		"redstone_torch",
 		DEF,
 		DEF,
 		DEF,
@@ -401,11 +371,11 @@ pub const LEGACY_BLOCK_TYPES: [[&str; 16]; 256] = [
 	/* 76 */
 	[
 		DEF,
-		"minecraft:redstone_wall_torch",
-		"minecraft:redstone_wall_torch",
-		"minecraft:redstone_wall_torch",
-		"minecraft:redstone_wall_torch",
-		"minecraft:redstone_torch",
+		"redstone_wall_torch",
+		"redstone_wall_torch",
+		"redstone_wall_torch",
+		"redstone_wall_torch",
+		"redstone_torch",
 		DEF,
 		DEF,
 		DEF,
@@ -418,70 +388,70 @@ pub const LEGACY_BLOCK_TYPES: [[&str; 16]; 256] = [
 		DEF,
 	],
 	/* 77 */
-	simple("minecraft:stone_button"),
+	simple("stone_button"),
 	/* 78 */
-	simple("minecraft:snow"),
+	simple("snow"),
 	/* 79 */
-	simple("minecraft:ice"),
+	simple("ice"),
 	/* 80 */
-	simple("minecraft:snow_block"),
+	simple("snow_block"),
 	/* 81 */
-	simple("minecraft:cactus"),
+	simple("cactus"),
 	/* 82 */
-	simple("minecraft:clay"),
+	simple("clay"),
 	/* 83 */
-	simple("minecraft:sugar_cane"),
+	simple("sugar_cane"),
 	/* 84 */
-	simple("minecraft:jukebox"),
+	simple("jukebox"),
 	/* 85 */
-	simple("minecraft:oak_fence"),
+	simple("oak_fence"),
 	/* 86 */
-	simple("minecraft:pumpkin"),
+	simple("pumpkin"),
 	/* 87 */
-	simple("minecraft:netherrack"),
+	simple("netherrack"),
 	/* 88 */
-	simple("minecraft:soul_sand"),
+	simple("soul_sand"),
 	/* 89 */
-	simple("minecraft:glowstone"),
+	simple("glowstone"),
 	/* 90 */
-	simple("minecraft:nether_portal"),
+	simple("nether_portal"),
 	/* 91 */
-	simple("minecraft:pumpkin"),
+	simple("pumpkin"),
 	/* 92 */
-	simple("minecraft:cake"),
+	simple("cake"),
 	/* 93 */
-	simple("minecraft:repeater"),
+	simple("repeater"),
 	/* 94 */
-	simple("minecraft:repeater"),
+	simple("repeater"),
 	/* 95 */
 	[
-		"minecraft:white_stained_glass",
-		"minecraft:orange_stained_glass",
-		"minecraft:magenta_stained_glass",
-		"minecraft:light_blue_stained_glass",
-		"minecraft:yellow_stained_glass",
-		"minecraft:lime_stained_glass",
-		"minecraft:pink_stained_glass",
-		"minecraft:gray_stained_glass",
-		"minecraft:light_gray_stained_glass",
-		"minecraft:cyan_stained_glass",
-		"minecraft:purple_stained_glass",
-		"minecraft:blue_stained_glass",
-		"minecraft:brown_stained_glass",
-		"minecraft:green_stained_glass",
-		"minecraft:red_stained_glass",
-		"minecraft:black_stained_glass",
+		"white_stained_glass",
+		"orange_stained_glass",
+		"magenta_stained_glass",
+		"light_blue_stained_glass",
+		"yellow_stained_glass",
+		"lime_stained_glass",
+		"pink_stained_glass",
+		"gray_stained_glass",
+		"light_gray_stained_glass",
+		"cyan_stained_glass",
+		"purple_stained_glass",
+		"blue_stained_glass",
+		"brown_stained_glass",
+		"green_stained_glass",
+		"red_stained_glass",
+		"black_stained_glass",
 	],
 	/* 96 */
-	simple("minecraft:oak_trapdoor"),
+	simple("oak_trapdoor"),
 	/* 97 */
 	[
-		"minecraft:infested_stone",
-		"minecraft:infested_cobblestone",
-		"minecraft:infested_stone_bricks",
-		"minecraft:infested_mossy_stone_bricks",
-		"minecraft:infested_cracked_stone_bricks",
-		"minecraft:infested_chiseled_stone_bricks",
+		"infested_stone",
+		"infested_cobblestone",
+		"infested_stone_bricks",
+		"infested_mossy_stone_bricks",
+		"infested_cracked_stone_bricks",
+		"infested_chiseled_stone_bricks",
 		DEF,
 		DEF,
 		DEF,
@@ -495,10 +465,10 @@ pub const LEGACY_BLOCK_TYPES: [[&str; 16]; 256] = [
 	],
 	/* 98 */
 	[
-		"minecraft:stone_bricks",
-		"minecraft:mossy_stone_bricks",
-		"minecraft:cracked_stone_bricks",
-		"minecraft:chiseled_stone_bricks",
+		"stone_bricks",
+		"mossy_stone_bricks",
+		"cracked_stone_bricks",
+		"chiseled_stone_bricks",
 		DEF,
 		DEF,
 		DEF,
@@ -513,65 +483,65 @@ pub const LEGACY_BLOCK_TYPES: [[&str; 16]; 256] = [
 		DEF,
 	],
 	/* 99 */
-	simple("minecraft:brown_mushroom_block"),
+	simple("brown_mushroom_block"),
 	/* 100 */
-	simple("minecraft:red_mushroom_block"),
+	simple("red_mushroom_block"),
 	/* 101 */
-	simple("minecraft:iron_bars"),
+	simple("iron_bars"),
 	/* 102 */
-	simple("minecraft:glass_pane"),
+	simple("glass_pane"),
 	/* 103 */
-	simple("minecraft:melon"),
+	simple("melon"),
 	/* 104 */
-	simple("minecraft:pumpkin_stem"),
+	simple("pumpkin_stem"),
 	/* 105 */
-	simple("minecraft:melon_stem"),
+	simple("melon_stem"),
 	/* 106 */
-	simple("minecraft:vine"),
+	simple("vine"),
 	/* 107 */
-	simple("minecraft:oak_fence_gate"),
+	simple("oak_fence_gate"),
 	/* 108 */
-	simple("minecraft:brick_stairs"),
+	simple("brick_stairs"),
 	/* 109 */
-	simple("minecraft:stone_brick_stairs"),
+	simple("stone_brick_stairs"),
 	/* 110 */
-	simple("minecraft:mycelium"),
+	simple("mycelium"),
 	/* 111 */
-	simple("minecraft:lily_pad"),
+	simple("lily_pad"),
 	/* 112 */
-	simple("minecraft:nether_bricks"),
+	simple("nether_bricks"),
 	/* 113 */
-	simple("minecraft:nether_brick_fence"),
+	simple("nether_brick_fence"),
 	/* 114 */
-	simple("minecraft:nether_brick_stairs"),
+	simple("nether_brick_stairs"),
 	/* 115 */
-	simple("minecraft:nether_wart"),
+	simple("nether_wart"),
 	/* 116 */
-	simple("minecraft:enchanting_table"),
+	simple("enchanting_table"),
 	/* 117 */
-	simple("minecraft:brewing_stand"),
+	simple("brewing_stand"),
 	/* 118 */
-	simple("minecraft:cauldron"),
+	simple("cauldron"),
 	/* 119 */
-	simple("minecraft:end_portal"),
+	simple("end_portal"),
 	/* 120 */
-	simple("minecraft:end_portal_frame"),
+	simple("end_portal_frame"),
 	/* 121 */
-	simple("minecraft:end_stone"),
+	simple("end_stone"),
 	/* 122 */
-	simple("minecraft:dragon_egg"),
+	simple("dragon_egg"),
 	/* 123 */
-	simple("minecraft:redstone_lamp"),
+	simple("redstone_lamp"),
 	/* 124 */
-	simple("minecraft:redstone_lamp"),
+	simple("redstone_lamp"),
 	/* 125 */
 	[
-		"minecraft:oak_slab",
-		"minecraft:spruce_slab",
-		"minecraft:birch_slab",
-		"minecraft:jungle_slab",
-		"minecraft:acacia_slab",
-		"minecraft:dark_oak_slab",
+		"oak_slab",
+		"spruce_slab",
+		"birch_slab",
+		"jungle_slab",
+		"acacia_slab",
+		"dark_oak_slab",
 		DEF,
 		DEF,
 		DEF,
@@ -585,51 +555,51 @@ pub const LEGACY_BLOCK_TYPES: [[&str; 16]; 256] = [
 	],
 	/* 126 */
 	[
-		"minecraft:oak_slab",
-		"minecraft:spruce_slab",
-		"minecraft:birch_slab",
-		"minecraft:jungle_slab",
-		"minecraft:acacia_slab",
-		"minecraft:dark_oak_slab",
+		"oak_slab",
+		"spruce_slab",
+		"birch_slab",
+		"jungle_slab",
+		"acacia_slab",
+		"dark_oak_slab",
 		DEF,
 		DEF,
-		"minecraft:oak_slab",
-		"minecraft:spruce_slab",
-		"minecraft:birch_slab",
-		"minecraft:jungle_slab",
-		"minecraft:acacia_slab",
-		"minecraft:dark_oak_slab",
+		"oak_slab",
+		"spruce_slab",
+		"birch_slab",
+		"jungle_slab",
+		"acacia_slab",
+		"dark_oak_slab",
 		DEF,
 		DEF,
 	],
 	/* 127 */
-	simple("minecraft:cocoa"),
+	simple("cocoa"),
 	/* 128 */
-	simple("minecraft:sandstone_stairs"),
+	simple("sandstone_stairs"),
 	/* 129 */
-	simple("minecraft:emerald_ore"),
+	simple("emerald_ore"),
 	/* 130 */
-	simple("minecraft:ender_chest"),
+	simple("ender_chest"),
 	/* 131 */
-	simple("minecraft:tripwire_hook"),
+	simple("tripwire_hook"),
 	/* 132 */
-	simple("minecraft:tripwire"),
+	simple("tripwire"),
 	/* 133 */
-	simple("minecraft:emerald_block"),
+	simple("emerald_block"),
 	/* 134 */
-	simple("minecraft:spruce_stairs"),
+	simple("spruce_stairs"),
 	/* 135 */
-	simple("minecraft:birch_stairs"),
+	simple("birch_stairs"),
 	/* 136 */
-	simple("minecraft:jungle_stairs"),
+	simple("jungle_stairs"),
 	/* 137 */
-	simple("minecraft:command_block"),
+	simple("command_block"),
 	/* 138 */
-	simple("minecraft:beacon"),
+	simple("beacon"),
 	/* 139 */
 	[
-		"minecraft:cobblestone_wall",
-		"minecraft:mossy_cobblestone_wall",
+		"cobblestone_wall",
+		"mossy_cobblestone_wall",
 		DEF,
 		DEF,
 		DEF,
@@ -646,151 +616,151 @@ pub const LEGACY_BLOCK_TYPES: [[&str; 16]; 256] = [
 		DEF,
 	],
 	/* 140 */
-	simple("minecraft:flower_pot"),
+	simple("flower_pot"),
 	/* 141 */
-	simple("minecraft:carrots"),
+	simple("carrots"),
 	/* 142 */
-	simple("minecraft:potatoes"),
+	simple("potatoes"),
 	/* 143 */
 	EMPTY,
 	/* 144 */
 	EMPTY,
 	/* 145 */
 	[
-		"minecraft:anvil",
-		"minecraft:anvil",
-		"minecraft:anvil",
-		"minecraft:anvil",
-		"minecraft:chipped_anvil",
-		"minecraft:chipped_anvil",
-		"minecraft:chipped_anvil",
-		"minecraft:chipped_anvil",
-		"minecraft:damaged_anvil",
-		"minecraft:damaged_anvil",
-		"minecraft:damaged_anvil",
-		"minecraft:damaged_anvil",
+		"anvil",
+		"anvil",
+		"anvil",
+		"anvil",
+		"chipped_anvil",
+		"chipped_anvil",
+		"chipped_anvil",
+		"chipped_anvil",
+		"damaged_anvil",
+		"damaged_anvil",
+		"damaged_anvil",
+		"damaged_anvil",
 		DEF,
 		DEF,
 		DEF,
 		DEF,
 	],
 	/* 146 */
-	simple("minecraft:trapped_chest"),
+	simple("trapped_chest"),
 	/* 147 */
-	simple("minecraft:light_weighted_pressure_plate"),
+	simple("light_weighted_pressure_plate"),
 	/* 148 */
-	simple("minecraft:heavy_weighted_pressure_plate"),
+	simple("heavy_weighted_pressure_plate"),
 	/* 149 */
-	simple("minecraft:comparator"),
+	simple("comparator"),
 	/* 150 */
-	simple("minecraft:comparator"),
+	simple("comparator"),
 	/* 151 */
-	simple("minecraft:daylight_detector"),
+	simple("daylight_detector"),
 	/* 152 */
-	simple("minecraft:redstone_block"),
+	simple("redstone_block"),
 	/* 153 */
-	simple("minecraft:nether_quartz_ore"),
+	simple("nether_quartz_ore"),
 	/* 154 */
-	simple("minecraft:hopper"),
+	simple("hopper"),
 	/* 155 */
-	simple("minecraft:quartz_block"),
+	simple("quartz_block"),
 	/* 156 */
-	simple("minecraft:quartz_stairs"),
+	simple("quartz_stairs"),
 	/* 157 */
-	simple("minecraft:activator_rail"),
+	simple("activator_rail"),
 	/* 158 */
-	simple("minecraft:dropper"),
+	simple("dropper"),
 	/* 159 */
 	[
-		"minecraft:white_terracotta",
-		"minecraft:orange_terracotta",
-		"minecraft:magenta_terracotta",
-		"minecraft:light_blue_terracotta",
-		"minecraft:yellow_terracotta",
-		"minecraft:lime_terracotta",
-		"minecraft:pink_terracotta",
-		"minecraft:gray_terracotta",
-		"minecraft:light_gray_terracotta",
-		"minecraft:cyan_terracotta",
-		"minecraft:purple_terracotta",
-		"minecraft:blue_terracotta",
-		"minecraft:brown_terracotta",
-		"minecraft:green_terracotta",
-		"minecraft:red_terracotta",
-		"minecraft:black_terracotta",
+		"white_terracotta",
+		"orange_terracotta",
+		"magenta_terracotta",
+		"light_blue_terracotta",
+		"yellow_terracotta",
+		"lime_terracotta",
+		"pink_terracotta",
+		"gray_terracotta",
+		"light_gray_terracotta",
+		"cyan_terracotta",
+		"purple_terracotta",
+		"blue_terracotta",
+		"brown_terracotta",
+		"green_terracotta",
+		"red_terracotta",
+		"black_terracotta",
 	],
 	/* 160 */
 	[
-		"minecraft:white_stained_glass_pane",
-		"minecraft:orange_stained_glass_pane",
-		"minecraft:magenta_stained_glass_pane",
-		"minecraft:light_blue_stained_glass_pane",
-		"minecraft:yellow_stained_glass_pane",
-		"minecraft:lime_stained_glass_pane",
-		"minecraft:pink_stained_glass_pane",
-		"minecraft:gray_stained_glass_pane",
-		"minecraft:light_gray_stained_glass_pane",
-		"minecraft:cyan_stained_glass_pane",
-		"minecraft:purple_stained_glass_pane",
-		"minecraft:blue_stained_glass_pane",
-		"minecraft:brown_stained_glass_pane",
-		"minecraft:green_stained_glass_pane",
-		"minecraft:red_stained_glass_pane",
-		"minecraft:black_stained_glass_pane",
+		"white_stained_glass_pane",
+		"orange_stained_glass_pane",
+		"magenta_stained_glass_pane",
+		"light_blue_stained_glass_pane",
+		"yellow_stained_glass_pane",
+		"lime_stained_glass_pane",
+		"pink_stained_glass_pane",
+		"gray_stained_glass_pane",
+		"light_gray_stained_glass_pane",
+		"cyan_stained_glass_pane",
+		"purple_stained_glass_pane",
+		"blue_stained_glass_pane",
+		"brown_stained_glass_pane",
+		"green_stained_glass_pane",
+		"red_stained_glass_pane",
+		"black_stained_glass_pane",
 	],
 	/* 161 */
 	[
-		"minecraft:acacia_leaves",
-		"minecraft:dark_oak_leaves",
+		"acacia_leaves",
+		"dark_oak_leaves",
 		DEF,
 		DEF,
-		"minecraft:acacia_leaves",
-		"minecraft:dark_oak_leaves",
+		"acacia_leaves",
+		"dark_oak_leaves",
 		DEF,
 		DEF,
-		"minecraft:acacia_leaves",
-		"minecraft:dark_oak_leaves",
+		"acacia_leaves",
+		"dark_oak_leaves",
 		DEF,
 		DEF,
-		"minecraft:acacia_leaves",
-		"minecraft:dark_oak_leaves",
+		"acacia_leaves",
+		"dark_oak_leaves",
 		DEF,
 		DEF,
 	],
 	/* 162 */
 	[
-		"minecraft:acacia_log",
-		"minecraft:dark_oak_log",
+		"acacia_log",
+		"dark_oak_log",
 		DEF,
 		DEF,
-		"minecraft:acacia_log",
-		"minecraft:dark_oak_log",
+		"acacia_log",
+		"dark_oak_log",
 		DEF,
 		DEF,
-		"minecraft:acacia_log",
-		"minecraft:dark_oak_log",
+		"acacia_log",
+		"dark_oak_log",
 		DEF,
 		DEF,
-		"minecraft:acacia_log",
-		"minecraft:dark_oak_log",
+		"acacia_log",
+		"dark_oak_log",
 		DEF,
 		DEF,
 	],
 	/* 163 */
-	simple("minecraft:acacia_stairs"),
+	simple("acacia_stairs"),
 	/* 164 */
-	simple("minecraft:dark_oak_stairs"),
+	simple("dark_oak_stairs"),
 	/* 165 */
-	simple("minecraft:slime_block"),
+	simple("slime_block"),
 	/* 166 */
-	simple("minecraft:barrier"),
+	simple("barrier"),
 	/* 167 */
-	simple("minecraft:iron_trapdoor"),
+	simple("iron_trapdoor"),
 	/* 168 */
 	[
-		"minecraft:prismarine",
-		"minecraft:prismarine_bricks",
-		"minecraft:dark_prismarine",
+		"prismarine",
+		"prismarine_bricks",
+		"dark_prismarine",
 		DEF,
 		DEF,
 		DEF,
@@ -806,42 +776,42 @@ pub const LEGACY_BLOCK_TYPES: [[&str; 16]; 256] = [
 		DEF,
 	],
 	/* 169 */
-	simple("minecraft:sea_lantern"),
+	simple("sea_lantern"),
 	/* 170 */
-	simple("minecraft:hay_block"),
+	simple("hay_block"),
 	/* 171 */
 	[
-		"minecraft:white_carpet",
-		"minecraft:orange_carpet",
-		"minecraft:magenta_carpet",
-		"minecraft:light_blue_carpet",
-		"minecraft:yellow_carpet",
-		"minecraft:lime_carpet",
-		"minecraft:pink_carpet",
-		"minecraft:gray_carpet",
-		"minecraft:light_gray_carpet",
-		"minecraft:cyan_carpet",
-		"minecraft:purple_carpet",
-		"minecraft:blue_carpet",
-		"minecraft:brown_carpet",
-		"minecraft:green_carpet",
-		"minecraft:red_carpet",
-		"minecraft:black_carpet",
+		"white_carpet",
+		"orange_carpet",
+		"magenta_carpet",
+		"light_blue_carpet",
+		"yellow_carpet",
+		"lime_carpet",
+		"pink_carpet",
+		"gray_carpet",
+		"light_gray_carpet",
+		"cyan_carpet",
+		"purple_carpet",
+		"blue_carpet",
+		"brown_carpet",
+		"green_carpet",
+		"red_carpet",
+		"black_carpet",
 	],
 	/* 172 */
-	simple("minecraft:terracotta"),
+	simple("terracotta"),
 	/* 173 */
-	simple("minecraft:coal_block"),
+	simple("coal_block"),
 	/* 174 */
-	simple("minecraft:packed_ice"),
+	simple("packed_ice"),
 	/* 175 */
 	[
-		"minecraft:sunflower",
-		"minecraft:lilac",
-		"minecraft:tall_grass",
-		"minecraft:large_fern",
-		"minecraft:rose_bush",
-		"minecraft:peony",
+		"sunflower",
+		"lilac",
+		"tall_grass",
+		"large_fern",
+		"rose_bush",
+		"peony",
 		DEF,
 		DEF,
 		DEF,
@@ -858,193 +828,193 @@ pub const LEGACY_BLOCK_TYPES: [[&str; 16]; 256] = [
 	/* 177 */
 	EMPTY, // wall banner
 	/* 178 */
-	simple("minecraft:daylight_detector"),
+	simple("daylight_detector"),
 	/* 179 */
-	simple("minecraft:red_sandstone"),
+	simple("red_sandstone"),
 	/* 180 */
-	simple("minecraft:red_sandstone_stairs"),
+	simple("red_sandstone_stairs"),
 	/* 181 */
-	simple("minecraft:red_sandstone_slab"),
+	simple("red_sandstone_slab"),
 	/* 182 */
-	simple("minecraft:red_sandstone_slab"),
+	simple("red_sandstone_slab"),
 	/* 183 */
-	simple("minecraft:spruce_fence_gate"),
+	simple("spruce_fence_gate"),
 	/* 184 */
-	simple("minecraft:birch_fence_gate"),
+	simple("birch_fence_gate"),
 	/* 185 */
-	simple("minecraft:jungle_fence_gate"),
+	simple("jungle_fence_gate"),
 	/* 186 */
-	simple("minecraft:dark_oak_fence_gate"),
+	simple("dark_oak_fence_gate"),
 	/* 187 */
-	simple("minecraft:acacia_fence_gate"),
+	simple("acacia_fence_gate"),
 	/* 188 */
-	simple("minecraft:spruce_fence"),
+	simple("spruce_fence"),
 	/* 189 */
-	simple("minecraft:birch_fence"),
+	simple("birch_fence"),
 	/* 190 */
-	simple("minecraft:jungle_fence"),
+	simple("jungle_fence"),
 	/* 191 */
-	simple("minecraft:dark_oak_fence"),
+	simple("dark_oak_fence"),
 	/* 192 */
-	simple("minecraft:acacia_fence"),
+	simple("acacia_fence"),
 	/* 193 */
-	simple("minecraft:spruce_door"),
+	simple("spruce_door"),
 	/* 194 */
-	simple("minecraft:birch_door"),
+	simple("birch_door"),
 	/* 195 */
-	simple("minecraft:jungle_door"),
+	simple("jungle_door"),
 	/* 196 */
-	simple("minecraft:acacia_door"),
+	simple("acacia_door"),
 	/* 197 */
-	simple("minecraft:dark_oak_door"),
+	simple("dark_oak_door"),
 	/* 198 */
-	simple("minecraft:end_rod"),
+	simple("end_rod"),
 	/* 199 */
-	simple("minecraft:chorus_plant"),
+	simple("chorus_plant"),
 	/* 200 */
-	simple("minecraft:chorus_flower"),
+	simple("chorus_flower"),
 	/* 201 */
-	simple("minecraft:purpur_block"),
+	simple("purpur_block"),
 	/* 202 */
-	simple("minecraft:purpur_pillar"),
+	simple("purpur_pillar"),
 	/* 203 */
-	simple("minecraft:purpur_stairs"),
+	simple("purpur_stairs"),
 	/* 204 */
-	simple("minecraft:purpur_slab"),
+	simple("purpur_slab"),
 	/* 205 */
-	simple("minecraft:purpur_slab"),
+	simple("purpur_slab"),
 	/* 206 */
-	simple("minecraft:end_stone_bricks"),
+	simple("end_stone_bricks"),
 	/* 207 */
-	simple("minecraft:beetroots"),
+	simple("beetroots"),
 	/* 208 */
-	simple("minecraft:grass_path"),
+	simple("grass_path"),
 	/* 209 */
-	simple("minecraft:end_gateway"),
+	simple("end_gateway"),
 	/* 210 */
-	simple("minecraft:repeating_command_block"),
+	simple("repeating_command_block"),
 	/* 211 */
-	simple("minecraft:chain_command_block"),
+	simple("chain_command_block"),
 	/* 212 */
-	simple("minecraft:frosted_ice"),
+	simple("frosted_ice"),
 	/* 213 */
-	simple("minecraft:magma_block"),
+	simple("magma_block"),
 	/* 214 */
-	simple("minecraft:nether_wart_block"),
+	simple("nether_wart_block"),
 	/* 215 */
-	simple("minecraft:red_nether_bricks"),
+	simple("red_nether_bricks"),
 	/* 216 */
-	simple("minecraft:bone_block"),
+	simple("bone_block"),
 	/* 217 */
-	simple("minecraft:structure_void"),
+	simple("structure_void"),
 	/* 218 */
-	simple("minecraft:observer"),
+	simple("observer"),
 	/* 219 */
-	simple("minecraft:white_shulker_box"),
+	simple("white_shulker_box"),
 	/* 220 */
-	simple("minecraft:orange_shulker_box"),
+	simple("orange_shulker_box"),
 	/* 221 */
-	simple("minecraft:magenta_shulker_box"),
+	simple("magenta_shulker_box"),
 	/* 222 */
-	simple("minecraft:light_blue_shulker_box"),
+	simple("light_blue_shulker_box"),
 	/* 223 */
-	simple("minecraft:yellow_shulker_box"),
+	simple("yellow_shulker_box"),
 	/* 224 */
-	simple("minecraft:lime_shulker_box"),
+	simple("lime_shulker_box"),
 	/* 225 */
-	simple("minecraft:pink_shulker_box"),
+	simple("pink_shulker_box"),
 	/* 226 */
-	simple("minecraft:gray_shulker_box"),
+	simple("gray_shulker_box"),
 	/* 227 */
-	simple("minecraft:light_gray_shulker_box"),
+	simple("light_gray_shulker_box"),
 	/* 228 */
-	simple("minecraft:cyan_shulker_box"),
+	simple("cyan_shulker_box"),
 	/* 229 */
-	simple("minecraft:purple_shulker_box"),
+	simple("purple_shulker_box"),
 	/* 230 */
-	simple("minecraft:blue_shulker_box"),
+	simple("blue_shulker_box"),
 	/* 231 */
-	simple("minecraft:brown_shulker_box"),
+	simple("brown_shulker_box"),
 	/* 232 */
-	simple("minecraft:green_shulker_box"),
+	simple("green_shulker_box"),
 	/* 233 */
-	simple("minecraft:red_shulker_box"),
+	simple("red_shulker_box"),
 	/* 234 */
-	simple("minecraft:black_shulker_box"),
+	simple("black_shulker_box"),
 	/* 235 */
-	simple("minecraft:white_glazed_terracotta"),
+	simple("white_glazed_terracotta"),
 	/* 236 */
-	simple("minecraft:orange_glazed_terracotta"),
+	simple("orange_glazed_terracotta"),
 	/* 237 */
-	simple("minecraft:magenta_glazed_terracotta"),
+	simple("magenta_glazed_terracotta"),
 	/* 238 */
-	simple("minecraft:light_blue_glazed_terracotta"),
+	simple("light_blue_glazed_terracotta"),
 	/* 239 */
-	simple("minecraft:yellow_glazed_terracotta"),
+	simple("yellow_glazed_terracotta"),
 	/* 240 */
-	simple("minecraft:lime_glazed_terracotta"),
+	simple("lime_glazed_terracotta"),
 	/* 241 */
-	simple("minecraft:pink_glazed_terracotta"),
+	simple("pink_glazed_terracotta"),
 	/* 242 */
-	simple("minecraft:gray_glazed_terracotta"),
+	simple("gray_glazed_terracotta"),
 	/* 243 */
-	simple("minecraft:light_gray_glazed_terracotta"),
+	simple("light_gray_glazed_terracotta"),
 	/* 244 */
-	simple("minecraft:cyan_glazed_terracotta"),
+	simple("cyan_glazed_terracotta"),
 	/* 245 */
-	simple("minecraft:purple_glazed_terracotta"),
+	simple("purple_glazed_terracotta"),
 	/* 246 */
-	simple("minecraft:blue_glazed_terracotta"),
+	simple("blue_glazed_terracotta"),
 	/* 247 */
-	simple("minecraft:brown_glazed_terracotta"),
+	simple("brown_glazed_terracotta"),
 	/* 248 */
-	simple("minecraft:green_glazed_terracotta"),
+	simple("green_glazed_terracotta"),
 	/* 249 */
-	simple("minecraft:red_glazed_terracotta"),
+	simple("red_glazed_terracotta"),
 	/* 250 */
-	simple("minecraft:black_glazed_terracotta"),
+	simple("black_glazed_terracotta"),
 	/* 251 */
 	[
-		"minecraft:white_concrete",
-		"minecraft:orange_concrete",
-		"minecraft:magenta_concrete",
-		"minecraft:light_blue_concrete",
-		"minecraft:yellow_concrete",
-		"minecraft:lime_concrete",
-		"minecraft:pink_concrete",
-		"minecraft:gray_concrete",
-		"minecraft:light_gray_concrete",
-		"minecraft:cyan_concrete",
-		"minecraft:purple_concrete",
-		"minecraft:blue_concrete",
-		"minecraft:brown_concrete",
-		"minecraft:green_concrete",
-		"minecraft:red_concrete",
-		"minecraft:black_concrete",
+		"white_concrete",
+		"orange_concrete",
+		"magenta_concrete",
+		"light_blue_concrete",
+		"yellow_concrete",
+		"lime_concrete",
+		"pink_concrete",
+		"gray_concrete",
+		"light_gray_concrete",
+		"cyan_concrete",
+		"purple_concrete",
+		"blue_concrete",
+		"brown_concrete",
+		"green_concrete",
+		"red_concrete",
+		"black_concrete",
 	],
 	/* 252 */
 	[
-		"minecraft:white_concrete_powder",
-		"minecraft:orange_concrete_powder",
-		"minecraft:magenta_concrete_powder",
-		"minecraft:light_blue_concrete_powder",
-		"minecraft:yellow_concrete_powder",
-		"minecraft:lime_concrete_powder",
-		"minecraft:pink_concrete_powder",
-		"minecraft:gray_concrete_powder",
-		"minecraft:light_gray_concrete_powder",
-		"minecraft:cyan_concrete_powder",
-		"minecraft:purple_concrete_powder",
-		"minecraft:blue_concrete_powder",
-		"minecraft:brown_concrete_powder",
-		"minecraft:green_concrete_powder",
-		"minecraft:red_concrete_powder",
-		"minecraft:black_concrete_powder",
+		"white_concrete_powder",
+		"orange_concrete_powder",
+		"magenta_concrete_powder",
+		"light_blue_concrete_powder",
+		"yellow_concrete_powder",
+		"lime_concrete_powder",
+		"pink_concrete_powder",
+		"gray_concrete_powder",
+		"light_gray_concrete_powder",
+		"cyan_concrete_powder",
+		"purple_concrete_powder",
+		"blue_concrete_powder",
+		"brown_concrete_powder",
+		"green_concrete_powder",
+		"red_concrete_powder",
+		"black_concrete_powder",
 	],
 	/* 253 */
 	EMPTY,
 	/* 254 */
 	EMPTY,
 	/* 255 */
-	simple("minecraft:structure_block"),
+	simple("structure_block"),
 ];
diff --git a/src/resource/mod.rs b/src/resource/mod.rs
index 812a0e7..8bad34f 100644
--- a/src/resource/mod.rs
+++ b/src/resource/mod.rs
@@ -5,7 +5,6 @@ use std::collections::HashMap;
 
 use enumflags2::{bitflags, BitFlags};
 
-pub use legacy_block_types::LEGACY_BLOCK_TYPES;
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 
 #[bitflags]
@@ -65,12 +64,8 @@ impl Default for BlockTypes {
 			.iter()
 			.map(|(k, v)| (String::from(*k), *v))
 			.collect();
-		let legacy_block_types = Box::new(LEGACY_BLOCK_TYPES.map(|inner| {
-			inner.map(|id| {
-				*id.strip_prefix("minecraft:")
-					.and_then(|suffix| block_type_map.get(suffix))
-					.expect("Unknown legacy block type")
-			})
+		let legacy_block_types = Box::new(legacy_block_types::LEGACY_BLOCK_TYPES.map(|inner| {
+			inner.map(|id| *block_type_map.get(id).expect("Unknown legacy block type"))
 		}));
 
 		BlockTypes {

From 1d4c7a86ffb5c06c2b8bf0782dd81c23e21ee085 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 2 Mar 2023 01:00:55 +0100
Subject: [PATCH 119/460] world/layer: replace iproduct!() with nested loops

iproduct!() is slow for more than 2 parameters.
---
 src/world/layer.rs | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/src/world/layer.rs b/src/world/layer.rs
index a5d8383..94bd3e7 100644
--- a/src/world/layer.rs
+++ b/src/world/layer.rs
@@ -1,5 +1,4 @@
 use anyhow::{Context, Result};
-use itertools::iproduct;
 use serde::{Deserialize, Serialize};
 
 use super::chunk::Chunk;
@@ -98,30 +97,30 @@ pub fn top_layer(chunk: &Chunk) -> Result<Box<BlockInfoArray>> {
 	let mut done = 0;
 	let mut ret = Box::<BlockInfoArray>::default();
 
-	for ((section_y, section), y, xz) in iproduct!(
-		chunk.sections().rev(),
-		BlockY::iter().rev(),
-		BlockInfoArray::keys()
-	) {
-		let entry = &mut ret[xz];
-		if entry.done() {
-			continue;
-		}
+	for (section_y, section) in chunk.sections().rev() {
+		for y in BlockY::iter().rev() {
+			for xz in BlockInfoArray::keys() {
+				let entry = &mut ret[xz];
+				if entry.done() {
+					continue;
+				}
 
-		let coords = SectionBlockCoords { xz, y };
-		let Some(block_type) = section.block_at(coords)? else {
-			continue;
-		};
-		let height = BlockHeight::new(section_y, y)?;
-		if !entry.fill(height, block_type) {
-			continue;
-		}
+				let coords = SectionBlockCoords { xz, y };
+				let Some(block_type) = section.block_at(coords)? else {
+					continue;
+				};
+				let height = BlockHeight::new(section_y, y)?;
+				if !entry.fill(height, block_type) {
+					continue;
+				}
 
-		assert!(entry.done());
+				assert!(entry.done());
 
-		done += 1;
-		if done == N * N {
-			break;
+				done += 1;
+				if done == N * N {
+					break;
+				}
+			}
 		}
 	}
 

From ec09afcf15d14514ecafd5833ecdd5b9e4c30294 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 2 Mar 2023 01:23:24 +0100
Subject: [PATCH 120/460] main: fully print error messages

---
 src/main.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.rs b/src/main.rs
index 80f2b25..a3c9105 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -155,7 +155,7 @@ impl<'a> RegionProcessor<'a> {
 
 			if let Err(err) = self.process_region(&path, coords) {
 				eprintln!(
-					"Failed to process region r.{}.{}.mca: {}",
+					"Failed to process region r.{}.{}.mca: {:?}",
 					coords.0, coords.1, err,
 				);
 			}

From 2ccb282f6fe4fb5781b76feecbb6d9048f4fb1be Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 3 Mar 2023 19:02:55 +0100
Subject: [PATCH 121/460] main: rename Paths to Config

---
 src/main.rs | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index a3c9105..38b9bf5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -18,19 +18,19 @@ struct Args {
 
 type RegionCoords = (i32, i32);
 
-struct Paths {
+struct Config {
 	region_dir: PathBuf,
 	processed_dir: PathBuf,
 	map_dir: PathBuf,
 }
 
-impl Paths {
+impl Config {
 	fn new(args: Args) -> Self {
 		let region_dir = [&args.input_dir, Path::new("region")].iter().collect();
 		let processed_dir = [&args.output_dir, Path::new("processed")].iter().collect();
 		let map_dir = [&args.output_dir, Path::new("map/0")].iter().collect();
 
-		Paths {
+		Config {
 			region_dir,
 			processed_dir,
 			map_dir,
@@ -51,14 +51,14 @@ impl Paths {
 /// Type with methods for processing the regions of a Minecraft save directory
 struct RegionProcessor<'a> {
 	block_types: resource::BlockTypes,
-	paths: &'a Paths,
+	config: &'a Config,
 }
 
 impl<'a> RegionProcessor<'a> {
-	fn new(paths: &'a Paths) -> Self {
+	fn new(config: &'a Config) -> Self {
 		RegionProcessor {
 			block_types: resource::BlockTypes::default(),
-			paths,
+			config,
 		}
 	}
 
@@ -84,10 +84,10 @@ impl<'a> RegionProcessor<'a> {
 		region: RegionCoords,
 		processed_data: &ChunkArray<Option<Box<world::layer::BlockInfoArray>>>,
 	) -> Result<()> {
-		let tmp_path = self.paths.processed_path(region, true);
+		let tmp_path = self.config.processed_path(region, true);
 		storage::write(&tmp_path, processed_data)?;
 
-		let output_path = self.paths.processed_path(region, false);
+		let output_path = self.config.processed_path(region, false);
 		fs::rename(&tmp_path, &output_path).with_context(|| {
 			format!(
 				"Failed to rename {} to {}",
@@ -125,17 +125,17 @@ impl<'a> RegionProcessor<'a> {
 	///
 	/// Returns a list of the coordinates of all processed regions
 	fn run(self) -> Result<Vec<RegionCoords>> {
-		let read_dir = self.paths.region_dir.read_dir().with_context(|| {
+		let read_dir = self.config.region_dir.read_dir().with_context(|| {
 			format!(
 				"Failed to read directory {}",
-				self.paths.region_dir.display()
+				self.config.region_dir.display()
 			)
 		})?;
 
-		fs::create_dir_all(&self.paths.processed_dir).with_context(|| {
+		fs::create_dir_all(&self.config.processed_dir).with_context(|| {
 			format!(
 				"Failed to create directory {}",
-				self.paths.processed_dir.display(),
+				self.config.processed_dir.display(),
 			)
 		})?;
 
@@ -168,12 +168,12 @@ impl<'a> RegionProcessor<'a> {
 }
 
 struct TileRenderer<'a> {
-	paths: &'a Paths,
+	config: &'a Config,
 }
 
 impl<'a> TileRenderer<'a> {
-	fn new(paths: &'a Paths) -> Self {
-		TileRenderer { paths }
+	fn new(config: &'a Config) -> Self {
+		TileRenderer { config }
 	}
 
 	fn render_tile(&self, coords: RegionCoords) -> Result<()> {
@@ -183,10 +183,10 @@ impl<'a> TileRenderer<'a> {
 	}
 
 	fn run(self, regions: &[RegionCoords]) -> Result<()> {
-		fs::create_dir_all(&self.paths.map_dir).with_context(|| {
+		fs::create_dir_all(&self.config.map_dir).with_context(|| {
 			format!(
 				"Failed to create directory {}",
-				self.paths.map_dir.display(),
+				self.config.map_dir.display(),
 			)
 		})?;
 
@@ -200,10 +200,10 @@ impl<'a> TileRenderer<'a> {
 
 fn main() -> Result<()> {
 	let args = Args::parse();
-	let paths = Paths::new(args);
+	let config = Config::new(args);
 
-	let regions = RegionProcessor::new(&paths).run()?;
-	TileRenderer::new(&paths).run(&regions)?;
+	let regions = RegionProcessor::new(&config).run()?;
+	TileRenderer::new(&config).run(&regions)?;
 
 	Ok(())
 }

From 51a0e178b1aeaab37c7d5560d81db974c7c93eba Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 3 Mar 2023 19:06:08 +0100
Subject: [PATCH 122/460] main: do not rebuild region filename from coords

---
 src/main.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 38b9bf5..5c40ffa 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -155,8 +155,9 @@ impl<'a> RegionProcessor<'a> {
 
 			if let Err(err) = self.process_region(&path, coords) {
 				eprintln!(
-					"Failed to process region r.{}.{}.mca: {:?}",
-					coords.0, coords.1, err,
+					"Failed to process region {}: {:?}",
+					path.file_name().unwrap_or_default().to_string_lossy(),
+					err,
 				);
 			}
 

From dda81546dec3dcb83d0e24136fe2e30503bd3cd3 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 3 Mar 2023 19:13:15 +0100
Subject: [PATCH 123/460] main: add map_path() method to Config struct

---
 src/main.rs | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main.rs b/src/main.rs
index 5c40ffa..381a0fd 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -46,6 +46,16 @@ impl Config {
 		);
 		[&self.processed_dir, Path::new(&filename)].iter().collect()
 	}
+
+	fn map_path(&self, coords: RegionCoords, temp: bool) -> PathBuf {
+		let filename = format!(
+			"r.{}.{}.png{}",
+			coords.0,
+			coords.1,
+			if temp { ".tmp" } else { "" },
+		);
+		[&self.map_dir, Path::new(&filename)].iter().collect()
+	}
 }
 
 /// Type with methods for processing the regions of a Minecraft save directory
@@ -178,7 +188,14 @@ impl<'a> TileRenderer<'a> {
 	}
 
 	fn render_tile(&self, coords: RegionCoords) -> Result<()> {
-		println!("Rendering tile r.{}.{}.png", coords.0, coords.1);
+		let output_path = self.config.map_path(coords, false);
+		println!(
+			"Rendering tile {}",
+			output_path
+				.file_name()
+				.unwrap_or_default()
+				.to_string_lossy(),
+		);
 
 		Ok(())
 	}

From 657d8af8a7311ea521f946254dc62daf5e63f487 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 3 Mar 2023 19:20:56 +0100
Subject: [PATCH 124/460] io/storage: add read() function

---
 src/io/storage.rs | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/io/storage.rs b/src/io/storage.rs
index 86430b3..10a7eb3 100644
--- a/src/io/storage.rs
+++ b/src/io/storage.rs
@@ -1,11 +1,11 @@
 use std::{
 	fs::File,
-	io::{BufWriter, Write},
+	io::{BufReader, BufWriter, Write},
 	path::Path,
 };
 
 use anyhow::{Context, Result};
-use serde::Serialize;
+use serde::{de::DeserializeOwned, Serialize};
 
 pub fn write<T: Serialize>(path: &Path, value: &T) -> Result<()> {
 	(|| -> Result<()> {
@@ -20,3 +20,13 @@ pub fn write<T: Serialize>(path: &Path, value: &T) -> Result<()> {
 	})()
 	.with_context(|| format!("Failed to write file {}", path.display()))
 }
+
+pub fn read<T: DeserializeOwned>(path: &Path) -> Result<T> {
+	(|| -> Result<T> {
+		let file = File::open(path)?;
+		let reader = BufReader::new(file);
+		let decompressor = zstd::Decoder::new(reader)?;
+		Ok(bincode::deserialize_from(decompressor)?)
+	})()
+	.with_context(|| format!("Failed to read file {}", path.display()))
+}

From e0467de0805dbd791873c09f2f21295a47a5bad1 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 3 Mar 2023 19:22:45 +0100
Subject: [PATCH 125/460] main: rename save_region() argument from region to
 coords

For consistency.
---
 src/main.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 381a0fd..d1125cb 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -91,13 +91,13 @@ impl<'a> RegionProcessor<'a> {
 
 	fn save_region(
 		&self,
-		region: RegionCoords,
+		coords: RegionCoords,
 		processed_data: &ChunkArray<Option<Box<world::layer::BlockInfoArray>>>,
 	) -> Result<()> {
-		let tmp_path = self.config.processed_path(region, true);
+		let tmp_path = self.config.processed_path(coords, true);
 		storage::write(&tmp_path, processed_data)?;
 
-		let output_path = self.config.processed_path(region, false);
+		let output_path = self.config.processed_path(coords, false);
 		fs::rename(&tmp_path, &output_path).with_context(|| {
 			format!(
 				"Failed to rename {} to {}",

From 89f35024b72f1a7b1e196f7d23544755d7989e65 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 3 Mar 2023 19:24:56 +0100
Subject: [PATCH 126/460] main: introduce ProcessedRegion type alias

---
 src/main.rs | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index d1125cb..073341c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -17,6 +17,7 @@ struct Args {
 }
 
 type RegionCoords = (i32, i32);
+type ProcessedRegion = ChunkArray<Option<Box<world::layer::BlockInfoArray>>>;
 
 struct Config {
 	region_dir: PathBuf,
@@ -89,13 +90,9 @@ impl<'a> RegionProcessor<'a> {
 		world::layer::top_layer(&chunk)
 	}
 
-	fn save_region(
-		&self,
-		coords: RegionCoords,
-		processed_data: &ChunkArray<Option<Box<world::layer::BlockInfoArray>>>,
-	) -> Result<()> {
+	fn save_region(&self, coords: RegionCoords, processed_region: &ProcessedRegion) -> Result<()> {
 		let tmp_path = self.config.processed_path(coords, true);
-		storage::write(&tmp_path, processed_data)?;
+		storage::write(&tmp_path, processed_region)?;
 
 		let output_path = self.config.processed_path(coords, false);
 		fs::rename(&tmp_path, &output_path).with_context(|| {
@@ -113,20 +110,19 @@ impl<'a> RegionProcessor<'a> {
 	fn process_region(&self, path: &Path, coords: RegionCoords) -> Result<()> {
 		println!("Processing region r.{}.{}.mca", coords.0, coords.1);
 
-		let mut processed_data: ChunkArray<Option<Box<world::layer::BlockInfoArray>>> =
-			Default::default();
+		let mut processed_region = ProcessedRegion::default();
 
 		minedmap::io::region::from_file(path)?.foreach_chunk(
 			|chunk_coords, data: world::de::Chunk| {
 				let processed_chunk = self
 					.process_chunk(data)
 					.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))?;
-				processed_data[chunk_coords] = Some(processed_chunk);
+				processed_region[chunk_coords] = Some(processed_chunk);
 				Ok(())
 			},
 		)?;
 
-		self.save_region(coords, &processed_data)?;
+		self.save_region(coords, &processed_region)?;
 
 		Ok(())
 	}

From d5406851b4ba2dd6ce80bb1aab84f8fd57b4953e Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 3 Mar 2023 19:42:56 +0100
Subject: [PATCH 127/460] main: load processed regions from render_tile()

---
 src/main.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main.rs b/src/main.rs
index 073341c..21ebc5b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -183,6 +183,11 @@ impl<'a> TileRenderer<'a> {
 		TileRenderer { config }
 	}
 
+	fn load_region(&self, coords: RegionCoords) -> Result<ProcessedRegion> {
+		let processed_path = self.config.processed_path(coords, false);
+		storage::read(&processed_path).context("Failed to load processed region data")
+	}
+
 	fn render_tile(&self, coords: RegionCoords) -> Result<()> {
 		let output_path = self.config.map_path(coords, false);
 		println!(
@@ -193,6 +198,8 @@ impl<'a> TileRenderer<'a> {
 				.to_string_lossy(),
 		);
 
+		let _region = self.load_region(coords);
+
 		Ok(())
 	}
 

From e6e1f55fe99852f510b979a16fc1bec0648a42d0 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 3 Mar 2023 20:00:03 +0100
Subject: [PATCH 128/460] Use zlib-ng backend for flate2 by default

Still allow disabling the feature to avoid the cmake dependency.
---
 Cargo.lock | 20 ++++++++++++++++++++
 Cargo.toml |  4 ++++
 TODO.md    |  1 -
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5adcd72..1137014 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -105,6 +105,15 @@ dependencies = [
  "os_str_bytes",
 ]
 
+[[package]]
+name = "cmake"
+version = "0.1.49"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "crc32fast"
 version = "1.3.2"
@@ -180,6 +189,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
 dependencies = [
  "crc32fast",
+ "libz-ng-sys",
  "miniz_oxide",
 ]
 
@@ -241,6 +251,16 @@ version = "0.2.139"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
 
+[[package]]
+name = "libz-ng-sys"
+version = "1.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4399ae96a9966bf581e726de86969f803a81b7ce795fcd5480e640589457e0f2"
+dependencies = [
+ "cmake",
+ "libc",
+]
+
 [[package]]
 name = "linux-raw-sys"
 version = "0.1.4"
diff --git a/Cargo.toml b/Cargo.toml
index 6f40d32..e719a80 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,3 +19,7 @@ itertools = "0.10.5"
 num-integer = "0.1.45"
 serde = "1.0.152"
 zstd = "0.12.3"
+
+[features]
+default = ["zlib-ng"]
+zlib-ng = ["flate2/zlib-ng"]
diff --git a/TODO.md b/TODO.md
index e6c14f6..cb18d08 100644
--- a/TODO.md
+++ b/TODO.md
@@ -5,4 +5,3 @@
 - To check:
   - fastnbt borrow
   - fastnbt from_reader
-  - flate2 backends

From 26555f17457b7ff0f636cee01e2383b5748ba7ca Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 3 Mar 2023 20:35:43 +0100
Subject: [PATCH 129/460] src/world/layer: make BlockInfo fields public

There were left private by accident.
---
 Cargo.lock         | 44 ++++++++++++++++++++++++++++++++++++++++++++
 Cargo.toml         |  1 +
 src/world/layer.rs |  6 +++---
 3 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1137014..dda9b5c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -114,6 +114,12 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "color_quant"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
+
 [[package]]
 name = "crc32fast"
 version = "1.3.2"
@@ -205,6 +211,20 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
 
+[[package]]
+name = "image"
+version = "0.24.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945"
+dependencies = [
+ "bytemuck",
+ "byteorder",
+ "color_quant",
+ "num-rational",
+ "num-traits",
+ "png",
+]
+
 [[package]]
 name = "io-lifetimes"
 version = "1.0.5"
@@ -278,6 +298,7 @@ dependencies = [
  "enumflags2",
  "fastnbt",
  "flate2",
+ "image",
  "itertools",
  "num-integer",
  "serde",
@@ -303,6 +324,17 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-rational"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-traits"
 version = "0.2.15"
@@ -330,6 +362,18 @@ version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
 
+[[package]]
+name = "png"
+version = "0.17.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638"
+dependencies = [
+ "bitflags",
+ "crc32fast",
+ "flate2",
+ "miniz_oxide",
+]
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
diff --git a/Cargo.toml b/Cargo.toml
index e719a80..9a82052 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,6 +15,7 @@ clap = { version = "4.1.4", features = ["derive"] }
 enumflags2 = "0.7.5"
 fastnbt = "2.3.2"
 flate2 = "1.0.25"
+image = { version = "0.24.5", default-features = false, features = ["png"] }
 itertools = "0.10.5"
 num-integer = "0.1.45"
 serde = "1.0.152"
diff --git a/src/world/layer.rs b/src/world/layer.rs
index 94bd3e7..2f9382c 100644
--- a/src/world/layer.rs
+++ b/src/world/layer.rs
@@ -27,9 +27,9 @@ impl BlockHeight {
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 pub struct BlockInfo {
-	block_type: BlockType,
-	y: BlockHeight,
-	depth: Option<BlockHeight>,
+	pub block_type: BlockType,
+	pub y: BlockHeight,
+	pub depth: Option<BlockHeight>,
 }
 
 /// Helper methods for [BlockInfo]

From fa04e3e94affaaf9ec31a9b82de7046cdfb1461c Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 3 Mar 2023 20:41:08 +0100
Subject: [PATCH 130/460] main: actually render tiles

---
 src/main.rs | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 58 insertions(+), 2 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 21ebc5b..054b659 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -188,7 +188,49 @@ impl<'a> TileRenderer<'a> {
 		storage::read(&processed_path).context("Failed to load processed region data")
 	}
 
+	fn render_chunk(
+		image: &mut image::RgbaImage,
+		coords: ChunkCoords,
+		chunk: &world::layer::BlockInfoArray,
+	) {
+		const N: u32 = BLOCKS_PER_CHUNK as u32;
+
+		let chunk_image = image::RgbaImage::from_fn(N, N, |x, z| {
+			image::Rgba(
+				match chunk[LayerBlockCoords {
+					x: BlockX(x as u8),
+					z: BlockZ(z as u8),
+				}] {
+					Some(block) => {
+						let c = block.block_type.color;
+						[c.0, c.1, c.2, 255]
+					}
+					None => [0, 0, 0, 0],
+				},
+			)
+		});
+		image::imageops::overlay(
+			image,
+			&chunk_image,
+			coords.x.0 as i64 * BLOCKS_PER_CHUNK as i64,
+			coords.z.0 as i64 * BLOCKS_PER_CHUNK as i64,
+		);
+	}
+
+	fn render_region(image: &mut image::RgbaImage, region: &ProcessedRegion) {
+		for (coords, chunk) in region.iter() {
+			let Some(chunk) = chunk else {
+				continue;
+			};
+
+			Self::render_chunk(image, coords, chunk);
+		}
+	}
+
 	fn render_tile(&self, coords: RegionCoords) -> Result<()> {
+		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
+
+		let tmp_path = self.config.map_path(coords, true);
 		let output_path = self.config.map_path(coords, false);
 		println!(
 			"Rendering tile {}",
@@ -198,7 +240,19 @@ impl<'a> TileRenderer<'a> {
 				.to_string_lossy(),
 		);
 
-		let _region = self.load_region(coords);
+		let region = self.load_region(coords)?;
+		let mut image = image::RgbaImage::new(N, N);
+		Self::render_region(&mut image, &region);
+		image
+			.save_with_format(&tmp_path, image::ImageFormat::Png)
+			.context("Failed to save image")?;
+		fs::rename(&tmp_path, &output_path).with_context(|| {
+			format!(
+				"Failed to rename {} to {}",
+				tmp_path.display(),
+				output_path.display(),
+			)
+		})?;
 
 		Ok(())
 	}
@@ -212,7 +266,9 @@ impl<'a> TileRenderer<'a> {
 		})?;
 
 		for &coords in regions {
-			self.render_tile(coords)?;
+			if let Err(err) = self.render_tile(coords) {
+				eprintln!("Failed to render tile {:?}: {:?}", coords, err,);
+			}
 		}
 
 		Ok(())

From a4b726992a620e55fd59c847a66ebff1462f49d6 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 3 Mar 2023 20:58:35 +0100
Subject: [PATCH 131/460] io/storage: compress/decompress data in bulk

The bulk API is signifiantly faster than the stream API.
---
 src/io/storage.rs | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/io/storage.rs b/src/io/storage.rs
index 10a7eb3..f4b2eed 100644
--- a/src/io/storage.rs
+++ b/src/io/storage.rs
@@ -1,6 +1,6 @@
 use std::{
 	fs::File,
-	io::{BufReader, BufWriter, Write},
+	io::{Read, Write},
 	path::Path,
 };
 
@@ -9,13 +9,16 @@ use serde::{de::DeserializeOwned, Serialize};
 
 pub fn write<T: Serialize>(path: &Path, value: &T) -> Result<()> {
 	(|| -> Result<()> {
-		let file = File::create(path)?;
-		let writer = BufWriter::new(file);
-		let mut compressor = zstd::Encoder::new(writer, 1)?;
-		bincode::serialize_into(&mut compressor, value)?;
-		let writer = compressor.finish()?;
-		let mut file = writer.into_inner()?;
+		let data = bincode::serialize(value)?;
+		let len = u32::try_from(data.len())?;
+		let compressed = zstd::bulk::compress(&data, 1)?;
+		drop(data);
+
+		let mut file = File::create(path)?;
+		file.write_all(&len.to_be_bytes())?;
+		file.write_all(&compressed)?;
 		file.flush()?;
+
 		Ok(())
 	})()
 	.with_context(|| format!("Failed to write file {}", path.display()))
@@ -23,10 +26,18 @@ pub fn write<T: Serialize>(path: &Path, value: &T) -> Result<()> {
 
 pub fn read<T: DeserializeOwned>(path: &Path) -> Result<T> {
 	(|| -> Result<T> {
-		let file = File::open(path)?;
-		let reader = BufReader::new(file);
-		let decompressor = zstd::Decoder::new(reader)?;
-		Ok(bincode::deserialize_from(decompressor)?)
+		let mut file = File::open(path)?;
+
+		let mut len_buf = [0u8; 4];
+		file.read_exact(&mut len_buf)?;
+		let len = usize::try_from(u32::from_be_bytes(len_buf))?;
+
+		let mut compressed = vec![];
+		file.read_to_end(&mut compressed)?;
+		let data = zstd::bulk::decompress(&compressed, len)?;
+		drop(compressed);
+
+		Ok(bincode::deserialize(&data)?)
 	})()
 	.with_context(|| format!("Failed to read file {}", path.display()))
 }

From 56573640fd8873712c4a15a505a9e45908e1db87 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 4 Mar 2023 00:27:26 +0100
Subject: [PATCH 132/460] world/section: prefer slice references to Vec and
 fastnbt types

Makes the code a bit nicer and saves repeated deref calls into fastnbt.
---
 src/world/chunk.rs   |  4 ++--
 src/world/section.rs | 22 +++++++++-------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/world/chunk.rs b/src/world/chunk.rs
index 45b3476..3f37210 100644
--- a/src/world/chunk.rs
+++ b/src/world/chunk.rs
@@ -92,12 +92,12 @@ impl<'a> Chunk<'a> {
 				(
 					SectionV1_13::new(
 						data_version,
-						section.block_states.data.as_ref(),
+						section.block_states.data.as_deref(),
 						&section.block_states.palette,
 						block_types,
 					)
 					.with_context(|| format!("Failed to load section at Y={}", section.y))?,
-					BiomesV18::new(section.biomes.data.as_ref(), &section.biomes.palette)
+					BiomesV18::new(section.biomes.data.as_deref(), &section.biomes.palette)
 						.with_context(|| {
 							format!("Failed to load section biomes at Y={}", section.y)
 						})?,
diff --git a/src/world/section.rs b/src/world/section.rs
index 8c98a68..819bd3f 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -37,14 +37,14 @@ pub trait Section {
 /// v1.13+ block data.
 #[derive(Debug)]
 pub struct BiomesV18<'a> {
-	_biomes: Option<&'a fastnbt::LongArray>,
-	_palette: &'a Vec<String>,
+	_biomes: Option<&'a [i64]>,
+	_palette: &'a [String],
 	_bits: u8,
 }
 
 impl<'a> BiomesV18<'a> {
 	/// Constructs a new [BiomesV18] from deserialized data structures
-	pub fn new(biomes: Option<&'a fastnbt::LongArray>, palette: &'a Vec<String>) -> Result<Self> {
+	pub fn new(biomes: Option<&'a [i64]>, palette: &'a [String]) -> Result<Self> {
 		let bits = palette_bits(palette.len(), 1, 6).context("Unsupported block palette size")?;
 
 		if let Some(biomes) = biomes {
@@ -66,7 +66,7 @@ impl<'a> BiomesV18<'a> {
 /// Minecraft v1.13+ section block data
 #[derive(Debug)]
 pub struct SectionV1_13<'a> {
-	block_states: Option<&'a fastnbt::LongArray>,
+	block_states: Option<&'a [i64]>,
 	palette: Vec<Option<BlockType>>,
 	bits: u8,
 	aligned_blocks: bool,
@@ -76,8 +76,8 @@ impl<'a> SectionV1_13<'a> {
 	/// Constructs a new [SectionV1_13] from deserialized data structures
 	pub fn new(
 		data_version: u32,
-		block_states: Option<&'a fastnbt::LongArray>,
-		palette: &'a Vec<de::BlockStatePaletteEntry>,
+		block_states: Option<&'a [i64]>,
+		palette: &'a [de::BlockStatePaletteEntry],
 		block_types: &'a BlockTypes,
 	) -> Result<Self> {
 		let aligned_blocks = data_version >= 2529;
@@ -158,18 +158,14 @@ impl<'a> Section for SectionV1_13<'a> {
 /// Pre-1.13 section block data
 #[derive(Debug)]
 pub struct SectionV0<'a> {
-	blocks: &'a fastnbt::ByteArray,
-	data: &'a fastnbt::ByteArray,
+	blocks: &'a [i8],
+	data: &'a [i8],
 	block_types: &'a BlockTypes,
 }
 
 impl<'a> SectionV0<'a> {
 	/// Constructs a new [SectionV0] from deserialized data structures
-	pub fn new(
-		blocks: &'a fastnbt::ByteArray,
-		data: &'a fastnbt::ByteArray,
-		block_types: &'a BlockTypes,
-	) -> Result<Self> {
+	pub fn new(blocks: &'a [i8], data: &'a [i8], block_types: &'a BlockTypes) -> Result<Self> {
 		use BLOCKS_PER_CHUNK as N;
 
 		if blocks.len() != N * N * N {

From ed422be451d878551d09e18caaebe4bdcd4d61a7 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 4 Mar 2023 11:39:47 +0100
Subject: [PATCH 133/460] TODO.md: update

- fastnbt decode doesn't really appear in profiles, so optimizing it
  using borrowed types is moot
- What does appear prominently in the profile though is top_layer() and
  block_at()
---
 TODO.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/TODO.md b/TODO.md
index cb18d08..c4c0668 100644
--- a/TODO.md
+++ b/TODO.md
@@ -3,5 +3,4 @@
 ## Optimizations
 
 - To check:
-  - fastnbt borrow
-  - fastnbt from_reader
+  - Bulk `block_at()`, possibly other `top_layer()` improvements

From 47dc3795a3c57a0c26dad824caba679e71046e83 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 4 Mar 2023 16:53:53 +0100
Subject: [PATCH 134/460] world: introduce SectionIterItem struct

---
 src/world/chunk.rs   | 26 +++++++++++++++-----------
 src/world/layer.rs   |  8 ++++++--
 src/world/section.rs |  4 +++-
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/world/chunk.rs b/src/world/chunk.rs
index 3f37210..72c5f9a 100644
--- a/src/world/chunk.rs
+++ b/src/world/chunk.rs
@@ -182,16 +182,19 @@ impl<'a> Chunk<'a> {
 	}
 }
 
+#[derive(Debug, Clone, Copy)]
+pub struct SectionIterItem<'a> {
+	pub y: SectionY,
+	pub section: &'a dyn Section,
+}
+
 trait SectionIterTrait<'a>:
-	Iterator<Item = (SectionY, &'a dyn Section)>
-	+ DoubleEndedIterator
-	+ ExactSizeIterator
-	+ FusedIterator
+	Iterator<Item = SectionIterItem<'a>> + DoubleEndedIterator + ExactSizeIterator + FusedIterator
 {
 }
 
 impl<'a, T> SectionIterTrait<'a> for T where
-	T: Iterator<Item = (SectionY, &'a dyn Section)>
+	T: Iterator<Item = SectionIterItem<'a>>
 		+ DoubleEndedIterator
 		+ ExactSizeIterator
 		+ FusedIterator
@@ -204,14 +207,15 @@ impl<'a> SectionIter<'a> {
 		F: FnOnce(&mut dyn SectionIterTrait<'a>) -> T,
 	{
 		match &mut self.inner {
-			SectionIterInner::V1_18 { iter } => f(
-				&mut iter.map(|(y, section)| -> (SectionY, &'a dyn Section) { (*y, &section.0) })
-			),
+			SectionIterInner::V1_18 { iter } => f(&mut iter.map(|(&y, section)| SectionIterItem {
+				y,
+				section: &section.0,
+			})),
 			SectionIterInner::V1_13 { iter } => {
-				f(&mut iter.map(|(y, section)| -> (SectionY, &'a dyn Section) { (*y, section) }))
+				f(&mut iter.map(|(&y, section)| SectionIterItem { y, section }))
 			}
 			SectionIterInner::V0 { iter } => {
-				f(&mut iter.map(|(y, section)| -> (SectionY, &'a dyn Section) { (*y, section) }))
+				f(&mut iter.map(|(&y, section)| SectionIterItem { y, section }))
 			}
 			SectionIterInner::Empty => f(&mut iter::empty()),
 		}
@@ -219,7 +223,7 @@ impl<'a> SectionIter<'a> {
 }
 
 impl<'a> Iterator for SectionIter<'a> {
-	type Item = (SectionY, &'a dyn Section);
+	type Item = SectionIterItem<'a>;
 
 	fn next(&mut self) -> Option<Self::Item> {
 		self.with_iter(|iter| iter.next())
diff --git a/src/world/layer.rs b/src/world/layer.rs
index 2f9382c..5541e34 100644
--- a/src/world/layer.rs
+++ b/src/world/layer.rs
@@ -1,7 +1,7 @@
 use anyhow::{Context, Result};
 use serde::{Deserialize, Serialize};
 
-use super::chunk::Chunk;
+use super::chunk::{Chunk, SectionIterItem};
 use crate::{
 	resource::{BlockFlag, BlockType},
 	types::*,
@@ -97,7 +97,11 @@ pub fn top_layer(chunk: &Chunk) -> Result<Box<BlockInfoArray>> {
 	let mut done = 0;
 	let mut ret = Box::<BlockInfoArray>::default();
 
-	for (section_y, section) in chunk.sections().rev() {
+	for SectionIterItem {
+		y: section_y,
+		section,
+	} in chunk.sections().rev()
+	{
 		for y in BlockY::iter().rev() {
 			for xz in BlockInfoArray::keys() {
 				let entry = &mut ret[xz];
diff --git a/src/world/section.rs b/src/world/section.rs
index 819bd3f..8a7a8d7 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -1,3 +1,5 @@
+use std::fmt::Debug;
+
 use anyhow::{bail, Context, Result};
 use num_integer::div_rem;
 
@@ -26,7 +28,7 @@ fn palette_bits(len: usize, min: u8, max: u8) -> Option<u8> {
 }
 
 /// Trait for common functions of [SectionV1_13] and [SectionV0]
-pub trait Section {
+pub trait Section: Debug {
 	fn block_at(&self, coords: SectionBlockCoords) -> Result<Option<BlockType>>;
 }
 

From 66f8d155f5f0ce9b77ca9ba0a240c01dacdd275a Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 4 Mar 2023 16:58:52 +0100
Subject: [PATCH 135/460] world/section: reorder type definitions

---
 src/world/section.rs | 66 ++++++++++++++++++++++----------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/world/section.rs b/src/world/section.rs
index 8a7a8d7..aa3c268 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -32,39 +32,6 @@ pub trait Section: Debug {
 	fn block_at(&self, coords: SectionBlockCoords) -> Result<Option<BlockType>>;
 }
 
-/// Minecraft v1.18+ section biome data
-///
-/// The biome data is part of the section structure in Minecraft v1.18+, with
-/// the biomes laid out as an array of indices into a palette, similar to the
-/// v1.13+ block data.
-#[derive(Debug)]
-pub struct BiomesV18<'a> {
-	_biomes: Option<&'a [i64]>,
-	_palette: &'a [String],
-	_bits: u8,
-}
-
-impl<'a> BiomesV18<'a> {
-	/// Constructs a new [BiomesV18] from deserialized data structures
-	pub fn new(biomes: Option<&'a [i64]>, palette: &'a [String]) -> Result<Self> {
-		let bits = palette_bits(palette.len(), 1, 6).context("Unsupported block palette size")?;
-
-		if let Some(biomes) = biomes {
-			let biomes_per_word = 64 / bits as usize;
-			let expected_length = (64 + biomes_per_word - 1) / biomes_per_word;
-			if biomes.len() != expected_length {
-				bail!("Invalid section biome data");
-			}
-		}
-
-		Ok(BiomesV18 {
-			_biomes: biomes,
-			_palette: palette,
-			_bits: bits,
-		})
-	}
-}
-
 /// Minecraft v1.13+ section block data
 #[derive(Debug)]
 pub struct SectionV1_13<'a> {
@@ -201,3 +168,36 @@ impl<'a> Section for SectionV0<'a> {
 		Ok(self.block_types.get_legacy(block, data))
 	}
 }
+
+/// Minecraft v1.18+ section biome data
+///
+/// The biome data is part of the section structure in Minecraft v1.18+, with
+/// the biomes laid out as an array of indices into a palette, similar to the
+/// v1.13+ block data.
+#[derive(Debug)]
+pub struct BiomesV18<'a> {
+	_biomes: Option<&'a [i64]>,
+	_palette: &'a [String],
+	_bits: u8,
+}
+
+impl<'a> BiomesV18<'a> {
+	/// Constructs a new [BiomesV18] from deserialized data structures
+	pub fn new(biomes: Option<&'a [i64]>, palette: &'a [String]) -> Result<Self> {
+		let bits = palette_bits(palette.len(), 1, 6).context("Unsupported block palette size")?;
+
+		if let Some(biomes) = biomes {
+			let biomes_per_word = 64 / bits as usize;
+			let expected_length = (64 + biomes_per_word - 1) / biomes_per_word;
+			if biomes.len() != expected_length {
+				bail!("Invalid section biome data");
+			}
+		}
+
+		Ok(BiomesV18 {
+			_biomes: biomes,
+			_palette: palette,
+			_bits: bits,
+		})
+	}
+}

From b4eb0d39f91e6a978acc5922e8d08c3cc05548f8 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 4 Mar 2023 17:03:22 +0100
Subject: [PATCH 136/460] world/section: add BlockLight type

---
 src/world/section.rs | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/world/section.rs b/src/world/section.rs
index aa3c268..d3c590a 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -201,3 +201,33 @@ impl<'a> BiomesV18<'a> {
 		})
 	}
 }
+
+#[derive(Debug, Clone, Copy)]
+pub struct BlockLight<'a>(Option<&'a [i8]>);
+
+impl<'a> BlockLight<'a> {
+	pub fn new(block_light: Option<&'a [i8]>) -> Result<Self> {
+		use BLOCKS_PER_CHUNK as N;
+		if let Some(block_light) = block_light {
+			if block_light.len() != N * N * N / 2 {
+				bail!("Invalid section block light data");
+			}
+		}
+		Ok(BlockLight(block_light))
+	}
+
+	pub fn block_light_at(&self, coords: SectionBlockCoords) -> u8 {
+		let Some(block_light) = self.0 else {
+			return 0;
+		};
+
+		let (offset, nibble) = div_rem(coords.offset(), 2);
+		let byte = block_light[offset] as u8;
+
+		if nibble == 1 {
+			byte >> 4
+		} else {
+			byte & 0xf
+		}
+	}
+}

From 482471492cf2622eb656fb272bf49728e4d4ccdf Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 4 Mar 2023 17:15:03 +0100
Subject: [PATCH 137/460] world/chunk: store BlockLight data in section map

---
 src/world/chunk.rs | 58 +++++++++++++++++++++++++++++-----------------
 1 file changed, 37 insertions(+), 21 deletions(-)

diff --git a/src/world/chunk.rs b/src/world/chunk.rs
index 72c5f9a..6895ea7 100644
--- a/src/world/chunk.rs
+++ b/src/world/chunk.rs
@@ -5,10 +5,7 @@ use std::{
 
 use anyhow::{bail, Context, Result};
 
-use super::{
-	de,
-	section::{BiomesV18, Section, SectionV0, SectionV1_13},
-};
+use super::{de, section::*};
 use crate::{resource::BlockTypes, types::*};
 
 /// Chunk data structure wrapping a [de::Chunk] for convenient access to
@@ -17,7 +14,7 @@ use crate::{resource::BlockTypes, types::*};
 pub enum Chunk<'a> {
 	/// Minecraft v1.18+ chunk with biome data moved into sections
 	V1_18 {
-		section_map: BTreeMap<SectionY, (SectionV1_13<'a>, BiomesV18<'a>)>,
+		section_map: BTreeMap<SectionY, (SectionV1_13<'a>, BiomesV18<'a>, BlockLight<'a>)>,
 	},
 	/// Minecraft v1.13+ chunk
 	///
@@ -26,14 +23,14 @@ pub enum Chunk<'a> {
 	/// section), and a palette mapping these indices to namespaced
 	/// block IDs
 	V1_13 {
-		section_map: BTreeMap<SectionY, SectionV1_13<'a>>,
+		section_map: BTreeMap<SectionY, (SectionV1_13<'a>, BlockLight<'a>)>,
 		biomes: &'a de::BiomesV0,
 	},
 	/// Original pre-1.13 chunk
 	///
 	/// The original chunk format with fixed 8-bit numeric block IDs
 	V0 {
-		section_map: BTreeMap<SectionY, SectionV0<'a>>,
+		section_map: BTreeMap<SectionY, (SectionV0<'a>, BlockLight<'a>)>,
 		biomes: &'a de::BiomesV0,
 	},
 	/// Unpopulated chunk without any block data
@@ -45,15 +42,15 @@ pub enum Chunk<'a> {
 enum SectionIterInner<'a> {
 	/// Iterator over sections of [Chunk::V1_18]
 	V1_18 {
-		iter: btree_map::Iter<'a, SectionY, (SectionV1_13<'a>, BiomesV18<'a>)>,
+		iter: btree_map::Iter<'a, SectionY, (SectionV1_13<'a>, BiomesV18<'a>, BlockLight<'a>)>,
 	},
 	/// Iterator over sections of [Chunk::V1_13]
 	V1_13 {
-		iter: btree_map::Iter<'a, SectionY, SectionV1_13<'a>>,
+		iter: btree_map::Iter<'a, SectionY, (SectionV1_13<'a>, BlockLight<'a>)>,
 	},
 	/// Iterator over sections of [Chunk::V0]
 	V0 {
-		iter: btree_map::Iter<'a, SectionY, SectionV0<'a>>,
+		iter: btree_map::Iter<'a, SectionY, (SectionV0<'a>, BlockLight<'a>)>,
 	},
 	/// Empty iterator over an unpopulated chunk ([Chunk::Empty])
 	Empty,
@@ -101,6 +98,9 @@ impl<'a> Chunk<'a> {
 						.with_context(|| {
 							format!("Failed to load section biomes at Y={}", section.y)
 						})?,
+					BlockLight::new(section.block_light.as_deref()).with_context(|| {
+						format!("Failed to load section block light at Y={}", section.y)
+					})?,
 				),
 			);
 		}
@@ -118,6 +118,10 @@ impl<'a> Chunk<'a> {
 		let mut section_map_v0 = BTreeMap::new();
 
 		for section in &level.sections {
+			let block_light =
+				BlockLight::new(section.block_light.as_deref()).with_context(|| {
+					format!("Failed to load section block light at Y={}", section.y)
+				})?;
 			match &section.section {
 				de::SectionV0Variants::V1_13 {
 					block_states,
@@ -125,16 +129,29 @@ impl<'a> Chunk<'a> {
 				} => {
 					section_map_v1_13.insert(
 						SectionY(section.y.into()),
-						SectionV1_13::new(data_version, Some(block_states), palette, block_types)
-							.with_context(|| format!("Failed to load section at Y={}", section.y))?,
+						(
+							SectionV1_13::new(
+								data_version,
+								Some(block_states),
+								palette,
+								block_types,
+							)
+							.with_context(|| {
+								format!("Failed to load section at Y={}", section.y)
+							})?,
+							block_light,
+						),
 					);
 				}
 				de::SectionV0Variants::V0 { blocks, data } => {
 					section_map_v0.insert(
 						SectionY(section.y.into()),
-						SectionV0::new(blocks, data, block_types).with_context(|| {
-							format!("Failed to load section at Y={}", section.y)
-						})?,
+						(
+							SectionV0::new(blocks, data, block_types).with_context(|| {
+								format!("Failed to load section at Y={}", section.y)
+							})?,
+							block_light,
+						),
 					);
 				}
 				de::SectionV0Variants::Empty {} => {}
@@ -207,15 +224,14 @@ impl<'a> SectionIter<'a> {
 		F: FnOnce(&mut dyn SectionIterTrait<'a>) -> T,
 	{
 		match &mut self.inner {
-			SectionIterInner::V1_18 { iter } => f(&mut iter.map(|(&y, section)| SectionIterItem {
-				y,
-				section: &section.0,
-			})),
+			SectionIterInner::V1_18 { iter } => {
+				f(&mut iter.map(|(&y, (section, _, _))| SectionIterItem { y, section }))
+			}
 			SectionIterInner::V1_13 { iter } => {
-				f(&mut iter.map(|(&y, section)| SectionIterItem { y, section }))
+				f(&mut iter.map(|(&y, (section, _))| SectionIterItem { y, section }))
 			}
 			SectionIterInner::V0 { iter } => {
-				f(&mut iter.map(|(&y, section)| SectionIterItem { y, section }))
+				f(&mut iter.map(|(&y, (section, _))| SectionIterItem { y, section }))
 			}
 			SectionIterInner::Empty => f(&mut iter::empty()),
 		}

From 51602d5fc1d79987f7a9c011c84db452ea175e64 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 4 Mar 2023 17:32:58 +0100
Subject: [PATCH 138/460] world/chunk: add block light to section iterator
 items

---
 src/world/chunk.rs | 27 ++++++++++++++++++++++-----
 src/world/layer.rs |  1 +
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/world/chunk.rs b/src/world/chunk.rs
index 6895ea7..984d8fe 100644
--- a/src/world/chunk.rs
+++ b/src/world/chunk.rs
@@ -203,6 +203,7 @@ impl<'a> Chunk<'a> {
 pub struct SectionIterItem<'a> {
 	pub y: SectionY,
 	pub section: &'a dyn Section,
+	pub block_light: BlockLight<'a>,
 }
 
 trait SectionIterTrait<'a>:
@@ -224,14 +225,30 @@ impl<'a> SectionIter<'a> {
 		F: FnOnce(&mut dyn SectionIterTrait<'a>) -> T,
 	{
 		match &mut self.inner {
-			SectionIterInner::V1_18 { iter } => {
-				f(&mut iter.map(|(&y, (section, _, _))| SectionIterItem { y, section }))
-			}
+			SectionIterInner::V1_18 { iter } => f(&mut iter.map(
+				|(&y, (section, _, block_light))| SectionIterItem {
+					y,
+					section,
+					block_light: *block_light,
+				},
+			)),
 			SectionIterInner::V1_13 { iter } => {
-				f(&mut iter.map(|(&y, (section, _))| SectionIterItem { y, section }))
+				f(
+					&mut iter.map(|(&y, (section, block_light))| SectionIterItem {
+						y,
+						section,
+						block_light: *block_light,
+					}),
+				)
 			}
 			SectionIterInner::V0 { iter } => {
-				f(&mut iter.map(|(&y, (section, _))| SectionIterItem { y, section }))
+				f(
+					&mut iter.map(|(&y, (section, block_light))| SectionIterItem {
+						y,
+						section,
+						block_light: *block_light,
+					}),
+				)
 			}
 			SectionIterInner::Empty => f(&mut iter::empty()),
 		}
diff --git a/src/world/layer.rs b/src/world/layer.rs
index 5541e34..2fd879b 100644
--- a/src/world/layer.rs
+++ b/src/world/layer.rs
@@ -100,6 +100,7 @@ pub fn top_layer(chunk: &Chunk) -> Result<Box<BlockInfoArray>> {
 	for SectionIterItem {
 		y: section_y,
 		section,
+		block_light: _,
 	} in chunk.sections().rev()
 	{
 		for y in BlockY::iter().rev() {

From 202364bfca3b5ab84c07d1cdd76bb1e7d3cb6784 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 4 Mar 2023 18:08:20 +0100
Subject: [PATCH 139/460] main: factor out overlay_chunk() function to build
 region images

---
 src/main.rs | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 054b659..899e772 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -59,6 +59,19 @@ impl Config {
 	}
 }
 
+fn overlay_chunk<I, J>(image: &mut I, chunk: &J, coords: ChunkCoords)
+where
+	I: image::GenericImage,
+	J: image::GenericImageView<Pixel = I::Pixel>,
+{
+	image::imageops::overlay(
+		image,
+		chunk,
+		coords.x.0 as i64 * BLOCKS_PER_CHUNK as i64,
+		coords.z.0 as i64 * BLOCKS_PER_CHUNK as i64,
+	);
+}
+
 /// Type with methods for processing the regions of a Minecraft save directory
 struct RegionProcessor<'a> {
 	block_types: resource::BlockTypes,
@@ -209,12 +222,7 @@ impl<'a> TileRenderer<'a> {
 				},
 			)
 		});
-		image::imageops::overlay(
-			image,
-			&chunk_image,
-			coords.x.0 as i64 * BLOCKS_PER_CHUNK as i64,
-			coords.z.0 as i64 * BLOCKS_PER_CHUNK as i64,
-		);
+		overlay_chunk(image, &chunk_image, coords);
 	}
 
 	fn render_region(image: &mut image::RgbaImage, region: &ProcessedRegion) {

From 4fd316f3fceba0b5cdf97e349a88b937772573ea Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 4 Mar 2023 20:33:10 +0100
Subject: [PATCH 140/460] world/layer: return None from top_layer() for empty
 chunks

Allow ignoring these chunks for the light map as well.
---
 src/main.rs        | 12 +++++++++---
 src/world/chunk.rs |  9 +++++++++
 src/world/layer.rs |  8 ++++++--
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 899e772..2ae6be3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -98,7 +98,10 @@ impl<'a> RegionProcessor<'a> {
 	}
 
 	/// Processes a single chunk
-	fn process_chunk(&self, data: world::de::Chunk) -> Result<Box<world::layer::BlockInfoArray>> {
+	fn process_chunk(
+		&self,
+		data: world::de::Chunk,
+	) -> Result<Option<Box<world::layer::BlockInfoArray>>> {
 		let chunk = world::chunk::Chunk::new(&data, &self.block_types)?;
 		world::layer::top_layer(&chunk)
 	}
@@ -127,9 +130,12 @@ impl<'a> RegionProcessor<'a> {
 
 		minedmap::io::region::from_file(path)?.foreach_chunk(
 			|chunk_coords, data: world::de::Chunk| {
-				let processed_chunk = self
+				let Some(processed_chunk) = self
 					.process_chunk(data)
-					.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))?;
+					.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))?
+				else {
+					return Ok(());
+				};
 				processed_region[chunk_coords] = Some(processed_chunk);
 				Ok(())
 			},
diff --git a/src/world/chunk.rs b/src/world/chunk.rs
index 984d8fe..10efc6a 100644
--- a/src/world/chunk.rs
+++ b/src/world/chunk.rs
@@ -179,6 +179,15 @@ impl<'a> Chunk<'a> {
 		)
 	}
 
+	pub fn is_empty(&self) -> bool {
+		match self {
+			Chunk::V1_18 { section_map } => section_map.is_empty(),
+			Chunk::V1_13 { section_map, .. } => section_map.is_empty(),
+			Chunk::V0 { section_map, .. } => section_map.is_empty(),
+			Chunk::Empty => true,
+		}
+	}
+
 	/// Returns an interator over the chunk's sections and their Y coordinates
 	pub fn sections(&self) -> SectionIter {
 		use SectionIterInner::*;
diff --git a/src/world/layer.rs b/src/world/layer.rs
index 2fd879b..8f9897a 100644
--- a/src/world/layer.rs
+++ b/src/world/layer.rs
@@ -91,9 +91,13 @@ pub type BlockInfoArray = LayerBlockArray<Option<BlockInfo>>;
 /// determined as the block that should be visible on the rendered
 /// map. For water blocks, the height of the first non-water block
 /// is additionally filled in as the water depth.
-pub fn top_layer(chunk: &Chunk) -> Result<Box<BlockInfoArray>> {
+pub fn top_layer(chunk: &Chunk) -> Result<Option<Box<BlockInfoArray>>> {
 	use BLOCKS_PER_CHUNK as N;
 
+	if chunk.is_empty() {
+		return Ok(None);
+	}
+
 	let mut done = 0;
 	let mut ret = Box::<BlockInfoArray>::default();
 
@@ -129,5 +133,5 @@ pub fn top_layer(chunk: &Chunk) -> Result<Box<BlockInfoArray>> {
 		}
 	}
 
-	Ok(ret)
+	Ok(Some(ret))
 }

From 116e7e5fb6c64dfb20e7ea08e8094e25dd5b8b4b Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 4 Mar 2023 17:38:52 +0100
Subject: [PATCH 141/460] world/layer: collect block light data with top layer

---
 src/world/layer.rs | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/world/layer.rs b/src/world/layer.rs
index 8f9897a..4036f4a 100644
--- a/src/world/layer.rs
+++ b/src/world/layer.rs
@@ -83,6 +83,7 @@ impl OptionBlockInfoExt for Option<BlockInfo> {
 }
 
 pub type BlockInfoArray = LayerBlockArray<Option<BlockInfo>>;
+pub type BlockLightArray = LayerBlockArray<u8>;
 
 /// Fills in a [BlockInfoArray] with the information of the chunk's top
 /// block layer
@@ -91,7 +92,7 @@ pub type BlockInfoArray = LayerBlockArray<Option<BlockInfo>>;
 /// determined as the block that should be visible on the rendered
 /// map. For water blocks, the height of the first non-water block
 /// is additionally filled in as the water depth.
-pub fn top_layer(chunk: &Chunk) -> Result<Option<Box<BlockInfoArray>>> {
+pub fn top_layer(chunk: &Chunk) -> Result<Option<(Box<BlockInfoArray>, Box<BlockLightArray>)>> {
 	use BLOCKS_PER_CHUNK as N;
 
 	if chunk.is_empty() {
@@ -99,33 +100,42 @@ pub fn top_layer(chunk: &Chunk) -> Result<Option<Box<BlockInfoArray>>> {
 	}
 
 	let mut done = 0;
-	let mut ret = Box::<BlockInfoArray>::default();
+	let mut blocks = Box::<BlockInfoArray>::default();
+	let mut light = Box::<BlockLightArray>::default();
 
 	for SectionIterItem {
 		y: section_y,
 		section,
-		block_light: _,
+		block_light,
 	} in chunk.sections().rev()
 	{
 		for y in BlockY::iter().rev() {
 			for xz in BlockInfoArray::keys() {
-				let entry = &mut ret[xz];
+				let entry = &mut blocks[xz];
 				if entry.done() {
 					continue;
 				}
 
 				let coords = SectionBlockCoords { xz, y };
-				let Some(block_type) = section.block_at(coords)? else {
-					continue;
+
+				'check_block: {
+					let Some(block_type) = section.block_at(coords)? else {
+						break 'check_block;
+					};
+
+					let height = BlockHeight::new(section_y, y)?;
+					if !entry.fill(height, block_type) {
+						break 'check_block;
+					}
+
+					assert!(entry.done());
+					done += 1;
 				};
-				let height = BlockHeight::new(section_y, y)?;
-				if !entry.fill(height, block_type) {
-					continue;
+
+				if entry.is_none() {
+					light[xz] = block_light.block_light_at(coords);
 				}
 
-				assert!(entry.done());
-
-				done += 1;
 				if done == N * N {
 					break;
 				}
@@ -133,5 +143,5 @@ pub fn top_layer(chunk: &Chunk) -> Result<Option<Box<BlockInfoArray>>> {
 		}
 	}
 
-	Ok(Some(ret))
+	Ok(Some((blocks, light)))
 }

From fbf212b55f3b39e9138f297d1771c93c9b324d84 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 4 Mar 2023 20:36:25 +0100
Subject: [PATCH 142/460] main: render light map

---
 src/main.rs | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 71 insertions(+), 3 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 2ae6be3..3b72d4d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -6,7 +6,12 @@ use std::{
 use anyhow::{Context, Result};
 use clap::Parser;
 
-use minedmap::{io::storage, resource, types::*, world};
+use minedmap::{
+	io::storage,
+	resource,
+	types::*,
+	world::{self, layer::BlockLightArray},
+};
 
 #[derive(Debug, Parser)]
 struct Args {
@@ -22,6 +27,7 @@ type ProcessedRegion = ChunkArray<Option<Box<world::layer::BlockInfoArray>>>;
 struct Config {
 	region_dir: PathBuf,
 	processed_dir: PathBuf,
+	light_dir: PathBuf,
 	map_dir: PathBuf,
 }
 
@@ -29,11 +35,13 @@ impl Config {
 	fn new(args: Args) -> Self {
 		let region_dir = [&args.input_dir, Path::new("region")].iter().collect();
 		let processed_dir = [&args.output_dir, Path::new("processed")].iter().collect();
+		let light_dir = [&args.output_dir, Path::new("light/0")].iter().collect();
 		let map_dir = [&args.output_dir, Path::new("map/0")].iter().collect();
 
 		Config {
 			region_dir,
 			processed_dir,
+			light_dir,
 			map_dir,
 		}
 	}
@@ -48,6 +56,16 @@ impl Config {
 		[&self.processed_dir, Path::new(&filename)].iter().collect()
 	}
 
+	fn light_path(&self, coords: RegionCoords, temp: bool) -> PathBuf {
+		let filename = format!(
+			"r.{}.{}.png{}",
+			coords.0,
+			coords.1,
+			if temp { ".tmp" } else { "" },
+		);
+		[&self.light_dir, Path::new(&filename)].iter().collect()
+	}
+
 	fn map_path(&self, coords: RegionCoords, temp: bool) -> PathBuf {
 		let filename = format!(
 			"r.{}.{}.png{}",
@@ -101,11 +119,29 @@ impl<'a> RegionProcessor<'a> {
 	fn process_chunk(
 		&self,
 		data: world::de::Chunk,
-	) -> Result<Option<Box<world::layer::BlockInfoArray>>> {
+	) -> Result<
+		Option<(
+			Box<world::layer::BlockInfoArray>,
+			Box<world::layer::BlockLightArray>,
+		)>,
+	> {
 		let chunk = world::chunk::Chunk::new(&data, &self.block_types)?;
 		world::layer::top_layer(&chunk)
 	}
 
+	fn chunk_lightmap(block_light: Box<BlockLightArray>) -> image::GrayAlphaImage {
+		const N: u32 = BLOCKS_PER_CHUNK as u32;
+
+		image::GrayAlphaImage::from_fn(N, N, |x, z| {
+			let v: f32 = block_light[LayerBlockCoords {
+				x: BlockX(x as u8),
+				z: BlockZ(z as u8),
+			}]
+			.into();
+			image::LumaA([0, (192.0 * (1.0 - v / 15.0)) as u8])
+		})
+	}
+
 	fn save_region(&self, coords: RegionCoords, processed_region: &ProcessedRegion) -> Result<()> {
 		let tmp_path = self.config.processed_path(coords, true);
 		storage::write(&tmp_path, processed_region)?;
@@ -122,26 +158,52 @@ impl<'a> RegionProcessor<'a> {
 		Ok(())
 	}
 
+	fn save_lightmap(&self, coords: RegionCoords, lightmap: &image::GrayAlphaImage) -> Result<()> {
+		let tmp_path = self.config.light_path(coords, true);
+		lightmap
+			.save_with_format(&tmp_path, image::ImageFormat::Png)
+			.context("Failed to save image")?;
+
+		let output_path = self.config.light_path(coords, false);
+		fs::rename(&tmp_path, &output_path).with_context(|| {
+			format!(
+				"Failed to rename {} to {}",
+				tmp_path.display(),
+				output_path.display(),
+			)
+		})?;
+
+		Ok(())
+	}
+
 	/// Processes a single region file
 	fn process_region(&self, path: &Path, coords: RegionCoords) -> Result<()> {
+		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
+
 		println!("Processing region r.{}.{}.mca", coords.0, coords.1);
 
 		let mut processed_region = ProcessedRegion::default();
+		let mut lightmap = image::GrayAlphaImage::new(N, N);
 
 		minedmap::io::region::from_file(path)?.foreach_chunk(
 			|chunk_coords, data: world::de::Chunk| {
-				let Some(processed_chunk) = self
+				let Some((processed_chunk, block_light)) = self
 					.process_chunk(data)
 					.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))?
 				else {
 					return Ok(());
 				};
 				processed_region[chunk_coords] = Some(processed_chunk);
+
+				let chunk_lightmap = Self::chunk_lightmap(block_light);
+				overlay_chunk(&mut lightmap, &chunk_lightmap, chunk_coords);
+
 				Ok(())
 			},
 		)?;
 
 		self.save_region(coords, &processed_region)?;
+		self.save_lightmap(coords, &lightmap)?;
 
 		Ok(())
 	}
@@ -163,6 +225,12 @@ impl<'a> RegionProcessor<'a> {
 				self.config.processed_dir.display(),
 			)
 		})?;
+		fs::create_dir_all(&self.config.light_dir).with_context(|| {
+			format!(
+				"Failed to create directory {}",
+				self.config.light_dir.display(),
+			)
+		})?;
 
 		let mut ret = Vec::new();
 

From 46802116d91a852b7f3edc1da7a09692337c30c3 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 4 Mar 2023 21:32:15 +0100
Subject: [PATCH 143/460] resource: change BlockColor into an array

---
 resource/generate.py        |    2 +-
 src/main.rs                 |    4 +-
 src/resource/block_types.rs | 1876 +++++++++++++++++------------------
 src/resource/mod.rs         |    2 +-
 4 files changed, 942 insertions(+), 942 deletions(-)

diff --git a/resource/generate.py b/resource/generate.py
index d91df98..4398ce4 100755
--- a/resource/generate.py
+++ b/resource/generate.py
@@ -36,7 +36,7 @@ with open(sys.argv[2], 'w') as f:
 			flags.append('Water')
 		flags = 'make_bitflags!(BlockFlag::{' + '|'.join(flags) + '})'
 
-		print('\t("%s", BlockType { flags: %s, color: BlockColor(%u, %u, %u) }),' % (
+		print('\t("%s", BlockType { flags: %s, color: BlockColor([%u, %u, %u]) }),' % (
 			name,
 			flags,
 			info['color']['r'],
diff --git a/src/main.rs b/src/main.rs
index 3b72d4d..14589f4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -289,8 +289,8 @@ impl<'a> TileRenderer<'a> {
 					z: BlockZ(z as u8),
 				}] {
 					Some(block) => {
-						let c = block.block_type.color;
-						[c.0, c.1, c.2, 255]
+						let c = block.block_type.color.0;
+						[c[0], c[1], c[2], 255]
 					}
 					None => [0, 0, 0, 0],
 				},
diff --git a/src/resource/block_types.rs b/src/resource/block_types.rs
index 6afed2a..1520b8e 100644
--- a/src/resource/block_types.rs
+++ b/src/resource/block_types.rs
@@ -7,6566 +7,6566 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 		"acacia_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"acacia_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(167, 95, 60),
+			color: BlockColor([167, 95, 60]),
 		},
 	),
 	(
 		"acacia_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(168, 90, 50),
+			color: BlockColor([168, 90, 50]),
 		},
 	),
 	(
 		"acacia_fence_gate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(168, 90, 50),
+			color: BlockColor([168, 90, 50]),
 		},
 	),
 	(
 		"acacia_leaves",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
-			color: BlockColor(149, 148, 148),
+			color: BlockColor([149, 148, 148]),
 		},
 	),
 	(
 		"acacia_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(150, 88, 55),
+			color: BlockColor([150, 88, 55]),
 		},
 	),
 	(
 		"acacia_planks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(168, 90, 50),
+			color: BlockColor([168, 90, 50]),
 		},
 	),
 	(
 		"acacia_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(168, 90, 50),
+			color: BlockColor([168, 90, 50]),
 		},
 	),
 	(
 		"acacia_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(118, 117, 23),
+			color: BlockColor([118, 117, 23]),
 		},
 	),
 	(
 		"acacia_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(168, 90, 50),
+			color: BlockColor([168, 90, 50]),
 		},
 	),
 	(
 		"acacia_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(168, 90, 50),
+			color: BlockColor([168, 90, 50]),
 		},
 	),
 	(
 		"acacia_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(168, 90, 50),
+			color: BlockColor([168, 90, 50]),
 		},
 	),
 	(
 		"acacia_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(156, 87, 51),
+			color: BlockColor([156, 87, 51]),
 		},
 	),
 	(
 		"acacia_wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"acacia_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(103, 96, 86),
+			color: BlockColor([103, 96, 86]),
 		},
 	),
 	(
 		"activator_rail",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(115, 87, 74),
+			color: BlockColor([115, 87, 74]),
 		},
 	),
 	(
 		"air",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"allium",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"amethyst_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(133, 97, 191),
+			color: BlockColor([133, 97, 191]),
 		},
 	),
 	(
 		"amethyst_cluster",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(163, 126, 207),
+			color: BlockColor([163, 126, 207]),
 		},
 	),
 	(
 		"ancient_debris",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(94, 66, 58),
+			color: BlockColor([94, 66, 58]),
 		},
 	),
 	(
 		"andesite",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(136, 136, 136),
+			color: BlockColor([136, 136, 136]),
 		},
 	),
 	(
 		"andesite_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(136, 136, 136),
+			color: BlockColor([136, 136, 136]),
 		},
 	),
 	(
 		"andesite_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(136, 136, 136),
+			color: BlockColor([136, 136, 136]),
 		},
 	),
 	(
 		"andesite_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(136, 136, 136),
+			color: BlockColor([136, 136, 136]),
 		},
 	),
 	(
 		"anvil",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(72, 72, 72),
+			color: BlockColor([72, 72, 72]),
 		},
 	),
 	(
 		"attached_melon_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: BlockColor(141, 142, 141),
+			color: BlockColor([141, 142, 141]),
 		},
 	),
 	(
 		"attached_pumpkin_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: BlockColor(139, 139, 139),
+			color: BlockColor([139, 139, 139]),
 		},
 	),
 	(
 		"azalea",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(101, 124, 47),
+			color: BlockColor([101, 124, 47]),
 		},
 	),
 	(
 		"azalea_leaves",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(90, 114, 44),
+			color: BlockColor([90, 114, 44]),
 		},
 	),
 	(
 		"azure_bluet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"bamboo",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(93, 144, 19),
+			color: BlockColor([93, 144, 19]),
 		},
 	),
 	(
 		"bamboo_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"barrel",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(134, 100, 58),
+			color: BlockColor([134, 100, 58]),
 		},
 	),
 	(
 		"barrier",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"basalt",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(80, 81, 86),
+			color: BlockColor([80, 81, 86]),
 		},
 	),
 	(
 		"beacon",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(117, 220, 215),
+			color: BlockColor([117, 220, 215]),
 		},
 	),
 	(
 		"bedrock",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(85, 85, 85),
+			color: BlockColor([85, 85, 85]),
 		},
 	),
 	(
 		"bee_nest",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(202, 160, 74),
+			color: BlockColor([202, 160, 74]),
 		},
 	),
 	(
 		"beehive",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(180, 146, 90),
+			color: BlockColor([180, 146, 90]),
 		},
 	),
 	(
 		"beetroots",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(93, 91, 30),
+			color: BlockColor([93, 91, 30]),
 		},
 	),
 	(
 		"bell",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(253, 235, 110),
+			color: BlockColor([253, 235, 110]),
 		},
 	),
 	(
 		"big_dripleaf",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(111, 141, 51),
+			color: BlockColor([111, 141, 51]),
 		},
 	),
 	(
 		"big_dripleaf_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"birch_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"birch_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(220, 209, 176),
+			color: BlockColor([220, 209, 176]),
 		},
 	),
 	(
 		"birch_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(192, 175, 121),
+			color: BlockColor([192, 175, 121]),
 		},
 	),
 	(
 		"birch_fence_gate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(192, 175, 121),
+			color: BlockColor([192, 175, 121]),
 		},
 	),
 	(
 		"birch_leaves",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Birch}),
-			color: BlockColor(130, 129, 130),
+			color: BlockColor([130, 129, 130]),
 		},
 	),
 	(
 		"birch_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(193, 179, 135),
+			color: BlockColor([193, 179, 135]),
 		},
 	),
 	(
 		"birch_planks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(192, 175, 121),
+			color: BlockColor([192, 175, 121]),
 		},
 	),
 	(
 		"birch_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(192, 175, 121),
+			color: BlockColor([192, 175, 121]),
 		},
 	),
 	(
 		"birch_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(127, 160, 79),
+			color: BlockColor([127, 160, 79]),
 		},
 	),
 	(
 		"birch_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(192, 175, 121),
+			color: BlockColor([192, 175, 121]),
 		},
 	),
 	(
 		"birch_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(192, 175, 121),
+			color: BlockColor([192, 175, 121]),
 		},
 	),
 	(
 		"birch_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(192, 175, 121),
+			color: BlockColor([192, 175, 121]),
 		},
 	),
 	(
 		"birch_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(207, 194, 157),
+			color: BlockColor([207, 194, 157]),
 		},
 	),
 	(
 		"birch_wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"birch_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(216, 215, 210),
+			color: BlockColor([216, 215, 210]),
 		},
 	),
 	(
 		"black_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"black_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"black_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"black_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(248, 222, 214),
+			color: BlockColor([248, 222, 214]),
 		},
 	),
 	(
 		"black_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(20, 21, 25),
+			color: BlockColor([20, 21, 25]),
 		},
 	),
 	(
 		"black_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(8, 10, 15),
+			color: BlockColor([8, 10, 15]),
 		},
 	),
 	(
 		"black_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(25, 26, 31),
+			color: BlockColor([25, 26, 31]),
 		},
 	),
 	(
 		"black_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(67, 30, 32),
+			color: BlockColor([67, 30, 32]),
 		},
 	),
 	(
 		"black_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(25, 25, 29),
+			color: BlockColor([25, 25, 29]),
 		},
 	),
 	(
 		"black_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(25, 25, 25),
+			color: BlockColor([25, 25, 25]),
 		},
 	),
 	(
 		"black_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(24, 24, 24),
+			color: BlockColor([24, 24, 24]),
 		},
 	),
 	(
 		"black_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(37, 22, 16),
+			color: BlockColor([37, 22, 16]),
 		},
 	),
 	(
 		"black_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"black_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(20, 21, 25),
+			color: BlockColor([20, 21, 25]),
 		},
 	),
 	(
 		"blackstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(42, 36, 41),
+			color: BlockColor([42, 36, 41]),
 		},
 	),
 	(
 		"blackstone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(42, 36, 41),
+			color: BlockColor([42, 36, 41]),
 		},
 	),
 	(
 		"blackstone_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(42, 36, 41),
+			color: BlockColor([42, 36, 41]),
 		},
 	),
 	(
 		"blackstone_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(42, 36, 41),
+			color: BlockColor([42, 36, 41]),
 		},
 	),
 	(
 		"blast_furnace",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(80, 80, 81),
+			color: BlockColor([80, 80, 81]),
 		},
 	),
 	(
 		"blue_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"blue_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"blue_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"blue_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(248, 222, 214),
+			color: BlockColor([248, 222, 214]),
 		},
 	),
 	(
 		"blue_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(53, 57, 157),
+			color: BlockColor([53, 57, 157]),
 		},
 	),
 	(
 		"blue_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(44, 46, 143),
+			color: BlockColor([44, 46, 143]),
 		},
 	),
 	(
 		"blue_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(70, 73, 166),
+			color: BlockColor([70, 73, 166]),
 		},
 	),
 	(
 		"blue_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(47, 64, 139),
+			color: BlockColor([47, 64, 139]),
 		},
 	),
 	(
 		"blue_ice",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(116, 167, 253),
+			color: BlockColor([116, 167, 253]),
 		},
 	),
 	(
 		"blue_orchid",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"blue_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(43, 45, 140),
+			color: BlockColor([43, 45, 140]),
 		},
 	),
 	(
 		"blue_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(51, 76, 178),
+			color: BlockColor([51, 76, 178]),
 		},
 	),
 	(
 		"blue_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(48, 73, 171),
+			color: BlockColor([48, 73, 171]),
 		},
 	),
 	(
 		"blue_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(74, 59, 91),
+			color: BlockColor([74, 59, 91]),
 		},
 	),
 	(
 		"blue_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"blue_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(53, 57, 157),
+			color: BlockColor([53, 57, 157]),
 		},
 	),
 	(
 		"bone_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(209, 206, 179),
+			color: BlockColor([209, 206, 179]),
 		},
 	),
 	(
 		"bookshelf",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(162, 130, 78),
+			color: BlockColor([162, 130, 78]),
 		},
 	),
 	(
 		"brain_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"brain_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(207, 91, 159),
+			color: BlockColor([207, 91, 159]),
 		},
 	),
 	(
 		"brain_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"brain_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"brewing_stand",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(122, 100, 80),
+			color: BlockColor([122, 100, 80]),
 		},
 	),
 	(
 		"brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(150, 97, 83),
+			color: BlockColor([150, 97, 83]),
 		},
 	),
 	(
 		"brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(150, 97, 83),
+			color: BlockColor([150, 97, 83]),
 		},
 	),
 	(
 		"brick_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(150, 97, 83),
+			color: BlockColor([150, 97, 83]),
 		},
 	),
 	(
 		"bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(150, 97, 83),
+			color: BlockColor([150, 97, 83]),
 		},
 	),
 	(
 		"brown_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"brown_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"brown_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"brown_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(248, 222, 214),
+			color: BlockColor([248, 222, 214]),
 		},
 	),
 	(
 		"brown_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(114, 71, 40),
+			color: BlockColor([114, 71, 40]),
 		},
 	),
 	(
 		"brown_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(96, 59, 31),
+			color: BlockColor([96, 59, 31]),
 		},
 	),
 	(
 		"brown_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(125, 84, 53),
+			color: BlockColor([125, 84, 53]),
 		},
 	),
 	(
 		"brown_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(119, 106, 85),
+			color: BlockColor([119, 106, 85]),
 		},
 	),
 	(
 		"brown_mushroom",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"brown_mushroom_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(149, 111, 81),
+			color: BlockColor([149, 111, 81]),
 		},
 	),
 	(
 		"brown_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(106, 66, 35),
+			color: BlockColor([106, 66, 35]),
 		},
 	),
 	(
 		"brown_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(102, 76, 51),
+			color: BlockColor([102, 76, 51]),
 		},
 	),
 	(
 		"brown_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(97, 73, 48),
+			color: BlockColor([97, 73, 48]),
 		},
 	),
 	(
 		"brown_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(77, 51, 35),
+			color: BlockColor([77, 51, 35]),
 		},
 	),
 	(
 		"brown_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"brown_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(114, 71, 40),
+			color: BlockColor([114, 71, 40]),
 		},
 	),
 	(
 		"bubble_column",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Water}),
-			color: BlockColor(177, 177, 177),
+			color: BlockColor([177, 177, 177]),
 		},
 	),
 	(
 		"bubble_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"bubble_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(165, 26, 162),
+			color: BlockColor([165, 26, 162]),
 		},
 	),
 	(
 		"bubble_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"bubble_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"budding_amethyst",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(132, 96, 186),
+			color: BlockColor([132, 96, 186]),
 		},
 	),
 	(
 		"cactus",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(85, 127, 43),
+			color: BlockColor([85, 127, 43]),
 		},
 	),
 	(
 		"cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(248, 222, 214),
+			color: BlockColor([248, 222, 214]),
 		},
 	),
 	(
 		"calcite",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(223, 224, 220),
+			color: BlockColor([223, 224, 220]),
 		},
 	),
 	(
 		"campfire",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(110, 88, 54),
+			color: BlockColor([110, 88, 54]),
 		},
 	),
 	(
 		"candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(248, 222, 214),
+			color: BlockColor([248, 222, 214]),
 		},
 	),
 	(
 		"carrots",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(81, 124, 37),
+			color: BlockColor([81, 124, 37]),
 		},
 	),
 	(
 		"cartography_table",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(103, 87, 67),
+			color: BlockColor([103, 87, 67]),
 		},
 	),
 	(
 		"carved_pumpkin",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(198, 118, 24),
+			color: BlockColor([198, 118, 24]),
 		},
 	),
 	(
 		"cauldron",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(73, 72, 74),
+			color: BlockColor([73, 72, 74]),
 		},
 	),
 	(
 		"cave_air",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"cave_vines",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(90, 109, 40),
+			color: BlockColor([90, 109, 40]),
 		},
 	),
 	(
 		"cave_vines_plant",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(88, 101, 38),
+			color: BlockColor([88, 101, 38]),
 		},
 	),
 	(
 		"chain",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"chain_command_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(131, 161, 147),
+			color: BlockColor([131, 161, 147]),
 		},
 	),
 	(
 		"chest",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(162, 130, 78),
+			color: BlockColor([162, 130, 78]),
 		},
 	),
 	(
 		"chipped_anvil",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(72, 72, 72),
+			color: BlockColor([72, 72, 72]),
 		},
 	),
 	(
 		"chiseled_deepslate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(54, 54, 54),
+			color: BlockColor([54, 54, 54]),
 		},
 	),
 	(
 		"chiseled_nether_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(47, 23, 28),
+			color: BlockColor([47, 23, 28]),
 		},
 	),
 	(
 		"chiseled_polished_blackstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(53, 48, 56),
+			color: BlockColor([53, 48, 56]),
 		},
 	),
 	(
 		"chiseled_quartz_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(231, 226, 218),
+			color: BlockColor([231, 226, 218]),
 		},
 	),
 	(
 		"chiseled_red_sandstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(181, 97, 31),
+			color: BlockColor([181, 97, 31]),
 		},
 	),
 	(
 		"chiseled_sandstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(223, 214, 170),
+			color: BlockColor([223, 214, 170]),
 		},
 	),
 	(
 		"chiseled_stone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(119, 118, 119),
+			color: BlockColor([119, 118, 119]),
 		},
 	),
 	(
 		"chorus_flower",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(151, 120, 151),
+			color: BlockColor([151, 120, 151]),
 		},
 	),
 	(
 		"chorus_plant",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(93, 57, 93),
+			color: BlockColor([93, 57, 93]),
 		},
 	),
 	(
 		"clay",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(160, 166, 179),
+			color: BlockColor([160, 166, 179]),
 		},
 	),
 	(
 		"coal_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(16, 15, 15),
+			color: BlockColor([16, 15, 15]),
 		},
 	),
 	(
 		"coal_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(105, 105, 105),
+			color: BlockColor([105, 105, 105]),
 		},
 	),
 	(
 		"coarse_dirt",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(119, 85, 59),
+			color: BlockColor([119, 85, 59]),
 		},
 	),
 	(
 		"cobbled_deepslate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(77, 77, 80),
+			color: BlockColor([77, 77, 80]),
 		},
 	),
 	(
 		"cobbled_deepslate_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(77, 77, 80),
+			color: BlockColor([77, 77, 80]),
 		},
 	),
 	(
 		"cobbled_deepslate_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(77, 77, 80),
+			color: BlockColor([77, 77, 80]),
 		},
 	),
 	(
 		"cobbled_deepslate_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(77, 77, 80),
+			color: BlockColor([77, 77, 80]),
 		},
 	),
 	(
 		"cobblestone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(127, 127, 127),
+			color: BlockColor([127, 127, 127]),
 		},
 	),
 	(
 		"cobblestone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(127, 127, 127),
+			color: BlockColor([127, 127, 127]),
 		},
 	),
 	(
 		"cobblestone_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(127, 127, 127),
+			color: BlockColor([127, 127, 127]),
 		},
 	),
 	(
 		"cobblestone_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(127, 127, 127),
+			color: BlockColor([127, 127, 127]),
 		},
 	),
 	(
 		"cobweb",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(228, 233, 234),
+			color: BlockColor([228, 233, 234]),
 		},
 	),
 	(
 		"cocoa",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(154, 91, 40),
+			color: BlockColor([154, 91, 40]),
 		},
 	),
 	(
 		"command_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(181, 136, 108),
+			color: BlockColor([181, 136, 108]),
 		},
 	),
 	(
 		"comparator",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(166, 161, 159),
+			color: BlockColor([166, 161, 159]),
 		},
 	),
 	(
 		"composter",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(88, 61, 23),
+			color: BlockColor([88, 61, 23]),
 		},
 	),
 	(
 		"conduit",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(159, 139, 113),
+			color: BlockColor([159, 139, 113]),
 		},
 	),
 	(
 		"copper_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(192, 107, 79),
+			color: BlockColor([192, 107, 79]),
 		},
 	),
 	(
 		"copper_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(124, 125, 120),
+			color: BlockColor([124, 125, 120]),
 		},
 	),
 	(
 		"cornflower",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"cracked_deepslate_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(64, 64, 65),
+			color: BlockColor([64, 64, 65]),
 		},
 	),
 	(
 		"cracked_deepslate_tiles",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(52, 52, 52),
+			color: BlockColor([52, 52, 52]),
 		},
 	),
 	(
 		"cracked_nether_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(40, 20, 23),
+			color: BlockColor([40, 20, 23]),
 		},
 	),
 	(
 		"cracked_polished_blackstone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(44, 37, 43),
+			color: BlockColor([44, 37, 43]),
 		},
 	),
 	(
 		"cracked_stone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(118, 117, 118),
+			color: BlockColor([118, 117, 118]),
 		},
 	),
 	(
 		"crafting_table",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(119, 73, 42),
+			color: BlockColor([119, 73, 42]),
 		},
 	),
 	(
 		"creeper_head",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"creeper_wall_head",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"crimson_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"crimson_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(114, 54, 79),
+			color: BlockColor([114, 54, 79]),
 		},
 	),
 	(
 		"crimson_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(101, 48, 70),
+			color: BlockColor([101, 48, 70]),
 		},
 	),
 	(
 		"crimson_fence_gate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(101, 48, 70),
+			color: BlockColor([101, 48, 70]),
 		},
 	),
 	(
 		"crimson_fungus",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"crimson_hyphae",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(92, 25, 29),
+			color: BlockColor([92, 25, 29]),
 		},
 	),
 	(
 		"crimson_nylium",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(130, 31, 31),
+			color: BlockColor([130, 31, 31]),
 		},
 	),
 	(
 		"crimson_planks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(101, 48, 70),
+			color: BlockColor([101, 48, 70]),
 		},
 	),
 	(
 		"crimson_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(101, 48, 70),
+			color: BlockColor([101, 48, 70]),
 		},
 	),
 	(
 		"crimson_roots",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(126, 8, 41),
+			color: BlockColor([126, 8, 41]),
 		},
 	),
 	(
 		"crimson_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(101, 48, 70),
+			color: BlockColor([101, 48, 70]),
 		},
 	),
 	(
 		"crimson_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(101, 48, 70),
+			color: BlockColor([101, 48, 70]),
 		},
 	),
 	(
 		"crimson_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(101, 48, 70),
+			color: BlockColor([101, 48, 70]),
 		},
 	),
 	(
 		"crimson_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(112, 49, 70),
+			color: BlockColor([112, 49, 70]),
 		},
 	),
 	(
 		"crimson_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(103, 50, 72),
+			color: BlockColor([103, 50, 72]),
 		},
 	),
 	(
 		"crimson_wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"crying_obsidian",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(32, 10, 60),
+			color: BlockColor([32, 10, 60]),
 		},
 	),
 	(
 		"cut_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(191, 106, 80),
+			color: BlockColor([191, 106, 80]),
 		},
 	),
 	(
 		"cut_copper_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(191, 106, 80),
+			color: BlockColor([191, 106, 80]),
 		},
 	),
 	(
 		"cut_copper_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(191, 106, 80),
+			color: BlockColor([191, 106, 80]),
 		},
 	),
 	(
 		"cut_red_sandstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(181, 97, 31),
+			color: BlockColor([181, 97, 31]),
 		},
 	),
 	(
 		"cut_red_sandstone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(181, 97, 31),
+			color: BlockColor([181, 97, 31]),
 		},
 	),
 	(
 		"cut_sandstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(223, 214, 170),
+			color: BlockColor([223, 214, 170]),
 		},
 	),
 	(
 		"cut_sandstone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(223, 214, 170),
+			color: BlockColor([223, 214, 170]),
 		},
 	),
 	(
 		"cyan_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"cyan_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"cyan_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"cyan_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(248, 222, 214),
+			color: BlockColor([248, 222, 214]),
 		},
 	),
 	(
 		"cyan_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(21, 137, 145),
+			color: BlockColor([21, 137, 145]),
 		},
 	),
 	(
 		"cyan_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(21, 119, 136),
+			color: BlockColor([21, 119, 136]),
 		},
 	),
 	(
 		"cyan_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(36, 147, 157),
+			color: BlockColor([36, 147, 157]),
 		},
 	),
 	(
 		"cyan_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(52, 118, 125),
+			color: BlockColor([52, 118, 125]),
 		},
 	),
 	(
 		"cyan_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(20, 121, 135),
+			color: BlockColor([20, 121, 135]),
 		},
 	),
 	(
 		"cyan_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(76, 127, 153),
+			color: BlockColor([76, 127, 153]),
 		},
 	),
 	(
 		"cyan_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(73, 122, 147),
+			color: BlockColor([73, 122, 147]),
 		},
 	),
 	(
 		"cyan_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(86, 91, 91),
+			color: BlockColor([86, 91, 91]),
 		},
 	),
 	(
 		"cyan_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"cyan_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(21, 137, 145),
+			color: BlockColor([21, 137, 145]),
 		},
 	),
 	(
 		"damaged_anvil",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(72, 72, 72),
+			color: BlockColor([72, 72, 72]),
 		},
 	),
 	(
 		"dandelion",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"dark_oak_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"dark_oak_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(76, 51, 25),
+			color: BlockColor([76, 51, 25]),
 		},
 	),
 	(
 		"dark_oak_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(66, 43, 20),
+			color: BlockColor([66, 43, 20]),
 		},
 	),
 	(
 		"dark_oak_fence_gate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(66, 43, 20),
+			color: BlockColor([66, 43, 20]),
 		},
 	),
 	(
 		"dark_oak_leaves",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
-			color: BlockColor(150, 150, 150),
+			color: BlockColor([150, 150, 150]),
 		},
 	),
 	(
 		"dark_oak_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(67, 45, 22),
+			color: BlockColor([67, 45, 22]),
 		},
 	),
 	(
 		"dark_oak_planks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(66, 43, 20),
+			color: BlockColor([66, 43, 20]),
 		},
 	),
 	(
 		"dark_oak_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(66, 43, 20),
+			color: BlockColor([66, 43, 20]),
 		},
 	),
 	(
 		"dark_oak_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(61, 90, 30),
+			color: BlockColor([61, 90, 30]),
 		},
 	),
 	(
 		"dark_oak_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(66, 43, 20),
+			color: BlockColor([66, 43, 20]),
 		},
 	),
 	(
 		"dark_oak_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(66, 43, 20),
+			color: BlockColor([66, 43, 20]),
 		},
 	),
 	(
 		"dark_oak_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(66, 43, 20),
+			color: BlockColor([66, 43, 20]),
 		},
 	),
 	(
 		"dark_oak_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(75, 49, 23),
+			color: BlockColor([75, 49, 23]),
 		},
 	),
 	(
 		"dark_oak_wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"dark_oak_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(60, 46, 26),
+			color: BlockColor([60, 46, 26]),
 		},
 	),
 	(
 		"dark_prismarine",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(51, 91, 75),
+			color: BlockColor([51, 91, 75]),
 		},
 	),
 	(
 		"dark_prismarine_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(51, 91, 75),
+			color: BlockColor([51, 91, 75]),
 		},
 	),
 	(
 		"dark_prismarine_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(51, 91, 75),
+			color: BlockColor([51, 91, 75]),
 		},
 	),
 	(
 		"daylight_detector",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(130, 116, 94),
+			color: BlockColor([130, 116, 94]),
 		},
 	),
 	(
 		"dead_brain_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"dead_brain_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(124, 117, 114),
+			color: BlockColor([124, 117, 114]),
 		},
 	),
 	(
 		"dead_brain_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"dead_brain_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"dead_bubble_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"dead_bubble_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(131, 123, 119),
+			color: BlockColor([131, 123, 119]),
 		},
 	),
 	(
 		"dead_bubble_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"dead_bubble_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"dead_bush",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(107, 78, 40),
+			color: BlockColor([107, 78, 40]),
 		},
 	),
 	(
 		"dead_fire_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"dead_fire_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(131, 123, 119),
+			color: BlockColor([131, 123, 119]),
 		},
 	),
 	(
 		"dead_fire_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"dead_fire_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"dead_horn_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"dead_horn_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(133, 126, 122),
+			color: BlockColor([133, 126, 122]),
 		},
 	),
 	(
 		"dead_horn_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"dead_horn_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"dead_tube_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"dead_tube_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(130, 123, 119),
+			color: BlockColor([130, 123, 119]),
 		},
 	),
 	(
 		"dead_tube_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"dead_tube_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"deepslate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(80, 80, 82),
+			color: BlockColor([80, 80, 82]),
 		},
 	),
 	(
 		"deepslate_brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(70, 70, 71),
+			color: BlockColor([70, 70, 71]),
 		},
 	),
 	(
 		"deepslate_brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(70, 70, 71),
+			color: BlockColor([70, 70, 71]),
 		},
 	),
 	(
 		"deepslate_brick_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(70, 70, 71),
+			color: BlockColor([70, 70, 71]),
 		},
 	),
 	(
 		"deepslate_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(70, 70, 71),
+			color: BlockColor([70, 70, 71]),
 		},
 	),
 	(
 		"deepslate_coal_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(74, 74, 76),
+			color: BlockColor([74, 74, 76]),
 		},
 	),
 	(
 		"deepslate_copper_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(92, 93, 89),
+			color: BlockColor([92, 93, 89]),
 		},
 	),
 	(
 		"deepslate_diamond_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(83, 106, 106),
+			color: BlockColor([83, 106, 106]),
 		},
 	),
 	(
 		"deepslate_emerald_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(78, 104, 87),
+			color: BlockColor([78, 104, 87]),
 		},
 	),
 	(
 		"deepslate_gold_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(115, 102, 78),
+			color: BlockColor([115, 102, 78]),
 		},
 	),
 	(
 		"deepslate_iron_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(106, 99, 94),
+			color: BlockColor([106, 99, 94]),
 		},
 	),
 	(
 		"deepslate_lapis_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(79, 90, 115),
+			color: BlockColor([79, 90, 115]),
 		},
 	),
 	(
 		"deepslate_redstone_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(104, 73, 74),
+			color: BlockColor([104, 73, 74]),
 		},
 	),
 	(
 		"deepslate_tile_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(54, 54, 55),
+			color: BlockColor([54, 54, 55]),
 		},
 	),
 	(
 		"deepslate_tile_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(54, 54, 55),
+			color: BlockColor([54, 54, 55]),
 		},
 	),
 	(
 		"deepslate_tile_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(54, 54, 55),
+			color: BlockColor([54, 54, 55]),
 		},
 	),
 	(
 		"deepslate_tiles",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(54, 54, 55),
+			color: BlockColor([54, 54, 55]),
 		},
 	),
 	(
 		"detector_rail",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(123, 104, 90),
+			color: BlockColor([123, 104, 90]),
 		},
 	),
 	(
 		"diamond_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(98, 237, 228),
+			color: BlockColor([98, 237, 228]),
 		},
 	),
 	(
 		"diamond_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(121, 141, 140),
+			color: BlockColor([121, 141, 140]),
 		},
 	),
 	(
 		"diorite",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(188, 188, 188),
+			color: BlockColor([188, 188, 188]),
 		},
 	),
 	(
 		"diorite_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(188, 188, 188),
+			color: BlockColor([188, 188, 188]),
 		},
 	),
 	(
 		"diorite_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(188, 188, 188),
+			color: BlockColor([188, 188, 188]),
 		},
 	),
 	(
 		"diorite_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(188, 188, 188),
+			color: BlockColor([188, 188, 188]),
 		},
 	),
 	(
 		"dirt",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(134, 96, 67),
+			color: BlockColor([134, 96, 67]),
 		},
 	),
 	(
 		"dirt_path",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(148, 121, 65),
+			color: BlockColor([148, 121, 65]),
 		},
 	),
 	(
 		"dispenser",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(110, 109, 109),
+			color: BlockColor([110, 109, 109]),
 		},
 	),
 	(
 		"dragon_egg",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(12, 9, 15),
+			color: BlockColor([12, 9, 15]),
 		},
 	),
 	(
 		"dragon_head",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"dragon_wall_head",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"dried_kelp_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(50, 58, 38),
+			color: BlockColor([50, 58, 38]),
 		},
 	),
 	(
 		"dripstone_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(134, 107, 92),
+			color: BlockColor([134, 107, 92]),
 		},
 	),
 	(
 		"dropper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(110, 109, 109),
+			color: BlockColor([110, 109, 109]),
 		},
 	),
 	(
 		"emerald_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(42, 203, 87),
+			color: BlockColor([42, 203, 87]),
 		},
 	),
 	(
 		"emerald_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(108, 136, 115),
+			color: BlockColor([108, 136, 115]),
 		},
 	),
 	(
 		"enchanting_table",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(128, 75, 85),
+			color: BlockColor([128, 75, 85]),
 		},
 	),
 	(
 		"end_gateway",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(15, 10, 24),
+			color: BlockColor([15, 10, 24]),
 		},
 	),
 	(
 		"end_portal",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(15, 10, 24),
+			color: BlockColor([15, 10, 24]),
 		},
 	),
 	(
 		"end_portal_frame",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(91, 120, 97),
+			color: BlockColor([91, 120, 97]),
 		},
 	),
 	(
 		"end_rod",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"end_stone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(219, 222, 158),
+			color: BlockColor([219, 222, 158]),
 		},
 	),
 	(
 		"end_stone_brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(218, 224, 162),
+			color: BlockColor([218, 224, 162]),
 		},
 	),
 	(
 		"end_stone_brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(218, 224, 162),
+			color: BlockColor([218, 224, 162]),
 		},
 	),
 	(
 		"end_stone_brick_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(218, 224, 162),
+			color: BlockColor([218, 224, 162]),
 		},
 	),
 	(
 		"end_stone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(218, 224, 162),
+			color: BlockColor([218, 224, 162]),
 		},
 	),
 	(
 		"ender_chest",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(15, 10, 24),
+			color: BlockColor([15, 10, 24]),
 		},
 	),
 	(
 		"exposed_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(161, 125, 103),
+			color: BlockColor([161, 125, 103]),
 		},
 	),
 	(
 		"exposed_cut_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(154, 121, 101),
+			color: BlockColor([154, 121, 101]),
 		},
 	),
 	(
 		"exposed_cut_copper_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(154, 121, 101),
+			color: BlockColor([154, 121, 101]),
 		},
 	),
 	(
 		"exposed_cut_copper_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(154, 121, 101),
+			color: BlockColor([154, 121, 101]),
 		},
 	),
 	(
 		"farmland",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(81, 44, 15),
+			color: BlockColor([81, 44, 15]),
 		},
 	),
 	(
 		"fern",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"fire",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(211, 140, 53),
+			color: BlockColor([211, 140, 53]),
 		},
 	),
 	(
 		"fire_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"fire_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(163, 35, 46),
+			color: BlockColor([163, 35, 46]),
 		},
 	),
 	(
 		"fire_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"fire_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"fletching_table",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(197, 180, 133),
+			color: BlockColor([197, 180, 133]),
 		},
 	),
 	(
 		"flower_pot",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(124, 68, 53),
+			color: BlockColor([124, 68, 53]),
 		},
 	),
 	(
 		"flowering_azalea",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(112, 121, 64),
+			color: BlockColor([112, 121, 64]),
 		},
 	),
 	(
 		"flowering_azalea_leaves",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(99, 111, 60),
+			color: BlockColor([99, 111, 60]),
 		},
 	),
 	(
 		"frogspawn",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(105, 90, 82),
+			color: BlockColor([105, 90, 82]),
 		},
 	),
 	(
 		"frosted_ice",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(140, 181, 252),
+			color: BlockColor([140, 181, 252]),
 		},
 	),
 	(
 		"furnace",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(110, 109, 109),
+			color: BlockColor([110, 109, 109]),
 		},
 	),
 	(
 		"gilded_blackstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(55, 42, 38),
+			color: BlockColor([55, 42, 38]),
 		},
 	),
 	(
 		"glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(175, 213, 219),
+			color: BlockColor([175, 213, 219]),
 		},
 	),
 	(
 		"glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(170, 210, 217),
+			color: BlockColor([170, 210, 217]),
 		},
 	),
 	(
 		"glow_item_frame",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"glow_lichen",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"glowstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(171, 131, 84),
+			color: BlockColor([171, 131, 84]),
 		},
 	),
 	(
 		"gold_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(246, 208, 61),
+			color: BlockColor([246, 208, 61]),
 		},
 	),
 	(
 		"gold_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(145, 133, 106),
+			color: BlockColor([145, 133, 106]),
 		},
 	),
 	(
 		"granite",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(149, 103, 85),
+			color: BlockColor([149, 103, 85]),
 		},
 	),
 	(
 		"granite_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(149, 103, 85),
+			color: BlockColor([149, 103, 85]),
 		},
 	),
 	(
 		"granite_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(149, 103, 85),
+			color: BlockColor([149, 103, 85]),
 		},
 	),
 	(
 		"granite_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(149, 103, 85),
+			color: BlockColor([149, 103, 85]),
 		},
 	),
 	(
 		"grass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"grass_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: BlockColor(147, 147, 147),
+			color: BlockColor([147, 147, 147]),
 		},
 	),
 	(
 		"grass_path",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(148, 121, 65),
+			color: BlockColor([148, 121, 65]),
 		},
 	),
 	(
 		"gravel",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(131, 127, 126),
+			color: BlockColor([131, 127, 126]),
 		},
 	),
 	(
 		"gray_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"gray_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"gray_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"gray_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(248, 222, 214),
+			color: BlockColor([248, 222, 214]),
 		},
 	),
 	(
 		"gray_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(62, 68, 71),
+			color: BlockColor([62, 68, 71]),
 		},
 	),
 	(
 		"gray_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(54, 57, 61),
+			color: BlockColor([54, 57, 61]),
 		},
 	),
 	(
 		"gray_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(76, 81, 84),
+			color: BlockColor([76, 81, 84]),
 		},
 	),
 	(
 		"gray_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(83, 90, 93),
+			color: BlockColor([83, 90, 93]),
 		},
 	),
 	(
 		"gray_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(55, 58, 62),
+			color: BlockColor([55, 58, 62]),
 		},
 	),
 	(
 		"gray_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(76, 76, 76),
+			color: BlockColor([76, 76, 76]),
 		},
 	),
 	(
 		"gray_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(73, 73, 73),
+			color: BlockColor([73, 73, 73]),
 		},
 	),
 	(
 		"gray_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(57, 42, 35),
+			color: BlockColor([57, 42, 35]),
 		},
 	),
 	(
 		"gray_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"gray_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(62, 68, 71),
+			color: BlockColor([62, 68, 71]),
 		},
 	),
 	(
 		"green_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"green_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"green_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"green_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(248, 222, 214),
+			color: BlockColor([248, 222, 214]),
 		},
 	),
 	(
 		"green_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(84, 109, 27),
+			color: BlockColor([84, 109, 27]),
 		},
 	),
 	(
 		"green_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(73, 91, 36),
+			color: BlockColor([73, 91, 36]),
 		},
 	),
 	(
 		"green_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(97, 119, 44),
+			color: BlockColor([97, 119, 44]),
 		},
 	),
 	(
 		"green_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(117, 142, 67),
+			color: BlockColor([117, 142, 67]),
 		},
 	),
 	(
 		"green_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(79, 100, 31),
+			color: BlockColor([79, 100, 31]),
 		},
 	),
 	(
 		"green_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(102, 127, 51),
+			color: BlockColor([102, 127, 51]),
 		},
 	),
 	(
 		"green_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(97, 122, 48),
+			color: BlockColor([97, 122, 48]),
 		},
 	),
 	(
 		"green_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(76, 83, 42),
+			color: BlockColor([76, 83, 42]),
 		},
 	),
 	(
 		"green_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"green_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(84, 109, 27),
+			color: BlockColor([84, 109, 27]),
 		},
 	),
 	(
 		"grindstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(142, 142, 142),
+			color: BlockColor([142, 142, 142]),
 		},
 	),
 	(
 		"hanging_roots",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(161, 115, 91),
+			color: BlockColor([161, 115, 91]),
 		},
 	),
 	(
 		"hay_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(165, 139, 12),
+			color: BlockColor([165, 139, 12]),
 		},
 	),
 	(
 		"heavy_weighted_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(220, 220, 220),
+			color: BlockColor([220, 220, 220]),
 		},
 	),
 	(
 		"honey_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(251, 185, 52),
+			color: BlockColor([251, 185, 52]),
 		},
 	),
 	(
 		"honeycomb_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(229, 148, 29),
+			color: BlockColor([229, 148, 29]),
 		},
 	),
 	(
 		"hopper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(75, 74, 75),
+			color: BlockColor([75, 74, 75]),
 		},
 	),
 	(
 		"horn_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"horn_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(216, 199, 66),
+			color: BlockColor([216, 199, 66]),
 		},
 	),
 	(
 		"horn_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"horn_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"ice",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(145, 183, 253),
+			color: BlockColor([145, 183, 253]),
 		},
 	),
 	(
 		"infested_chiseled_stone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(119, 118, 119),
+			color: BlockColor([119, 118, 119]),
 		},
 	),
 	(
 		"infested_cobblestone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(127, 127, 127),
+			color: BlockColor([127, 127, 127]),
 		},
 	),
 	(
 		"infested_cracked_stone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(118, 117, 118),
+			color: BlockColor([118, 117, 118]),
 		},
 	),
 	(
 		"infested_deepslate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(80, 80, 82),
+			color: BlockColor([80, 80, 82]),
 		},
 	),
 	(
 		"infested_mossy_stone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(115, 121, 105),
+			color: BlockColor([115, 121, 105]),
 		},
 	),
 	(
 		"infested_stone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(125, 125, 125),
+			color: BlockColor([125, 125, 125]),
 		},
 	),
 	(
 		"infested_stone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(122, 121, 122),
+			color: BlockColor([122, 121, 122]),
 		},
 	),
 	(
 		"iron_bars",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(136, 139, 135),
+			color: BlockColor([136, 139, 135]),
 		},
 	),
 	(
 		"iron_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(220, 220, 220),
+			color: BlockColor([220, 220, 220]),
 		},
 	),
 	(
 		"iron_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(194, 193, 193),
+			color: BlockColor([194, 193, 193]),
 		},
 	),
 	(
 		"iron_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(136, 129, 122),
+			color: BlockColor([136, 129, 122]),
 		},
 	),
 	(
 		"iron_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(202, 202, 202),
+			color: BlockColor([202, 202, 202]),
 		},
 	),
 	(
 		"item_frame",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"jack_o_lantern",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(214, 152, 52),
+			color: BlockColor([214, 152, 52]),
 		},
 	),
 	(
 		"jigsaw",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(80, 69, 81),
+			color: BlockColor([80, 69, 81]),
 		},
 	),
 	(
 		"jukebox",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(93, 64, 47),
+			color: BlockColor([93, 64, 47]),
 		},
 	),
 	(
 		"jungle_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"jungle_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(163, 119, 84),
+			color: BlockColor([163, 119, 84]),
 		},
 	),
 	(
 		"jungle_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(160, 115, 80),
+			color: BlockColor([160, 115, 80]),
 		},
 	),
 	(
 		"jungle_fence_gate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(160, 115, 80),
+			color: BlockColor([160, 115, 80]),
 		},
 	),
 	(
 		"jungle_leaves",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
-			color: BlockColor(156, 154, 143),
+			color: BlockColor([156, 154, 143]),
 		},
 	),
 	(
 		"jungle_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(149, 109, 70),
+			color: BlockColor([149, 109, 70]),
 		},
 	),
 	(
 		"jungle_planks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(160, 115, 80),
+			color: BlockColor([160, 115, 80]),
 		},
 	),
 	(
 		"jungle_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(160, 115, 80),
+			color: BlockColor([160, 115, 80]),
 		},
 	),
 	(
 		"jungle_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(47, 81, 16),
+			color: BlockColor([47, 81, 16]),
 		},
 	),
 	(
 		"jungle_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(160, 115, 80),
+			color: BlockColor([160, 115, 80]),
 		},
 	),
 	(
 		"jungle_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(160, 115, 80),
+			color: BlockColor([160, 115, 80]),
 		},
 	),
 	(
 		"jungle_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(160, 115, 80),
+			color: BlockColor([160, 115, 80]),
 		},
 	),
 	(
 		"jungle_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(152, 110, 77),
+			color: BlockColor([152, 110, 77]),
 		},
 	),
 	(
 		"jungle_wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"jungle_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(85, 67, 25),
+			color: BlockColor([85, 67, 25]),
 		},
 	),
 	(
 		"kelp",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"kelp_plant",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(86, 130, 42),
+			color: BlockColor([86, 130, 42]),
 		},
 	),
 	(
 		"ladder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"lantern",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(106, 91, 83),
+			color: BlockColor([106, 91, 83]),
 		},
 	),
 	(
 		"lapis_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(30, 67, 140),
+			color: BlockColor([30, 67, 140]),
 		},
 	),
 	(
 		"lapis_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(107, 117, 141),
+			color: BlockColor([107, 117, 141]),
 		},
 	),
 	(
 		"large_amethyst_bud",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"large_fern",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: BlockColor(125, 125, 125),
+			color: BlockColor([125, 125, 125]),
 		},
 	),
 	(
 		"lava",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(212, 90, 18),
+			color: BlockColor([212, 90, 18]),
 		},
 	),
 	(
 		"lava_cauldron",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(73, 72, 74),
+			color: BlockColor([73, 72, 74]),
 		},
 	),
 	(
 		"lectern",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(173, 137, 83),
+			color: BlockColor([173, 137, 83]),
 		},
 	),
 	(
 		"lever",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"light",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"light_blue_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"light_blue_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"light_blue_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"light_blue_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(248, 222, 214),
+			color: BlockColor([248, 222, 214]),
 		},
 	),
 	(
 		"light_blue_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(58, 175, 217),
+			color: BlockColor([58, 175, 217]),
 		},
 	),
 	(
 		"light_blue_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(35, 137, 198),
+			color: BlockColor([35, 137, 198]),
 		},
 	),
 	(
 		"light_blue_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(74, 180, 213),
+			color: BlockColor([74, 180, 213]),
 		},
 	),
 	(
 		"light_blue_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(94, 164, 208),
+			color: BlockColor([94, 164, 208]),
 		},
 	),
 	(
 		"light_blue_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(49, 163, 212),
+			color: BlockColor([49, 163, 212]),
 		},
 	),
 	(
 		"light_blue_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(102, 153, 216),
+			color: BlockColor([102, 153, 216]),
 		},
 	),
 	(
 		"light_blue_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(97, 147, 208),
+			color: BlockColor([97, 147, 208]),
 		},
 	),
 	(
 		"light_blue_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(113, 108, 137),
+			color: BlockColor([113, 108, 137]),
 		},
 	),
 	(
 		"light_blue_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"light_blue_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(58, 175, 217),
+			color: BlockColor([58, 175, 217]),
 		},
 	),
 	(
 		"light_gray_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"light_gray_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"light_gray_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"light_gray_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(248, 222, 214),
+			color: BlockColor([248, 222, 214]),
 		},
 	),
 	(
 		"light_gray_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(142, 142, 134),
+			color: BlockColor([142, 142, 134]),
 		},
 	),
 	(
 		"light_gray_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(125, 125, 115),
+			color: BlockColor([125, 125, 115]),
 		},
 	),
 	(
 		"light_gray_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(154, 154, 148),
+			color: BlockColor([154, 154, 148]),
 		},
 	),
 	(
 		"light_gray_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(144, 166, 167),
+			color: BlockColor([144, 166, 167]),
 		},
 	),
 	(
 		"light_gray_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(124, 124, 115),
+			color: BlockColor([124, 124, 115]),
 		},
 	),
 	(
 		"light_gray_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(153, 153, 153),
+			color: BlockColor([153, 153, 153]),
 		},
 	),
 	(
 		"light_gray_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(147, 147, 147),
+			color: BlockColor([147, 147, 147]),
 		},
 	),
 	(
 		"light_gray_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(135, 106, 97),
+			color: BlockColor([135, 106, 97]),
 		},
 	),
 	(
 		"light_gray_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"light_gray_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(142, 142, 134),
+			color: BlockColor([142, 142, 134]),
 		},
 	),
 	(
 		"light_weighted_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(246, 208, 61),
+			color: BlockColor([246, 208, 61]),
 		},
 	),
 	(
 		"lightning_rod",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"lilac",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(154, 125, 147),
+			color: BlockColor([154, 125, 147]),
 		},
 	),
 	(
 		"lily_of_the_valley",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"lily_pad",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: BlockColor(133, 133, 133),
+			color: BlockColor([133, 133, 133]),
 		},
 	),
 	(
 		"lime_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"lime_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"lime_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"lime_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(248, 222, 214),
+			color: BlockColor([248, 222, 214]),
 		},
 	),
 	(
 		"lime_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(112, 185, 25),
+			color: BlockColor([112, 185, 25]),
 		},
 	),
 	(
 		"lime_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(94, 168, 24),
+			color: BlockColor([94, 168, 24]),
 		},
 	),
 	(
 		"lime_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(125, 189, 41),
+			color: BlockColor([125, 189, 41]),
 		},
 	),
 	(
 		"lime_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(162, 197, 55),
+			color: BlockColor([162, 197, 55]),
 		},
 	),
 	(
 		"lime_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(99, 172, 23),
+			color: BlockColor([99, 172, 23]),
 		},
 	),
 	(
 		"lime_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(127, 204, 25),
+			color: BlockColor([127, 204, 25]),
 		},
 	),
 	(
 		"lime_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(122, 196, 24),
+			color: BlockColor([122, 196, 24]),
 		},
 	),
 	(
 		"lime_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(103, 117, 52),
+			color: BlockColor([103, 117, 52]),
 		},
 	),
 	(
 		"lime_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"lime_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(112, 185, 25),
+			color: BlockColor([112, 185, 25]),
 		},
 	),
 	(
 		"lodestone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(147, 149, 152),
+			color: BlockColor([147, 149, 152]),
 		},
 	),
 	(
 		"loom",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(142, 119, 91),
+			color: BlockColor([142, 119, 91]),
 		},
 	),
 	(
 		"magenta_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"magenta_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"magenta_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"magenta_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(248, 222, 214),
+			color: BlockColor([248, 222, 214]),
 		},
 	),
 	(
 		"magenta_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(189, 68, 179),
+			color: BlockColor([189, 68, 179]),
 		},
 	),
 	(
 		"magenta_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(169, 48, 159),
+			color: BlockColor([169, 48, 159]),
 		},
 	),
 	(
 		"magenta_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(192, 83, 184),
+			color: BlockColor([192, 83, 184]),
 		},
 	),
 	(
 		"magenta_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(208, 100, 191),
+			color: BlockColor([208, 100, 191]),
 		},
 	),
 	(
 		"magenta_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(173, 54, 163),
+			color: BlockColor([173, 54, 163]),
 		},
 	),
 	(
 		"magenta_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(178, 76, 216),
+			color: BlockColor([178, 76, 216]),
 		},
 	),
 	(
 		"magenta_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(171, 73, 208),
+			color: BlockColor([171, 73, 208]),
 		},
 	),
 	(
 		"magenta_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(149, 88, 108),
+			color: BlockColor([149, 88, 108]),
 		},
 	),
 	(
 		"magenta_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"magenta_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(189, 68, 179),
+			color: BlockColor([189, 68, 179]),
 		},
 	),
 	(
 		"magma_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(142, 63, 31),
+			color: BlockColor([142, 63, 31]),
 		},
 	),
 	(
 		"mangrove_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"mangrove_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(112, 48, 46),
+			color: BlockColor([112, 48, 46]),
 		},
 	),
 	(
 		"mangrove_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(117, 54, 48),
+			color: BlockColor([117, 54, 48]),
 		},
 	),
 	(
 		"mangrove_fence_gate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(117, 54, 48),
+			color: BlockColor([117, 54, 48]),
 		},
 	),
 	(
 		"mangrove_leaves",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
-			color: BlockColor(129, 128, 128),
+			color: BlockColor([129, 128, 128]),
 		},
 	),
 	(
 		"mangrove_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(102, 48, 42),
+			color: BlockColor([102, 48, 42]),
 		},
 	),
 	(
 		"mangrove_planks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(117, 54, 48),
+			color: BlockColor([117, 54, 48]),
 		},
 	),
 	(
 		"mangrove_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(117, 54, 48),
+			color: BlockColor([117, 54, 48]),
 		},
 	),
 	(
 		"mangrove_propagule",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(96, 174, 83),
+			color: BlockColor([96, 174, 83]),
 		},
 	),
 	(
 		"mangrove_roots",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(74, 59, 38),
+			color: BlockColor([74, 59, 38]),
 		},
 	),
 	(
 		"mangrove_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(117, 54, 48),
+			color: BlockColor([117, 54, 48]),
 		},
 	),
 	(
 		"mangrove_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(117, 54, 48),
+			color: BlockColor([117, 54, 48]),
 		},
 	),
 	(
 		"mangrove_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(117, 54, 48),
+			color: BlockColor([117, 54, 48]),
 		},
 	),
 	(
 		"mangrove_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(110, 46, 42),
+			color: BlockColor([110, 46, 42]),
 		},
 	),
 	(
 		"mangrove_wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"mangrove_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(83, 66, 41),
+			color: BlockColor([83, 66, 41]),
 		},
 	),
 	(
 		"medium_amethyst_bud",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"melon",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(111, 144, 30),
+			color: BlockColor([111, 144, 30]),
 		},
 	),
 	(
 		"melon_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: BlockColor(153, 153, 153),
+			color: BlockColor([153, 153, 153]),
 		},
 	),
 	(
 		"moss_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(89, 109, 45),
+			color: BlockColor([89, 109, 45]),
 		},
 	),
 	(
 		"moss_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(89, 109, 45),
+			color: BlockColor([89, 109, 45]),
 		},
 	),
 	(
 		"mossy_cobblestone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(110, 118, 94),
+			color: BlockColor([110, 118, 94]),
 		},
 	),
 	(
 		"mossy_cobblestone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(110, 118, 94),
+			color: BlockColor([110, 118, 94]),
 		},
 	),
 	(
 		"mossy_cobblestone_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(110, 118, 94),
+			color: BlockColor([110, 118, 94]),
 		},
 	),
 	(
 		"mossy_cobblestone_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(110, 118, 94),
+			color: BlockColor([110, 118, 94]),
 		},
 	),
 	(
 		"mossy_stone_brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(115, 121, 105),
+			color: BlockColor([115, 121, 105]),
 		},
 	),
 	(
 		"mossy_stone_brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(115, 121, 105),
+			color: BlockColor([115, 121, 105]),
 		},
 	),
 	(
 		"mossy_stone_brick_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(115, 121, 105),
+			color: BlockColor([115, 121, 105]),
 		},
 	),
 	(
 		"mossy_stone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(115, 121, 105),
+			color: BlockColor([115, 121, 105]),
 		},
 	),
 	(
 		"moving_piston",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"mud",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(60, 57, 60),
+			color: BlockColor([60, 57, 60]),
 		},
 	),
 	(
 		"mud_brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(137, 103, 79),
+			color: BlockColor([137, 103, 79]),
 		},
 	),
 	(
 		"mud_brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(137, 103, 79),
+			color: BlockColor([137, 103, 79]),
 		},
 	),
 	(
 		"mud_brick_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(137, 103, 79),
+			color: BlockColor([137, 103, 79]),
 		},
 	),
 	(
 		"mud_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(137, 103, 79),
+			color: BlockColor([137, 103, 79]),
 		},
 	),
 	(
 		"muddy_mangrove_roots",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(70, 58, 45),
+			color: BlockColor([70, 58, 45]),
 		},
 	),
 	(
 		"mushroom_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(203, 196, 185),
+			color: BlockColor([203, 196, 185]),
 		},
 	),
 	(
 		"mycelium",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(111, 98, 101),
+			color: BlockColor([111, 98, 101]),
 		},
 	),
 	(
 		"nether_brick_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(44, 21, 26),
+			color: BlockColor([44, 21, 26]),
 		},
 	),
 	(
 		"nether_brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(44, 21, 26),
+			color: BlockColor([44, 21, 26]),
 		},
 	),
 	(
 		"nether_brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(44, 21, 26),
+			color: BlockColor([44, 21, 26]),
 		},
 	),
 	(
 		"nether_brick_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(44, 21, 26),
+			color: BlockColor([44, 21, 26]),
 		},
 	),
 	(
 		"nether_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(44, 21, 26),
+			color: BlockColor([44, 21, 26]),
 		},
 	),
 	(
 		"nether_gold_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(115, 54, 42),
+			color: BlockColor([115, 54, 42]),
 		},
 	),
 	(
 		"nether_portal",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(89, 11, 192),
+			color: BlockColor([89, 11, 192]),
 		},
 	),
 	(
 		"nether_quartz_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(117, 65, 62),
+			color: BlockColor([117, 65, 62]),
 		},
 	),
 	(
 		"nether_sprouts",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(19, 151, 133),
+			color: BlockColor([19, 151, 133]),
 		},
 	),
 	(
 		"nether_wart",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(111, 18, 19),
+			color: BlockColor([111, 18, 19]),
 		},
 	),
 	(
 		"nether_wart_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(114, 2, 2),
+			color: BlockColor([114, 2, 2]),
 		},
 	),
 	(
 		"netherite_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(66, 61, 63),
+			color: BlockColor([66, 61, 63]),
 		},
 	),
 	(
 		"netherrack",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(97, 38, 38),
+			color: BlockColor([97, 38, 38]),
 		},
 	),
 	(
 		"note_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(88, 58, 40),
+			color: BlockColor([88, 58, 40]),
 		},
 	),
 	(
 		"oak_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"oak_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(140, 110, 66),
+			color: BlockColor([140, 110, 66]),
 		},
 	),
 	(
 		"oak_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(162, 130, 78),
+			color: BlockColor([162, 130, 78]),
 		},
 	),
 	(
 		"oak_fence_gate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(162, 130, 78),
+			color: BlockColor([162, 130, 78]),
 		},
 	),
 	(
 		"oak_leaves",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
-			color: BlockColor(144, 144, 144),
+			color: BlockColor([144, 144, 144]),
 		},
 	),
 	(
 		"oak_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(151, 121, 73),
+			color: BlockColor([151, 121, 73]),
 		},
 	),
 	(
 		"oak_planks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(162, 130, 78),
+			color: BlockColor([162, 130, 78]),
 		},
 	),
 	(
 		"oak_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(162, 130, 78),
+			color: BlockColor([162, 130, 78]),
 		},
 	),
 	(
 		"oak_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(77, 106, 40),
+			color: BlockColor([77, 106, 40]),
 		},
 	),
 	(
 		"oak_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(162, 130, 78),
+			color: BlockColor([162, 130, 78]),
 		},
 	),
 	(
 		"oak_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(162, 130, 78),
+			color: BlockColor([162, 130, 78]),
 		},
 	),
 	(
 		"oak_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(162, 130, 78),
+			color: BlockColor([162, 130, 78]),
 		},
 	),
 	(
 		"oak_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(124, 99, 56),
+			color: BlockColor([124, 99, 56]),
 		},
 	),
 	(
 		"oak_wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"oak_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(109, 85, 50),
+			color: BlockColor([109, 85, 50]),
 		},
 	),
 	(
 		"observer",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(98, 98, 98),
+			color: BlockColor([98, 98, 98]),
 		},
 	),
 	(
 		"obsidian",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(15, 10, 24),
+			color: BlockColor([15, 10, 24]),
 		},
 	),
 	(
 		"ochre_froglight",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(250, 245, 206),
+			color: BlockColor([250, 245, 206]),
 		},
 	),
 	(
 		"orange_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"orange_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"orange_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"orange_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(248, 222, 214),
+			color: BlockColor([248, 222, 214]),
 		},
 	),
 	(
 		"orange_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(240, 118, 19),
+			color: BlockColor([240, 118, 19]),
 		},
 	),
 	(
 		"orange_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(224, 97, 0),
+			color: BlockColor([224, 97, 0]),
 		},
 	),
 	(
 		"orange_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(227, 131, 31),
+			color: BlockColor([227, 131, 31]),
 		},
 	),
 	(
 		"orange_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(154, 147, 91),
+			color: BlockColor([154, 147, 91]),
 		},
 	),
 	(
 		"orange_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(234, 106, 8),
+			color: BlockColor([234, 106, 8]),
 		},
 	),
 	(
 		"orange_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(216, 127, 51),
+			color: BlockColor([216, 127, 51]),
 		},
 	),
 	(
 		"orange_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(208, 122, 48),
+			color: BlockColor([208, 122, 48]),
 		},
 	),
 	(
 		"orange_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(161, 83, 37),
+			color: BlockColor([161, 83, 37]),
 		},
 	),
 	(
 		"orange_tulip",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"orange_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"orange_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(240, 118, 19),
+			color: BlockColor([240, 118, 19]),
 		},
 	),
 	(
 		"oxeye_daisy",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"oxidized_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(82, 162, 132),
+			color: BlockColor([82, 162, 132]),
 		},
 	),
 	(
 		"oxidized_cut_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(79, 153, 126),
+			color: BlockColor([79, 153, 126]),
 		},
 	),
 	(
 		"oxidized_cut_copper_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(79, 153, 126),
+			color: BlockColor([79, 153, 126]),
 		},
 	),
 	(
 		"oxidized_cut_copper_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(79, 153, 126),
+			color: BlockColor([79, 153, 126]),
 		},
 	),
 	(
 		"packed_ice",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(141, 180, 250),
+			color: BlockColor([141, 180, 250]),
 		},
 	),
 	(
 		"packed_mud",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(142, 106, 79),
+			color: BlockColor([142, 106, 79]),
 		},
 	),
 	(
 		"pearlescent_froglight",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(245, 240, 239),
+			color: BlockColor([245, 240, 239]),
 		},
 	),
 	(
 		"peony",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(129, 126, 139),
+			color: BlockColor([129, 126, 139]),
 		},
 	),
 	(
 		"petrified_oak_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(162, 130, 78),
+			color: BlockColor([162, 130, 78]),
 		},
 	),
 	(
 		"pink_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"pink_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"pink_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"pink_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(248, 222, 214),
+			color: BlockColor([248, 222, 214]),
 		},
 	),
 	(
 		"pink_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(237, 141, 172),
+			color: BlockColor([237, 141, 172]),
 		},
 	),
 	(
 		"pink_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(213, 101, 142),
+			color: BlockColor([213, 101, 142]),
 		},
 	),
 	(
 		"pink_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(228, 153, 181),
+			color: BlockColor([228, 153, 181]),
 		},
 	),
 	(
 		"pink_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(235, 154, 181),
+			color: BlockColor([235, 154, 181]),
 		},
 	),
 	(
 		"pink_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(230, 121, 157),
+			color: BlockColor([230, 121, 157]),
 		},
 	),
 	(
 		"pink_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(242, 127, 165),
+			color: BlockColor([242, 127, 165]),
 		},
 	),
 	(
 		"pink_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(233, 122, 159),
+			color: BlockColor([233, 122, 159]),
 		},
 	),
 	(
 		"pink_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(161, 78, 78),
+			color: BlockColor([161, 78, 78]),
 		},
 	),
 	(
 		"pink_tulip",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"pink_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"pink_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(237, 141, 172),
+			color: BlockColor([237, 141, 172]),
 		},
 	),
 	(
 		"piston",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(109, 104, 96),
+			color: BlockColor([109, 104, 96]),
 		},
 	),
 	(
 		"piston_head",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(153, 127, 85),
+			color: BlockColor([153, 127, 85]),
 		},
 	),
 	(
 		"player_head",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"player_wall_head",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"podzol",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(91, 63, 24),
+			color: BlockColor([91, 63, 24]),
 		},
 	),
 	(
 		"pointed_dripstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(129, 102, 89),
+			color: BlockColor([129, 102, 89]),
 		},
 	),
 	(
 		"polished_andesite",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(132, 134, 133),
+			color: BlockColor([132, 134, 133]),
 		},
 	),
 	(
 		"polished_andesite_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(132, 134, 133),
+			color: BlockColor([132, 134, 133]),
 		},
 	),
 	(
 		"polished_andesite_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(132, 134, 133),
+			color: BlockColor([132, 134, 133]),
 		},
 	),
 	(
 		"polished_basalt",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(99, 98, 100),
+			color: BlockColor([99, 98, 100]),
 		},
 	),
 	(
 		"polished_blackstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(53, 48, 56),
+			color: BlockColor([53, 48, 56]),
 		},
 	),
 	(
 		"polished_blackstone_brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(48, 42, 49),
+			color: BlockColor([48, 42, 49]),
 		},
 	),
 	(
 		"polished_blackstone_brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(48, 42, 49),
+			color: BlockColor([48, 42, 49]),
 		},
 	),
 	(
 		"polished_blackstone_brick_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(48, 42, 49),
+			color: BlockColor([48, 42, 49]),
 		},
 	),
 	(
 		"polished_blackstone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(48, 42, 49),
+			color: BlockColor([48, 42, 49]),
 		},
 	),
 	(
 		"polished_blackstone_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"polished_blackstone_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(53, 48, 56),
+			color: BlockColor([53, 48, 56]),
 		},
 	),
 	(
 		"polished_blackstone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(53, 48, 56),
+			color: BlockColor([53, 48, 56]),
 		},
 	),
 	(
 		"polished_blackstone_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(53, 48, 56),
+			color: BlockColor([53, 48, 56]),
 		},
 	),
 	(
 		"polished_blackstone_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(53, 48, 56),
+			color: BlockColor([53, 48, 56]),
 		},
 	),
 	(
 		"polished_deepslate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(72, 72, 73),
+			color: BlockColor([72, 72, 73]),
 		},
 	),
 	(
 		"polished_deepslate_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(72, 72, 73),
+			color: BlockColor([72, 72, 73]),
 		},
 	),
 	(
 		"polished_deepslate_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(72, 72, 73),
+			color: BlockColor([72, 72, 73]),
 		},
 	),
 	(
 		"polished_deepslate_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(72, 72, 73),
+			color: BlockColor([72, 72, 73]),
 		},
 	),
 	(
 		"polished_diorite",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(192, 193, 194),
+			color: BlockColor([192, 193, 194]),
 		},
 	),
 	(
 		"polished_diorite_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(192, 193, 194),
+			color: BlockColor([192, 193, 194]),
 		},
 	),
 	(
 		"polished_diorite_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(192, 193, 194),
+			color: BlockColor([192, 193, 194]),
 		},
 	),
 	(
 		"polished_granite",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(154, 106, 89),
+			color: BlockColor([154, 106, 89]),
 		},
 	),
 	(
 		"polished_granite_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(154, 106, 89),
+			color: BlockColor([154, 106, 89]),
 		},
 	),
 	(
 		"polished_granite_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(154, 106, 89),
+			color: BlockColor([154, 106, 89]),
 		},
 	),
 	(
 		"poppy",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"potatoes",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(84, 135, 47),
+			color: BlockColor([84, 135, 47]),
 		},
 	),
 	(
 		"potted_acacia_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(118, 117, 23),
+			color: BlockColor([118, 117, 23]),
 		},
 	),
 	(
 		"potted_allium",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(158, 137, 183),
+			color: BlockColor([158, 137, 183]),
 		},
 	),
 	(
 		"potted_azalea_bush",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(101, 124, 47),
+			color: BlockColor([101, 124, 47]),
 		},
 	),
 	(
 		"potted_azure_bluet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(169, 204, 127),
+			color: BlockColor([169, 204, 127]),
 		},
 	),
 	(
 		"potted_bamboo",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(93, 144, 19),
+			color: BlockColor([93, 144, 19]),
 		},
 	),
 	(
 		"potted_birch_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(127, 160, 79),
+			color: BlockColor([127, 160, 79]),
 		},
 	),
 	(
 		"potted_blue_orchid",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(47, 162, 168),
+			color: BlockColor([47, 162, 168]),
 		},
 	),
 	(
 		"potted_brown_mushroom",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(153, 116, 92),
+			color: BlockColor([153, 116, 92]),
 		},
 	),
 	(
 		"potted_cactus",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(85, 127, 43),
+			color: BlockColor([85, 127, 43]),
 		},
 	),
 	(
 		"potted_cornflower",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(79, 121, 146),
+			color: BlockColor([79, 121, 146]),
 		},
 	),
 	(
 		"potted_crimson_fungus",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(141, 44, 29),
+			color: BlockColor([141, 44, 29]),
 		},
 	),
 	(
 		"potted_crimson_roots",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(127, 8, 41),
+			color: BlockColor([127, 8, 41]),
 		},
 	),
 	(
 		"potted_dandelion",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(147, 172, 43),
+			color: BlockColor([147, 172, 43]),
 		},
 	),
 	(
 		"potted_dark_oak_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(61, 90, 30),
+			color: BlockColor([61, 90, 30]),
 		},
 	),
 	(
 		"potted_dead_bush",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(107, 78, 40),
+			color: BlockColor([107, 78, 40]),
 		},
 	),
 	(
 		"potted_fern",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: BlockColor(124, 124, 124),
+			color: BlockColor([124, 124, 124]),
 		},
 	),
 	(
 		"potted_flowering_azalea_bush",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(112, 121, 64),
+			color: BlockColor([112, 121, 64]),
 		},
 	),
 	(
 		"potted_jungle_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(47, 81, 16),
+			color: BlockColor([47, 81, 16]),
 		},
 	),
 	(
 		"potted_lily_of_the_valley",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(123, 174, 95),
+			color: BlockColor([123, 174, 95]),
 		},
 	),
 	(
 		"potted_mangrove_propagule",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(96, 174, 83),
+			color: BlockColor([96, 174, 83]),
 		},
 	),
 	(
 		"potted_oak_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(77, 106, 40),
+			color: BlockColor([77, 106, 40]),
 		},
 	),
 	(
 		"potted_orange_tulip",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(93, 142, 30),
+			color: BlockColor([93, 142, 30]),
 		},
 	),
 	(
 		"potted_oxeye_daisy",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(179, 202, 143),
+			color: BlockColor([179, 202, 143]),
 		},
 	),
 	(
 		"potted_pink_tulip",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(99, 157, 78),
+			color: BlockColor([99, 157, 78]),
 		},
 	),
 	(
 		"potted_poppy",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(128, 64, 37),
+			color: BlockColor([128, 64, 37]),
 		},
 	),
 	(
 		"potted_red_mushroom",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(216, 75, 67),
+			color: BlockColor([216, 75, 67]),
 		},
 	),
 	(
 		"potted_red_tulip",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(89, 128, 32),
+			color: BlockColor([89, 128, 32]),
 		},
 	),
 	(
 		"potted_spruce_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(44, 60, 36),
+			color: BlockColor([44, 60, 36]),
 		},
 	),
 	(
 		"potted_warped_fungus",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(74, 109, 87),
+			color: BlockColor([74, 109, 87]),
 		},
 	),
 	(
 		"potted_warped_roots",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(20, 136, 123),
+			color: BlockColor([20, 136, 123]),
 		},
 	),
 	(
 		"potted_white_tulip",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(93, 164, 71),
+			color: BlockColor([93, 164, 71]),
 		},
 	),
 	(
 		"potted_wither_rose",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(41, 44, 23),
+			color: BlockColor([41, 44, 23]),
 		},
 	),
 	(
 		"powder_snow",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(248, 253, 253),
+			color: BlockColor([248, 253, 253]),
 		},
 	),
 	(
 		"powder_snow_cauldron",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(73, 72, 74),
+			color: BlockColor([73, 72, 74]),
 		},
 	),
 	(
 		"powered_rail",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(137, 109, 74),
+			color: BlockColor([137, 109, 74]),
 		},
 	),
 	(
 		"prismarine",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(99, 156, 151),
+			color: BlockColor([99, 156, 151]),
 		},
 	),
 	(
 		"prismarine_brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(99, 171, 158),
+			color: BlockColor([99, 171, 158]),
 		},
 	),
 	(
 		"prismarine_brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(99, 171, 158),
+			color: BlockColor([99, 171, 158]),
 		},
 	),
 	(
 		"prismarine_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(99, 171, 158),
+			color: BlockColor([99, 171, 158]),
 		},
 	),
 	(
 		"prismarine_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(99, 156, 151),
+			color: BlockColor([99, 156, 151]),
 		},
 	),
 	(
 		"prismarine_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(99, 156, 151),
+			color: BlockColor([99, 156, 151]),
 		},
 	),
 	(
 		"prismarine_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(99, 156, 151),
+			color: BlockColor([99, 156, 151]),
 		},
 	),
 	(
 		"pumpkin",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(198, 118, 24),
+			color: BlockColor([198, 118, 24]),
 		},
 	),
 	(
 		"pumpkin_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: BlockColor(154, 154, 154),
+			color: BlockColor([154, 154, 154]),
 		},
 	),
 	(
 		"purple_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"purple_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"purple_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"purple_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(248, 222, 214),
+			color: BlockColor([248, 222, 214]),
 		},
 	),
 	(
 		"purple_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(121, 42, 172),
+			color: BlockColor([121, 42, 172]),
 		},
 	),
 	(
 		"purple_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(100, 31, 156),
+			color: BlockColor([100, 31, 156]),
 		},
 	),
 	(
 		"purple_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(131, 55, 177),
+			color: BlockColor([131, 55, 177]),
 		},
 	),
 	(
 		"purple_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(109, 48, 152),
+			color: BlockColor([109, 48, 152]),
 		},
 	),
 	(
 		"purple_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(103, 32, 156),
+			color: BlockColor([103, 32, 156]),
 		},
 	),
 	(
 		"purple_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(127, 63, 178),
+			color: BlockColor([127, 63, 178]),
 		},
 	),
 	(
 		"purple_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(122, 61, 171),
+			color: BlockColor([122, 61, 171]),
 		},
 	),
 	(
 		"purple_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(118, 70, 86),
+			color: BlockColor([118, 70, 86]),
 		},
 	),
 	(
 		"purple_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"purple_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(121, 42, 172),
+			color: BlockColor([121, 42, 172]),
 		},
 	),
 	(
 		"purpur_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(169, 125, 169),
+			color: BlockColor([169, 125, 169]),
 		},
 	),
 	(
 		"purpur_pillar",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(171, 129, 171),
+			color: BlockColor([171, 129, 171]),
 		},
 	),
 	(
 		"purpur_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(169, 125, 169),
+			color: BlockColor([169, 125, 169]),
 		},
 	),
 	(
 		"purpur_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(169, 125, 169),
+			color: BlockColor([169, 125, 169]),
 		},
 	),
 	(
 		"quartz_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(235, 229, 222),
+			color: BlockColor([235, 229, 222]),
 		},
 	),
 	(
 		"quartz_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(234, 229, 221),
+			color: BlockColor([234, 229, 221]),
 		},
 	),
 	(
 		"quartz_pillar",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(235, 230, 224),
+			color: BlockColor([235, 230, 224]),
 		},
 	),
 	(
 		"quartz_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(235, 229, 222),
+			color: BlockColor([235, 229, 222]),
 		},
 	),
 	(
 		"quartz_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(235, 229, 222),
+			color: BlockColor([235, 229, 222]),
 		},
 	),
 	(
 		"rail",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(125, 111, 88),
+			color: BlockColor([125, 111, 88]),
 		},
 	),
 	(
 		"raw_copper_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(154, 105, 79),
+			color: BlockColor([154, 105, 79]),
 		},
 	),
 	(
 		"raw_gold_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(221, 169, 46),
+			color: BlockColor([221, 169, 46]),
 		},
 	),
 	(
 		"raw_iron_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(166, 135, 107),
+			color: BlockColor([166, 135, 107]),
 		},
 	),
 	(
 		"red_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"red_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"red_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"red_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(248, 222, 214),
+			color: BlockColor([248, 222, 214]),
 		},
 	),
 	(
 		"red_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(160, 39, 34),
+			color: BlockColor([160, 39, 34]),
 		},
 	),
 	(
 		"red_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(142, 32, 32),
+			color: BlockColor([142, 32, 32]),
 		},
 	),
 	(
 		"red_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(168, 54, 50),
+			color: BlockColor([168, 54, 50]),
 		},
 	),
 	(
 		"red_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(181, 59, 53),
+			color: BlockColor([181, 59, 53]),
 		},
 	),
 	(
 		"red_mushroom",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"red_mushroom_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(200, 46, 45),
+			color: BlockColor([200, 46, 45]),
 		},
 	),
 	(
 		"red_nether_brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(69, 7, 9),
+			color: BlockColor([69, 7, 9]),
 		},
 	),
 	(
 		"red_nether_brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(69, 7, 9),
+			color: BlockColor([69, 7, 9]),
 		},
 	),
 	(
 		"red_nether_brick_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(69, 7, 9),
+			color: BlockColor([69, 7, 9]),
 		},
 	),
 	(
 		"red_nether_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(69, 7, 9),
+			color: BlockColor([69, 7, 9]),
 		},
 	),
 	(
 		"red_sand",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(190, 102, 33),
+			color: BlockColor([190, 102, 33]),
 		},
 	),
 	(
 		"red_sandstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(181, 97, 31),
+			color: BlockColor([181, 97, 31]),
 		},
 	),
 	(
 		"red_sandstone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(181, 97, 31),
+			color: BlockColor([181, 97, 31]),
 		},
 	),
 	(
 		"red_sandstone_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(181, 97, 31),
+			color: BlockColor([181, 97, 31]),
 		},
 	),
 	(
 		"red_sandstone_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(181, 97, 31),
+			color: BlockColor([181, 97, 31]),
 		},
 	),
 	(
 		"red_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(140, 31, 30),
+			color: BlockColor([140, 31, 30]),
 		},
 	),
 	(
 		"red_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(153, 51, 51),
+			color: BlockColor([153, 51, 51]),
 		},
 	),
 	(
 		"red_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(147, 48, 48),
+			color: BlockColor([147, 48, 48]),
 		},
 	),
 	(
 		"red_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(143, 61, 46),
+			color: BlockColor([143, 61, 46]),
 		},
 	),
 	(
 		"red_tulip",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"red_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"red_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(160, 39, 34),
+			color: BlockColor([160, 39, 34]),
 		},
 	),
 	(
 		"redstone_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(175, 24, 5),
+			color: BlockColor([175, 24, 5]),
 		},
 	),
 	(
 		"redstone_lamp",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(95, 54, 30),
+			color: BlockColor([95, 54, 30]),
 		},
 	),
 	(
 		"redstone_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(140, 109, 109),
+			color: BlockColor([140, 109, 109]),
 		},
 	),
 	(
 		"redstone_torch",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"redstone_wall_torch",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"redstone_wire",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(175, 24, 5),
+			color: BlockColor([175, 24, 5]),
 		},
 	),
 	(
 		"reinforced_deepslate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(80, 82, 78),
+			color: BlockColor([80, 82, 78]),
 		},
 	),
 	(
 		"repeater",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(160, 157, 156),
+			color: BlockColor([160, 157, 156]),
 		},
 	),
 	(
 		"repeating_command_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(129, 111, 176),
+			color: BlockColor([129, 111, 176]),
 		},
 	),
 	(
 		"respawn_anchor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(75, 26, 144),
+			color: BlockColor([75, 26, 144]),
 		},
 	),
 	(
 		"rooted_dirt",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(144, 103, 76),
+			color: BlockColor([144, 103, 76]),
 		},
 	),
 	(
 		"rose_bush",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(131, 66, 37),
+			color: BlockColor([131, 66, 37]),
 		},
 	),
 	(
 		"sand",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(219, 207, 163),
+			color: BlockColor([219, 207, 163]),
 		},
 	),
 	(
 		"sandstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(223, 214, 170),
+			color: BlockColor([223, 214, 170]),
 		},
 	),
 	(
 		"sandstone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(223, 214, 170),
+			color: BlockColor([223, 214, 170]),
 		},
 	),
 	(
 		"sandstone_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(223, 214, 170),
+			color: BlockColor([223, 214, 170]),
 		},
 	),
 	(
 		"sandstone_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(223, 214, 170),
+			color: BlockColor([223, 214, 170]),
 		},
 	),
 	(
 		"scaffolding",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(174, 134, 80),
+			color: BlockColor([174, 134, 80]),
 		},
 	),
 	(
 		"sculk",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(12, 29, 36),
+			color: BlockColor([12, 29, 36]),
 		},
 	),
 	(
 		"sculk_catalyst",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(15, 31, 38),
+			color: BlockColor([15, 31, 38]),
 		},
 	),
 	(
 		"sculk_sensor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(7, 70, 84),
+			color: BlockColor([7, 70, 84]),
 		},
 	),
 	(
 		"sculk_shrieker",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(198, 205, 169),
+			color: BlockColor([198, 205, 169]),
 		},
 	),
 	(
 		"sculk_vein",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(7, 48, 57),
+			color: BlockColor([7, 48, 57]),
 		},
 	),
 	(
 		"sea_lantern",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(172, 199, 190),
+			color: BlockColor([172, 199, 190]),
 		},
 	),
 	(
 		"sea_pickle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(90, 97, 39),
+			color: BlockColor([90, 97, 39]),
 		},
 	),
 	(
 		"seagrass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"shroomlight",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(240, 146, 70),
+			color: BlockColor([240, 146, 70]),
 		},
 	),
 	(
 		"shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(139, 96, 139),
+			color: BlockColor([139, 96, 139]),
 		},
 	),
 	(
 		"sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(162, 130, 78),
+			color: BlockColor([162, 130, 78]),
 		},
 	),
 	(
 		"skeleton_skull",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"skeleton_wall_skull",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"slime_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(111, 192, 91),
+			color: BlockColor([111, 192, 91]),
 		},
 	),
 	(
 		"small_amethyst_bud",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"small_dripleaf",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"smithing_table",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(57, 58, 70),
+			color: BlockColor([57, 58, 70]),
 		},
 	),
 	(
 		"smoker",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(85, 83, 81),
+			color: BlockColor([85, 83, 81]),
 		},
 	),
 	(
 		"smooth_basalt",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(72, 72, 78),
+			color: BlockColor([72, 72, 78]),
 		},
 	),
 	(
 		"smooth_quartz",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(235, 229, 222),
+			color: BlockColor([235, 229, 222]),
 		},
 	),
 	(
 		"smooth_quartz_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(235, 229, 222),
+			color: BlockColor([235, 229, 222]),
 		},
 	),
 	(
 		"smooth_quartz_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(235, 229, 222),
+			color: BlockColor([235, 229, 222]),
 		},
 	),
 	(
 		"smooth_red_sandstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(181, 97, 31),
+			color: BlockColor([181, 97, 31]),
 		},
 	),
 	(
 		"smooth_red_sandstone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(181, 97, 31),
+			color: BlockColor([181, 97, 31]),
 		},
 	),
 	(
 		"smooth_red_sandstone_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(181, 97, 31),
+			color: BlockColor([181, 97, 31]),
 		},
 	),
 	(
 		"smooth_sandstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(223, 214, 170),
+			color: BlockColor([223, 214, 170]),
 		},
 	),
 	(
 		"smooth_sandstone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(223, 214, 170),
+			color: BlockColor([223, 214, 170]),
 		},
 	),
 	(
 		"smooth_sandstone_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(223, 214, 170),
+			color: BlockColor([223, 214, 170]),
 		},
 	),
 	(
 		"smooth_stone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(158, 158, 158),
+			color: BlockColor([158, 158, 158]),
 		},
 	),
 	(
 		"smooth_stone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(158, 158, 158),
+			color: BlockColor([158, 158, 158]),
 		},
 	),
 	(
 		"snow",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(249, 254, 254),
+			color: BlockColor([249, 254, 254]),
 		},
 	),
 	(
 		"snow_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(249, 254, 254),
+			color: BlockColor([249, 254, 254]),
 		},
 	),
 	(
 		"soul_campfire",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(80, 204, 208),
+			color: BlockColor([80, 204, 208]),
 		},
 	),
 	(
 		"soul_fire",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(51, 192, 197),
+			color: BlockColor([51, 192, 197]),
 		},
 	),
 	(
 		"soul_lantern",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(71, 99, 114),
+			color: BlockColor([71, 99, 114]),
 		},
 	),
 	(
 		"soul_sand",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(81, 62, 50),
+			color: BlockColor([81, 62, 50]),
 		},
 	),
 	(
 		"soul_soil",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(75, 57, 46),
+			color: BlockColor([75, 57, 46]),
 		},
 	),
 	(
 		"soul_torch",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"soul_wall_torch",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"spawner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(36, 46, 62),
+			color: BlockColor([36, 46, 62]),
 		},
 	),
 	(
 		"sponge",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(195, 192, 74),
+			color: BlockColor([195, 192, 74]),
 		},
 	),
 	(
 		"spore_blossom",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(206, 96, 158),
+			color: BlockColor([206, 96, 158]),
 		},
 	),
 	(
 		"spruce_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"spruce_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(106, 80, 48),
+			color: BlockColor([106, 80, 48]),
 		},
 	),
 	(
 		"spruce_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(114, 84, 48),
+			color: BlockColor([114, 84, 48]),
 		},
 	),
 	(
 		"spruce_fence_gate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(114, 84, 48),
+			color: BlockColor([114, 84, 48]),
 		},
 	),
 	(
 		"spruce_leaves",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Spruce}),
-			color: BlockColor(126, 126, 126),
+			color: BlockColor([126, 126, 126]),
 		},
 	),
 	(
 		"spruce_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(108, 80, 46),
+			color: BlockColor([108, 80, 46]),
 		},
 	),
 	(
 		"spruce_planks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(114, 84, 48),
+			color: BlockColor([114, 84, 48]),
 		},
 	),
 	(
 		"spruce_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(114, 84, 48),
+			color: BlockColor([114, 84, 48]),
 		},
 	),
 	(
 		"spruce_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(44, 60, 36),
+			color: BlockColor([44, 60, 36]),
 		},
 	),
 	(
 		"spruce_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(114, 84, 48),
+			color: BlockColor([114, 84, 48]),
 		},
 	),
 	(
 		"spruce_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(114, 84, 48),
+			color: BlockColor([114, 84, 48]),
 		},
 	),
 	(
 		"spruce_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(114, 84, 48),
+			color: BlockColor([114, 84, 48]),
 		},
 	),
 	(
 		"spruce_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(103, 79, 47),
+			color: BlockColor([103, 79, 47]),
 		},
 	),
 	(
 		"spruce_wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"spruce_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(58, 37, 16),
+			color: BlockColor([58, 37, 16]),
 		},
 	),
 	(
 		"sticky_piston",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(109, 104, 96),
+			color: BlockColor([109, 104, 96]),
 		},
 	),
 	(
 		"stone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(125, 125, 125),
+			color: BlockColor([125, 125, 125]),
 		},
 	),
 	(
 		"stone_brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(122, 121, 122),
+			color: BlockColor([122, 121, 122]),
 		},
 	),
 	(
 		"stone_brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(122, 121, 122),
+			color: BlockColor([122, 121, 122]),
 		},
 	),
 	(
 		"stone_brick_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(122, 121, 122),
+			color: BlockColor([122, 121, 122]),
 		},
 	),
 	(
 		"stone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(122, 121, 122),
+			color: BlockColor([122, 121, 122]),
 		},
 	),
 	(
 		"stone_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"stone_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(125, 125, 125),
+			color: BlockColor([125, 125, 125]),
 		},
 	),
 	(
 		"stone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(125, 125, 125),
+			color: BlockColor([125, 125, 125]),
 		},
 	),
 	(
 		"stone_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(125, 125, 125),
+			color: BlockColor([125, 125, 125]),
 		},
 	),
 	(
 		"stonecutter",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(123, 118, 111),
+			color: BlockColor([123, 118, 111]),
 		},
 	),
 	(
 		"stripped_acacia_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(166, 91, 51),
+			color: BlockColor([166, 91, 51]),
 		},
 	),
 	(
 		"stripped_acacia_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(174, 92, 59),
+			color: BlockColor([174, 92, 59]),
 		},
 	),
 	(
 		"stripped_birch_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(191, 171, 116),
+			color: BlockColor([191, 171, 116]),
 		},
 	),
 	(
 		"stripped_birch_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(196, 176, 118),
+			color: BlockColor([196, 176, 118]),
 		},
 	),
 	(
 		"stripped_crimson_hyphae",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(137, 57, 90),
+			color: BlockColor([137, 57, 90]),
 		},
 	),
 	(
 		"stripped_crimson_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(121, 56, 82),
+			color: BlockColor([121, 56, 82]),
 		},
 	),
 	(
 		"stripped_dark_oak_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(65, 44, 22),
+			color: BlockColor([65, 44, 22]),
 		},
 	),
 	(
 		"stripped_dark_oak_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(72, 56, 36),
+			color: BlockColor([72, 56, 36]),
 		},
 	),
 	(
 		"stripped_jungle_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(165, 122, 81),
+			color: BlockColor([165, 122, 81]),
 		},
 	),
 	(
 		"stripped_jungle_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(171, 132, 84),
+			color: BlockColor([171, 132, 84]),
 		},
 	),
 	(
 		"stripped_mangrove_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(109, 43, 43),
+			color: BlockColor([109, 43, 43]),
 		},
 	),
 	(
 		"stripped_mangrove_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(119, 54, 47),
+			color: BlockColor([119, 54, 47]),
 		},
 	),
 	(
 		"stripped_oak_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(160, 129, 77),
+			color: BlockColor([160, 129, 77]),
 		},
 	),
 	(
 		"stripped_oak_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(177, 144, 86),
+			color: BlockColor([177, 144, 86]),
 		},
 	),
 	(
 		"stripped_spruce_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(105, 80, 46),
+			color: BlockColor([105, 80, 46]),
 		},
 	),
 	(
 		"stripped_spruce_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(115, 89, 52),
+			color: BlockColor([115, 89, 52]),
 		},
 	),
 	(
 		"stripped_warped_hyphae",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(57, 150, 147),
+			color: BlockColor([57, 150, 147]),
 		},
 	),
 	(
 		"stripped_warped_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(52, 128, 124),
+			color: BlockColor([52, 128, 124]),
 		},
 	),
 	(
 		"structure_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(88, 74, 90),
+			color: BlockColor([88, 74, 90]),
 		},
 	),
 	(
 		"structure_void",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"sugar_cane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(148, 192, 101),
+			color: BlockColor([148, 192, 101]),
 		},
 	),
 	(
 		"sunflower",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(246, 196, 54),
+			color: BlockColor([246, 196, 54]),
 		},
 	),
 	(
 		"sweet_berry_bush",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(68, 77, 50),
+			color: BlockColor([68, 77, 50]),
 		},
 	),
 	(
 		"tall_grass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: BlockColor(151, 149, 151),
+			color: BlockColor([151, 149, 151]),
 		},
 	),
 	(
 		"tall_seagrass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(59, 139, 14),
+			color: BlockColor([59, 139, 14]),
 		},
 	),
 	(
 		"target",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(226, 170, 157),
+			color: BlockColor([226, 170, 157]),
 		},
 	),
 	(
 		"terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(152, 94, 67),
+			color: BlockColor([152, 94, 67]),
 		},
 	),
 	(
 		"tinted_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(44, 38, 46),
+			color: BlockColor([44, 38, 46]),
 		},
 	),
 	(
 		"tnt",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(142, 62, 53),
+			color: BlockColor([142, 62, 53]),
 		},
 	),
 	(
 		"torch",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"trapped_chest",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(162, 130, 78),
+			color: BlockColor([162, 130, 78]),
 		},
 	),
 	(
 		"tripwire",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"tripwire_hook",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"tube_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"tube_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(49, 87, 206),
+			color: BlockColor([49, 87, 206]),
 		},
 	),
 	(
 		"tube_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"tube_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"tuff",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(108, 109, 102),
+			color: BlockColor([108, 109, 102]),
 		},
 	),
 	(
 		"turtle_egg",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(228, 226, 191),
+			color: BlockColor([228, 226, 191]),
 		},
 	),
 	(
 		"twisting_vines",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(20, 143, 124),
+			color: BlockColor([20, 143, 124]),
 		},
 	),
 	(
 		"twisting_vines_plant",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(20, 135, 122),
+			color: BlockColor([20, 135, 122]),
 		},
 	),
 	(
 		"verdant_froglight",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(229, 244, 228),
+			color: BlockColor([229, 244, 228]),
 		},
 	),
 	(
 		"vine",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: BlockColor(116, 116, 116),
+			color: BlockColor([116, 116, 116]),
 		},
 	),
 	(
 		"void_air",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"wall_torch",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"warped_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"warped_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(44, 126, 120),
+			color: BlockColor([44, 126, 120]),
 		},
 	),
 	(
 		"warped_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(43, 104, 99),
+			color: BlockColor([43, 104, 99]),
 		},
 	),
 	(
 		"warped_fence_gate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(43, 104, 99),
+			color: BlockColor([43, 104, 99]),
 		},
 	),
 	(
 		"warped_fungus",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"warped_hyphae",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(58, 58, 77),
+			color: BlockColor([58, 58, 77]),
 		},
 	),
 	(
 		"warped_nylium",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(43, 114, 101),
+			color: BlockColor([43, 114, 101]),
 		},
 	),
 	(
 		"warped_planks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(43, 104, 99),
+			color: BlockColor([43, 104, 99]),
 		},
 	),
 	(
 		"warped_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(43, 104, 99),
+			color: BlockColor([43, 104, 99]),
 		},
 	),
 	(
 		"warped_roots",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(20, 138, 124),
+			color: BlockColor([20, 138, 124]),
 		},
 	),
 	(
 		"warped_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(43, 104, 99),
+			color: BlockColor([43, 104, 99]),
 		},
 	),
 	(
 		"warped_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(43, 104, 99),
+			color: BlockColor([43, 104, 99]),
 		},
 	),
 	(
 		"warped_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(43, 104, 99),
+			color: BlockColor([43, 104, 99]),
 		},
 	),
 	(
 		"warped_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(53, 109, 110),
+			color: BlockColor([53, 109, 110]),
 		},
 	),
 	(
 		"warped_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(47, 119, 111),
+			color: BlockColor([47, 119, 111]),
 		},
 	),
 	(
 		"warped_wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"warped_wart_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(22, 119, 121),
+			color: BlockColor([22, 119, 121]),
 		},
 	),
 	(
 		"water",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Water}),
-			color: BlockColor(177, 177, 177),
+			color: BlockColor([177, 177, 177]),
 		},
 	),
 	(
 		"water_cauldron",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(73, 72, 74),
+			color: BlockColor([73, 72, 74]),
 		},
 	),
 	(
 		"waxed_copper_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(192, 107, 79),
+			color: BlockColor([192, 107, 79]),
 		},
 	),
 	(
 		"waxed_cut_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(191, 106, 80),
+			color: BlockColor([191, 106, 80]),
 		},
 	),
 	(
 		"waxed_cut_copper_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(191, 106, 80),
+			color: BlockColor([191, 106, 80]),
 		},
 	),
 	(
 		"waxed_cut_copper_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(191, 106, 80),
+			color: BlockColor([191, 106, 80]),
 		},
 	),
 	(
 		"waxed_exposed_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(161, 125, 103),
+			color: BlockColor([161, 125, 103]),
 		},
 	),
 	(
 		"waxed_exposed_cut_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(154, 121, 101),
+			color: BlockColor([154, 121, 101]),
 		},
 	),
 	(
 		"waxed_exposed_cut_copper_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(154, 121, 101),
+			color: BlockColor([154, 121, 101]),
 		},
 	),
 	(
 		"waxed_exposed_cut_copper_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(154, 121, 101),
+			color: BlockColor([154, 121, 101]),
 		},
 	),
 	(
 		"waxed_oxidized_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(82, 162, 132),
+			color: BlockColor([82, 162, 132]),
 		},
 	),
 	(
 		"waxed_oxidized_cut_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(79, 153, 126),
+			color: BlockColor([79, 153, 126]),
 		},
 	),
 	(
 		"waxed_oxidized_cut_copper_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(79, 153, 126),
+			color: BlockColor([79, 153, 126]),
 		},
 	),
 	(
 		"waxed_oxidized_cut_copper_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(79, 153, 126),
+			color: BlockColor([79, 153, 126]),
 		},
 	),
 	(
 		"waxed_weathered_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(108, 153, 110),
+			color: BlockColor([108, 153, 110]),
 		},
 	),
 	(
 		"waxed_weathered_cut_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(109, 145, 107),
+			color: BlockColor([109, 145, 107]),
 		},
 	),
 	(
 		"waxed_weathered_cut_copper_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(109, 145, 107),
+			color: BlockColor([109, 145, 107]),
 		},
 	),
 	(
 		"waxed_weathered_cut_copper_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(109, 145, 107),
+			color: BlockColor([109, 145, 107]),
 		},
 	),
 	(
 		"weathered_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(108, 153, 110),
+			color: BlockColor([108, 153, 110]),
 		},
 	),
 	(
 		"weathered_cut_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(109, 145, 107),
+			color: BlockColor([109, 145, 107]),
 		},
 	),
 	(
 		"weathered_cut_copper_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(109, 145, 107),
+			color: BlockColor([109, 145, 107]),
 		},
 	),
 	(
 		"weathered_cut_copper_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(109, 145, 107),
+			color: BlockColor([109, 145, 107]),
 		},
 	),
 	(
 		"weeping_vines",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(104, 1, 0),
+			color: BlockColor([104, 1, 0]),
 		},
 	),
 	(
 		"weeping_vines_plant",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(132, 16, 12),
+			color: BlockColor([132, 16, 12]),
 		},
 	),
 	(
 		"wet_sponge",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(171, 181, 70),
+			color: BlockColor([171, 181, 70]),
 		},
 	),
 	(
 		"wheat",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(166, 151, 73),
+			color: BlockColor([166, 151, 73]),
 		},
 	),
 	(
 		"white_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"white_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"white_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"white_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(248, 222, 214),
+			color: BlockColor([248, 222, 214]),
 		},
 	),
 	(
 		"white_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(233, 236, 236),
+			color: BlockColor([233, 236, 236]),
 		},
 	),
 	(
 		"white_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(207, 213, 214),
+			color: BlockColor([207, 213, 214]),
 		},
 	),
 	(
 		"white_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(225, 227, 227),
+			color: BlockColor([225, 227, 227]),
 		},
 	),
 	(
 		"white_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(188, 212, 202),
+			color: BlockColor([188, 212, 202]),
 		},
 	),
 	(
 		"white_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(215, 220, 221),
+			color: BlockColor([215, 220, 221]),
 		},
 	),
 	(
 		"white_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(255, 255, 255),
+			color: BlockColor([255, 255, 255]),
 		},
 	),
 	(
 		"white_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(246, 246, 246),
+			color: BlockColor([246, 246, 246]),
 		},
 	),
 	(
 		"white_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(209, 178, 161),
+			color: BlockColor([209, 178, 161]),
 		},
 	),
 	(
 		"white_tulip",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"white_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"white_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(233, 236, 236),
+			color: BlockColor([233, 236, 236]),
 		},
 	),
 	(
 		"wither_rose",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"wither_skeleton_skull",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"wither_skeleton_wall_skull",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"yellow_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"yellow_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"yellow_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"yellow_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(248, 222, 214),
+			color: BlockColor([248, 222, 214]),
 		},
 	),
 	(
 		"yellow_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(248, 197, 39),
+			color: BlockColor([248, 197, 39]),
 		},
 	),
 	(
 		"yellow_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(240, 175, 21),
+			color: BlockColor([240, 175, 21]),
 		},
 	),
 	(
 		"yellow_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(232, 199, 54),
+			color: BlockColor([232, 199, 54]),
 		},
 	),
 	(
 		"yellow_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(234, 192, 88),
+			color: BlockColor([234, 192, 88]),
 		},
 	),
 	(
 		"yellow_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(248, 188, 29),
+			color: BlockColor([248, 188, 29]),
 		},
 	),
 	(
 		"yellow_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(229, 229, 51),
+			color: BlockColor([229, 229, 51]),
 		},
 	),
 	(
 		"yellow_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(221, 221, 48),
+			color: BlockColor([221, 221, 48]),
 		},
 	),
 	(
 		"yellow_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(186, 133, 35),
+			color: BlockColor([186, 133, 35]),
 		},
 	),
 	(
 		"yellow_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"yellow_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor(248, 197, 39),
+			color: BlockColor([248, 197, 39]),
 		},
 	),
 	(
 		"zombie_head",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 	(
 		"zombie_wall_head",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor(0, 0, 0),
+			color: BlockColor([0, 0, 0]),
 		},
 	),
 ];
diff --git a/src/resource/mod.rs b/src/resource/mod.rs
index 8bad34f..672daa0 100644
--- a/src/resource/mod.rs
+++ b/src/resource/mod.rs
@@ -34,7 +34,7 @@ where
 }
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
-pub struct BlockColor(pub u8, pub u8, pub u8);
+pub struct BlockColor(pub [u8; 3]);
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 pub struct BlockType {

From bcec704d27670c6bb673bddaba2f46548ddf5cd1 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 4 Mar 2023 21:45:59 +0100
Subject: [PATCH 144/460] main: add height-based color modification

Modify terrain color depending on the height to give a sense of
elevation.
---
 src/main.rs        | 25 +++++++++++++++++++------
 src/world/layer.rs |  2 +-
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 14589f4..a0afa43 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -10,7 +10,10 @@ use minedmap::{
 	io::storage,
 	resource,
 	types::*,
-	world::{self, layer::BlockLightArray},
+	world::{
+		self,
+		layer::{BlockInfo, BlockLightArray},
+	},
 };
 
 #[derive(Debug, Parser)]
@@ -275,6 +278,19 @@ impl<'a> TileRenderer<'a> {
 		storage::read(&processed_path).context("Failed to load processed region data")
 	}
 
+	fn block_color(block: &BlockInfo) -> [u8; 4] {
+		let h = block
+			.depth
+			.map(|depth| 0.5 + 0.005 * depth.0 as f32)
+			.unwrap_or_default();
+		let c = block
+			.block_type
+			.color
+			.0
+			.map(|v| (f32::from(v) * h).clamp(0.0, 255.0) as u8);
+		[c[0], c[1], c[2], 255]
+	}
+
 	fn render_chunk(
 		image: &mut image::RgbaImage,
 		coords: ChunkCoords,
@@ -284,14 +300,11 @@ impl<'a> TileRenderer<'a> {
 
 		let chunk_image = image::RgbaImage::from_fn(N, N, |x, z| {
 			image::Rgba(
-				match chunk[LayerBlockCoords {
+				match &chunk[LayerBlockCoords {
 					x: BlockX(x as u8),
 					z: BlockZ(z as u8),
 				}] {
-					Some(block) => {
-						let c = block.block_type.color.0;
-						[c[0], c[1], c[2], 255]
-					}
+					Some(block) => Self::block_color(block),
 					None => [0, 0, 0, 0],
 				},
 			)
diff --git a/src/world/layer.rs b/src/world/layer.rs
index 4036f4a..fd24790 100644
--- a/src/world/layer.rs
+++ b/src/world/layer.rs
@@ -8,7 +8,7 @@ use crate::{
 };
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
-pub struct BlockHeight(i32);
+pub struct BlockHeight(pub i32);
 
 impl BlockHeight {
 	/// Constructs a new [BlockHeight] from section and block Y indices

From e62e19796c5996eaccea6d60cc9790becc770077 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 1 Apr 2023 16:15:29 +0200
Subject: [PATCH 145/460] Update dependencies

---
 Cargo.lock | 276 +++++++++++++++++++++++++++--------------------------
 1 file changed, 139 insertions(+), 137 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dda9b5c..4ca24e2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9,10 +9,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
-name = "anyhow"
-version = "1.0.69"
+name = "anstream"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
+checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-wincon",
+ "concolor-override",
+ "concolor-query",
+ "is-terminal",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa"
+dependencies = [
+ "anstyle",
+ "windows-sys",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.70"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
 
 [[package]]
 name = "autocfg"
@@ -37,9 +77,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bytemuck"
-version = "1.13.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c041d3eab048880cb0b86b256447da3f18859a163c3b8d8893f4e6368abe6393"
+checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
 
 [[package]]
 name = "byteorder"
@@ -70,46 +110,51 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.1.6"
+version = "4.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3"
+checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3"
 dependencies = [
- "bitflags",
+ "clap_builder",
  "clap_derive",
- "clap_lex",
- "is-terminal",
  "once_cell",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "bitflags",
+ "clap_lex",
  "strsim",
- "termcolor",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.1.0"
+version = "4.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8"
+checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4"
 dependencies = [
  "heck",
- "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.12",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.3.2"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350b9cf31731f9957399229e9b2adc51eeabdfbe9d71d9a0552275fd12710d09"
-dependencies = [
- "os_str_bytes",
-]
+checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1"
 
 [[package]]
 name = "cmake"
-version = "0.1.49"
+version = "0.1.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c"
+checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130"
 dependencies = [
  "cc",
 ]
@@ -120,6 +165,21 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
+[[package]]
+name = "concolor-override"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f"
+
+[[package]]
+name = "concolor-query"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf"
+dependencies = [
+ "windows-sys",
+]
+
 [[package]]
 name = "crc32fast"
 version = "1.3.2"
@@ -152,18 +212,18 @@ checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 1.0.109",
 ]
 
 [[package]]
 name = "errno"
-version = "0.2.8"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
+checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0"
 dependencies = [
  "errno-dragonfly",
  "libc",
- "winapi",
+ "windows-sys",
 ]
 
 [[package]]
@@ -178,9 +238,9 @@ dependencies = [
 
 [[package]]
 name = "fastnbt"
-version = "2.3.2"
+version = "2.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da8cfe3db6e587f39487b01dae75222c5fa809342f6aa4b8310d17b53e666728"
+checksum = "f1aab2b0109236f6c89cc81b9e2ef4aced6d585aabe96ac860ee5e9a102eb198"
 dependencies = [
  "byteorder",
  "cesu8",
@@ -213,9 +273,9 @@ checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
 
 [[package]]
 name = "image"
-version = "0.24.5"
+version = "0.24.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945"
+checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a"
 dependencies = [
  "bytemuck",
  "byteorder",
@@ -227,19 +287,20 @@ dependencies = [
 
 [[package]]
 name = "io-lifetimes"
-version = "1.0.5"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3"
+checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb"
 dependencies = [
+ "hermit-abi",
  "libc",
  "windows-sys",
 ]
 
 [[package]]
 name = "is-terminal"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857"
+checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8"
 dependencies = [
  "hermit-abi",
  "io-lifetimes",
@@ -258,18 +319,18 @@ dependencies = [
 
 [[package]]
 name = "jobserver"
-version = "0.1.25"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b"
+checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.139"
+version = "0.2.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
+checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
 
 [[package]]
 name = "libz-ng-sys"
@@ -283,9 +344,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.1.4"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f"
 
 [[package]]
 name = "minedmap"
@@ -350,12 +411,6 @@ version = "1.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
 
-[[package]]
-name = "os_str_bytes"
-version = "6.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
-
 [[package]]
 name = "pkg-config"
 version = "0.3.26"
@@ -374,53 +429,29 @@ dependencies = [
  "miniz_oxide",
 ]
 
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
 [[package]]
 name = "proc-macro2"
-version = "1.0.51"
+version = "1.0.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6"
+checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.23"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
+checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "rustix"
-version = "0.36.8"
+version = "0.37.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644"
+checksum = "d097081ed288dfe45699b72f5b5d648e5f15d64d900c7080273baa20c16a6849"
 dependencies = [
  "bitflags",
  "errno",
@@ -432,9 +463,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.152"
+version = "1.0.159"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb"
+checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
 dependencies = [
  "serde_derive",
 ]
@@ -450,13 +481,13 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.152"
+version = "1.0.159"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e"
+checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.12",
 ]
 
 [[package]]
@@ -477,56 +508,27 @@ dependencies = [
 ]
 
 [[package]]
-name = "termcolor"
-version = "1.2.0"
+name = "syn"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
+checksum = "79d9531f94112cfc3e4c8f5f02cb2b58f72c97b7efd85f70203cc6d8efda5927"
 dependencies = [
- "winapi-util",
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
 ]
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.6"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
+checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
 
 [[package]]
-name = "version_check"
-version = "0.9.4"
+name = "utf8parse"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "windows-sys"
@@ -539,9 +541,9 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
 dependencies = [
  "windows_aarch64_gnullvm",
  "windows_aarch64_msvc",
@@ -554,45 +556,45 @@ dependencies = [
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.1"
+version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
 
 [[package]]
 name = "zstd"

From f2b7808e8495e9a16388046ed0d8073803fb5132 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 2 Apr 2023 15:10:40 +0200
Subject: [PATCH 146/460] world: distinguish pre-v1.18 biome data structures

---
 src/world/chunk.rs   |  7 +++----
 src/world/section.rs | 30 ++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/world/chunk.rs b/src/world/chunk.rs
index 10efc6a..a9a5c6b 100644
--- a/src/world/chunk.rs
+++ b/src/world/chunk.rs
@@ -24,14 +24,14 @@ pub enum Chunk<'a> {
 	/// block IDs
 	V1_13 {
 		section_map: BTreeMap<SectionY, (SectionV1_13<'a>, BlockLight<'a>)>,
-		biomes: &'a de::BiomesV0,
+		biomes: BiomesV0<'a>,
 	},
 	/// Original pre-1.13 chunk
 	///
 	/// The original chunk format with fixed 8-bit numeric block IDs
 	V0 {
 		section_map: BTreeMap<SectionY, (SectionV0<'a>, BlockLight<'a>)>,
-		biomes: &'a de::BiomesV0,
+		biomes: BiomesV0<'a>,
 	},
 	/// Unpopulated chunk without any block data
 	Empty,
@@ -158,8 +158,7 @@ impl<'a> Chunk<'a> {
 			}
 		}
 
-		// TODO Check biomes length
-		let biomes = level.biomes.as_ref().context("Invalid biome data");
+		let biomes = BiomesV0::new(level.biomes.as_ref());
 
 		Ok(
 			match (section_map_v1_13.is_empty(), section_map_v0.is_empty()) {
diff --git a/src/world/section.rs b/src/world/section.rs
index d3c590a..1aa8b7f 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -202,6 +202,36 @@ impl<'a> BiomesV18<'a> {
 	}
 }
 
+/// Pre-v1.18 section biome data
+///
+/// There are a 3 formats for biome data that were used in
+/// different pre-v1.18 Minecraft versions
+#[derive(Debug)]
+pub enum BiomesV0<'a> {
+	IntArrayV15(&'a fastnbt::IntArray),
+	IntArrayV0(&'a fastnbt::IntArray),
+	ByteArray(&'a fastnbt::ByteArray),
+}
+
+impl<'a> BiomesV0<'a> {
+	/// Constructs a new [BiomesV0] from deserialized data structures
+	pub fn new(biomes: Option<&'a de::BiomesV0>) -> Result<Self> {
+		const N: usize = BLOCKS_PER_CHUNK;
+		const MAXY: usize = 256;
+		const BN: usize = N >> 2;
+		const BMAXY: usize = MAXY >> 2;
+
+		Ok(match biomes {
+			Some(de::BiomesV0::IntArray(data)) if data.len() == BN * BN * BMAXY => {
+				BiomesV0::IntArrayV15(data)
+			}
+			Some(de::BiomesV0::IntArray(data)) if data.len() == N * N => BiomesV0::IntArrayV0(data),
+			Some(de::BiomesV0::ByteArray(data)) if data.len() == N * N => BiomesV0::ByteArray(data),
+			_ => bail!("Invalid biome data"),
+		})
+	}
+}
+
 #[derive(Debug, Clone, Copy)]
 pub struct BlockLight<'a>(Option<&'a [i8]>);
 

From e462e17ee24dd99da20bb9c5029d8291410b50d0 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 5 Apr 2023 20:05:59 +0200
Subject: [PATCH 147/460] resource: rename BlockColor to Color

The same struct will be used for biomes.
---
 resource/generate.py        |    2 +-
 src/resource/block_types.rs | 1876 +++++++++++++++++------------------
 src/resource/mod.rs         |    4 +-
 3 files changed, 941 insertions(+), 941 deletions(-)

diff --git a/resource/generate.py b/resource/generate.py
index 4398ce4..fabff63 100755
--- a/resource/generate.py
+++ b/resource/generate.py
@@ -36,7 +36,7 @@ with open(sys.argv[2], 'w') as f:
 			flags.append('Water')
 		flags = 'make_bitflags!(BlockFlag::{' + '|'.join(flags) + '})'
 
-		print('\t("%s", BlockType { flags: %s, color: BlockColor([%u, %u, %u]) }),' % (
+		print('\t("%s", BlockType { flags: %s, color: Color([%u, %u, %u]) }),' % (
 			name,
 			flags,
 			info['color']['r'],
diff --git a/src/resource/block_types.rs b/src/resource/block_types.rs
index 1520b8e..467cf7a 100644
--- a/src/resource/block_types.rs
+++ b/src/resource/block_types.rs
@@ -7,6566 +7,6566 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 		"acacia_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"acacia_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([167, 95, 60]),
+			color: Color([167, 95, 60]),
 		},
 	),
 	(
 		"acacia_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([168, 90, 50]),
+			color: Color([168, 90, 50]),
 		},
 	),
 	(
 		"acacia_fence_gate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([168, 90, 50]),
+			color: Color([168, 90, 50]),
 		},
 	),
 	(
 		"acacia_leaves",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
-			color: BlockColor([149, 148, 148]),
+			color: Color([149, 148, 148]),
 		},
 	),
 	(
 		"acacia_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([150, 88, 55]),
+			color: Color([150, 88, 55]),
 		},
 	),
 	(
 		"acacia_planks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([168, 90, 50]),
+			color: Color([168, 90, 50]),
 		},
 	),
 	(
 		"acacia_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([168, 90, 50]),
+			color: Color([168, 90, 50]),
 		},
 	),
 	(
 		"acacia_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([118, 117, 23]),
+			color: Color([118, 117, 23]),
 		},
 	),
 	(
 		"acacia_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([168, 90, 50]),
+			color: Color([168, 90, 50]),
 		},
 	),
 	(
 		"acacia_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([168, 90, 50]),
+			color: Color([168, 90, 50]),
 		},
 	),
 	(
 		"acacia_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([168, 90, 50]),
+			color: Color([168, 90, 50]),
 		},
 	),
 	(
 		"acacia_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([156, 87, 51]),
+			color: Color([156, 87, 51]),
 		},
 	),
 	(
 		"acacia_wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"acacia_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([103, 96, 86]),
+			color: Color([103, 96, 86]),
 		},
 	),
 	(
 		"activator_rail",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([115, 87, 74]),
+			color: Color([115, 87, 74]),
 		},
 	),
 	(
 		"air",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"allium",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"amethyst_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([133, 97, 191]),
+			color: Color([133, 97, 191]),
 		},
 	),
 	(
 		"amethyst_cluster",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([163, 126, 207]),
+			color: Color([163, 126, 207]),
 		},
 	),
 	(
 		"ancient_debris",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([94, 66, 58]),
+			color: Color([94, 66, 58]),
 		},
 	),
 	(
 		"andesite",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([136, 136, 136]),
+			color: Color([136, 136, 136]),
 		},
 	),
 	(
 		"andesite_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([136, 136, 136]),
+			color: Color([136, 136, 136]),
 		},
 	),
 	(
 		"andesite_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([136, 136, 136]),
+			color: Color([136, 136, 136]),
 		},
 	),
 	(
 		"andesite_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([136, 136, 136]),
+			color: Color([136, 136, 136]),
 		},
 	),
 	(
 		"anvil",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([72, 72, 72]),
+			color: Color([72, 72, 72]),
 		},
 	),
 	(
 		"attached_melon_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: BlockColor([141, 142, 141]),
+			color: Color([141, 142, 141]),
 		},
 	),
 	(
 		"attached_pumpkin_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: BlockColor([139, 139, 139]),
+			color: Color([139, 139, 139]),
 		},
 	),
 	(
 		"azalea",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([101, 124, 47]),
+			color: Color([101, 124, 47]),
 		},
 	),
 	(
 		"azalea_leaves",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([90, 114, 44]),
+			color: Color([90, 114, 44]),
 		},
 	),
 	(
 		"azure_bluet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"bamboo",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([93, 144, 19]),
+			color: Color([93, 144, 19]),
 		},
 	),
 	(
 		"bamboo_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"barrel",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([134, 100, 58]),
+			color: Color([134, 100, 58]),
 		},
 	),
 	(
 		"barrier",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"basalt",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([80, 81, 86]),
+			color: Color([80, 81, 86]),
 		},
 	),
 	(
 		"beacon",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([117, 220, 215]),
+			color: Color([117, 220, 215]),
 		},
 	),
 	(
 		"bedrock",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([85, 85, 85]),
+			color: Color([85, 85, 85]),
 		},
 	),
 	(
 		"bee_nest",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([202, 160, 74]),
+			color: Color([202, 160, 74]),
 		},
 	),
 	(
 		"beehive",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([180, 146, 90]),
+			color: Color([180, 146, 90]),
 		},
 	),
 	(
 		"beetroots",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([93, 91, 30]),
+			color: Color([93, 91, 30]),
 		},
 	),
 	(
 		"bell",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([253, 235, 110]),
+			color: Color([253, 235, 110]),
 		},
 	),
 	(
 		"big_dripleaf",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([111, 141, 51]),
+			color: Color([111, 141, 51]),
 		},
 	),
 	(
 		"big_dripleaf_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"birch_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"birch_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([220, 209, 176]),
+			color: Color([220, 209, 176]),
 		},
 	),
 	(
 		"birch_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([192, 175, 121]),
+			color: Color([192, 175, 121]),
 		},
 	),
 	(
 		"birch_fence_gate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([192, 175, 121]),
+			color: Color([192, 175, 121]),
 		},
 	),
 	(
 		"birch_leaves",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Birch}),
-			color: BlockColor([130, 129, 130]),
+			color: Color([130, 129, 130]),
 		},
 	),
 	(
 		"birch_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([193, 179, 135]),
+			color: Color([193, 179, 135]),
 		},
 	),
 	(
 		"birch_planks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([192, 175, 121]),
+			color: Color([192, 175, 121]),
 		},
 	),
 	(
 		"birch_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([192, 175, 121]),
+			color: Color([192, 175, 121]),
 		},
 	),
 	(
 		"birch_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([127, 160, 79]),
+			color: Color([127, 160, 79]),
 		},
 	),
 	(
 		"birch_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([192, 175, 121]),
+			color: Color([192, 175, 121]),
 		},
 	),
 	(
 		"birch_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([192, 175, 121]),
+			color: Color([192, 175, 121]),
 		},
 	),
 	(
 		"birch_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([192, 175, 121]),
+			color: Color([192, 175, 121]),
 		},
 	),
 	(
 		"birch_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([207, 194, 157]),
+			color: Color([207, 194, 157]),
 		},
 	),
 	(
 		"birch_wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"birch_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([216, 215, 210]),
+			color: Color([216, 215, 210]),
 		},
 	),
 	(
 		"black_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"black_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"black_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"black_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([248, 222, 214]),
+			color: Color([248, 222, 214]),
 		},
 	),
 	(
 		"black_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([20, 21, 25]),
+			color: Color([20, 21, 25]),
 		},
 	),
 	(
 		"black_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([8, 10, 15]),
+			color: Color([8, 10, 15]),
 		},
 	),
 	(
 		"black_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([25, 26, 31]),
+			color: Color([25, 26, 31]),
 		},
 	),
 	(
 		"black_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([67, 30, 32]),
+			color: Color([67, 30, 32]),
 		},
 	),
 	(
 		"black_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([25, 25, 29]),
+			color: Color([25, 25, 29]),
 		},
 	),
 	(
 		"black_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([25, 25, 25]),
+			color: Color([25, 25, 25]),
 		},
 	),
 	(
 		"black_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([24, 24, 24]),
+			color: Color([24, 24, 24]),
 		},
 	),
 	(
 		"black_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([37, 22, 16]),
+			color: Color([37, 22, 16]),
 		},
 	),
 	(
 		"black_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"black_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([20, 21, 25]),
+			color: Color([20, 21, 25]),
 		},
 	),
 	(
 		"blackstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([42, 36, 41]),
+			color: Color([42, 36, 41]),
 		},
 	),
 	(
 		"blackstone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([42, 36, 41]),
+			color: Color([42, 36, 41]),
 		},
 	),
 	(
 		"blackstone_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([42, 36, 41]),
+			color: Color([42, 36, 41]),
 		},
 	),
 	(
 		"blackstone_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([42, 36, 41]),
+			color: Color([42, 36, 41]),
 		},
 	),
 	(
 		"blast_furnace",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([80, 80, 81]),
+			color: Color([80, 80, 81]),
 		},
 	),
 	(
 		"blue_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"blue_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"blue_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"blue_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([248, 222, 214]),
+			color: Color([248, 222, 214]),
 		},
 	),
 	(
 		"blue_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([53, 57, 157]),
+			color: Color([53, 57, 157]),
 		},
 	),
 	(
 		"blue_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([44, 46, 143]),
+			color: Color([44, 46, 143]),
 		},
 	),
 	(
 		"blue_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([70, 73, 166]),
+			color: Color([70, 73, 166]),
 		},
 	),
 	(
 		"blue_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([47, 64, 139]),
+			color: Color([47, 64, 139]),
 		},
 	),
 	(
 		"blue_ice",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([116, 167, 253]),
+			color: Color([116, 167, 253]),
 		},
 	),
 	(
 		"blue_orchid",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"blue_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([43, 45, 140]),
+			color: Color([43, 45, 140]),
 		},
 	),
 	(
 		"blue_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([51, 76, 178]),
+			color: Color([51, 76, 178]),
 		},
 	),
 	(
 		"blue_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([48, 73, 171]),
+			color: Color([48, 73, 171]),
 		},
 	),
 	(
 		"blue_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([74, 59, 91]),
+			color: Color([74, 59, 91]),
 		},
 	),
 	(
 		"blue_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"blue_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([53, 57, 157]),
+			color: Color([53, 57, 157]),
 		},
 	),
 	(
 		"bone_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([209, 206, 179]),
+			color: Color([209, 206, 179]),
 		},
 	),
 	(
 		"bookshelf",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([162, 130, 78]),
+			color: Color([162, 130, 78]),
 		},
 	),
 	(
 		"brain_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"brain_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([207, 91, 159]),
+			color: Color([207, 91, 159]),
 		},
 	),
 	(
 		"brain_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"brain_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"brewing_stand",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([122, 100, 80]),
+			color: Color([122, 100, 80]),
 		},
 	),
 	(
 		"brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([150, 97, 83]),
+			color: Color([150, 97, 83]),
 		},
 	),
 	(
 		"brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([150, 97, 83]),
+			color: Color([150, 97, 83]),
 		},
 	),
 	(
 		"brick_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([150, 97, 83]),
+			color: Color([150, 97, 83]),
 		},
 	),
 	(
 		"bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([150, 97, 83]),
+			color: Color([150, 97, 83]),
 		},
 	),
 	(
 		"brown_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"brown_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"brown_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"brown_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([248, 222, 214]),
+			color: Color([248, 222, 214]),
 		},
 	),
 	(
 		"brown_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([114, 71, 40]),
+			color: Color([114, 71, 40]),
 		},
 	),
 	(
 		"brown_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([96, 59, 31]),
+			color: Color([96, 59, 31]),
 		},
 	),
 	(
 		"brown_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([125, 84, 53]),
+			color: Color([125, 84, 53]),
 		},
 	),
 	(
 		"brown_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([119, 106, 85]),
+			color: Color([119, 106, 85]),
 		},
 	),
 	(
 		"brown_mushroom",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"brown_mushroom_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([149, 111, 81]),
+			color: Color([149, 111, 81]),
 		},
 	),
 	(
 		"brown_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([106, 66, 35]),
+			color: Color([106, 66, 35]),
 		},
 	),
 	(
 		"brown_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([102, 76, 51]),
+			color: Color([102, 76, 51]),
 		},
 	),
 	(
 		"brown_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([97, 73, 48]),
+			color: Color([97, 73, 48]),
 		},
 	),
 	(
 		"brown_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([77, 51, 35]),
+			color: Color([77, 51, 35]),
 		},
 	),
 	(
 		"brown_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"brown_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([114, 71, 40]),
+			color: Color([114, 71, 40]),
 		},
 	),
 	(
 		"bubble_column",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Water}),
-			color: BlockColor([177, 177, 177]),
+			color: Color([177, 177, 177]),
 		},
 	),
 	(
 		"bubble_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"bubble_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([165, 26, 162]),
+			color: Color([165, 26, 162]),
 		},
 	),
 	(
 		"bubble_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"bubble_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"budding_amethyst",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([132, 96, 186]),
+			color: Color([132, 96, 186]),
 		},
 	),
 	(
 		"cactus",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([85, 127, 43]),
+			color: Color([85, 127, 43]),
 		},
 	),
 	(
 		"cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([248, 222, 214]),
+			color: Color([248, 222, 214]),
 		},
 	),
 	(
 		"calcite",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([223, 224, 220]),
+			color: Color([223, 224, 220]),
 		},
 	),
 	(
 		"campfire",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([110, 88, 54]),
+			color: Color([110, 88, 54]),
 		},
 	),
 	(
 		"candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([248, 222, 214]),
+			color: Color([248, 222, 214]),
 		},
 	),
 	(
 		"carrots",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([81, 124, 37]),
+			color: Color([81, 124, 37]),
 		},
 	),
 	(
 		"cartography_table",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([103, 87, 67]),
+			color: Color([103, 87, 67]),
 		},
 	),
 	(
 		"carved_pumpkin",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([198, 118, 24]),
+			color: Color([198, 118, 24]),
 		},
 	),
 	(
 		"cauldron",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([73, 72, 74]),
+			color: Color([73, 72, 74]),
 		},
 	),
 	(
 		"cave_air",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"cave_vines",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([90, 109, 40]),
+			color: Color([90, 109, 40]),
 		},
 	),
 	(
 		"cave_vines_plant",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([88, 101, 38]),
+			color: Color([88, 101, 38]),
 		},
 	),
 	(
 		"chain",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"chain_command_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([131, 161, 147]),
+			color: Color([131, 161, 147]),
 		},
 	),
 	(
 		"chest",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([162, 130, 78]),
+			color: Color([162, 130, 78]),
 		},
 	),
 	(
 		"chipped_anvil",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([72, 72, 72]),
+			color: Color([72, 72, 72]),
 		},
 	),
 	(
 		"chiseled_deepslate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([54, 54, 54]),
+			color: Color([54, 54, 54]),
 		},
 	),
 	(
 		"chiseled_nether_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([47, 23, 28]),
+			color: Color([47, 23, 28]),
 		},
 	),
 	(
 		"chiseled_polished_blackstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([53, 48, 56]),
+			color: Color([53, 48, 56]),
 		},
 	),
 	(
 		"chiseled_quartz_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([231, 226, 218]),
+			color: Color([231, 226, 218]),
 		},
 	),
 	(
 		"chiseled_red_sandstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([181, 97, 31]),
+			color: Color([181, 97, 31]),
 		},
 	),
 	(
 		"chiseled_sandstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([223, 214, 170]),
+			color: Color([223, 214, 170]),
 		},
 	),
 	(
 		"chiseled_stone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([119, 118, 119]),
+			color: Color([119, 118, 119]),
 		},
 	),
 	(
 		"chorus_flower",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([151, 120, 151]),
+			color: Color([151, 120, 151]),
 		},
 	),
 	(
 		"chorus_plant",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([93, 57, 93]),
+			color: Color([93, 57, 93]),
 		},
 	),
 	(
 		"clay",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([160, 166, 179]),
+			color: Color([160, 166, 179]),
 		},
 	),
 	(
 		"coal_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([16, 15, 15]),
+			color: Color([16, 15, 15]),
 		},
 	),
 	(
 		"coal_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([105, 105, 105]),
+			color: Color([105, 105, 105]),
 		},
 	),
 	(
 		"coarse_dirt",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([119, 85, 59]),
+			color: Color([119, 85, 59]),
 		},
 	),
 	(
 		"cobbled_deepslate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([77, 77, 80]),
+			color: Color([77, 77, 80]),
 		},
 	),
 	(
 		"cobbled_deepslate_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([77, 77, 80]),
+			color: Color([77, 77, 80]),
 		},
 	),
 	(
 		"cobbled_deepslate_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([77, 77, 80]),
+			color: Color([77, 77, 80]),
 		},
 	),
 	(
 		"cobbled_deepslate_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([77, 77, 80]),
+			color: Color([77, 77, 80]),
 		},
 	),
 	(
 		"cobblestone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([127, 127, 127]),
+			color: Color([127, 127, 127]),
 		},
 	),
 	(
 		"cobblestone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([127, 127, 127]),
+			color: Color([127, 127, 127]),
 		},
 	),
 	(
 		"cobblestone_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([127, 127, 127]),
+			color: Color([127, 127, 127]),
 		},
 	),
 	(
 		"cobblestone_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([127, 127, 127]),
+			color: Color([127, 127, 127]),
 		},
 	),
 	(
 		"cobweb",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([228, 233, 234]),
+			color: Color([228, 233, 234]),
 		},
 	),
 	(
 		"cocoa",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([154, 91, 40]),
+			color: Color([154, 91, 40]),
 		},
 	),
 	(
 		"command_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([181, 136, 108]),
+			color: Color([181, 136, 108]),
 		},
 	),
 	(
 		"comparator",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([166, 161, 159]),
+			color: Color([166, 161, 159]),
 		},
 	),
 	(
 		"composter",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([88, 61, 23]),
+			color: Color([88, 61, 23]),
 		},
 	),
 	(
 		"conduit",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([159, 139, 113]),
+			color: Color([159, 139, 113]),
 		},
 	),
 	(
 		"copper_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([192, 107, 79]),
+			color: Color([192, 107, 79]),
 		},
 	),
 	(
 		"copper_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([124, 125, 120]),
+			color: Color([124, 125, 120]),
 		},
 	),
 	(
 		"cornflower",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"cracked_deepslate_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([64, 64, 65]),
+			color: Color([64, 64, 65]),
 		},
 	),
 	(
 		"cracked_deepslate_tiles",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([52, 52, 52]),
+			color: Color([52, 52, 52]),
 		},
 	),
 	(
 		"cracked_nether_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([40, 20, 23]),
+			color: Color([40, 20, 23]),
 		},
 	),
 	(
 		"cracked_polished_blackstone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([44, 37, 43]),
+			color: Color([44, 37, 43]),
 		},
 	),
 	(
 		"cracked_stone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([118, 117, 118]),
+			color: Color([118, 117, 118]),
 		},
 	),
 	(
 		"crafting_table",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([119, 73, 42]),
+			color: Color([119, 73, 42]),
 		},
 	),
 	(
 		"creeper_head",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"creeper_wall_head",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"crimson_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"crimson_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([114, 54, 79]),
+			color: Color([114, 54, 79]),
 		},
 	),
 	(
 		"crimson_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([101, 48, 70]),
+			color: Color([101, 48, 70]),
 		},
 	),
 	(
 		"crimson_fence_gate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([101, 48, 70]),
+			color: Color([101, 48, 70]),
 		},
 	),
 	(
 		"crimson_fungus",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"crimson_hyphae",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([92, 25, 29]),
+			color: Color([92, 25, 29]),
 		},
 	),
 	(
 		"crimson_nylium",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([130, 31, 31]),
+			color: Color([130, 31, 31]),
 		},
 	),
 	(
 		"crimson_planks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([101, 48, 70]),
+			color: Color([101, 48, 70]),
 		},
 	),
 	(
 		"crimson_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([101, 48, 70]),
+			color: Color([101, 48, 70]),
 		},
 	),
 	(
 		"crimson_roots",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([126, 8, 41]),
+			color: Color([126, 8, 41]),
 		},
 	),
 	(
 		"crimson_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([101, 48, 70]),
+			color: Color([101, 48, 70]),
 		},
 	),
 	(
 		"crimson_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([101, 48, 70]),
+			color: Color([101, 48, 70]),
 		},
 	),
 	(
 		"crimson_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([101, 48, 70]),
+			color: Color([101, 48, 70]),
 		},
 	),
 	(
 		"crimson_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([112, 49, 70]),
+			color: Color([112, 49, 70]),
 		},
 	),
 	(
 		"crimson_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([103, 50, 72]),
+			color: Color([103, 50, 72]),
 		},
 	),
 	(
 		"crimson_wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"crying_obsidian",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([32, 10, 60]),
+			color: Color([32, 10, 60]),
 		},
 	),
 	(
 		"cut_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([191, 106, 80]),
+			color: Color([191, 106, 80]),
 		},
 	),
 	(
 		"cut_copper_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([191, 106, 80]),
+			color: Color([191, 106, 80]),
 		},
 	),
 	(
 		"cut_copper_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([191, 106, 80]),
+			color: Color([191, 106, 80]),
 		},
 	),
 	(
 		"cut_red_sandstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([181, 97, 31]),
+			color: Color([181, 97, 31]),
 		},
 	),
 	(
 		"cut_red_sandstone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([181, 97, 31]),
+			color: Color([181, 97, 31]),
 		},
 	),
 	(
 		"cut_sandstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([223, 214, 170]),
+			color: Color([223, 214, 170]),
 		},
 	),
 	(
 		"cut_sandstone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([223, 214, 170]),
+			color: Color([223, 214, 170]),
 		},
 	),
 	(
 		"cyan_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"cyan_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"cyan_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"cyan_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([248, 222, 214]),
+			color: Color([248, 222, 214]),
 		},
 	),
 	(
 		"cyan_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([21, 137, 145]),
+			color: Color([21, 137, 145]),
 		},
 	),
 	(
 		"cyan_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([21, 119, 136]),
+			color: Color([21, 119, 136]),
 		},
 	),
 	(
 		"cyan_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([36, 147, 157]),
+			color: Color([36, 147, 157]),
 		},
 	),
 	(
 		"cyan_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([52, 118, 125]),
+			color: Color([52, 118, 125]),
 		},
 	),
 	(
 		"cyan_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([20, 121, 135]),
+			color: Color([20, 121, 135]),
 		},
 	),
 	(
 		"cyan_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([76, 127, 153]),
+			color: Color([76, 127, 153]),
 		},
 	),
 	(
 		"cyan_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([73, 122, 147]),
+			color: Color([73, 122, 147]),
 		},
 	),
 	(
 		"cyan_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([86, 91, 91]),
+			color: Color([86, 91, 91]),
 		},
 	),
 	(
 		"cyan_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"cyan_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([21, 137, 145]),
+			color: Color([21, 137, 145]),
 		},
 	),
 	(
 		"damaged_anvil",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([72, 72, 72]),
+			color: Color([72, 72, 72]),
 		},
 	),
 	(
 		"dandelion",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"dark_oak_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"dark_oak_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([76, 51, 25]),
+			color: Color([76, 51, 25]),
 		},
 	),
 	(
 		"dark_oak_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([66, 43, 20]),
+			color: Color([66, 43, 20]),
 		},
 	),
 	(
 		"dark_oak_fence_gate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([66, 43, 20]),
+			color: Color([66, 43, 20]),
 		},
 	),
 	(
 		"dark_oak_leaves",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
-			color: BlockColor([150, 150, 150]),
+			color: Color([150, 150, 150]),
 		},
 	),
 	(
 		"dark_oak_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([67, 45, 22]),
+			color: Color([67, 45, 22]),
 		},
 	),
 	(
 		"dark_oak_planks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([66, 43, 20]),
+			color: Color([66, 43, 20]),
 		},
 	),
 	(
 		"dark_oak_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([66, 43, 20]),
+			color: Color([66, 43, 20]),
 		},
 	),
 	(
 		"dark_oak_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([61, 90, 30]),
+			color: Color([61, 90, 30]),
 		},
 	),
 	(
 		"dark_oak_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([66, 43, 20]),
+			color: Color([66, 43, 20]),
 		},
 	),
 	(
 		"dark_oak_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([66, 43, 20]),
+			color: Color([66, 43, 20]),
 		},
 	),
 	(
 		"dark_oak_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([66, 43, 20]),
+			color: Color([66, 43, 20]),
 		},
 	),
 	(
 		"dark_oak_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([75, 49, 23]),
+			color: Color([75, 49, 23]),
 		},
 	),
 	(
 		"dark_oak_wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"dark_oak_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([60, 46, 26]),
+			color: Color([60, 46, 26]),
 		},
 	),
 	(
 		"dark_prismarine",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([51, 91, 75]),
+			color: Color([51, 91, 75]),
 		},
 	),
 	(
 		"dark_prismarine_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([51, 91, 75]),
+			color: Color([51, 91, 75]),
 		},
 	),
 	(
 		"dark_prismarine_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([51, 91, 75]),
+			color: Color([51, 91, 75]),
 		},
 	),
 	(
 		"daylight_detector",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([130, 116, 94]),
+			color: Color([130, 116, 94]),
 		},
 	),
 	(
 		"dead_brain_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"dead_brain_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([124, 117, 114]),
+			color: Color([124, 117, 114]),
 		},
 	),
 	(
 		"dead_brain_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"dead_brain_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"dead_bubble_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"dead_bubble_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([131, 123, 119]),
+			color: Color([131, 123, 119]),
 		},
 	),
 	(
 		"dead_bubble_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"dead_bubble_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"dead_bush",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([107, 78, 40]),
+			color: Color([107, 78, 40]),
 		},
 	),
 	(
 		"dead_fire_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"dead_fire_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([131, 123, 119]),
+			color: Color([131, 123, 119]),
 		},
 	),
 	(
 		"dead_fire_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"dead_fire_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"dead_horn_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"dead_horn_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([133, 126, 122]),
+			color: Color([133, 126, 122]),
 		},
 	),
 	(
 		"dead_horn_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"dead_horn_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"dead_tube_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"dead_tube_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([130, 123, 119]),
+			color: Color([130, 123, 119]),
 		},
 	),
 	(
 		"dead_tube_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"dead_tube_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"deepslate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([80, 80, 82]),
+			color: Color([80, 80, 82]),
 		},
 	),
 	(
 		"deepslate_brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([70, 70, 71]),
+			color: Color([70, 70, 71]),
 		},
 	),
 	(
 		"deepslate_brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([70, 70, 71]),
+			color: Color([70, 70, 71]),
 		},
 	),
 	(
 		"deepslate_brick_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([70, 70, 71]),
+			color: Color([70, 70, 71]),
 		},
 	),
 	(
 		"deepslate_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([70, 70, 71]),
+			color: Color([70, 70, 71]),
 		},
 	),
 	(
 		"deepslate_coal_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([74, 74, 76]),
+			color: Color([74, 74, 76]),
 		},
 	),
 	(
 		"deepslate_copper_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([92, 93, 89]),
+			color: Color([92, 93, 89]),
 		},
 	),
 	(
 		"deepslate_diamond_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([83, 106, 106]),
+			color: Color([83, 106, 106]),
 		},
 	),
 	(
 		"deepslate_emerald_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([78, 104, 87]),
+			color: Color([78, 104, 87]),
 		},
 	),
 	(
 		"deepslate_gold_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([115, 102, 78]),
+			color: Color([115, 102, 78]),
 		},
 	),
 	(
 		"deepslate_iron_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([106, 99, 94]),
+			color: Color([106, 99, 94]),
 		},
 	),
 	(
 		"deepslate_lapis_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([79, 90, 115]),
+			color: Color([79, 90, 115]),
 		},
 	),
 	(
 		"deepslate_redstone_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([104, 73, 74]),
+			color: Color([104, 73, 74]),
 		},
 	),
 	(
 		"deepslate_tile_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([54, 54, 55]),
+			color: Color([54, 54, 55]),
 		},
 	),
 	(
 		"deepslate_tile_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([54, 54, 55]),
+			color: Color([54, 54, 55]),
 		},
 	),
 	(
 		"deepslate_tile_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([54, 54, 55]),
+			color: Color([54, 54, 55]),
 		},
 	),
 	(
 		"deepslate_tiles",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([54, 54, 55]),
+			color: Color([54, 54, 55]),
 		},
 	),
 	(
 		"detector_rail",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([123, 104, 90]),
+			color: Color([123, 104, 90]),
 		},
 	),
 	(
 		"diamond_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([98, 237, 228]),
+			color: Color([98, 237, 228]),
 		},
 	),
 	(
 		"diamond_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([121, 141, 140]),
+			color: Color([121, 141, 140]),
 		},
 	),
 	(
 		"diorite",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([188, 188, 188]),
+			color: Color([188, 188, 188]),
 		},
 	),
 	(
 		"diorite_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([188, 188, 188]),
+			color: Color([188, 188, 188]),
 		},
 	),
 	(
 		"diorite_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([188, 188, 188]),
+			color: Color([188, 188, 188]),
 		},
 	),
 	(
 		"diorite_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([188, 188, 188]),
+			color: Color([188, 188, 188]),
 		},
 	),
 	(
 		"dirt",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([134, 96, 67]),
+			color: Color([134, 96, 67]),
 		},
 	),
 	(
 		"dirt_path",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([148, 121, 65]),
+			color: Color([148, 121, 65]),
 		},
 	),
 	(
 		"dispenser",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([110, 109, 109]),
+			color: Color([110, 109, 109]),
 		},
 	),
 	(
 		"dragon_egg",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([12, 9, 15]),
+			color: Color([12, 9, 15]),
 		},
 	),
 	(
 		"dragon_head",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"dragon_wall_head",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"dried_kelp_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([50, 58, 38]),
+			color: Color([50, 58, 38]),
 		},
 	),
 	(
 		"dripstone_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([134, 107, 92]),
+			color: Color([134, 107, 92]),
 		},
 	),
 	(
 		"dropper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([110, 109, 109]),
+			color: Color([110, 109, 109]),
 		},
 	),
 	(
 		"emerald_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([42, 203, 87]),
+			color: Color([42, 203, 87]),
 		},
 	),
 	(
 		"emerald_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([108, 136, 115]),
+			color: Color([108, 136, 115]),
 		},
 	),
 	(
 		"enchanting_table",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([128, 75, 85]),
+			color: Color([128, 75, 85]),
 		},
 	),
 	(
 		"end_gateway",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([15, 10, 24]),
+			color: Color([15, 10, 24]),
 		},
 	),
 	(
 		"end_portal",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([15, 10, 24]),
+			color: Color([15, 10, 24]),
 		},
 	),
 	(
 		"end_portal_frame",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([91, 120, 97]),
+			color: Color([91, 120, 97]),
 		},
 	),
 	(
 		"end_rod",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"end_stone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([219, 222, 158]),
+			color: Color([219, 222, 158]),
 		},
 	),
 	(
 		"end_stone_brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([218, 224, 162]),
+			color: Color([218, 224, 162]),
 		},
 	),
 	(
 		"end_stone_brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([218, 224, 162]),
+			color: Color([218, 224, 162]),
 		},
 	),
 	(
 		"end_stone_brick_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([218, 224, 162]),
+			color: Color([218, 224, 162]),
 		},
 	),
 	(
 		"end_stone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([218, 224, 162]),
+			color: Color([218, 224, 162]),
 		},
 	),
 	(
 		"ender_chest",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([15, 10, 24]),
+			color: Color([15, 10, 24]),
 		},
 	),
 	(
 		"exposed_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([161, 125, 103]),
+			color: Color([161, 125, 103]),
 		},
 	),
 	(
 		"exposed_cut_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([154, 121, 101]),
+			color: Color([154, 121, 101]),
 		},
 	),
 	(
 		"exposed_cut_copper_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([154, 121, 101]),
+			color: Color([154, 121, 101]),
 		},
 	),
 	(
 		"exposed_cut_copper_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([154, 121, 101]),
+			color: Color([154, 121, 101]),
 		},
 	),
 	(
 		"farmland",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([81, 44, 15]),
+			color: Color([81, 44, 15]),
 		},
 	),
 	(
 		"fern",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"fire",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([211, 140, 53]),
+			color: Color([211, 140, 53]),
 		},
 	),
 	(
 		"fire_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"fire_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([163, 35, 46]),
+			color: Color([163, 35, 46]),
 		},
 	),
 	(
 		"fire_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"fire_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"fletching_table",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([197, 180, 133]),
+			color: Color([197, 180, 133]),
 		},
 	),
 	(
 		"flower_pot",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([124, 68, 53]),
+			color: Color([124, 68, 53]),
 		},
 	),
 	(
 		"flowering_azalea",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([112, 121, 64]),
+			color: Color([112, 121, 64]),
 		},
 	),
 	(
 		"flowering_azalea_leaves",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([99, 111, 60]),
+			color: Color([99, 111, 60]),
 		},
 	),
 	(
 		"frogspawn",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([105, 90, 82]),
+			color: Color([105, 90, 82]),
 		},
 	),
 	(
 		"frosted_ice",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([140, 181, 252]),
+			color: Color([140, 181, 252]),
 		},
 	),
 	(
 		"furnace",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([110, 109, 109]),
+			color: Color([110, 109, 109]),
 		},
 	),
 	(
 		"gilded_blackstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([55, 42, 38]),
+			color: Color([55, 42, 38]),
 		},
 	),
 	(
 		"glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([175, 213, 219]),
+			color: Color([175, 213, 219]),
 		},
 	),
 	(
 		"glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([170, 210, 217]),
+			color: Color([170, 210, 217]),
 		},
 	),
 	(
 		"glow_item_frame",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"glow_lichen",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"glowstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([171, 131, 84]),
+			color: Color([171, 131, 84]),
 		},
 	),
 	(
 		"gold_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([246, 208, 61]),
+			color: Color([246, 208, 61]),
 		},
 	),
 	(
 		"gold_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([145, 133, 106]),
+			color: Color([145, 133, 106]),
 		},
 	),
 	(
 		"granite",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([149, 103, 85]),
+			color: Color([149, 103, 85]),
 		},
 	),
 	(
 		"granite_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([149, 103, 85]),
+			color: Color([149, 103, 85]),
 		},
 	),
 	(
 		"granite_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([149, 103, 85]),
+			color: Color([149, 103, 85]),
 		},
 	),
 	(
 		"granite_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([149, 103, 85]),
+			color: Color([149, 103, 85]),
 		},
 	),
 	(
 		"grass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"grass_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: BlockColor([147, 147, 147]),
+			color: Color([147, 147, 147]),
 		},
 	),
 	(
 		"grass_path",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([148, 121, 65]),
+			color: Color([148, 121, 65]),
 		},
 	),
 	(
 		"gravel",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([131, 127, 126]),
+			color: Color([131, 127, 126]),
 		},
 	),
 	(
 		"gray_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"gray_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"gray_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"gray_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([248, 222, 214]),
+			color: Color([248, 222, 214]),
 		},
 	),
 	(
 		"gray_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([62, 68, 71]),
+			color: Color([62, 68, 71]),
 		},
 	),
 	(
 		"gray_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([54, 57, 61]),
+			color: Color([54, 57, 61]),
 		},
 	),
 	(
 		"gray_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([76, 81, 84]),
+			color: Color([76, 81, 84]),
 		},
 	),
 	(
 		"gray_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([83, 90, 93]),
+			color: Color([83, 90, 93]),
 		},
 	),
 	(
 		"gray_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([55, 58, 62]),
+			color: Color([55, 58, 62]),
 		},
 	),
 	(
 		"gray_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([76, 76, 76]),
+			color: Color([76, 76, 76]),
 		},
 	),
 	(
 		"gray_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([73, 73, 73]),
+			color: Color([73, 73, 73]),
 		},
 	),
 	(
 		"gray_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([57, 42, 35]),
+			color: Color([57, 42, 35]),
 		},
 	),
 	(
 		"gray_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"gray_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([62, 68, 71]),
+			color: Color([62, 68, 71]),
 		},
 	),
 	(
 		"green_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"green_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"green_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"green_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([248, 222, 214]),
+			color: Color([248, 222, 214]),
 		},
 	),
 	(
 		"green_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([84, 109, 27]),
+			color: Color([84, 109, 27]),
 		},
 	),
 	(
 		"green_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([73, 91, 36]),
+			color: Color([73, 91, 36]),
 		},
 	),
 	(
 		"green_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([97, 119, 44]),
+			color: Color([97, 119, 44]),
 		},
 	),
 	(
 		"green_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([117, 142, 67]),
+			color: Color([117, 142, 67]),
 		},
 	),
 	(
 		"green_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([79, 100, 31]),
+			color: Color([79, 100, 31]),
 		},
 	),
 	(
 		"green_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([102, 127, 51]),
+			color: Color([102, 127, 51]),
 		},
 	),
 	(
 		"green_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([97, 122, 48]),
+			color: Color([97, 122, 48]),
 		},
 	),
 	(
 		"green_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([76, 83, 42]),
+			color: Color([76, 83, 42]),
 		},
 	),
 	(
 		"green_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"green_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([84, 109, 27]),
+			color: Color([84, 109, 27]),
 		},
 	),
 	(
 		"grindstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([142, 142, 142]),
+			color: Color([142, 142, 142]),
 		},
 	),
 	(
 		"hanging_roots",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([161, 115, 91]),
+			color: Color([161, 115, 91]),
 		},
 	),
 	(
 		"hay_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([165, 139, 12]),
+			color: Color([165, 139, 12]),
 		},
 	),
 	(
 		"heavy_weighted_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([220, 220, 220]),
+			color: Color([220, 220, 220]),
 		},
 	),
 	(
 		"honey_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([251, 185, 52]),
+			color: Color([251, 185, 52]),
 		},
 	),
 	(
 		"honeycomb_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([229, 148, 29]),
+			color: Color([229, 148, 29]),
 		},
 	),
 	(
 		"hopper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([75, 74, 75]),
+			color: Color([75, 74, 75]),
 		},
 	),
 	(
 		"horn_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"horn_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([216, 199, 66]),
+			color: Color([216, 199, 66]),
 		},
 	),
 	(
 		"horn_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"horn_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"ice",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([145, 183, 253]),
+			color: Color([145, 183, 253]),
 		},
 	),
 	(
 		"infested_chiseled_stone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([119, 118, 119]),
+			color: Color([119, 118, 119]),
 		},
 	),
 	(
 		"infested_cobblestone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([127, 127, 127]),
+			color: Color([127, 127, 127]),
 		},
 	),
 	(
 		"infested_cracked_stone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([118, 117, 118]),
+			color: Color([118, 117, 118]),
 		},
 	),
 	(
 		"infested_deepslate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([80, 80, 82]),
+			color: Color([80, 80, 82]),
 		},
 	),
 	(
 		"infested_mossy_stone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([115, 121, 105]),
+			color: Color([115, 121, 105]),
 		},
 	),
 	(
 		"infested_stone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([125, 125, 125]),
+			color: Color([125, 125, 125]),
 		},
 	),
 	(
 		"infested_stone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([122, 121, 122]),
+			color: Color([122, 121, 122]),
 		},
 	),
 	(
 		"iron_bars",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([136, 139, 135]),
+			color: Color([136, 139, 135]),
 		},
 	),
 	(
 		"iron_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([220, 220, 220]),
+			color: Color([220, 220, 220]),
 		},
 	),
 	(
 		"iron_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([194, 193, 193]),
+			color: Color([194, 193, 193]),
 		},
 	),
 	(
 		"iron_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([136, 129, 122]),
+			color: Color([136, 129, 122]),
 		},
 	),
 	(
 		"iron_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([202, 202, 202]),
+			color: Color([202, 202, 202]),
 		},
 	),
 	(
 		"item_frame",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"jack_o_lantern",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([214, 152, 52]),
+			color: Color([214, 152, 52]),
 		},
 	),
 	(
 		"jigsaw",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([80, 69, 81]),
+			color: Color([80, 69, 81]),
 		},
 	),
 	(
 		"jukebox",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([93, 64, 47]),
+			color: Color([93, 64, 47]),
 		},
 	),
 	(
 		"jungle_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"jungle_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([163, 119, 84]),
+			color: Color([163, 119, 84]),
 		},
 	),
 	(
 		"jungle_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([160, 115, 80]),
+			color: Color([160, 115, 80]),
 		},
 	),
 	(
 		"jungle_fence_gate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([160, 115, 80]),
+			color: Color([160, 115, 80]),
 		},
 	),
 	(
 		"jungle_leaves",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
-			color: BlockColor([156, 154, 143]),
+			color: Color([156, 154, 143]),
 		},
 	),
 	(
 		"jungle_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([149, 109, 70]),
+			color: Color([149, 109, 70]),
 		},
 	),
 	(
 		"jungle_planks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([160, 115, 80]),
+			color: Color([160, 115, 80]),
 		},
 	),
 	(
 		"jungle_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([160, 115, 80]),
+			color: Color([160, 115, 80]),
 		},
 	),
 	(
 		"jungle_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([47, 81, 16]),
+			color: Color([47, 81, 16]),
 		},
 	),
 	(
 		"jungle_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([160, 115, 80]),
+			color: Color([160, 115, 80]),
 		},
 	),
 	(
 		"jungle_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([160, 115, 80]),
+			color: Color([160, 115, 80]),
 		},
 	),
 	(
 		"jungle_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([160, 115, 80]),
+			color: Color([160, 115, 80]),
 		},
 	),
 	(
 		"jungle_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([152, 110, 77]),
+			color: Color([152, 110, 77]),
 		},
 	),
 	(
 		"jungle_wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"jungle_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([85, 67, 25]),
+			color: Color([85, 67, 25]),
 		},
 	),
 	(
 		"kelp",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"kelp_plant",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([86, 130, 42]),
+			color: Color([86, 130, 42]),
 		},
 	),
 	(
 		"ladder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"lantern",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([106, 91, 83]),
+			color: Color([106, 91, 83]),
 		},
 	),
 	(
 		"lapis_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([30, 67, 140]),
+			color: Color([30, 67, 140]),
 		},
 	),
 	(
 		"lapis_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([107, 117, 141]),
+			color: Color([107, 117, 141]),
 		},
 	),
 	(
 		"large_amethyst_bud",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"large_fern",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: BlockColor([125, 125, 125]),
+			color: Color([125, 125, 125]),
 		},
 	),
 	(
 		"lava",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([212, 90, 18]),
+			color: Color([212, 90, 18]),
 		},
 	),
 	(
 		"lava_cauldron",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([73, 72, 74]),
+			color: Color([73, 72, 74]),
 		},
 	),
 	(
 		"lectern",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([173, 137, 83]),
+			color: Color([173, 137, 83]),
 		},
 	),
 	(
 		"lever",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"light",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"light_blue_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"light_blue_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"light_blue_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"light_blue_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([248, 222, 214]),
+			color: Color([248, 222, 214]),
 		},
 	),
 	(
 		"light_blue_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([58, 175, 217]),
+			color: Color([58, 175, 217]),
 		},
 	),
 	(
 		"light_blue_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([35, 137, 198]),
+			color: Color([35, 137, 198]),
 		},
 	),
 	(
 		"light_blue_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([74, 180, 213]),
+			color: Color([74, 180, 213]),
 		},
 	),
 	(
 		"light_blue_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([94, 164, 208]),
+			color: Color([94, 164, 208]),
 		},
 	),
 	(
 		"light_blue_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([49, 163, 212]),
+			color: Color([49, 163, 212]),
 		},
 	),
 	(
 		"light_blue_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([102, 153, 216]),
+			color: Color([102, 153, 216]),
 		},
 	),
 	(
 		"light_blue_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([97, 147, 208]),
+			color: Color([97, 147, 208]),
 		},
 	),
 	(
 		"light_blue_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([113, 108, 137]),
+			color: Color([113, 108, 137]),
 		},
 	),
 	(
 		"light_blue_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"light_blue_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([58, 175, 217]),
+			color: Color([58, 175, 217]),
 		},
 	),
 	(
 		"light_gray_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"light_gray_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"light_gray_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"light_gray_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([248, 222, 214]),
+			color: Color([248, 222, 214]),
 		},
 	),
 	(
 		"light_gray_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([142, 142, 134]),
+			color: Color([142, 142, 134]),
 		},
 	),
 	(
 		"light_gray_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([125, 125, 115]),
+			color: Color([125, 125, 115]),
 		},
 	),
 	(
 		"light_gray_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([154, 154, 148]),
+			color: Color([154, 154, 148]),
 		},
 	),
 	(
 		"light_gray_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([144, 166, 167]),
+			color: Color([144, 166, 167]),
 		},
 	),
 	(
 		"light_gray_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([124, 124, 115]),
+			color: Color([124, 124, 115]),
 		},
 	),
 	(
 		"light_gray_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([153, 153, 153]),
+			color: Color([153, 153, 153]),
 		},
 	),
 	(
 		"light_gray_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([147, 147, 147]),
+			color: Color([147, 147, 147]),
 		},
 	),
 	(
 		"light_gray_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([135, 106, 97]),
+			color: Color([135, 106, 97]),
 		},
 	),
 	(
 		"light_gray_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"light_gray_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([142, 142, 134]),
+			color: Color([142, 142, 134]),
 		},
 	),
 	(
 		"light_weighted_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([246, 208, 61]),
+			color: Color([246, 208, 61]),
 		},
 	),
 	(
 		"lightning_rod",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"lilac",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([154, 125, 147]),
+			color: Color([154, 125, 147]),
 		},
 	),
 	(
 		"lily_of_the_valley",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"lily_pad",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: BlockColor([133, 133, 133]),
+			color: Color([133, 133, 133]),
 		},
 	),
 	(
 		"lime_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"lime_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"lime_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"lime_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([248, 222, 214]),
+			color: Color([248, 222, 214]),
 		},
 	),
 	(
 		"lime_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([112, 185, 25]),
+			color: Color([112, 185, 25]),
 		},
 	),
 	(
 		"lime_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([94, 168, 24]),
+			color: Color([94, 168, 24]),
 		},
 	),
 	(
 		"lime_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([125, 189, 41]),
+			color: Color([125, 189, 41]),
 		},
 	),
 	(
 		"lime_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([162, 197, 55]),
+			color: Color([162, 197, 55]),
 		},
 	),
 	(
 		"lime_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([99, 172, 23]),
+			color: Color([99, 172, 23]),
 		},
 	),
 	(
 		"lime_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([127, 204, 25]),
+			color: Color([127, 204, 25]),
 		},
 	),
 	(
 		"lime_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([122, 196, 24]),
+			color: Color([122, 196, 24]),
 		},
 	),
 	(
 		"lime_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([103, 117, 52]),
+			color: Color([103, 117, 52]),
 		},
 	),
 	(
 		"lime_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"lime_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([112, 185, 25]),
+			color: Color([112, 185, 25]),
 		},
 	),
 	(
 		"lodestone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([147, 149, 152]),
+			color: Color([147, 149, 152]),
 		},
 	),
 	(
 		"loom",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([142, 119, 91]),
+			color: Color([142, 119, 91]),
 		},
 	),
 	(
 		"magenta_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"magenta_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"magenta_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"magenta_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([248, 222, 214]),
+			color: Color([248, 222, 214]),
 		},
 	),
 	(
 		"magenta_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([189, 68, 179]),
+			color: Color([189, 68, 179]),
 		},
 	),
 	(
 		"magenta_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([169, 48, 159]),
+			color: Color([169, 48, 159]),
 		},
 	),
 	(
 		"magenta_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([192, 83, 184]),
+			color: Color([192, 83, 184]),
 		},
 	),
 	(
 		"magenta_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([208, 100, 191]),
+			color: Color([208, 100, 191]),
 		},
 	),
 	(
 		"magenta_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([173, 54, 163]),
+			color: Color([173, 54, 163]),
 		},
 	),
 	(
 		"magenta_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([178, 76, 216]),
+			color: Color([178, 76, 216]),
 		},
 	),
 	(
 		"magenta_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([171, 73, 208]),
+			color: Color([171, 73, 208]),
 		},
 	),
 	(
 		"magenta_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([149, 88, 108]),
+			color: Color([149, 88, 108]),
 		},
 	),
 	(
 		"magenta_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"magenta_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([189, 68, 179]),
+			color: Color([189, 68, 179]),
 		},
 	),
 	(
 		"magma_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([142, 63, 31]),
+			color: Color([142, 63, 31]),
 		},
 	),
 	(
 		"mangrove_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"mangrove_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([112, 48, 46]),
+			color: Color([112, 48, 46]),
 		},
 	),
 	(
 		"mangrove_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([117, 54, 48]),
+			color: Color([117, 54, 48]),
 		},
 	),
 	(
 		"mangrove_fence_gate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([117, 54, 48]),
+			color: Color([117, 54, 48]),
 		},
 	),
 	(
 		"mangrove_leaves",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
-			color: BlockColor([129, 128, 128]),
+			color: Color([129, 128, 128]),
 		},
 	),
 	(
 		"mangrove_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([102, 48, 42]),
+			color: Color([102, 48, 42]),
 		},
 	),
 	(
 		"mangrove_planks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([117, 54, 48]),
+			color: Color([117, 54, 48]),
 		},
 	),
 	(
 		"mangrove_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([117, 54, 48]),
+			color: Color([117, 54, 48]),
 		},
 	),
 	(
 		"mangrove_propagule",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([96, 174, 83]),
+			color: Color([96, 174, 83]),
 		},
 	),
 	(
 		"mangrove_roots",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([74, 59, 38]),
+			color: Color([74, 59, 38]),
 		},
 	),
 	(
 		"mangrove_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([117, 54, 48]),
+			color: Color([117, 54, 48]),
 		},
 	),
 	(
 		"mangrove_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([117, 54, 48]),
+			color: Color([117, 54, 48]),
 		},
 	),
 	(
 		"mangrove_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([117, 54, 48]),
+			color: Color([117, 54, 48]),
 		},
 	),
 	(
 		"mangrove_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([110, 46, 42]),
+			color: Color([110, 46, 42]),
 		},
 	),
 	(
 		"mangrove_wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"mangrove_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([83, 66, 41]),
+			color: Color([83, 66, 41]),
 		},
 	),
 	(
 		"medium_amethyst_bud",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"melon",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([111, 144, 30]),
+			color: Color([111, 144, 30]),
 		},
 	),
 	(
 		"melon_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: BlockColor([153, 153, 153]),
+			color: Color([153, 153, 153]),
 		},
 	),
 	(
 		"moss_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([89, 109, 45]),
+			color: Color([89, 109, 45]),
 		},
 	),
 	(
 		"moss_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([89, 109, 45]),
+			color: Color([89, 109, 45]),
 		},
 	),
 	(
 		"mossy_cobblestone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([110, 118, 94]),
+			color: Color([110, 118, 94]),
 		},
 	),
 	(
 		"mossy_cobblestone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([110, 118, 94]),
+			color: Color([110, 118, 94]),
 		},
 	),
 	(
 		"mossy_cobblestone_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([110, 118, 94]),
+			color: Color([110, 118, 94]),
 		},
 	),
 	(
 		"mossy_cobblestone_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([110, 118, 94]),
+			color: Color([110, 118, 94]),
 		},
 	),
 	(
 		"mossy_stone_brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([115, 121, 105]),
+			color: Color([115, 121, 105]),
 		},
 	),
 	(
 		"mossy_stone_brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([115, 121, 105]),
+			color: Color([115, 121, 105]),
 		},
 	),
 	(
 		"mossy_stone_brick_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([115, 121, 105]),
+			color: Color([115, 121, 105]),
 		},
 	),
 	(
 		"mossy_stone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([115, 121, 105]),
+			color: Color([115, 121, 105]),
 		},
 	),
 	(
 		"moving_piston",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"mud",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([60, 57, 60]),
+			color: Color([60, 57, 60]),
 		},
 	),
 	(
 		"mud_brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([137, 103, 79]),
+			color: Color([137, 103, 79]),
 		},
 	),
 	(
 		"mud_brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([137, 103, 79]),
+			color: Color([137, 103, 79]),
 		},
 	),
 	(
 		"mud_brick_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([137, 103, 79]),
+			color: Color([137, 103, 79]),
 		},
 	),
 	(
 		"mud_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([137, 103, 79]),
+			color: Color([137, 103, 79]),
 		},
 	),
 	(
 		"muddy_mangrove_roots",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([70, 58, 45]),
+			color: Color([70, 58, 45]),
 		},
 	),
 	(
 		"mushroom_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([203, 196, 185]),
+			color: Color([203, 196, 185]),
 		},
 	),
 	(
 		"mycelium",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([111, 98, 101]),
+			color: Color([111, 98, 101]),
 		},
 	),
 	(
 		"nether_brick_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([44, 21, 26]),
+			color: Color([44, 21, 26]),
 		},
 	),
 	(
 		"nether_brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([44, 21, 26]),
+			color: Color([44, 21, 26]),
 		},
 	),
 	(
 		"nether_brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([44, 21, 26]),
+			color: Color([44, 21, 26]),
 		},
 	),
 	(
 		"nether_brick_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([44, 21, 26]),
+			color: Color([44, 21, 26]),
 		},
 	),
 	(
 		"nether_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([44, 21, 26]),
+			color: Color([44, 21, 26]),
 		},
 	),
 	(
 		"nether_gold_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([115, 54, 42]),
+			color: Color([115, 54, 42]),
 		},
 	),
 	(
 		"nether_portal",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([89, 11, 192]),
+			color: Color([89, 11, 192]),
 		},
 	),
 	(
 		"nether_quartz_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([117, 65, 62]),
+			color: Color([117, 65, 62]),
 		},
 	),
 	(
 		"nether_sprouts",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([19, 151, 133]),
+			color: Color([19, 151, 133]),
 		},
 	),
 	(
 		"nether_wart",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([111, 18, 19]),
+			color: Color([111, 18, 19]),
 		},
 	),
 	(
 		"nether_wart_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([114, 2, 2]),
+			color: Color([114, 2, 2]),
 		},
 	),
 	(
 		"netherite_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([66, 61, 63]),
+			color: Color([66, 61, 63]),
 		},
 	),
 	(
 		"netherrack",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([97, 38, 38]),
+			color: Color([97, 38, 38]),
 		},
 	),
 	(
 		"note_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([88, 58, 40]),
+			color: Color([88, 58, 40]),
 		},
 	),
 	(
 		"oak_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"oak_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([140, 110, 66]),
+			color: Color([140, 110, 66]),
 		},
 	),
 	(
 		"oak_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([162, 130, 78]),
+			color: Color([162, 130, 78]),
 		},
 	),
 	(
 		"oak_fence_gate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([162, 130, 78]),
+			color: Color([162, 130, 78]),
 		},
 	),
 	(
 		"oak_leaves",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
-			color: BlockColor([144, 144, 144]),
+			color: Color([144, 144, 144]),
 		},
 	),
 	(
 		"oak_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([151, 121, 73]),
+			color: Color([151, 121, 73]),
 		},
 	),
 	(
 		"oak_planks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([162, 130, 78]),
+			color: Color([162, 130, 78]),
 		},
 	),
 	(
 		"oak_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([162, 130, 78]),
+			color: Color([162, 130, 78]),
 		},
 	),
 	(
 		"oak_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([77, 106, 40]),
+			color: Color([77, 106, 40]),
 		},
 	),
 	(
 		"oak_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([162, 130, 78]),
+			color: Color([162, 130, 78]),
 		},
 	),
 	(
 		"oak_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([162, 130, 78]),
+			color: Color([162, 130, 78]),
 		},
 	),
 	(
 		"oak_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([162, 130, 78]),
+			color: Color([162, 130, 78]),
 		},
 	),
 	(
 		"oak_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([124, 99, 56]),
+			color: Color([124, 99, 56]),
 		},
 	),
 	(
 		"oak_wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"oak_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([109, 85, 50]),
+			color: Color([109, 85, 50]),
 		},
 	),
 	(
 		"observer",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([98, 98, 98]),
+			color: Color([98, 98, 98]),
 		},
 	),
 	(
 		"obsidian",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([15, 10, 24]),
+			color: Color([15, 10, 24]),
 		},
 	),
 	(
 		"ochre_froglight",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([250, 245, 206]),
+			color: Color([250, 245, 206]),
 		},
 	),
 	(
 		"orange_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"orange_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"orange_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"orange_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([248, 222, 214]),
+			color: Color([248, 222, 214]),
 		},
 	),
 	(
 		"orange_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([240, 118, 19]),
+			color: Color([240, 118, 19]),
 		},
 	),
 	(
 		"orange_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([224, 97, 0]),
+			color: Color([224, 97, 0]),
 		},
 	),
 	(
 		"orange_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([227, 131, 31]),
+			color: Color([227, 131, 31]),
 		},
 	),
 	(
 		"orange_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([154, 147, 91]),
+			color: Color([154, 147, 91]),
 		},
 	),
 	(
 		"orange_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([234, 106, 8]),
+			color: Color([234, 106, 8]),
 		},
 	),
 	(
 		"orange_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([216, 127, 51]),
+			color: Color([216, 127, 51]),
 		},
 	),
 	(
 		"orange_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([208, 122, 48]),
+			color: Color([208, 122, 48]),
 		},
 	),
 	(
 		"orange_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([161, 83, 37]),
+			color: Color([161, 83, 37]),
 		},
 	),
 	(
 		"orange_tulip",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"orange_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"orange_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([240, 118, 19]),
+			color: Color([240, 118, 19]),
 		},
 	),
 	(
 		"oxeye_daisy",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"oxidized_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([82, 162, 132]),
+			color: Color([82, 162, 132]),
 		},
 	),
 	(
 		"oxidized_cut_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([79, 153, 126]),
+			color: Color([79, 153, 126]),
 		},
 	),
 	(
 		"oxidized_cut_copper_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([79, 153, 126]),
+			color: Color([79, 153, 126]),
 		},
 	),
 	(
 		"oxidized_cut_copper_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([79, 153, 126]),
+			color: Color([79, 153, 126]),
 		},
 	),
 	(
 		"packed_ice",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([141, 180, 250]),
+			color: Color([141, 180, 250]),
 		},
 	),
 	(
 		"packed_mud",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([142, 106, 79]),
+			color: Color([142, 106, 79]),
 		},
 	),
 	(
 		"pearlescent_froglight",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([245, 240, 239]),
+			color: Color([245, 240, 239]),
 		},
 	),
 	(
 		"peony",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([129, 126, 139]),
+			color: Color([129, 126, 139]),
 		},
 	),
 	(
 		"petrified_oak_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([162, 130, 78]),
+			color: Color([162, 130, 78]),
 		},
 	),
 	(
 		"pink_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"pink_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"pink_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"pink_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([248, 222, 214]),
+			color: Color([248, 222, 214]),
 		},
 	),
 	(
 		"pink_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([237, 141, 172]),
+			color: Color([237, 141, 172]),
 		},
 	),
 	(
 		"pink_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([213, 101, 142]),
+			color: Color([213, 101, 142]),
 		},
 	),
 	(
 		"pink_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([228, 153, 181]),
+			color: Color([228, 153, 181]),
 		},
 	),
 	(
 		"pink_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([235, 154, 181]),
+			color: Color([235, 154, 181]),
 		},
 	),
 	(
 		"pink_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([230, 121, 157]),
+			color: Color([230, 121, 157]),
 		},
 	),
 	(
 		"pink_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([242, 127, 165]),
+			color: Color([242, 127, 165]),
 		},
 	),
 	(
 		"pink_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([233, 122, 159]),
+			color: Color([233, 122, 159]),
 		},
 	),
 	(
 		"pink_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([161, 78, 78]),
+			color: Color([161, 78, 78]),
 		},
 	),
 	(
 		"pink_tulip",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"pink_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"pink_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([237, 141, 172]),
+			color: Color([237, 141, 172]),
 		},
 	),
 	(
 		"piston",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([109, 104, 96]),
+			color: Color([109, 104, 96]),
 		},
 	),
 	(
 		"piston_head",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([153, 127, 85]),
+			color: Color([153, 127, 85]),
 		},
 	),
 	(
 		"player_head",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"player_wall_head",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"podzol",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([91, 63, 24]),
+			color: Color([91, 63, 24]),
 		},
 	),
 	(
 		"pointed_dripstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([129, 102, 89]),
+			color: Color([129, 102, 89]),
 		},
 	),
 	(
 		"polished_andesite",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([132, 134, 133]),
+			color: Color([132, 134, 133]),
 		},
 	),
 	(
 		"polished_andesite_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([132, 134, 133]),
+			color: Color([132, 134, 133]),
 		},
 	),
 	(
 		"polished_andesite_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([132, 134, 133]),
+			color: Color([132, 134, 133]),
 		},
 	),
 	(
 		"polished_basalt",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([99, 98, 100]),
+			color: Color([99, 98, 100]),
 		},
 	),
 	(
 		"polished_blackstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([53, 48, 56]),
+			color: Color([53, 48, 56]),
 		},
 	),
 	(
 		"polished_blackstone_brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([48, 42, 49]),
+			color: Color([48, 42, 49]),
 		},
 	),
 	(
 		"polished_blackstone_brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([48, 42, 49]),
+			color: Color([48, 42, 49]),
 		},
 	),
 	(
 		"polished_blackstone_brick_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([48, 42, 49]),
+			color: Color([48, 42, 49]),
 		},
 	),
 	(
 		"polished_blackstone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([48, 42, 49]),
+			color: Color([48, 42, 49]),
 		},
 	),
 	(
 		"polished_blackstone_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"polished_blackstone_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([53, 48, 56]),
+			color: Color([53, 48, 56]),
 		},
 	),
 	(
 		"polished_blackstone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([53, 48, 56]),
+			color: Color([53, 48, 56]),
 		},
 	),
 	(
 		"polished_blackstone_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([53, 48, 56]),
+			color: Color([53, 48, 56]),
 		},
 	),
 	(
 		"polished_blackstone_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([53, 48, 56]),
+			color: Color([53, 48, 56]),
 		},
 	),
 	(
 		"polished_deepslate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([72, 72, 73]),
+			color: Color([72, 72, 73]),
 		},
 	),
 	(
 		"polished_deepslate_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([72, 72, 73]),
+			color: Color([72, 72, 73]),
 		},
 	),
 	(
 		"polished_deepslate_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([72, 72, 73]),
+			color: Color([72, 72, 73]),
 		},
 	),
 	(
 		"polished_deepslate_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([72, 72, 73]),
+			color: Color([72, 72, 73]),
 		},
 	),
 	(
 		"polished_diorite",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([192, 193, 194]),
+			color: Color([192, 193, 194]),
 		},
 	),
 	(
 		"polished_diorite_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([192, 193, 194]),
+			color: Color([192, 193, 194]),
 		},
 	),
 	(
 		"polished_diorite_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([192, 193, 194]),
+			color: Color([192, 193, 194]),
 		},
 	),
 	(
 		"polished_granite",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([154, 106, 89]),
+			color: Color([154, 106, 89]),
 		},
 	),
 	(
 		"polished_granite_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([154, 106, 89]),
+			color: Color([154, 106, 89]),
 		},
 	),
 	(
 		"polished_granite_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([154, 106, 89]),
+			color: Color([154, 106, 89]),
 		},
 	),
 	(
 		"poppy",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"potatoes",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([84, 135, 47]),
+			color: Color([84, 135, 47]),
 		},
 	),
 	(
 		"potted_acacia_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([118, 117, 23]),
+			color: Color([118, 117, 23]),
 		},
 	),
 	(
 		"potted_allium",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([158, 137, 183]),
+			color: Color([158, 137, 183]),
 		},
 	),
 	(
 		"potted_azalea_bush",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([101, 124, 47]),
+			color: Color([101, 124, 47]),
 		},
 	),
 	(
 		"potted_azure_bluet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([169, 204, 127]),
+			color: Color([169, 204, 127]),
 		},
 	),
 	(
 		"potted_bamboo",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([93, 144, 19]),
+			color: Color([93, 144, 19]),
 		},
 	),
 	(
 		"potted_birch_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([127, 160, 79]),
+			color: Color([127, 160, 79]),
 		},
 	),
 	(
 		"potted_blue_orchid",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([47, 162, 168]),
+			color: Color([47, 162, 168]),
 		},
 	),
 	(
 		"potted_brown_mushroom",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([153, 116, 92]),
+			color: Color([153, 116, 92]),
 		},
 	),
 	(
 		"potted_cactus",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([85, 127, 43]),
+			color: Color([85, 127, 43]),
 		},
 	),
 	(
 		"potted_cornflower",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([79, 121, 146]),
+			color: Color([79, 121, 146]),
 		},
 	),
 	(
 		"potted_crimson_fungus",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([141, 44, 29]),
+			color: Color([141, 44, 29]),
 		},
 	),
 	(
 		"potted_crimson_roots",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([127, 8, 41]),
+			color: Color([127, 8, 41]),
 		},
 	),
 	(
 		"potted_dandelion",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([147, 172, 43]),
+			color: Color([147, 172, 43]),
 		},
 	),
 	(
 		"potted_dark_oak_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([61, 90, 30]),
+			color: Color([61, 90, 30]),
 		},
 	),
 	(
 		"potted_dead_bush",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([107, 78, 40]),
+			color: Color([107, 78, 40]),
 		},
 	),
 	(
 		"potted_fern",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: BlockColor([124, 124, 124]),
+			color: Color([124, 124, 124]),
 		},
 	),
 	(
 		"potted_flowering_azalea_bush",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([112, 121, 64]),
+			color: Color([112, 121, 64]),
 		},
 	),
 	(
 		"potted_jungle_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([47, 81, 16]),
+			color: Color([47, 81, 16]),
 		},
 	),
 	(
 		"potted_lily_of_the_valley",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([123, 174, 95]),
+			color: Color([123, 174, 95]),
 		},
 	),
 	(
 		"potted_mangrove_propagule",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([96, 174, 83]),
+			color: Color([96, 174, 83]),
 		},
 	),
 	(
 		"potted_oak_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([77, 106, 40]),
+			color: Color([77, 106, 40]),
 		},
 	),
 	(
 		"potted_orange_tulip",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([93, 142, 30]),
+			color: Color([93, 142, 30]),
 		},
 	),
 	(
 		"potted_oxeye_daisy",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([179, 202, 143]),
+			color: Color([179, 202, 143]),
 		},
 	),
 	(
 		"potted_pink_tulip",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([99, 157, 78]),
+			color: Color([99, 157, 78]),
 		},
 	),
 	(
 		"potted_poppy",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([128, 64, 37]),
+			color: Color([128, 64, 37]),
 		},
 	),
 	(
 		"potted_red_mushroom",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([216, 75, 67]),
+			color: Color([216, 75, 67]),
 		},
 	),
 	(
 		"potted_red_tulip",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([89, 128, 32]),
+			color: Color([89, 128, 32]),
 		},
 	),
 	(
 		"potted_spruce_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([44, 60, 36]),
+			color: Color([44, 60, 36]),
 		},
 	),
 	(
 		"potted_warped_fungus",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([74, 109, 87]),
+			color: Color([74, 109, 87]),
 		},
 	),
 	(
 		"potted_warped_roots",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([20, 136, 123]),
+			color: Color([20, 136, 123]),
 		},
 	),
 	(
 		"potted_white_tulip",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([93, 164, 71]),
+			color: Color([93, 164, 71]),
 		},
 	),
 	(
 		"potted_wither_rose",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([41, 44, 23]),
+			color: Color([41, 44, 23]),
 		},
 	),
 	(
 		"powder_snow",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([248, 253, 253]),
+			color: Color([248, 253, 253]),
 		},
 	),
 	(
 		"powder_snow_cauldron",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([73, 72, 74]),
+			color: Color([73, 72, 74]),
 		},
 	),
 	(
 		"powered_rail",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([137, 109, 74]),
+			color: Color([137, 109, 74]),
 		},
 	),
 	(
 		"prismarine",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([99, 156, 151]),
+			color: Color([99, 156, 151]),
 		},
 	),
 	(
 		"prismarine_brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([99, 171, 158]),
+			color: Color([99, 171, 158]),
 		},
 	),
 	(
 		"prismarine_brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([99, 171, 158]),
+			color: Color([99, 171, 158]),
 		},
 	),
 	(
 		"prismarine_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([99, 171, 158]),
+			color: Color([99, 171, 158]),
 		},
 	),
 	(
 		"prismarine_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([99, 156, 151]),
+			color: Color([99, 156, 151]),
 		},
 	),
 	(
 		"prismarine_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([99, 156, 151]),
+			color: Color([99, 156, 151]),
 		},
 	),
 	(
 		"prismarine_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([99, 156, 151]),
+			color: Color([99, 156, 151]),
 		},
 	),
 	(
 		"pumpkin",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([198, 118, 24]),
+			color: Color([198, 118, 24]),
 		},
 	),
 	(
 		"pumpkin_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: BlockColor([154, 154, 154]),
+			color: Color([154, 154, 154]),
 		},
 	),
 	(
 		"purple_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"purple_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"purple_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"purple_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([248, 222, 214]),
+			color: Color([248, 222, 214]),
 		},
 	),
 	(
 		"purple_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([121, 42, 172]),
+			color: Color([121, 42, 172]),
 		},
 	),
 	(
 		"purple_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([100, 31, 156]),
+			color: Color([100, 31, 156]),
 		},
 	),
 	(
 		"purple_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([131, 55, 177]),
+			color: Color([131, 55, 177]),
 		},
 	),
 	(
 		"purple_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([109, 48, 152]),
+			color: Color([109, 48, 152]),
 		},
 	),
 	(
 		"purple_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([103, 32, 156]),
+			color: Color([103, 32, 156]),
 		},
 	),
 	(
 		"purple_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([127, 63, 178]),
+			color: Color([127, 63, 178]),
 		},
 	),
 	(
 		"purple_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([122, 61, 171]),
+			color: Color([122, 61, 171]),
 		},
 	),
 	(
 		"purple_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([118, 70, 86]),
+			color: Color([118, 70, 86]),
 		},
 	),
 	(
 		"purple_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"purple_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([121, 42, 172]),
+			color: Color([121, 42, 172]),
 		},
 	),
 	(
 		"purpur_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([169, 125, 169]),
+			color: Color([169, 125, 169]),
 		},
 	),
 	(
 		"purpur_pillar",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([171, 129, 171]),
+			color: Color([171, 129, 171]),
 		},
 	),
 	(
 		"purpur_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([169, 125, 169]),
+			color: Color([169, 125, 169]),
 		},
 	),
 	(
 		"purpur_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([169, 125, 169]),
+			color: Color([169, 125, 169]),
 		},
 	),
 	(
 		"quartz_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([235, 229, 222]),
+			color: Color([235, 229, 222]),
 		},
 	),
 	(
 		"quartz_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([234, 229, 221]),
+			color: Color([234, 229, 221]),
 		},
 	),
 	(
 		"quartz_pillar",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([235, 230, 224]),
+			color: Color([235, 230, 224]),
 		},
 	),
 	(
 		"quartz_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([235, 229, 222]),
+			color: Color([235, 229, 222]),
 		},
 	),
 	(
 		"quartz_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([235, 229, 222]),
+			color: Color([235, 229, 222]),
 		},
 	),
 	(
 		"rail",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([125, 111, 88]),
+			color: Color([125, 111, 88]),
 		},
 	),
 	(
 		"raw_copper_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([154, 105, 79]),
+			color: Color([154, 105, 79]),
 		},
 	),
 	(
 		"raw_gold_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([221, 169, 46]),
+			color: Color([221, 169, 46]),
 		},
 	),
 	(
 		"raw_iron_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([166, 135, 107]),
+			color: Color([166, 135, 107]),
 		},
 	),
 	(
 		"red_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"red_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"red_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"red_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([248, 222, 214]),
+			color: Color([248, 222, 214]),
 		},
 	),
 	(
 		"red_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([160, 39, 34]),
+			color: Color([160, 39, 34]),
 		},
 	),
 	(
 		"red_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([142, 32, 32]),
+			color: Color([142, 32, 32]),
 		},
 	),
 	(
 		"red_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([168, 54, 50]),
+			color: Color([168, 54, 50]),
 		},
 	),
 	(
 		"red_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([181, 59, 53]),
+			color: Color([181, 59, 53]),
 		},
 	),
 	(
 		"red_mushroom",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"red_mushroom_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([200, 46, 45]),
+			color: Color([200, 46, 45]),
 		},
 	),
 	(
 		"red_nether_brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([69, 7, 9]),
+			color: Color([69, 7, 9]),
 		},
 	),
 	(
 		"red_nether_brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([69, 7, 9]),
+			color: Color([69, 7, 9]),
 		},
 	),
 	(
 		"red_nether_brick_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([69, 7, 9]),
+			color: Color([69, 7, 9]),
 		},
 	),
 	(
 		"red_nether_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([69, 7, 9]),
+			color: Color([69, 7, 9]),
 		},
 	),
 	(
 		"red_sand",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([190, 102, 33]),
+			color: Color([190, 102, 33]),
 		},
 	),
 	(
 		"red_sandstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([181, 97, 31]),
+			color: Color([181, 97, 31]),
 		},
 	),
 	(
 		"red_sandstone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([181, 97, 31]),
+			color: Color([181, 97, 31]),
 		},
 	),
 	(
 		"red_sandstone_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([181, 97, 31]),
+			color: Color([181, 97, 31]),
 		},
 	),
 	(
 		"red_sandstone_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([181, 97, 31]),
+			color: Color([181, 97, 31]),
 		},
 	),
 	(
 		"red_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([140, 31, 30]),
+			color: Color([140, 31, 30]),
 		},
 	),
 	(
 		"red_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([153, 51, 51]),
+			color: Color([153, 51, 51]),
 		},
 	),
 	(
 		"red_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([147, 48, 48]),
+			color: Color([147, 48, 48]),
 		},
 	),
 	(
 		"red_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([143, 61, 46]),
+			color: Color([143, 61, 46]),
 		},
 	),
 	(
 		"red_tulip",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"red_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"red_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([160, 39, 34]),
+			color: Color([160, 39, 34]),
 		},
 	),
 	(
 		"redstone_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([175, 24, 5]),
+			color: Color([175, 24, 5]),
 		},
 	),
 	(
 		"redstone_lamp",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([95, 54, 30]),
+			color: Color([95, 54, 30]),
 		},
 	),
 	(
 		"redstone_ore",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([140, 109, 109]),
+			color: Color([140, 109, 109]),
 		},
 	),
 	(
 		"redstone_torch",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"redstone_wall_torch",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"redstone_wire",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([175, 24, 5]),
+			color: Color([175, 24, 5]),
 		},
 	),
 	(
 		"reinforced_deepslate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([80, 82, 78]),
+			color: Color([80, 82, 78]),
 		},
 	),
 	(
 		"repeater",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([160, 157, 156]),
+			color: Color([160, 157, 156]),
 		},
 	),
 	(
 		"repeating_command_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([129, 111, 176]),
+			color: Color([129, 111, 176]),
 		},
 	),
 	(
 		"respawn_anchor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([75, 26, 144]),
+			color: Color([75, 26, 144]),
 		},
 	),
 	(
 		"rooted_dirt",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([144, 103, 76]),
+			color: Color([144, 103, 76]),
 		},
 	),
 	(
 		"rose_bush",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([131, 66, 37]),
+			color: Color([131, 66, 37]),
 		},
 	),
 	(
 		"sand",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([219, 207, 163]),
+			color: Color([219, 207, 163]),
 		},
 	),
 	(
 		"sandstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([223, 214, 170]),
+			color: Color([223, 214, 170]),
 		},
 	),
 	(
 		"sandstone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([223, 214, 170]),
+			color: Color([223, 214, 170]),
 		},
 	),
 	(
 		"sandstone_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([223, 214, 170]),
+			color: Color([223, 214, 170]),
 		},
 	),
 	(
 		"sandstone_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([223, 214, 170]),
+			color: Color([223, 214, 170]),
 		},
 	),
 	(
 		"scaffolding",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([174, 134, 80]),
+			color: Color([174, 134, 80]),
 		},
 	),
 	(
 		"sculk",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([12, 29, 36]),
+			color: Color([12, 29, 36]),
 		},
 	),
 	(
 		"sculk_catalyst",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([15, 31, 38]),
+			color: Color([15, 31, 38]),
 		},
 	),
 	(
 		"sculk_sensor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([7, 70, 84]),
+			color: Color([7, 70, 84]),
 		},
 	),
 	(
 		"sculk_shrieker",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([198, 205, 169]),
+			color: Color([198, 205, 169]),
 		},
 	),
 	(
 		"sculk_vein",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([7, 48, 57]),
+			color: Color([7, 48, 57]),
 		},
 	),
 	(
 		"sea_lantern",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([172, 199, 190]),
+			color: Color([172, 199, 190]),
 		},
 	),
 	(
 		"sea_pickle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([90, 97, 39]),
+			color: Color([90, 97, 39]),
 		},
 	),
 	(
 		"seagrass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"shroomlight",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([240, 146, 70]),
+			color: Color([240, 146, 70]),
 		},
 	),
 	(
 		"shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([139, 96, 139]),
+			color: Color([139, 96, 139]),
 		},
 	),
 	(
 		"sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([162, 130, 78]),
+			color: Color([162, 130, 78]),
 		},
 	),
 	(
 		"skeleton_skull",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"skeleton_wall_skull",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"slime_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([111, 192, 91]),
+			color: Color([111, 192, 91]),
 		},
 	),
 	(
 		"small_amethyst_bud",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"small_dripleaf",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"smithing_table",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([57, 58, 70]),
+			color: Color([57, 58, 70]),
 		},
 	),
 	(
 		"smoker",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([85, 83, 81]),
+			color: Color([85, 83, 81]),
 		},
 	),
 	(
 		"smooth_basalt",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([72, 72, 78]),
+			color: Color([72, 72, 78]),
 		},
 	),
 	(
 		"smooth_quartz",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([235, 229, 222]),
+			color: Color([235, 229, 222]),
 		},
 	),
 	(
 		"smooth_quartz_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([235, 229, 222]),
+			color: Color([235, 229, 222]),
 		},
 	),
 	(
 		"smooth_quartz_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([235, 229, 222]),
+			color: Color([235, 229, 222]),
 		},
 	),
 	(
 		"smooth_red_sandstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([181, 97, 31]),
+			color: Color([181, 97, 31]),
 		},
 	),
 	(
 		"smooth_red_sandstone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([181, 97, 31]),
+			color: Color([181, 97, 31]),
 		},
 	),
 	(
 		"smooth_red_sandstone_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([181, 97, 31]),
+			color: Color([181, 97, 31]),
 		},
 	),
 	(
 		"smooth_sandstone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([223, 214, 170]),
+			color: Color([223, 214, 170]),
 		},
 	),
 	(
 		"smooth_sandstone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([223, 214, 170]),
+			color: Color([223, 214, 170]),
 		},
 	),
 	(
 		"smooth_sandstone_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([223, 214, 170]),
+			color: Color([223, 214, 170]),
 		},
 	),
 	(
 		"smooth_stone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([158, 158, 158]),
+			color: Color([158, 158, 158]),
 		},
 	),
 	(
 		"smooth_stone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([158, 158, 158]),
+			color: Color([158, 158, 158]),
 		},
 	),
 	(
 		"snow",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([249, 254, 254]),
+			color: Color([249, 254, 254]),
 		},
 	),
 	(
 		"snow_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([249, 254, 254]),
+			color: Color([249, 254, 254]),
 		},
 	),
 	(
 		"soul_campfire",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([80, 204, 208]),
+			color: Color([80, 204, 208]),
 		},
 	),
 	(
 		"soul_fire",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([51, 192, 197]),
+			color: Color([51, 192, 197]),
 		},
 	),
 	(
 		"soul_lantern",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([71, 99, 114]),
+			color: Color([71, 99, 114]),
 		},
 	),
 	(
 		"soul_sand",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([81, 62, 50]),
+			color: Color([81, 62, 50]),
 		},
 	),
 	(
 		"soul_soil",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([75, 57, 46]),
+			color: Color([75, 57, 46]),
 		},
 	),
 	(
 		"soul_torch",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"soul_wall_torch",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"spawner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([36, 46, 62]),
+			color: Color([36, 46, 62]),
 		},
 	),
 	(
 		"sponge",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([195, 192, 74]),
+			color: Color([195, 192, 74]),
 		},
 	),
 	(
 		"spore_blossom",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([206, 96, 158]),
+			color: Color([206, 96, 158]),
 		},
 	),
 	(
 		"spruce_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"spruce_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([106, 80, 48]),
+			color: Color([106, 80, 48]),
 		},
 	),
 	(
 		"spruce_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([114, 84, 48]),
+			color: Color([114, 84, 48]),
 		},
 	),
 	(
 		"spruce_fence_gate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([114, 84, 48]),
+			color: Color([114, 84, 48]),
 		},
 	),
 	(
 		"spruce_leaves",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Spruce}),
-			color: BlockColor([126, 126, 126]),
+			color: Color([126, 126, 126]),
 		},
 	),
 	(
 		"spruce_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([108, 80, 46]),
+			color: Color([108, 80, 46]),
 		},
 	),
 	(
 		"spruce_planks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([114, 84, 48]),
+			color: Color([114, 84, 48]),
 		},
 	),
 	(
 		"spruce_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([114, 84, 48]),
+			color: Color([114, 84, 48]),
 		},
 	),
 	(
 		"spruce_sapling",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([44, 60, 36]),
+			color: Color([44, 60, 36]),
 		},
 	),
 	(
 		"spruce_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([114, 84, 48]),
+			color: Color([114, 84, 48]),
 		},
 	),
 	(
 		"spruce_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([114, 84, 48]),
+			color: Color([114, 84, 48]),
 		},
 	),
 	(
 		"spruce_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([114, 84, 48]),
+			color: Color([114, 84, 48]),
 		},
 	),
 	(
 		"spruce_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([103, 79, 47]),
+			color: Color([103, 79, 47]),
 		},
 	),
 	(
 		"spruce_wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"spruce_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([58, 37, 16]),
+			color: Color([58, 37, 16]),
 		},
 	),
 	(
 		"sticky_piston",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([109, 104, 96]),
+			color: Color([109, 104, 96]),
 		},
 	),
 	(
 		"stone",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([125, 125, 125]),
+			color: Color([125, 125, 125]),
 		},
 	),
 	(
 		"stone_brick_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([122, 121, 122]),
+			color: Color([122, 121, 122]),
 		},
 	),
 	(
 		"stone_brick_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([122, 121, 122]),
+			color: Color([122, 121, 122]),
 		},
 	),
 	(
 		"stone_brick_wall",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([122, 121, 122]),
+			color: Color([122, 121, 122]),
 		},
 	),
 	(
 		"stone_bricks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([122, 121, 122]),
+			color: Color([122, 121, 122]),
 		},
 	),
 	(
 		"stone_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"stone_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([125, 125, 125]),
+			color: Color([125, 125, 125]),
 		},
 	),
 	(
 		"stone_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([125, 125, 125]),
+			color: Color([125, 125, 125]),
 		},
 	),
 	(
 		"stone_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([125, 125, 125]),
+			color: Color([125, 125, 125]),
 		},
 	),
 	(
 		"stonecutter",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([123, 118, 111]),
+			color: Color([123, 118, 111]),
 		},
 	),
 	(
 		"stripped_acacia_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([166, 91, 51]),
+			color: Color([166, 91, 51]),
 		},
 	),
 	(
 		"stripped_acacia_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([174, 92, 59]),
+			color: Color([174, 92, 59]),
 		},
 	),
 	(
 		"stripped_birch_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([191, 171, 116]),
+			color: Color([191, 171, 116]),
 		},
 	),
 	(
 		"stripped_birch_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([196, 176, 118]),
+			color: Color([196, 176, 118]),
 		},
 	),
 	(
 		"stripped_crimson_hyphae",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([137, 57, 90]),
+			color: Color([137, 57, 90]),
 		},
 	),
 	(
 		"stripped_crimson_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([121, 56, 82]),
+			color: Color([121, 56, 82]),
 		},
 	),
 	(
 		"stripped_dark_oak_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([65, 44, 22]),
+			color: Color([65, 44, 22]),
 		},
 	),
 	(
 		"stripped_dark_oak_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([72, 56, 36]),
+			color: Color([72, 56, 36]),
 		},
 	),
 	(
 		"stripped_jungle_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([165, 122, 81]),
+			color: Color([165, 122, 81]),
 		},
 	),
 	(
 		"stripped_jungle_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([171, 132, 84]),
+			color: Color([171, 132, 84]),
 		},
 	),
 	(
 		"stripped_mangrove_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([109, 43, 43]),
+			color: Color([109, 43, 43]),
 		},
 	),
 	(
 		"stripped_mangrove_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([119, 54, 47]),
+			color: Color([119, 54, 47]),
 		},
 	),
 	(
 		"stripped_oak_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([160, 129, 77]),
+			color: Color([160, 129, 77]),
 		},
 	),
 	(
 		"stripped_oak_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([177, 144, 86]),
+			color: Color([177, 144, 86]),
 		},
 	),
 	(
 		"stripped_spruce_log",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([105, 80, 46]),
+			color: Color([105, 80, 46]),
 		},
 	),
 	(
 		"stripped_spruce_wood",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([115, 89, 52]),
+			color: Color([115, 89, 52]),
 		},
 	),
 	(
 		"stripped_warped_hyphae",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([57, 150, 147]),
+			color: Color([57, 150, 147]),
 		},
 	),
 	(
 		"stripped_warped_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([52, 128, 124]),
+			color: Color([52, 128, 124]),
 		},
 	),
 	(
 		"structure_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([88, 74, 90]),
+			color: Color([88, 74, 90]),
 		},
 	),
 	(
 		"structure_void",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"sugar_cane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([148, 192, 101]),
+			color: Color([148, 192, 101]),
 		},
 	),
 	(
 		"sunflower",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([246, 196, 54]),
+			color: Color([246, 196, 54]),
 		},
 	),
 	(
 		"sweet_berry_bush",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([68, 77, 50]),
+			color: Color([68, 77, 50]),
 		},
 	),
 	(
 		"tall_grass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: BlockColor([151, 149, 151]),
+			color: Color([151, 149, 151]),
 		},
 	),
 	(
 		"tall_seagrass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([59, 139, 14]),
+			color: Color([59, 139, 14]),
 		},
 	),
 	(
 		"target",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([226, 170, 157]),
+			color: Color([226, 170, 157]),
 		},
 	),
 	(
 		"terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([152, 94, 67]),
+			color: Color([152, 94, 67]),
 		},
 	),
 	(
 		"tinted_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([44, 38, 46]),
+			color: Color([44, 38, 46]),
 		},
 	),
 	(
 		"tnt",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([142, 62, 53]),
+			color: Color([142, 62, 53]),
 		},
 	),
 	(
 		"torch",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"trapped_chest",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([162, 130, 78]),
+			color: Color([162, 130, 78]),
 		},
 	),
 	(
 		"tripwire",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"tripwire_hook",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"tube_coral",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"tube_coral_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([49, 87, 206]),
+			color: Color([49, 87, 206]),
 		},
 	),
 	(
 		"tube_coral_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"tube_coral_wall_fan",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"tuff",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([108, 109, 102]),
+			color: Color([108, 109, 102]),
 		},
 	),
 	(
 		"turtle_egg",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([228, 226, 191]),
+			color: Color([228, 226, 191]),
 		},
 	),
 	(
 		"twisting_vines",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([20, 143, 124]),
+			color: Color([20, 143, 124]),
 		},
 	),
 	(
 		"twisting_vines_plant",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([20, 135, 122]),
+			color: Color([20, 135, 122]),
 		},
 	),
 	(
 		"verdant_froglight",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([229, 244, 228]),
+			color: Color([229, 244, 228]),
 		},
 	),
 	(
 		"vine",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: BlockColor([116, 116, 116]),
+			color: Color([116, 116, 116]),
 		},
 	),
 	(
 		"void_air",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"wall_torch",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"warped_button",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"warped_door",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([44, 126, 120]),
+			color: Color([44, 126, 120]),
 		},
 	),
 	(
 		"warped_fence",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([43, 104, 99]),
+			color: Color([43, 104, 99]),
 		},
 	),
 	(
 		"warped_fence_gate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([43, 104, 99]),
+			color: Color([43, 104, 99]),
 		},
 	),
 	(
 		"warped_fungus",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"warped_hyphae",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([58, 58, 77]),
+			color: Color([58, 58, 77]),
 		},
 	),
 	(
 		"warped_nylium",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([43, 114, 101]),
+			color: Color([43, 114, 101]),
 		},
 	),
 	(
 		"warped_planks",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([43, 104, 99]),
+			color: Color([43, 104, 99]),
 		},
 	),
 	(
 		"warped_pressure_plate",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([43, 104, 99]),
+			color: Color([43, 104, 99]),
 		},
 	),
 	(
 		"warped_roots",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([20, 138, 124]),
+			color: Color([20, 138, 124]),
 		},
 	),
 	(
 		"warped_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([43, 104, 99]),
+			color: Color([43, 104, 99]),
 		},
 	),
 	(
 		"warped_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([43, 104, 99]),
+			color: Color([43, 104, 99]),
 		},
 	),
 	(
 		"warped_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([43, 104, 99]),
+			color: Color([43, 104, 99]),
 		},
 	),
 	(
 		"warped_stem",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([53, 109, 110]),
+			color: Color([53, 109, 110]),
 		},
 	),
 	(
 		"warped_trapdoor",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([47, 119, 111]),
+			color: Color([47, 119, 111]),
 		},
 	),
 	(
 		"warped_wall_sign",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"warped_wart_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([22, 119, 121]),
+			color: Color([22, 119, 121]),
 		},
 	),
 	(
 		"water",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque|Water}),
-			color: BlockColor([177, 177, 177]),
+			color: Color([177, 177, 177]),
 		},
 	),
 	(
 		"water_cauldron",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([73, 72, 74]),
+			color: Color([73, 72, 74]),
 		},
 	),
 	(
 		"waxed_copper_block",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([192, 107, 79]),
+			color: Color([192, 107, 79]),
 		},
 	),
 	(
 		"waxed_cut_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([191, 106, 80]),
+			color: Color([191, 106, 80]),
 		},
 	),
 	(
 		"waxed_cut_copper_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([191, 106, 80]),
+			color: Color([191, 106, 80]),
 		},
 	),
 	(
 		"waxed_cut_copper_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([191, 106, 80]),
+			color: Color([191, 106, 80]),
 		},
 	),
 	(
 		"waxed_exposed_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([161, 125, 103]),
+			color: Color([161, 125, 103]),
 		},
 	),
 	(
 		"waxed_exposed_cut_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([154, 121, 101]),
+			color: Color([154, 121, 101]),
 		},
 	),
 	(
 		"waxed_exposed_cut_copper_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([154, 121, 101]),
+			color: Color([154, 121, 101]),
 		},
 	),
 	(
 		"waxed_exposed_cut_copper_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([154, 121, 101]),
+			color: Color([154, 121, 101]),
 		},
 	),
 	(
 		"waxed_oxidized_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([82, 162, 132]),
+			color: Color([82, 162, 132]),
 		},
 	),
 	(
 		"waxed_oxidized_cut_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([79, 153, 126]),
+			color: Color([79, 153, 126]),
 		},
 	),
 	(
 		"waxed_oxidized_cut_copper_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([79, 153, 126]),
+			color: Color([79, 153, 126]),
 		},
 	),
 	(
 		"waxed_oxidized_cut_copper_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([79, 153, 126]),
+			color: Color([79, 153, 126]),
 		},
 	),
 	(
 		"waxed_weathered_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([108, 153, 110]),
+			color: Color([108, 153, 110]),
 		},
 	),
 	(
 		"waxed_weathered_cut_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([109, 145, 107]),
+			color: Color([109, 145, 107]),
 		},
 	),
 	(
 		"waxed_weathered_cut_copper_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([109, 145, 107]),
+			color: Color([109, 145, 107]),
 		},
 	),
 	(
 		"waxed_weathered_cut_copper_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([109, 145, 107]),
+			color: Color([109, 145, 107]),
 		},
 	),
 	(
 		"weathered_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([108, 153, 110]),
+			color: Color([108, 153, 110]),
 		},
 	),
 	(
 		"weathered_cut_copper",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([109, 145, 107]),
+			color: Color([109, 145, 107]),
 		},
 	),
 	(
 		"weathered_cut_copper_slab",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([109, 145, 107]),
+			color: Color([109, 145, 107]),
 		},
 	),
 	(
 		"weathered_cut_copper_stairs",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([109, 145, 107]),
+			color: Color([109, 145, 107]),
 		},
 	),
 	(
 		"weeping_vines",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([104, 1, 0]),
+			color: Color([104, 1, 0]),
 		},
 	),
 	(
 		"weeping_vines_plant",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([132, 16, 12]),
+			color: Color([132, 16, 12]),
 		},
 	),
 	(
 		"wet_sponge",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([171, 181, 70]),
+			color: Color([171, 181, 70]),
 		},
 	),
 	(
 		"wheat",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([166, 151, 73]),
+			color: Color([166, 151, 73]),
 		},
 	),
 	(
 		"white_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"white_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"white_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"white_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([248, 222, 214]),
+			color: Color([248, 222, 214]),
 		},
 	),
 	(
 		"white_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([233, 236, 236]),
+			color: Color([233, 236, 236]),
 		},
 	),
 	(
 		"white_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([207, 213, 214]),
+			color: Color([207, 213, 214]),
 		},
 	),
 	(
 		"white_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([225, 227, 227]),
+			color: Color([225, 227, 227]),
 		},
 	),
 	(
 		"white_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([188, 212, 202]),
+			color: Color([188, 212, 202]),
 		},
 	),
 	(
 		"white_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([215, 220, 221]),
+			color: Color([215, 220, 221]),
 		},
 	),
 	(
 		"white_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([255, 255, 255]),
+			color: Color([255, 255, 255]),
 		},
 	),
 	(
 		"white_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([246, 246, 246]),
+			color: Color([246, 246, 246]),
 		},
 	),
 	(
 		"white_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([209, 178, 161]),
+			color: Color([209, 178, 161]),
 		},
 	),
 	(
 		"white_tulip",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"white_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"white_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([233, 236, 236]),
+			color: Color([233, 236, 236]),
 		},
 	),
 	(
 		"wither_rose",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"wither_skeleton_skull",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"wither_skeleton_wall_skull",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"yellow_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"yellow_bed",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"yellow_candle",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"yellow_candle_cake",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([248, 222, 214]),
+			color: Color([248, 222, 214]),
 		},
 	),
 	(
 		"yellow_carpet",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([248, 197, 39]),
+			color: Color([248, 197, 39]),
 		},
 	),
 	(
 		"yellow_concrete",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([240, 175, 21]),
+			color: Color([240, 175, 21]),
 		},
 	),
 	(
 		"yellow_concrete_powder",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([232, 199, 54]),
+			color: Color([232, 199, 54]),
 		},
 	),
 	(
 		"yellow_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([234, 192, 88]),
+			color: Color([234, 192, 88]),
 		},
 	),
 	(
 		"yellow_shulker_box",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([248, 188, 29]),
+			color: Color([248, 188, 29]),
 		},
 	),
 	(
 		"yellow_stained_glass",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([229, 229, 51]),
+			color: Color([229, 229, 51]),
 		},
 	),
 	(
 		"yellow_stained_glass_pane",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([221, 221, 48]),
+			color: Color([221, 221, 48]),
 		},
 	),
 	(
 		"yellow_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([186, 133, 35]),
+			color: Color([186, 133, 35]),
 		},
 	),
 	(
 		"yellow_wall_banner",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"yellow_wool",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: BlockColor([248, 197, 39]),
+			color: Color([248, 197, 39]),
 		},
 	),
 	(
 		"zombie_head",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 	(
 		"zombie_wall_head",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{}),
-			color: BlockColor([0, 0, 0]),
+			color: Color([0, 0, 0]),
 		},
 	),
 ];
diff --git a/src/resource/mod.rs b/src/resource/mod.rs
index 672daa0..806ba27 100644
--- a/src/resource/mod.rs
+++ b/src/resource/mod.rs
@@ -34,7 +34,7 @@ where
 }
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
-pub struct BlockColor(pub [u8; 3]);
+pub struct Color(pub [u8; 3]);
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 pub struct BlockType {
@@ -43,7 +43,7 @@ pub struct BlockType {
 		deserialize_with = "deserialize_block_flags"
 	)]
 	pub flags: BitFlags<BlockFlag>,
-	pub color: BlockColor,
+	pub color: Color,
 }
 
 impl BlockType {

From 524b1b1913ef785fbb1ef9e45946b36f0e4f3dad Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 6 Apr 2023 21:35:01 +0200
Subject: [PATCH 148/460] resource: add biome data

---
 src/resource/biomes.rs | 372 +++++++++++++++++++++++++++++++++++++++++
 src/resource/mod.rs    |  53 ++++++
 2 files changed, 425 insertions(+)
 create mode 100644 src/resource/biomes.rs

diff --git a/src/resource/biomes.rs b/src/resource/biomes.rs
new file mode 100644
index 0000000..1421883
--- /dev/null
+++ b/src/resource/biomes.rs
@@ -0,0 +1,372 @@
+use super::Color;
+
+#[derive(Debug, Clone, Copy)]
+pub enum BiomeGrassColorModifier {
+	DarkForest,
+	Swamp,
+}
+
+#[derive(Debug, Clone, Copy)]
+pub struct Biome {
+	pub temp: i8,
+	pub downfall: i8,
+	pub water_color: Option<Color>,
+	pub foliage_color: Option<Color>,
+	pub grass_color: Option<Color>,
+	pub grass_color_modifier: Option<BiomeGrassColorModifier>,
+}
+
+impl Biome {
+	const fn new(temp: i16, downfall: i16) -> Biome {
+		const fn encode(v: i16) -> i8 {
+			(v / 5) as i8
+		}
+		Biome {
+			temp: encode(temp),
+			downfall: encode(downfall),
+			grass_color_modifier: None,
+			water_color: None,
+			foliage_color: None,
+			grass_color: None,
+		}
+	}
+
+	const fn water(self, water_color: [u8; 3]) -> Biome {
+		Biome {
+			water_color: Some(Color(water_color)),
+			..self
+		}
+	}
+
+	const fn foliage(self, foliage_color: [u8; 3]) -> Biome {
+		Biome {
+			foliage_color: Some(Color(foliage_color)),
+			..self
+		}
+	}
+
+	const fn grass(self, grass_color: [u8; 3]) -> Biome {
+		Biome {
+			grass_color: Some(Color(grass_color)),
+			..self
+		}
+	}
+
+	const fn modify(self, grass_color_modifier: BiomeGrassColorModifier) -> Biome {
+		Biome {
+			grass_color_modifier: Some(grass_color_modifier),
+			..self
+		}
+	}
+}
+
+// Data extracted from Minecraft code decompiled using https://github.com/Hexeption/MCP-Reborn
+
+#[allow(clippy::zero_prefixed_literal)]
+pub const BIOMES: &[(&str, Biome)] = {
+	use BiomeGrassColorModifier::*;
+
+	&[
+		// Overworld
+		(
+			"badlands",
+			Biome::new(2_00, 0_00)
+				.foliage([158, 129, 77])
+				.grass([144, 129, 77]),
+		),
+		("bamboo_jungle", Biome::new(0_95, 0_90)),
+		("beach", Biome::new(0_80, 0_40)),
+		("birch_forest", Biome::new(0_60, 0_60)),
+		("cold_ocean", Biome::new(0_50, 0_50).water([61, 87, 214])),
+		("dark_forest", Biome::new(0_70, 0_80).modify(DarkForest)),
+		(
+			"deep_cold_ocean",
+			Biome::new(0_50, 0_50).water([61, 87, 214]),
+		),
+		("deep_dark", Biome::new(0_80, 0_40)),
+		(
+			"deep_frozen_ocean",
+			Biome::new(0_50, 0_50).water([57, 56, 201]),
+		),
+		(
+			"deep_lukewarm_ocean",
+			Biome::new(0_50, 0_50).water([69, 173, 242]),
+		),
+		("deep_ocean", Biome::new(0_50, 0_50)),
+		("desert", Biome::new(2_00, 0_00)),
+		("dripstone_caves", Biome::new(0_80, 0_40)),
+		(
+			"eroded_badlands",
+			Biome::new(2_00, 0_00)
+				.foliage([158, 129, 77])
+				.grass([144, 129, 77]),
+		),
+		("flower_forest", Biome::new(0_70, 0_80)),
+		("forest", Biome::new(0_70, 0_80)),
+		("frozen_ocean", Biome::new(0_00, 0_50).water([57, 56, 201])),
+		("frozen_peaks", Biome::new(-0_70, 0_90)),
+		("frozen_river", Biome::new(0_00, 0_50).water([57, 56, 201])),
+		("grove", Biome::new(-0_20, 0_80)),
+		("ice_spikes", Biome::new(0_00, 0_50)),
+		("jagged_peaks", Biome::new(-0_70, 0_90)),
+		("jungle", Biome::new(0_95, 0_90)),
+		(
+			"lukewarm_ocean",
+			Biome::new(0_50, 0_50).water([69, 173, 242]),
+		),
+		("lush_caves", Biome::new(0_50, 0_50)),
+		(
+			"mangrove_swamp",
+			Biome::new(0_80, 0_90)
+				.water([58, 122, 106])
+				.foliage([141, 177, 39])
+				.modify(Swamp),
+		),
+		("meadow", Biome::new(0_50, 0_80).water([14, 78, 207])),
+		("mushroom_fields", Biome::new(0_90, 1_00)),
+		("ocean", Biome::new(0_50, 0_50)),
+		("old_growth_birch_forest", Biome::new(0_60, 0_60)),
+		("old_growth_pine_taiga", Biome::new(0_30, 0_80)),
+		("old_growth_spruce_taiga", Biome::new(0_25, 0_80)),
+		("plains", Biome::new(0_80, 0_40)),
+		("river", Biome::new(0_50, 0_50)),
+		("savanna", Biome::new(2_00, 0_00)),
+		("savanna_plateau", Biome::new(2_00, 0_00)),
+		("snowy_beach", Biome::new(0_05, 0_30).water([61, 87, 214])),
+		("snowy_plains", Biome::new(0_00, 0_50)),
+		("snowy_slopes", Biome::new(-0_30, 0_90)),
+		("snowy_taiga", Biome::new(-0_50, 0_40).water([61, 87, 214])),
+		("sparse_jungle", Biome::new(0_95, 0_80)),
+		("stony_peaks", Biome::new(1_00, 0_30)),
+		("stony_shore", Biome::new(0_20, 0_30)),
+		("sunflower_plains", Biome::new(0_80, 0_40)),
+		(
+			"swamp",
+			Biome::new(0_80, 0_90)
+				.water([97, 123, 100])
+				.foliage([106, 112, 57])
+				.modify(Swamp),
+		),
+		("taiga", Biome::new(0_25, 0_80)),
+		("the_void", Biome::new(0_50, 0_50)),
+		("warm_ocean", Biome::new(0_50, 0_50).water([67, 213, 238])),
+		("windswept_forest", Biome::new(0_20, 0_30)),
+		("windswept_gravelly_hills", Biome::new(0_20, 0_30)),
+		("windswept_hills", Biome::new(0_20, 0_30)),
+		("windswept_savanna", Biome::new(2_00, 0_00)),
+		(
+			"wooded_badlands",
+			Biome::new(2_00, 0_00)
+				.foliage([158, 129, 77])
+				.grass([144, 129, 77]),
+		),
+		// Nether
+		("basalt_deltas", Biome::new(2_00, 0_00)),
+		("crimson_forest", Biome::new(2_00, 0_00)),
+		("nether_wastes", Biome::new(2_00, 0_00)),
+		("soul_sand_valley", Biome::new(2_00, 0_00)),
+		("warped_forest", Biome::new(2_00, 0_00)),
+		// End
+		("end_barrens", Biome::new(0_50, 0_50)),
+		("end_highlands", Biome::new(0_50, 0_50)),
+		("end_midlands", Biome::new(0_50, 0_50)),
+		("small_end_islands", Biome::new(0_50, 0_50)),
+		("the_end", Biome::new(0_50, 0_50)),
+	]
+};
+
+pub const BIOME_ALIASES: &[(&str, &str)] = &[
+	// Biomes fix
+	("beaches", "beach"),
+	("cold_beach", "snowy_beach"),
+	("cold_deep_ocean", "deep_cold_ocean"),
+	("extreme_hills", "mountains"),
+	("extreme_hills_with_trees", "wooded_mountains"),
+	("forest_hills", "wooded_hills"),
+	("frozen_deep_ocean", "deep_frozen_ocean"),
+	("hell", "nether_wastes"),
+	("ice_flats", "snowy_tundra"),
+	("ice_mountains", "snowy_mountains"),
+	("lukewarm_deep_ocean", "deep_lukewarm_ocean"),
+	("mesa", "badlands"),
+	("mesa_clear_rock", "badlands_plateau"),
+	("mesa_rock", "wooded_badlands_plateau"),
+	("mushroom_island", "mushroom_fields"),
+	("mushroom_island_shore", "mushroom_field_shore"),
+	("mutated_birch_forest", "tall_birch_forest"),
+	("mutated_birch_forest_hills", "tall_birch_hills"),
+	("mutated_desert", "desert_lakes"),
+	("mutated_extreme_hills", "gravelly_mountains"),
+	(
+		"mutated_extreme_hills_with_trees",
+		"modified_gravelly_mountains",
+	),
+	("mutated_forest", "flower_forest"),
+	("mutated_ice_flats", "ice_spikes"),
+	("mutated_jungle", "modified_jungle"),
+	("mutated_jungle_edge", "modified_jungle_edge"),
+	("mutated_mesa", "eroded_badlands"),
+	("mutated_mesa_clear_rock", "modified_badlands_plateau"),
+	("mutated_mesa_rock", "modified_wooded_badlands_plateau"),
+	("mutated_plains", "sunflower_plains"),
+	("mutated_redwood_taiga", "giant_spruce_taiga"),
+	("mutated_redwood_taiga_hills", "giant_spruce_taiga_hills"),
+	("mutated_roofed_forest", "dark_forest_hills"),
+	("mutated_savanna", "shattered_savanna"),
+	("mutated_savanna_rock", "shattered_savanna_plateau"),
+	("mutated_swampland", "swamp_hills"),
+	("mutated_taiga", "taiga_mountains"),
+	("mutated_taiga_cold", "snowy_taiga_mountains"),
+	("redwood_taiga", "giant_tree_taiga"),
+	("redwood_taiga_hills", "giant_tree_taiga_hills"),
+	("roofed_forest", "dark_forest"),
+	("savanna_rock", "savanna_plateau"),
+	("sky", "the_end"),
+	("sky_island_barren", "end_barrens"),
+	("sky_island_high", "end_highlands"),
+	("sky_island_low", "small_end_islands"),
+	("sky_island_medium", "end_midlands"),
+	("smaller_extreme_hills", "mountain_edge"),
+	("stone_beach", "stone_shore"),
+	("swampland", "swamp"),
+	("taiga_cold", "snowy_taiga"),
+	("taiga_cold_hills", "snowy_taiga_hills"),
+	("void", "the_void"),
+	("warm_deep_ocean", "deep_warm_ocean"),
+	// Nether biome rename
+	("nether", "nether_wastes"),
+	// Caves and Cliffs biome renames
+	("badlands_plateau", "badlands"),
+	("bamboo_jungle_hills", "bamboo_jungle"),
+	("birch_forest_hills", "birch_forest"),
+	("dark_forest_hills", "dark_forest"),
+	("desert_hills", "desert"),
+	("desert_lakes", "desert"),
+	("giant_spruce_taiga", "old_growth_spruce_taiga"),
+	("giant_spruce_taiga_hills", "old_growth_spruce_taiga"),
+	("giant_tree_taiga", "old_growth_pine_taiga"),
+	("giant_tree_taiga_hills", "old_growth_pine_taiga"),
+	("gravelly_mountains", "windswept_gravelly_hills"),
+	("jungle_edge", "sparse_jungle"),
+	("jungle_hills", "jungle"),
+	("lofty_peaks", "jagged_peaks"),
+	("modified_badlands_plateau", "badlands"),
+	("modified_gravelly_mountains", "windswept_gravelly_hills"),
+	("modified_jungle", "jungle"),
+	("modified_jungle_edge", "sparse_jungle"),
+	("modified_wooded_badlands_plateau", "wooded_badlands"),
+	("mountain_edge", "windswept_hills"),
+	("mountains", "windswept_hills"),
+	("mushroom_field_shore", "mushroom_fields"),
+	("shattered_savanna", "windswept_savanna"),
+	("shattered_savanna_plateau", "windswept_savanna"),
+	("snowcapped_peaks", "frozen_peaks"),
+	("snowy_mountains", "snowy_plains"),
+	("snowy_taiga_hills", "snowy_taiga"),
+	("snowy_taiga_mountains", "snowy_taiga"),
+	("snowy_tundra", "snowy_plains"),
+	("stone_shore", "stony_shore"),
+	("swamp_hills", "swamp"),
+	("taiga_hills", "taiga"),
+	("taiga_mountains", "taiga"),
+	("tall_birch_forest", "old_growth_birch_forest"),
+	("tall_birch_hills", "old_growth_birch_forest"),
+	("wooded_badlands_plateau", "wooded_badlands"),
+	("wooded_hills", "forest"),
+	("wooded_mountains", "windswept_forest"),
+	// Remove Deep Warm Ocean
+	("deep_warm_ocean", "warm_ocean"),
+];
+
+pub fn legacy_biome(index: u8) -> &'static str {
+	match index {
+		0 => "ocean",
+		1 => "plains",
+		2 => "desert",
+		3 => "mountains",
+		4 => "forest",
+		5 => "taiga",
+		6 => "swamp",
+		7 => "river",
+		8 => "nether_wastes",
+		9 => "the_end",
+		10 => "frozen_ocean",
+		11 => "frozen_river",
+		12 => "snowy_tundra",
+		13 => "snowy_mountains",
+		14 => "mushroom_fields",
+		15 => "mushroom_field_shore",
+		16 => "beach",
+		17 => "desert_hills",
+		18 => "wooded_hills",
+		19 => "taiga_hills",
+		20 => "mountain_edge",
+		21 => "jungle",
+		22 => "jungle_hills",
+		23 => "jungle_edge",
+		24 => "deep_ocean",
+		25 => "stone_shore",
+		26 => "snowy_beach",
+		27 => "birch_forest",
+		28 => "birch_forest_hills",
+		29 => "dark_forest",
+		30 => "snowy_taiga",
+		31 => "snowy_taiga_hills",
+		32 => "giant_tree_taiga",
+		33 => "giant_tree_taiga_hills",
+		34 => "wooded_mountains",
+		35 => "savanna",
+		36 => "savanna_plateau",
+		37 => "badlands",
+		38 => "wooded_badlands_plateau",
+		39 => "badlands_plateau",
+		40 => "small_end_islands",
+		41 => "end_midlands",
+		42 => "end_highlands",
+		43 => "end_barrens",
+		44 => "warm_ocean",
+		45 => "lukewarm_ocean",
+		46 => "cold_ocean",
+		47 => "deep_warm_ocean",
+		48 => "deep_lukewarm_ocean",
+		49 => "deep_cold_ocean",
+		50 => "deep_frozen_ocean",
+		127 => "the_void",
+		129 => "sunflower_plains",
+		130 => "desert_lakes",
+		131 => "gravelly_mountains",
+		132 => "flower_forest",
+		133 => "taiga_mountains",
+		134 => "swamp_hills",
+		140 => "ice_spikes",
+		149 => "modified_jungle",
+		151 => "modified_jungle_edge",
+		155 => "tall_birch_forest",
+		156 => "tall_birch_hills",
+		157 => "dark_forest_hills",
+		158 => "snowy_taiga_mountains",
+		160 => "giant_spruce_taiga",
+		161 => "giant_spruce_taiga_hills",
+		162 => "modified_gravelly_mountains",
+		163 => "shattered_savanna",
+		164 => "shattered_savanna_plateau",
+		165 => "eroded_badlands",
+		166 => "modified_wooded_badlands_plateau",
+		167 => "modified_badlands_plateau",
+		168 => "bamboo_jungle",
+		169 => "bamboo_jungle_hills",
+		170 => "soul_sand_valley",
+		171 => "crimson_forest",
+		172 => "warped_forest",
+		173 => "basalt_deltas",
+		174 => "dripstone_caves",
+		175 => "lush_caves",
+		177 => "meadow",
+		178 => "grove",
+		179 => "snowy_slopes",
+		180 => "snowcapped_peaks",
+		181 => "lofty_peaks",
+		182 => "stony_peaks",
+		_ => "ocean",
+	}
+}
diff --git a/src/resource/mod.rs b/src/resource/mod.rs
index 806ba27..62c5d9c 100644
--- a/src/resource/mod.rs
+++ b/src/resource/mod.rs
@@ -1,3 +1,4 @@
+mod biomes;
 mod block_types;
 mod legacy_block_types;
 
@@ -87,3 +88,55 @@ impl BlockTypes {
 		Some(self.legacy_block_types[id as usize][data as usize])
 	}
 }
+
+pub use biomes::Biome;
+
+#[derive(Debug)]
+pub struct BiomeTypes {
+	biome_map: HashMap<String, &'static Biome>,
+	legacy_biomes: Box<[&'static Biome; 256]>,
+}
+
+impl Default for BiomeTypes {
+	fn default() -> Self {
+		let mut biome_map: HashMap<_, _> = biomes::BIOMES
+			.iter()
+			.map(|(k, v)| (String::from(*k), v))
+			.collect();
+
+		for &(old, new) in biomes::BIOME_ALIASES.iter().rev() {
+			let biome = biome_map
+				.get(new)
+				.copied()
+				.expect("Biome alias for unknown biome");
+			assert!(biome_map.insert(String::from(old), biome).is_none());
+		}
+
+		let legacy_biomes = (0..=255)
+			.map(|index| {
+				let id = biomes::legacy_biome(index);
+				*biome_map.get(id).expect("Unknown legacy biome")
+			})
+			.collect::<Box<[_]>>()
+			.try_into()
+			.unwrap();
+
+		Self {
+			biome_map,
+			legacy_biomes,
+		}
+	}
+}
+
+impl BiomeTypes {
+	#[inline]
+	pub fn get(&self, id: &str) -> Option<&Biome> {
+		let suffix = id.strip_prefix("minecraft:")?;
+		self.biome_map.get(suffix).copied()
+	}
+
+	#[inline]
+	pub fn get_legacy(&self, id: u8) -> Option<&Biome> {
+		Some(self.legacy_biomes[id as usize])
+	}
+}

From e117c769375ff67317749650d513efeec6c4360b Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 7 Apr 2023 09:29:01 +0200
Subject: [PATCH 149/460] world: pass biome data into chunk/section structures

---
 src/main.rs          |  4 +++-
 src/world/chunk.rs   | 31 ++++++++++++++++++++++---------
 src/world/section.rs | 35 ++++++++++++++++++++++++++---------
 3 files changed, 51 insertions(+), 19 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index a0afa43..fcd588d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -96,6 +96,7 @@ where
 /// Type with methods for processing the regions of a Minecraft save directory
 struct RegionProcessor<'a> {
 	block_types: resource::BlockTypes,
+	biome_types: resource::BiomeTypes,
 	config: &'a Config,
 }
 
@@ -103,6 +104,7 @@ impl<'a> RegionProcessor<'a> {
 	fn new(config: &'a Config) -> Self {
 		RegionProcessor {
 			block_types: resource::BlockTypes::default(),
+			biome_types: resource::BiomeTypes::default(),
 			config,
 		}
 	}
@@ -128,7 +130,7 @@ impl<'a> RegionProcessor<'a> {
 			Box<world::layer::BlockLightArray>,
 		)>,
 	> {
-		let chunk = world::chunk::Chunk::new(&data, &self.block_types)?;
+		let chunk = world::chunk::Chunk::new(&data, &self.block_types, &self.biome_types)?;
 		world::layer::top_layer(&chunk)
 	}
 
diff --git a/src/world/chunk.rs b/src/world/chunk.rs
index a9a5c6b..aa6c9a7 100644
--- a/src/world/chunk.rs
+++ b/src/world/chunk.rs
@@ -6,7 +6,10 @@ use std::{
 use anyhow::{bail, Context, Result};
 
 use super::{de, section::*};
-use crate::{resource::BlockTypes, types::*};
+use crate::{
+	resource::{BiomeTypes, BlockTypes},
+	types::*,
+};
 
 /// Chunk data structure wrapping a [de::Chunk] for convenient access to
 /// block and biome data
@@ -64,14 +67,20 @@ pub struct SectionIter<'a> {
 
 impl<'a> Chunk<'a> {
 	/// Creates a new [Chunk] from a deserialized [de::Chunk]
-	pub fn new(data: &'a de::Chunk, block_types: &'a BlockTypes) -> Result<Self> {
+	pub fn new(
+		data: &'a de::Chunk,
+		block_types: &'a BlockTypes,
+		biome_types: &'a BiomeTypes,
+	) -> Result<Self> {
 		let data_version = data.data_version.unwrap_or_default();
 
 		match &data.chunk {
 			de::ChunkVariants::V1_18 { sections } => {
-				Self::new_v1_18(data_version, sections, block_types)
+				Self::new_v1_18(data_version, sections, block_types, biome_types)
+			}
+			de::ChunkVariants::V0 { level } => {
+				Self::new_v0(data_version, level, block_types, biome_types)
 			}
-			de::ChunkVariants::V0 { level } => Self::new_v0(data_version, level, block_types),
 		}
 	}
 
@@ -80,6 +89,7 @@ impl<'a> Chunk<'a> {
 		data_version: u32,
 		sections: &'a Vec<de::SectionV1_18>,
 		block_types: &'a BlockTypes,
+		biome_types: &'a BiomeTypes,
 	) -> Result<Self> {
 		let mut section_map = BTreeMap::new();
 
@@ -94,10 +104,12 @@ impl<'a> Chunk<'a> {
 						block_types,
 					)
 					.with_context(|| format!("Failed to load section at Y={}", section.y))?,
-					BiomesV18::new(section.biomes.data.as_deref(), &section.biomes.palette)
-						.with_context(|| {
-							format!("Failed to load section biomes at Y={}", section.y)
-						})?,
+					BiomesV18::new(
+						section.biomes.data.as_deref(),
+						&section.biomes.palette,
+						biome_types,
+					)
+					.with_context(|| format!("Failed to load section biomes at Y={}", section.y))?,
 					BlockLight::new(section.block_light.as_deref()).with_context(|| {
 						format!("Failed to load section block light at Y={}", section.y)
 					})?,
@@ -113,6 +125,7 @@ impl<'a> Chunk<'a> {
 		data_version: u32,
 		level: &'a de::LevelV0,
 		block_types: &'a BlockTypes,
+		biome_types: &'a BiomeTypes,
 	) -> Result<Self> {
 		let mut section_map_v1_13 = BTreeMap::new();
 		let mut section_map_v0 = BTreeMap::new();
@@ -158,7 +171,7 @@ impl<'a> Chunk<'a> {
 			}
 		}
 
-		let biomes = BiomesV0::new(level.biomes.as_ref());
+		let biomes = BiomesV0::new(level.biomes.as_ref(), biome_types);
 
 		Ok(
 			match (section_map_v1_13.is_empty(), section_map_v0.is_empty()) {
diff --git a/src/world/section.rs b/src/world/section.rs
index 1aa8b7f..c943e11 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -5,7 +5,7 @@ use num_integer::div_rem;
 
 use super::de;
 use crate::{
-	resource::{BlockType, BlockTypes},
+	resource::{BiomeTypes, BlockType, BlockTypes},
 	types::*,
 };
 
@@ -183,7 +183,11 @@ pub struct BiomesV18<'a> {
 
 impl<'a> BiomesV18<'a> {
 	/// Constructs a new [BiomesV18] from deserialized data structures
-	pub fn new(biomes: Option<&'a [i64]>, palette: &'a [String]) -> Result<Self> {
+	pub fn new(
+		biomes: Option<&'a [i64]>,
+		palette: &'a [String],
+		_biome_types: &'a BiomeTypes,
+	) -> Result<Self> {
 		let bits = palette_bits(palette.len(), 1, 6).context("Unsupported block palette size")?;
 
 		if let Some(biomes) = biomes {
@@ -208,14 +212,23 @@ impl<'a> BiomesV18<'a> {
 /// different pre-v1.18 Minecraft versions
 #[derive(Debug)]
 pub enum BiomesV0<'a> {
-	IntArrayV15(&'a fastnbt::IntArray),
-	IntArrayV0(&'a fastnbt::IntArray),
-	ByteArray(&'a fastnbt::ByteArray),
+	IntArrayV15 {
+		data: &'a fastnbt::IntArray,
+		biome_types: &'a BiomeTypes,
+	},
+	IntArrayV0 {
+		data: &'a fastnbt::IntArray,
+		biome_types: &'a BiomeTypes,
+	},
+	ByteArray {
+		data: &'a fastnbt::ByteArray,
+		biome_types: &'a BiomeTypes,
+	},
 }
 
 impl<'a> BiomesV0<'a> {
 	/// Constructs a new [BiomesV0] from deserialized data structures
-	pub fn new(biomes: Option<&'a de::BiomesV0>) -> Result<Self> {
+	pub fn new(biomes: Option<&'a de::BiomesV0>, biome_types: &'a BiomeTypes) -> Result<Self> {
 		const N: usize = BLOCKS_PER_CHUNK;
 		const MAXY: usize = 256;
 		const BN: usize = N >> 2;
@@ -223,10 +236,14 @@ impl<'a> BiomesV0<'a> {
 
 		Ok(match biomes {
 			Some(de::BiomesV0::IntArray(data)) if data.len() == BN * BN * BMAXY => {
-				BiomesV0::IntArrayV15(data)
+				BiomesV0::IntArrayV15 { data, biome_types }
+			}
+			Some(de::BiomesV0::IntArray(data)) if data.len() == N * N => {
+				BiomesV0::IntArrayV0 { data, biome_types }
+			}
+			Some(de::BiomesV0::ByteArray(data)) if data.len() == N * N => {
+				BiomesV0::ByteArray { data, biome_types }
 			}
-			Some(de::BiomesV0::IntArray(data)) if data.len() == N * N => BiomesV0::IntArrayV0(data),
-			Some(de::BiomesV0::ByteArray(data)) if data.len() == N * N => BiomesV0::ByteArray(data),
 			_ => bail!("Invalid biome data"),
 		})
 	}

From b8b0e0627f0726039134a5cf1ad9edeb771b3ee1 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 7 Apr 2023 09:37:02 +0200
Subject: [PATCH 150/460] world: correctly name BiomesV1_18

---
 src/world/chunk.rs   | 6 +++---
 src/world/section.rs | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/world/chunk.rs b/src/world/chunk.rs
index aa6c9a7..026276a 100644
--- a/src/world/chunk.rs
+++ b/src/world/chunk.rs
@@ -17,7 +17,7 @@ use crate::{
 pub enum Chunk<'a> {
 	/// Minecraft v1.18+ chunk with biome data moved into sections
 	V1_18 {
-		section_map: BTreeMap<SectionY, (SectionV1_13<'a>, BiomesV18<'a>, BlockLight<'a>)>,
+		section_map: BTreeMap<SectionY, (SectionV1_13<'a>, BiomesV1_18<'a>, BlockLight<'a>)>,
 	},
 	/// Minecraft v1.13+ chunk
 	///
@@ -45,7 +45,7 @@ pub enum Chunk<'a> {
 enum SectionIterInner<'a> {
 	/// Iterator over sections of [Chunk::V1_18]
 	V1_18 {
-		iter: btree_map::Iter<'a, SectionY, (SectionV1_13<'a>, BiomesV18<'a>, BlockLight<'a>)>,
+		iter: btree_map::Iter<'a, SectionY, (SectionV1_13<'a>, BiomesV1_18<'a>, BlockLight<'a>)>,
 	},
 	/// Iterator over sections of [Chunk::V1_13]
 	V1_13 {
@@ -104,7 +104,7 @@ impl<'a> Chunk<'a> {
 						block_types,
 					)
 					.with_context(|| format!("Failed to load section at Y={}", section.y))?,
-					BiomesV18::new(
+					BiomesV1_18::new(
 						section.biomes.data.as_deref(),
 						&section.biomes.palette,
 						biome_types,
diff --git a/src/world/section.rs b/src/world/section.rs
index c943e11..f960d16 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -175,13 +175,13 @@ impl<'a> Section for SectionV0<'a> {
 /// the biomes laid out as an array of indices into a palette, similar to the
 /// v1.13+ block data.
 #[derive(Debug)]
-pub struct BiomesV18<'a> {
+pub struct BiomesV1_18<'a> {
 	_biomes: Option<&'a [i64]>,
 	_palette: &'a [String],
 	_bits: u8,
 }
 
-impl<'a> BiomesV18<'a> {
+impl<'a> BiomesV1_18<'a> {
 	/// Constructs a new [BiomesV18] from deserialized data structures
 	pub fn new(
 		biomes: Option<&'a [i64]>,
@@ -198,7 +198,7 @@ impl<'a> BiomesV18<'a> {
 			}
 		}
 
-		Ok(BiomesV18 {
+		Ok(BiomesV1_18 {
 			_biomes: biomes,
 			_palette: palette,
 			_bits: bits,

From c6843cfb9c0af41fa93fe5168f4cce33a28d2dcf Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 7 Apr 2023 09:38:31 +0200
Subject: [PATCH 151/460] world: resolve biome palette entries for v1.18 biome
 data

---
 src/world/section.rs | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/world/section.rs b/src/world/section.rs
index f960d16..5d2781a 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -5,7 +5,7 @@ use num_integer::div_rem;
 
 use super::de;
 use crate::{
-	resource::{BiomeTypes, BlockType, BlockTypes},
+	resource::{Biome, BiomeTypes, BlockType, BlockTypes},
 	types::*,
 };
 
@@ -177,7 +177,7 @@ impl<'a> Section for SectionV0<'a> {
 #[derive(Debug)]
 pub struct BiomesV1_18<'a> {
 	_biomes: Option<&'a [i64]>,
-	_palette: &'a [String],
+	_palette: Vec<Option<&'a Biome>>,
 	_bits: u8,
 }
 
@@ -186,7 +186,7 @@ impl<'a> BiomesV1_18<'a> {
 	pub fn new(
 		biomes: Option<&'a [i64]>,
 		palette: &'a [String],
-		_biome_types: &'a BiomeTypes,
+		biome_types: &'a BiomeTypes,
 	) -> Result<Self> {
 		let bits = palette_bits(palette.len(), 1, 6).context("Unsupported block palette size")?;
 
@@ -198,9 +198,20 @@ impl<'a> BiomesV1_18<'a> {
 			}
 		}
 
+		let palette_types = palette
+			.iter()
+			.map(|entry| {
+				let biome_type = biome_types.get(entry);
+				if biome_type.is_none() {
+					eprintln!("Unknown biome type: {}", entry);
+				}
+				biome_type
+			})
+			.collect();
+
 		Ok(BiomesV1_18 {
 			_biomes: biomes,
-			_palette: palette,
+			_palette: palette_types,
 			_bits: bits,
 		})
 	}

From 3ea93296d7f54f770888260f1b0693d21b95bfdd Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 8 Apr 2023 21:19:55 +0200
Subject: [PATCH 152/460] Update dependencies

---
 Cargo.lock | 155 ++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 105 insertions(+), 50 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4ca24e2..5a3f9e8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -45,7 +45,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa"
 dependencies = [
  "anstyle",
- "windows-sys",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -141,7 +141,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.12",
+ "syn",
 ]
 
 [[package]]
@@ -177,7 +177,7 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf"
 dependencies = [
- "windows-sys",
+ "windows-sys 0.45.0",
 ]
 
 [[package]]
@@ -197,33 +197,33 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
 
 [[package]]
 name = "enumflags2"
-version = "0.7.5"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e75d4cd21b95383444831539909fbb14b9dc3fdceb2a6f5d36577329a1f55ccb"
+checksum = "0044ebdf7fbb2a772e0c0233a9d3173c5cd8af8ae7078d4c5188af44ffffaa4b"
 dependencies = [
  "enumflags2_derive",
 ]
 
 [[package]]
 name = "enumflags2_derive"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f58dc3c5e468259f19f2d46304a6b28f1c3d034442e14b322d2b850e36f6d5ae"
+checksum = "9d2c772ccdbdfd1967b4f5d79d17c98ebf92009fdcc838db7aa434462f600c26"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "errno"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0"
+checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
 dependencies = [
  "errno-dragonfly",
  "libc",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -287,25 +287,25 @@ dependencies = [
 
 [[package]]
 name = "io-lifetimes"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb"
+checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
 dependencies = [
  "hermit-abi",
  "libc",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "is-terminal"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8"
+checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
 dependencies = [
  "hermit-abi",
  "io-lifetimes",
  "rustix",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -328,9 +328,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.140"
+version = "0.2.141"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
+checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
 
 [[package]]
 name = "libz-ng-sys"
@@ -431,9 +431,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.54"
+version = "1.0.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534"
+checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
 dependencies = [
  "unicode-ident",
 ]
@@ -449,16 +449,16 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.37.6"
+version = "0.37.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d097081ed288dfe45699b72f5b5d648e5f15d64d900c7080273baa20c16a6849"
+checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77"
 dependencies = [
  "bitflags",
  "errno",
  "io-lifetimes",
  "libc",
  "linux-raw-sys",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -487,7 +487,7 @@ checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.12",
+ "syn",
 ]
 
 [[package]]
@@ -498,20 +498,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79d9531f94112cfc3e4c8f5f02cb2b58f72c97b7efd85f70203cc6d8efda5927"
+checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -536,7 +525,16 @@ version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.0",
 ]
 
 [[package]]
@@ -545,13 +543,28 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.0",
+ "windows_aarch64_msvc 0.48.0",
+ "windows_i686_gnu 0.48.0",
+ "windows_i686_msvc 0.48.0",
+ "windows_x86_64_gnu 0.48.0",
+ "windows_x86_64_gnullvm 0.48.0",
+ "windows_x86_64_msvc 0.48.0",
 ]
 
 [[package]]
@@ -560,42 +573,84 @@ version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.42.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+
 [[package]]
 name = "zstd"
 version = "0.12.3+zstd.1.5.2"
@@ -607,9 +662,9 @@ dependencies = [
 
 [[package]]
 name = "zstd-safe"
-version = "6.0.4+zstd.1.5.4"
+version = "6.0.5+zstd.1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7afb4b54b8910cf5447638cb54bf4e8a65cbedd783af98b98c62ffe91f185543"
+checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b"
 dependencies = [
  "libc",
  "zstd-sys",
@@ -617,9 +672,9 @@ dependencies = [
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.7+zstd.1.5.4"
+version = "2.0.8+zstd.1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5"
+checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c"
 dependencies = [
  "cc",
  "libc",

From aa2edc3d13919b5be48e2bde69b936857586ab53 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 8 Apr 2023 10:48:00 +0200
Subject: [PATCH 153/460] world/section: move biome_types field out of BiomesV0
 enum

---
 src/world/section.rs | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/world/section.rs b/src/world/section.rs
index 5d2781a..e11f40a 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -217,24 +217,22 @@ impl<'a> BiomesV1_18<'a> {
 	}
 }
 
-/// Pre-v1.18 section biome data
+/// Pre-v1.18 section biome data variants
 ///
 /// There are a 3 formats for biome data that were used in
 /// different pre-v1.18 Minecraft versions
 #[derive(Debug)]
-pub enum BiomesV0<'a> {
-	IntArrayV15 {
-		data: &'a fastnbt::IntArray,
-		biome_types: &'a BiomeTypes,
-	},
-	IntArrayV0 {
-		data: &'a fastnbt::IntArray,
-		biome_types: &'a BiomeTypes,
-	},
-	ByteArray {
-		data: &'a fastnbt::ByteArray,
-		biome_types: &'a BiomeTypes,
-	},
+enum BiomesV0Data<'a> {
+	IntArrayV15(&'a fastnbt::IntArray),
+	IntArrayV0(&'a fastnbt::IntArray),
+	ByteArray(&'a fastnbt::ByteArray),
+}
+
+/// Pre-v1.18 section biome data
+#[derive(Debug)]
+pub struct BiomesV0<'a> {
+	data: BiomesV0Data<'a>,
+	biome_types: &'a BiomeTypes,
 }
 
 impl<'a> BiomesV0<'a> {
@@ -245,18 +243,19 @@ impl<'a> BiomesV0<'a> {
 		const BN: usize = N >> 2;
 		const BMAXY: usize = MAXY >> 2;
 
-		Ok(match biomes {
+		let data = match biomes {
 			Some(de::BiomesV0::IntArray(data)) if data.len() == BN * BN * BMAXY => {
-				BiomesV0::IntArrayV15 { data, biome_types }
+				BiomesV0Data::IntArrayV15(data)
 			}
 			Some(de::BiomesV0::IntArray(data)) if data.len() == N * N => {
-				BiomesV0::IntArrayV0 { data, biome_types }
+				BiomesV0Data::IntArrayV0(data)
 			}
 			Some(de::BiomesV0::ByteArray(data)) if data.len() == N * N => {
-				BiomesV0::ByteArray { data, biome_types }
+				BiomesV0Data::ByteArray(data)
 			}
 			_ => bail!("Invalid biome data"),
-		})
+		};
+		Ok(BiomesV0 { data, biome_types })
 	}
 }
 

From b93e61315275706e69140ffa59e329962f83470f Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 8 Apr 2023 10:59:20 +0200
Subject: [PATCH 154/460] types: add LayerBlockCoords::offset() helper

---
 src/types.rs | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/types.rs b/src/types.rs
index 2598485..06e01f9 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -53,6 +53,20 @@ impl Debug for LayerBlockCoords {
 	}
 }
 
+impl LayerBlockCoords {
+	/// Computes a block's offset in various data structures
+	///
+	/// Many chunk data structures store block and biome data in the same
+	/// order. This method computes the offset at which the data for the
+	/// block at a given coordinate is stored.
+	pub fn offset(&self) -> usize {
+		use BLOCKS_PER_CHUNK as N;
+		let x = self.x.0 as usize;
+		let z = self.z.0 as usize;
+		N * z + x
+	}
+}
+
 /// Generic array for data stored per block of a chunk layer
 ///
 /// Includes various convenient iteration functions.
@@ -102,10 +116,8 @@ impl SectionBlockCoords {
 	/// block at a given coordinate is stored.
 	pub fn offset(&self) -> usize {
 		use BLOCKS_PER_CHUNK as N;
-		let x = self.xz.x.0 as usize;
 		let y = self.y.0 as usize;
-		let z = self.xz.z.0 as usize;
-		((y * N) + z) * N + x
+		N * N * y + self.xz.offset()
 	}
 }
 

From ddc515a9d77122264a0ca8d8a9b19df6ab33515f Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 8 Apr 2023 12:10:54 +0200
Subject: [PATCH 155/460] world/section: implement biome_at()

---
 src/world/section.rs | 80 ++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 74 insertions(+), 6 deletions(-)

diff --git a/src/world/section.rs b/src/world/section.rs
index e11f40a..5f6553d 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -169,6 +169,11 @@ impl<'a> Section for SectionV0<'a> {
 	}
 }
 
+/// Trait for common functions of [BiomesV1_18] and [BiomesV0]
+pub trait Biomes: Debug {
+	fn biome_at(&self, section: SectionY, coords: SectionBlockCoords) -> Result<Option<&Biome>>;
+}
+
 /// Minecraft v1.18+ section biome data
 ///
 /// The biome data is part of the section structure in Minecraft v1.18+, with
@@ -176,9 +181,9 @@ impl<'a> Section for SectionV0<'a> {
 /// v1.13+ block data.
 #[derive(Debug)]
 pub struct BiomesV1_18<'a> {
-	_biomes: Option<&'a [i64]>,
-	_palette: Vec<Option<&'a Biome>>,
-	_bits: u8,
+	biomes: Option<&'a [i64]>,
+	palette: Vec<Option<&'a Biome>>,
+	bits: u8,
 }
 
 impl<'a> BiomesV1_18<'a> {
@@ -210,11 +215,45 @@ impl<'a> BiomesV1_18<'a> {
 			.collect();
 
 		Ok(BiomesV1_18 {
-			_biomes: biomes,
-			_palette: palette_types,
-			_bits: bits,
+			biomes,
+			palette: palette_types,
+			bits,
 		})
 	}
+
+	/// Looks up the block type palette index at the given coordinates
+	fn palette_index_at(&self, coords: SectionBlockCoords) -> usize {
+		const N: usize = BLOCKS_PER_CHUNK;
+		const BN: usize = N >> 2;
+
+		let Some(biomes) = self.biomes else {
+			return 0;
+		};
+
+		let bits = self.bits as usize;
+		let mask = (1 << bits) - 1;
+
+		let x = (coords.xz.x.0 >> 2) as usize;
+		let y = (coords.y.0 >> 2) as usize;
+		let z = (coords.xz.z.0 >> 2) as usize;
+		let offset = BN * BN * y + BN * z + x;
+
+		let blocks_per_word = 64 / bits;
+		let (word, shift) = div_rem(offset, blocks_per_word);
+		let shifted = biomes[word] as u64 >> (shift * bits);
+
+		(shifted & mask) as usize
+	}
+}
+
+impl<'a> Biomes for BiomesV1_18<'a> {
+	fn biome_at(&self, _section: SectionY, coords: SectionBlockCoords) -> Result<Option<&Biome>> {
+		let index = self.palette_index_at(coords);
+		Ok(*self
+			.palette
+			.get(index)
+			.context("Palette index out of bounds")?)
+	}
 }
 
 /// Pre-v1.18 section biome data variants
@@ -259,6 +298,35 @@ impl<'a> BiomesV0<'a> {
 	}
 }
 
+impl<'a> Biomes for BiomesV0<'a> {
+	fn biome_at(&self, section: SectionY, coords: SectionBlockCoords) -> Result<Option<&Biome>> {
+		let id = match self.data {
+			BiomesV0Data::IntArrayV15(data) => {
+				const N: usize = BLOCKS_PER_CHUNK;
+				const MAXY: usize = 256;
+				const BN: usize = N >> 2;
+
+				let LayerBlockCoords { x, z } = coords.xz;
+				let y = section
+					.0
+					.checked_mul(BLOCKS_PER_CHUNK as i32)
+					.and_then(|y| y.checked_add_unsigned(coords.y.0.into()))
+					.filter(|&height| height >= 0 && (height as usize) < MAXY)
+					.context("Y coordinate out of range")? as usize;
+				let offset = (y >> 2) * BN * BN + (z.0 >> 2) as usize * BN + (x.0 >> 2) as usize;
+				let id = data[offset] as u32;
+				id.try_into().context("Biome index out of range")?
+			}
+			BiomesV0Data::IntArrayV0(data) => {
+				let id = data[coords.xz.offset()] as u32;
+				id.try_into().context("Biome index out of range")?
+			}
+			BiomesV0Data::ByteArray(data) => data[coords.xz.offset()] as u8,
+		};
+		Ok(self.biome_types.get_legacy(id))
+	}
+}
+
 #[derive(Debug, Clone, Copy)]
 pub struct BlockLight<'a>(Option<&'a [i8]>);
 

From 0d2c99dacfffc8b6d8e88db09090d3421ac12f2e Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 8 Apr 2023 21:03:50 +0200
Subject: [PATCH 156/460] world/chunk: include biomes in section iterator item

---
 src/world/chunk.rs | 60 +++++++++++++++++++++++++++-------------------
 src/world/layer.rs |  1 +
 2 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/src/world/chunk.rs b/src/world/chunk.rs
index 026276a..4f743fc 100644
--- a/src/world/chunk.rs
+++ b/src/world/chunk.rs
@@ -50,10 +50,12 @@ enum SectionIterInner<'a> {
 	/// Iterator over sections of [Chunk::V1_13]
 	V1_13 {
 		iter: btree_map::Iter<'a, SectionY, (SectionV1_13<'a>, BlockLight<'a>)>,
+		biomes: &'a BiomesV0<'a>,
 	},
 	/// Iterator over sections of [Chunk::V0]
 	V0 {
 		iter: btree_map::Iter<'a, SectionY, (SectionV0<'a>, BlockLight<'a>)>,
+		biomes: &'a BiomesV0<'a>,
 	},
 	/// Empty iterator over an unpopulated chunk ([Chunk::Empty])
 	Empty,
@@ -208,11 +210,19 @@ impl<'a> Chunk<'a> {
 				Chunk::V1_18 { section_map } => V1_18 {
 					iter: section_map.iter(),
 				},
-				Chunk::V1_13 { section_map, .. } => V1_13 {
+				Chunk::V1_13 {
+					section_map,
+					biomes,
+				} => V1_13 {
 					iter: section_map.iter(),
+					biomes,
 				},
-				Chunk::V0 { section_map, .. } => V0 {
+				Chunk::V0 {
+					section_map,
+					biomes,
+				} => V0 {
 					iter: section_map.iter(),
+					biomes,
 				},
 				Chunk::Empty => Empty,
 			},
@@ -224,6 +234,7 @@ impl<'a> Chunk<'a> {
 pub struct SectionIterItem<'a> {
 	pub y: SectionY,
 	pub section: &'a dyn Section,
+	pub biomes: &'a dyn Biomes,
 	pub block_light: BlockLight<'a>,
 }
 
@@ -247,30 +258,29 @@ impl<'a> SectionIter<'a> {
 	{
 		match &mut self.inner {
 			SectionIterInner::V1_18 { iter } => f(&mut iter.map(
-				|(&y, (section, _, block_light))| SectionIterItem {
+				|(&y, (section, biomes, block_light))| SectionIterItem {
 					y,
 					section,
+					biomes,
+					block_light: *block_light,
+				},
+			)),
+			SectionIterInner::V1_13 { iter, biomes } => f(&mut iter.map(
+				|(&y, (section, block_light))| SectionIterItem {
+					y,
+					section,
+					biomes: *biomes,
+					block_light: *block_light,
+				},
+			)),
+			SectionIterInner::V0 { iter, biomes } => f(&mut iter.map(
+				|(&y, (section, block_light))| SectionIterItem {
+					y,
+					section,
+					biomes: *biomes,
 					block_light: *block_light,
 				},
 			)),
-			SectionIterInner::V1_13 { iter } => {
-				f(
-					&mut iter.map(|(&y, (section, block_light))| SectionIterItem {
-						y,
-						section,
-						block_light: *block_light,
-					}),
-				)
-			}
-			SectionIterInner::V0 { iter } => {
-				f(
-					&mut iter.map(|(&y, (section, block_light))| SectionIterItem {
-						y,
-						section,
-						block_light: *block_light,
-					}),
-				)
-			}
 			SectionIterInner::Empty => f(&mut iter::empty()),
 		}
 	}
@@ -286,8 +296,8 @@ impl<'a> Iterator for SectionIter<'a> {
 	fn size_hint(&self) -> (usize, Option<usize>) {
 		match &self.inner {
 			SectionIterInner::V1_18 { iter } => iter.size_hint(),
-			SectionIterInner::V1_13 { iter } => iter.size_hint(),
-			SectionIterInner::V0 { iter } => iter.size_hint(),
+			SectionIterInner::V1_13 { iter, .. } => iter.size_hint(),
+			SectionIterInner::V0 { iter, .. } => iter.size_hint(),
 			SectionIterInner::Empty => (0, Some(0)),
 		}
 	}
@@ -307,8 +317,8 @@ impl<'a> ExactSizeIterator for SectionIter<'a> {
 	fn len(&self) -> usize {
 		match &self.inner {
 			SectionIterInner::V1_18 { iter } => iter.len(),
-			SectionIterInner::V1_13 { iter } => iter.len(),
-			SectionIterInner::V0 { iter } => iter.len(),
+			SectionIterInner::V1_13 { iter, .. } => iter.len(),
+			SectionIterInner::V0 { iter, .. } => iter.len(),
 			SectionIterInner::Empty => 0,
 		}
 	}
diff --git a/src/world/layer.rs b/src/world/layer.rs
index fd24790..1e5abba 100644
--- a/src/world/layer.rs
+++ b/src/world/layer.rs
@@ -106,6 +106,7 @@ pub fn top_layer(chunk: &Chunk) -> Result<Option<(Box<BlockInfoArray>, Box<Block
 	for SectionIterItem {
 		y: section_y,
 		section,
+		biomes: _,
 		block_light,
 	} in chunk.sections().rev()
 	{

From e912f60ba389230ca2ec9418badfdd7572b63e85 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 9 Apr 2023 22:56:02 +0200
Subject: [PATCH 157/460] world/layer: add biome data to returned layer

---
 src/main.rs        |  7 +++++--
 src/world/layer.rs | 17 +++++++++++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index fcd588d..50884e3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -126,7 +126,10 @@ impl<'a> RegionProcessor<'a> {
 		data: world::de::Chunk,
 	) -> Result<
 		Option<(
-			Box<world::layer::BlockInfoArray>,
+			(
+				Box<world::layer::BlockInfoArray>,
+				Box<world::layer::BiomeArray>,
+			),
 			Box<world::layer::BlockLightArray>,
 		)>,
 	> {
@@ -192,7 +195,7 @@ impl<'a> RegionProcessor<'a> {
 
 		minedmap::io::region::from_file(path)?.foreach_chunk(
 			|chunk_coords, data: world::de::Chunk| {
-				let Some((processed_chunk, block_light)) = self
+				let Some(((processed_chunk, _), block_light)) = self
 					.process_chunk(data)
 					.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))?
 				else {
diff --git a/src/world/layer.rs b/src/world/layer.rs
index 1e5abba..a457191 100644
--- a/src/world/layer.rs
+++ b/src/world/layer.rs
@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 
 use super::chunk::{Chunk, SectionIterItem};
 use crate::{
-	resource::{BlockFlag, BlockType},
+	resource::{Biome, BlockFlag, BlockType},
 	types::*,
 };
 
@@ -83,6 +83,7 @@ impl OptionBlockInfoExt for Option<BlockInfo> {
 }
 
 pub type BlockInfoArray = LayerBlockArray<Option<BlockInfo>>;
+pub type BiomeArray = LayerBlockArray<Option<Biome>>;
 pub type BlockLightArray = LayerBlockArray<u8>;
 
 /// Fills in a [BlockInfoArray] with the information of the chunk's top
@@ -92,7 +93,9 @@ pub type BlockLightArray = LayerBlockArray<u8>;
 /// determined as the block that should be visible on the rendered
 /// map. For water blocks, the height of the first non-water block
 /// is additionally filled in as the water depth.
-pub fn top_layer(chunk: &Chunk) -> Result<Option<(Box<BlockInfoArray>, Box<BlockLightArray>)>> {
+pub fn top_layer(
+	chunk: &Chunk,
+) -> Result<Option<((Box<BlockInfoArray>, Box<BiomeArray>), Box<BlockLightArray>)>> {
 	use BLOCKS_PER_CHUNK as N;
 
 	if chunk.is_empty() {
@@ -101,12 +104,13 @@ pub fn top_layer(chunk: &Chunk) -> Result<Option<(Box<BlockInfoArray>, Box<Block
 
 	let mut done = 0;
 	let mut blocks = Box::<BlockInfoArray>::default();
+	let mut block_biomes = Box::<BiomeArray>::default();
 	let mut light = Box::<BlockLightArray>::default();
 
 	for SectionIterItem {
 		y: section_y,
 		section,
-		biomes: _,
+		biomes,
 		block_light,
 	} in chunk.sections().rev()
 	{
@@ -133,6 +137,11 @@ pub fn top_layer(chunk: &Chunk) -> Result<Option<(Box<BlockInfoArray>, Box<Block
 					done += 1;
 				};
 
+				let biome_entry = &mut block_biomes[xz];
+				if !entry.is_none() && biome_entry.is_none() {
+					*biome_entry = biomes.biome_at(section_y, coords)?.copied();
+				}
+
 				if entry.is_none() {
 					light[xz] = block_light.block_light_at(coords);
 				}
@@ -144,5 +153,5 @@ pub fn top_layer(chunk: &Chunk) -> Result<Option<(Box<BlockInfoArray>, Box<Block
 		}
 	}
 
-	Ok(Some((blocks, light)))
+	Ok(Some(((blocks, block_biomes), light)))
 }

From 0d81dfa35b5d6776a055701e05b63bdce52418e8 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 9 Apr 2023 23:20:20 +0200
Subject: [PATCH 158/460] main: store biome data in processed data files

---
 src/main.rs            | 18 ++++++++++++------
 src/resource/biomes.rs |  6 ++++--
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 50884e3..e2121e6 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -25,7 +25,12 @@ struct Args {
 }
 
 type RegionCoords = (i32, i32);
-type ProcessedRegion = ChunkArray<Option<Box<world::layer::BlockInfoArray>>>;
+type ProcessedRegion = ChunkArray<
+	Option<(
+		Box<world::layer::BlockInfoArray>,
+		Box<world::layer::BiomeArray>,
+	)>,
+>;
 
 struct Config {
 	region_dir: PathBuf,
@@ -195,7 +200,7 @@ impl<'a> RegionProcessor<'a> {
 
 		minedmap::io::region::from_file(path)?.foreach_chunk(
 			|chunk_coords, data: world::de::Chunk| {
-				let Some(((processed_chunk, _), block_light)) = self
+				let Some((processed_chunk, block_light)) = self
 					.process_chunk(data)
 					.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))?
 				else {
@@ -299,13 +304,14 @@ impl<'a> TileRenderer<'a> {
 	fn render_chunk(
 		image: &mut image::RgbaImage,
 		coords: ChunkCoords,
-		chunk: &world::layer::BlockInfoArray,
+		blocks: &world::layer::BlockInfoArray,
+		_biomes: &world::layer::BiomeArray,
 	) {
 		const N: u32 = BLOCKS_PER_CHUNK as u32;
 
 		let chunk_image = image::RgbaImage::from_fn(N, N, |x, z| {
 			image::Rgba(
-				match &chunk[LayerBlockCoords {
+				match &blocks[LayerBlockCoords {
 					x: BlockX(x as u8),
 					z: BlockZ(z as u8),
 				}] {
@@ -319,11 +325,11 @@ impl<'a> TileRenderer<'a> {
 
 	fn render_region(image: &mut image::RgbaImage, region: &ProcessedRegion) {
 		for (coords, chunk) in region.iter() {
-			let Some(chunk) = chunk else {
+			let Some((blocks, biomes)) = chunk else {
 				continue;
 			};
 
-			Self::render_chunk(image, coords, chunk);
+			Self::render_chunk(image, coords, blocks, biomes);
 		}
 	}
 
diff --git a/src/resource/biomes.rs b/src/resource/biomes.rs
index 1421883..036cafc 100644
--- a/src/resource/biomes.rs
+++ b/src/resource/biomes.rs
@@ -1,12 +1,14 @@
+use serde::{Deserialize, Serialize};
+
 use super::Color;
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 pub enum BiomeGrassColorModifier {
 	DarkForest,
 	Swamp,
 }
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 pub struct Biome {
 	pub temp: i8,
 	pub downfall: i8,

From d79377ad6b36d5709ebb343cb44f1d0756697fb5 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 10 Apr 2023 20:58:07 +0200
Subject: [PATCH 159/460] main: pass biome into block_color()

No biome edge smoothing yet.
---
 src/main.rs | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index e2121e6..223e694 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -8,7 +8,7 @@ use clap::Parser;
 
 use minedmap::{
 	io::storage,
-	resource,
+	resource::{self, Biome},
 	types::*,
 	world::{
 		self,
@@ -288,7 +288,7 @@ impl<'a> TileRenderer<'a> {
 		storage::read(&processed_path).context("Failed to load processed region data")
 	}
 
-	fn block_color(block: &BlockInfo) -> [u8; 4] {
+	fn block_color(block: &BlockInfo, _biome: &Biome) -> [u8; 4] {
 		let h = block
 			.depth
 			.map(|depth| 0.5 + 0.005 * depth.0 as f32)
@@ -305,20 +305,19 @@ impl<'a> TileRenderer<'a> {
 		image: &mut image::RgbaImage,
 		coords: ChunkCoords,
 		blocks: &world::layer::BlockInfoArray,
-		_biomes: &world::layer::BiomeArray,
+		biomes: &world::layer::BiomeArray,
 	) {
 		const N: u32 = BLOCKS_PER_CHUNK as u32;
 
 		let chunk_image = image::RgbaImage::from_fn(N, N, |x, z| {
-			image::Rgba(
-				match &blocks[LayerBlockCoords {
-					x: BlockX(x as u8),
-					z: BlockZ(z as u8),
-				}] {
-					Some(block) => Self::block_color(block),
-					None => [0, 0, 0, 0],
-				},
-			)
+			let coords = LayerBlockCoords {
+				x: BlockX(x as u8),
+				z: BlockZ(z as u8),
+			};
+			image::Rgba(match (&blocks[coords], &biomes[coords]) {
+				(Some(block), Some(biome)) => Self::block_color(block, biome),
+				_ => [0, 0, 0, 0],
+			})
 		});
 		overlay_chunk(image, &chunk_image, coords);
 	}

From 2e05998b48396c12613f4de66949f6c7a4bf4a91 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 30 Apr 2023 08:22:59 +0200
Subject: [PATCH 160/460] Update depenencies

---
 Cargo.lock | 219 +++++++++++++++++++++--------------------------------
 1 file changed, 85 insertions(+), 134 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5a3f9e8..7531593 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10,49 +10,58 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "anstream"
-version = "0.2.6"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f"
+checksum = "6342bd4f5a1205d7f41e94a41a901f5647c938cdfa96036338e8533c9d6c2450"
 dependencies = [
  "anstyle",
  "anstyle-parse",
+ "anstyle-query",
  "anstyle-wincon",
- "concolor-override",
- "concolor-query",
+ "colorchoice",
  "is-terminal",
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle"
-version = "0.3.5"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2"
+checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.1.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116"
+checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
-name = "anstyle-wincon"
-version = "0.2.0"
+name = "anstyle-query"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
 dependencies = [
  "anstyle",
- "windows-sys 0.45.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.70"
+version = "1.0.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4"
+checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
 
 [[package]]
 name = "autocfg"
@@ -110,9 +119,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.2.1"
+version = "4.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3"
+checksum = "8a1f23fa97e1d1641371b51f35535cb26959b8e27ab50d167a8b996b5bada819"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -121,9 +130,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.2.1"
+version = "4.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f"
+checksum = "0fdc5d93c358224b4d6867ef1356d740de2303e9892edc06c5340daeccd96bab"
 dependencies = [
  "anstream",
  "anstyle",
@@ -166,19 +175,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
 [[package]]
-name = "concolor-override"
+name = "colorchoice"
 version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f"
-
-[[package]]
-name = "concolor-query"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf"
-dependencies = [
- "windows-sys 0.45.0",
-]
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
 [[package]]
 name = "crc32fast"
@@ -197,18 +197,18 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
 
 [[package]]
 name = "enumflags2"
-version = "0.7.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0044ebdf7fbb2a772e0c0233a9d3173c5cd8af8ae7078d4c5188af44ffffaa4b"
+checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2"
 dependencies = [
  "enumflags2_derive",
 ]
 
 [[package]]
 name = "enumflags2_derive"
-version = "0.7.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d2c772ccdbdfd1967b4f5d79d17c98ebf92009fdcc838db7aa434462f600c26"
+checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -223,7 +223,7 @@ checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
 dependencies = [
  "errno-dragonfly",
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -238,9 +238,9 @@ dependencies = [
 
 [[package]]
 name = "fastnbt"
-version = "2.4.3"
+version = "2.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1aab2b0109236f6c89cc81b9e2ef4aced6d585aabe96ac860ee5e9a102eb198"
+checksum = "3369bd70629bccfda7e344883c9ae3ab7f3b10a357bcf8b0f69caa7256bcf188"
 dependencies = [
  "byteorder",
  "cesu8",
@@ -249,10 +249,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "flate2"
-version = "1.0.25"
+name = "fdeflate"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
+checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10"
+dependencies = [
+ "simd-adler32",
+]
+
+[[package]]
+name = "flate2"
+version = "1.0.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
 dependencies = [
  "crc32fast",
  "libz-ng-sys",
@@ -293,7 +302,7 @@ checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
 dependencies = [
  "hermit-abi",
  "libc",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -305,7 +314,7 @@ dependencies = [
  "hermit-abi",
  "io-lifetimes",
  "rustix",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -328,15 +337,15 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.141"
+version = "0.2.142"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5"
+checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
 
 [[package]]
 name = "libz-ng-sys"
-version = "1.1.8"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4399ae96a9966bf581e726de86969f803a81b7ce795fcd5480e640589457e0f2"
+checksum = "2468756f34903b582fe7154dc1ffdebd89d0562c4a43b53c621bb0f1b1043ccb"
 dependencies = [
  "cmake",
  "libc",
@@ -344,9 +353,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.3.1"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f"
+checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c"
 
 [[package]]
 name = "minedmap"
@@ -368,11 +377,12 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.6.2"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
 dependencies = [
  "adler",
+ "simd-adler32",
 ]
 
 [[package]]
@@ -419,12 +429,13 @@ checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
 
 [[package]]
 name = "png"
-version = "0.17.7"
+version = "0.17.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638"
+checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa"
 dependencies = [
  "bitflags",
  "crc32fast",
+ "fdeflate",
  "flate2",
  "miniz_oxide",
 ]
@@ -449,23 +460,23 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.37.11"
+version = "0.37.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77"
+checksum = "8bbfc1d1c7c40c01715f47d71444744a81669ca84e8b63e25a55e169b1f86433"
 dependencies = [
  "bitflags",
  "errno",
  "io-lifetimes",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "serde"
-version = "1.0.159"
+version = "1.0.160"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065"
+checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
 dependencies = [
  "serde_derive",
 ]
@@ -481,15 +492,21 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.159"
+version = "1.0.160"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585"
+checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn",
 ]
 
+[[package]]
+name = "simd-adler32"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f"
+
 [[package]]
 name = "strsim"
 version = "0.10.0"
@@ -498,9 +515,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "syn"
-version = "2.0.13"
+version = "2.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec"
+checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -519,37 +536,13 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.2",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows-targets 0.48.0",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "windows-targets",
 ]
 
 [[package]]
@@ -558,93 +551,51 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
 dependencies = [
- "windows_aarch64_gnullvm 0.48.0",
- "windows_aarch64_msvc 0.48.0",
- "windows_i686_gnu 0.48.0",
- "windows_i686_msvc 0.48.0",
- "windows_x86_64_gnu 0.48.0",
- "windows_x86_64_gnullvm 0.48.0",
- "windows_x86_64_msvc 0.48.0",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
 ]
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.0"

From 61fb23b94b959f2e86a3dcbada9d9dd72219793c Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 30 Apr 2023 10:46:56 +0200
Subject: [PATCH 161/460] Move main source file to bin subdirectory

---
 src/{ => bin/minedmap}/main.rs | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/{ => bin/minedmap}/main.rs (100%)

diff --git a/src/main.rs b/src/bin/minedmap/main.rs
similarity index 100%
rename from src/main.rs
rename to src/bin/minedmap/main.rs

From 1a5e8894fe2619083e503b63c7497983a8038783 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 30 Apr 2023 11:01:15 +0200
Subject: [PATCH 162/460] minedmap: split up main module

---
 src/bin/minedmap/common.rs           |  77 ++++++
 src/bin/minedmap/main.rs             | 385 +--------------------------
 src/bin/minedmap/region_processor.rs | 183 +++++++++++++
 src/bin/minedmap/tile_renderer.rs    | 113 ++++++++
 4 files changed, 385 insertions(+), 373 deletions(-)
 create mode 100644 src/bin/minedmap/common.rs
 create mode 100644 src/bin/minedmap/region_processor.rs
 create mode 100644 src/bin/minedmap/tile_renderer.rs

diff --git a/src/bin/minedmap/common.rs b/src/bin/minedmap/common.rs
new file mode 100644
index 0000000..ae645d1
--- /dev/null
+++ b/src/bin/minedmap/common.rs
@@ -0,0 +1,77 @@
+use std::path::{Path, PathBuf};
+
+use minedmap::{types::*, world};
+
+pub type RegionCoords = (i32, i32);
+pub type ProcessedRegion = ChunkArray<
+	Option<(
+		Box<world::layer::BlockInfoArray>,
+		Box<world::layer::BiomeArray>,
+	)>,
+>;
+
+pub struct Config {
+	pub region_dir: PathBuf,
+	pub processed_dir: PathBuf,
+	pub light_dir: PathBuf,
+	pub map_dir: PathBuf,
+}
+
+impl Config {
+	pub fn new(args: super::Args) -> Self {
+		let region_dir = [&args.input_dir, Path::new("region")].iter().collect();
+		let processed_dir = [&args.output_dir, Path::new("processed")].iter().collect();
+		let light_dir = [&args.output_dir, Path::new("light/0")].iter().collect();
+		let map_dir = [&args.output_dir, Path::new("map/0")].iter().collect();
+
+		Config {
+			region_dir,
+			processed_dir,
+			light_dir,
+			map_dir,
+		}
+	}
+
+	pub fn processed_path(&self, coords: RegionCoords, temp: bool) -> PathBuf {
+		let filename = format!(
+			"r.{}.{}.bin{}",
+			coords.0,
+			coords.1,
+			if temp { ".tmp" } else { "" },
+		);
+		[&self.processed_dir, Path::new(&filename)].iter().collect()
+	}
+
+	pub fn light_path(&self, coords: RegionCoords, temp: bool) -> PathBuf {
+		let filename = format!(
+			"r.{}.{}.png{}",
+			coords.0,
+			coords.1,
+			if temp { ".tmp" } else { "" },
+		);
+		[&self.light_dir, Path::new(&filename)].iter().collect()
+	}
+
+	pub fn map_path(&self, coords: RegionCoords, temp: bool) -> PathBuf {
+		let filename = format!(
+			"r.{}.{}.png{}",
+			coords.0,
+			coords.1,
+			if temp { ".tmp" } else { "" },
+		);
+		[&self.map_dir, Path::new(&filename)].iter().collect()
+	}
+}
+
+pub fn overlay_chunk<I, J>(image: &mut I, chunk: &J, coords: ChunkCoords)
+where
+	I: image::GenericImage,
+	J: image::GenericImageView<Pixel = I::Pixel>,
+{
+	image::imageops::overlay(
+		image,
+		chunk,
+		coords.x.0 as i64 * BLOCKS_PER_CHUNK as i64,
+		coords.z.0 as i64 * BLOCKS_PER_CHUNK as i64,
+	);
+}
diff --git a/src/bin/minedmap/main.rs b/src/bin/minedmap/main.rs
index 223e694..d0714ef 100644
--- a/src/bin/minedmap/main.rs
+++ b/src/bin/minedmap/main.rs
@@ -1,383 +1,22 @@
-use std::{
-	fs,
-	path::{Path, PathBuf},
-};
+mod common;
+mod region_processor;
+mod tile_renderer;
 
-use anyhow::{Context, Result};
+use std::path::PathBuf;
+
+use anyhow::Result;
 use clap::Parser;
 
-use minedmap::{
-	io::storage,
-	resource::{self, Biome},
-	types::*,
-	world::{
-		self,
-		layer::{BlockInfo, BlockLightArray},
-	},
-};
+use common::Config;
+use region_processor::RegionProcessor;
+use tile_renderer::TileRenderer;
 
 #[derive(Debug, Parser)]
-struct Args {
+pub struct Args {
 	/// Minecraft save directory
-	input_dir: PathBuf,
+	pub input_dir: PathBuf,
 	/// MinedMap data directory
-	output_dir: PathBuf,
-}
-
-type RegionCoords = (i32, i32);
-type ProcessedRegion = ChunkArray<
-	Option<(
-		Box<world::layer::BlockInfoArray>,
-		Box<world::layer::BiomeArray>,
-	)>,
->;
-
-struct Config {
-	region_dir: PathBuf,
-	processed_dir: PathBuf,
-	light_dir: PathBuf,
-	map_dir: PathBuf,
-}
-
-impl Config {
-	fn new(args: Args) -> Self {
-		let region_dir = [&args.input_dir, Path::new("region")].iter().collect();
-		let processed_dir = [&args.output_dir, Path::new("processed")].iter().collect();
-		let light_dir = [&args.output_dir, Path::new("light/0")].iter().collect();
-		let map_dir = [&args.output_dir, Path::new("map/0")].iter().collect();
-
-		Config {
-			region_dir,
-			processed_dir,
-			light_dir,
-			map_dir,
-		}
-	}
-
-	fn processed_path(&self, coords: RegionCoords, temp: bool) -> PathBuf {
-		let filename = format!(
-			"r.{}.{}.bin{}",
-			coords.0,
-			coords.1,
-			if temp { ".tmp" } else { "" },
-		);
-		[&self.processed_dir, Path::new(&filename)].iter().collect()
-	}
-
-	fn light_path(&self, coords: RegionCoords, temp: bool) -> PathBuf {
-		let filename = format!(
-			"r.{}.{}.png{}",
-			coords.0,
-			coords.1,
-			if temp { ".tmp" } else { "" },
-		);
-		[&self.light_dir, Path::new(&filename)].iter().collect()
-	}
-
-	fn map_path(&self, coords: RegionCoords, temp: bool) -> PathBuf {
-		let filename = format!(
-			"r.{}.{}.png{}",
-			coords.0,
-			coords.1,
-			if temp { ".tmp" } else { "" },
-		);
-		[&self.map_dir, Path::new(&filename)].iter().collect()
-	}
-}
-
-fn overlay_chunk<I, J>(image: &mut I, chunk: &J, coords: ChunkCoords)
-where
-	I: image::GenericImage,
-	J: image::GenericImageView<Pixel = I::Pixel>,
-{
-	image::imageops::overlay(
-		image,
-		chunk,
-		coords.x.0 as i64 * BLOCKS_PER_CHUNK as i64,
-		coords.z.0 as i64 * BLOCKS_PER_CHUNK as i64,
-	);
-}
-
-/// Type with methods for processing the regions of a Minecraft save directory
-struct RegionProcessor<'a> {
-	block_types: resource::BlockTypes,
-	biome_types: resource::BiomeTypes,
-	config: &'a Config,
-}
-
-impl<'a> RegionProcessor<'a> {
-	fn new(config: &'a Config) -> Self {
-		RegionProcessor {
-			block_types: resource::BlockTypes::default(),
-			biome_types: resource::BiomeTypes::default(),
-			config,
-		}
-	}
-
-	/// Parses a filename in the format r.X.Z.mca into the contained X and Z values
-	fn parse_region_filename(path: &Path) -> Option<RegionCoords> {
-		let file_name = path.file_name()?.to_str()?;
-		let parts: Vec<_> = file_name.split('.').collect();
-		let &["r", x, z, "mca"] = parts.as_slice() else {
-			return None;
-		};
-
-		Some((x.parse().ok()?, z.parse().ok()?))
-	}
-
-	/// Processes a single chunk
-	fn process_chunk(
-		&self,
-		data: world::de::Chunk,
-	) -> Result<
-		Option<(
-			(
-				Box<world::layer::BlockInfoArray>,
-				Box<world::layer::BiomeArray>,
-			),
-			Box<world::layer::BlockLightArray>,
-		)>,
-	> {
-		let chunk = world::chunk::Chunk::new(&data, &self.block_types, &self.biome_types)?;
-		world::layer::top_layer(&chunk)
-	}
-
-	fn chunk_lightmap(block_light: Box<BlockLightArray>) -> image::GrayAlphaImage {
-		const N: u32 = BLOCKS_PER_CHUNK as u32;
-
-		image::GrayAlphaImage::from_fn(N, N, |x, z| {
-			let v: f32 = block_light[LayerBlockCoords {
-				x: BlockX(x as u8),
-				z: BlockZ(z as u8),
-			}]
-			.into();
-			image::LumaA([0, (192.0 * (1.0 - v / 15.0)) as u8])
-		})
-	}
-
-	fn save_region(&self, coords: RegionCoords, processed_region: &ProcessedRegion) -> Result<()> {
-		let tmp_path = self.config.processed_path(coords, true);
-		storage::write(&tmp_path, processed_region)?;
-
-		let output_path = self.config.processed_path(coords, false);
-		fs::rename(&tmp_path, &output_path).with_context(|| {
-			format!(
-				"Failed to rename {} to {}",
-				tmp_path.display(),
-				output_path.display(),
-			)
-		})?;
-
-		Ok(())
-	}
-
-	fn save_lightmap(&self, coords: RegionCoords, lightmap: &image::GrayAlphaImage) -> Result<()> {
-		let tmp_path = self.config.light_path(coords, true);
-		lightmap
-			.save_with_format(&tmp_path, image::ImageFormat::Png)
-			.context("Failed to save image")?;
-
-		let output_path = self.config.light_path(coords, false);
-		fs::rename(&tmp_path, &output_path).with_context(|| {
-			format!(
-				"Failed to rename {} to {}",
-				tmp_path.display(),
-				output_path.display(),
-			)
-		})?;
-
-		Ok(())
-	}
-
-	/// Processes a single region file
-	fn process_region(&self, path: &Path, coords: RegionCoords) -> Result<()> {
-		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
-
-		println!("Processing region r.{}.{}.mca", coords.0, coords.1);
-
-		let mut processed_region = ProcessedRegion::default();
-		let mut lightmap = image::GrayAlphaImage::new(N, N);
-
-		minedmap::io::region::from_file(path)?.foreach_chunk(
-			|chunk_coords, data: world::de::Chunk| {
-				let Some((processed_chunk, block_light)) = self
-					.process_chunk(data)
-					.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))?
-				else {
-					return Ok(());
-				};
-				processed_region[chunk_coords] = Some(processed_chunk);
-
-				let chunk_lightmap = Self::chunk_lightmap(block_light);
-				overlay_chunk(&mut lightmap, &chunk_lightmap, chunk_coords);
-
-				Ok(())
-			},
-		)?;
-
-		self.save_region(coords, &processed_region)?;
-		self.save_lightmap(coords, &lightmap)?;
-
-		Ok(())
-	}
-
-	/// Iterates over all region files of a Minecraft save directory
-	///
-	/// Returns a list of the coordinates of all processed regions
-	fn run(self) -> Result<Vec<RegionCoords>> {
-		let read_dir = self.config.region_dir.read_dir().with_context(|| {
-			format!(
-				"Failed to read directory {}",
-				self.config.region_dir.display()
-			)
-		})?;
-
-		fs::create_dir_all(&self.config.processed_dir).with_context(|| {
-			format!(
-				"Failed to create directory {}",
-				self.config.processed_dir.display(),
-			)
-		})?;
-		fs::create_dir_all(&self.config.light_dir).with_context(|| {
-			format!(
-				"Failed to create directory {}",
-				self.config.light_dir.display(),
-			)
-		})?;
-
-		let mut ret = Vec::new();
-
-		for entry in read_dir.filter_map(|entry| entry.ok()).filter(|entry| {
-			// We are only interested in regular files
-			entry
-				.file_type()
-				.map(|file_type| file_type.is_file())
-				.unwrap_or_default()
-		}) {
-			let path = entry.path();
-			let Some(coords) = Self::parse_region_filename(&path) else {
-				continue;
-			};
-
-			if let Err(err) = self.process_region(&path, coords) {
-				eprintln!(
-					"Failed to process region {}: {:?}",
-					path.file_name().unwrap_or_default().to_string_lossy(),
-					err,
-				);
-			}
-
-			ret.push(coords);
-		}
-
-		Ok(ret)
-	}
-}
-
-struct TileRenderer<'a> {
-	config: &'a Config,
-}
-
-impl<'a> TileRenderer<'a> {
-	fn new(config: &'a Config) -> Self {
-		TileRenderer { config }
-	}
-
-	fn load_region(&self, coords: RegionCoords) -> Result<ProcessedRegion> {
-		let processed_path = self.config.processed_path(coords, false);
-		storage::read(&processed_path).context("Failed to load processed region data")
-	}
-
-	fn block_color(block: &BlockInfo, _biome: &Biome) -> [u8; 4] {
-		let h = block
-			.depth
-			.map(|depth| 0.5 + 0.005 * depth.0 as f32)
-			.unwrap_or_default();
-		let c = block
-			.block_type
-			.color
-			.0
-			.map(|v| (f32::from(v) * h).clamp(0.0, 255.0) as u8);
-		[c[0], c[1], c[2], 255]
-	}
-
-	fn render_chunk(
-		image: &mut image::RgbaImage,
-		coords: ChunkCoords,
-		blocks: &world::layer::BlockInfoArray,
-		biomes: &world::layer::BiomeArray,
-	) {
-		const N: u32 = BLOCKS_PER_CHUNK as u32;
-
-		let chunk_image = image::RgbaImage::from_fn(N, N, |x, z| {
-			let coords = LayerBlockCoords {
-				x: BlockX(x as u8),
-				z: BlockZ(z as u8),
-			};
-			image::Rgba(match (&blocks[coords], &biomes[coords]) {
-				(Some(block), Some(biome)) => Self::block_color(block, biome),
-				_ => [0, 0, 0, 0],
-			})
-		});
-		overlay_chunk(image, &chunk_image, coords);
-	}
-
-	fn render_region(image: &mut image::RgbaImage, region: &ProcessedRegion) {
-		for (coords, chunk) in region.iter() {
-			let Some((blocks, biomes)) = chunk else {
-				continue;
-			};
-
-			Self::render_chunk(image, coords, blocks, biomes);
-		}
-	}
-
-	fn render_tile(&self, coords: RegionCoords) -> Result<()> {
-		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
-
-		let tmp_path = self.config.map_path(coords, true);
-		let output_path = self.config.map_path(coords, false);
-		println!(
-			"Rendering tile {}",
-			output_path
-				.file_name()
-				.unwrap_or_default()
-				.to_string_lossy(),
-		);
-
-		let region = self.load_region(coords)?;
-		let mut image = image::RgbaImage::new(N, N);
-		Self::render_region(&mut image, &region);
-		image
-			.save_with_format(&tmp_path, image::ImageFormat::Png)
-			.context("Failed to save image")?;
-		fs::rename(&tmp_path, &output_path).with_context(|| {
-			format!(
-				"Failed to rename {} to {}",
-				tmp_path.display(),
-				output_path.display(),
-			)
-		})?;
-
-		Ok(())
-	}
-
-	fn run(self, regions: &[RegionCoords]) -> Result<()> {
-		fs::create_dir_all(&self.config.map_dir).with_context(|| {
-			format!(
-				"Failed to create directory {}",
-				self.config.map_dir.display(),
-			)
-		})?;
-
-		for &coords in regions {
-			if let Err(err) = self.render_tile(coords) {
-				eprintln!("Failed to render tile {:?}: {:?}", coords, err,);
-			}
-		}
-
-		Ok(())
-	}
+	pub output_dir: PathBuf,
 }
 
 fn main() -> Result<()> {
diff --git a/src/bin/minedmap/region_processor.rs b/src/bin/minedmap/region_processor.rs
new file mode 100644
index 0000000..640467c
--- /dev/null
+++ b/src/bin/minedmap/region_processor.rs
@@ -0,0 +1,183 @@
+use std::{fs, path::Path};
+
+use anyhow::{Context, Result};
+
+use minedmap::{io::storage, resource, types::*, world};
+
+use super::common::*;
+
+/// Type with methods for processing the regions of a Minecraft save directory
+pub struct RegionProcessor<'a> {
+	block_types: resource::BlockTypes,
+	biome_types: resource::BiomeTypes,
+	config: &'a Config,
+}
+
+impl<'a> RegionProcessor<'a> {
+	pub fn new(config: &'a Config) -> Self {
+		RegionProcessor {
+			block_types: resource::BlockTypes::default(),
+			biome_types: resource::BiomeTypes::default(),
+			config,
+		}
+	}
+
+	/// Parses a filename in the format r.X.Z.mca into the contained X and Z values
+	fn parse_region_filename(path: &Path) -> Option<RegionCoords> {
+		let file_name = path.file_name()?.to_str()?;
+		let parts: Vec<_> = file_name.split('.').collect();
+		let &["r", x, z, "mca"] = parts.as_slice() else {
+			return None;
+		};
+
+		Some((x.parse().ok()?, z.parse().ok()?))
+	}
+
+	/// Processes a single chunk
+	fn process_chunk(
+		&self,
+		data: world::de::Chunk,
+	) -> Result<
+		Option<(
+			(
+				Box<world::layer::BlockInfoArray>,
+				Box<world::layer::BiomeArray>,
+			),
+			Box<world::layer::BlockLightArray>,
+		)>,
+	> {
+		let chunk = world::chunk::Chunk::new(&data, &self.block_types, &self.biome_types)?;
+		world::layer::top_layer(&chunk)
+	}
+
+	fn chunk_lightmap(block_light: Box<world::layer::BlockLightArray>) -> image::GrayAlphaImage {
+		const N: u32 = BLOCKS_PER_CHUNK as u32;
+
+		image::GrayAlphaImage::from_fn(N, N, |x, z| {
+			let v: f32 = block_light[LayerBlockCoords {
+				x: BlockX(x as u8),
+				z: BlockZ(z as u8),
+			}]
+			.into();
+			image::LumaA([0, (192.0 * (1.0 - v / 15.0)) as u8])
+		})
+	}
+
+	fn save_region(&self, coords: RegionCoords, processed_region: &ProcessedRegion) -> Result<()> {
+		let tmp_path = self.config.processed_path(coords, true);
+		storage::write(&tmp_path, processed_region)?;
+
+		let output_path = self.config.processed_path(coords, false);
+		fs::rename(&tmp_path, &output_path).with_context(|| {
+			format!(
+				"Failed to rename {} to {}",
+				tmp_path.display(),
+				output_path.display(),
+			)
+		})?;
+
+		Ok(())
+	}
+
+	fn save_lightmap(&self, coords: RegionCoords, lightmap: &image::GrayAlphaImage) -> Result<()> {
+		let tmp_path = self.config.light_path(coords, true);
+		lightmap
+			.save_with_format(&tmp_path, image::ImageFormat::Png)
+			.context("Failed to save image")?;
+
+		let output_path = self.config.light_path(coords, false);
+		fs::rename(&tmp_path, &output_path).with_context(|| {
+			format!(
+				"Failed to rename {} to {}",
+				tmp_path.display(),
+				output_path.display(),
+			)
+		})?;
+
+		Ok(())
+	}
+
+	/// Processes a single region file
+	fn process_region(&self, path: &Path, coords: RegionCoords) -> Result<()> {
+		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
+
+		println!("Processing region r.{}.{}.mca", coords.0, coords.1);
+
+		let mut processed_region = ProcessedRegion::default();
+		let mut lightmap = image::GrayAlphaImage::new(N, N);
+
+		minedmap::io::region::from_file(path)?.foreach_chunk(
+			|chunk_coords, data: world::de::Chunk| {
+				let Some((processed_chunk, block_light)) = self
+					.process_chunk(data)
+					.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))?
+				else {
+					return Ok(());
+				};
+				processed_region[chunk_coords] = Some(processed_chunk);
+
+				let chunk_lightmap = Self::chunk_lightmap(block_light);
+				overlay_chunk(&mut lightmap, &chunk_lightmap, chunk_coords);
+
+				Ok(())
+			},
+		)?;
+
+		self.save_region(coords, &processed_region)?;
+		self.save_lightmap(coords, &lightmap)?;
+
+		Ok(())
+	}
+
+	/// Iterates over all region files of a Minecraft save directory
+	///
+	/// Returns a list of the coordinates of all processed regions
+	pub fn run(self) -> Result<Vec<RegionCoords>> {
+		let read_dir = self.config.region_dir.read_dir().with_context(|| {
+			format!(
+				"Failed to read directory {}",
+				self.config.region_dir.display()
+			)
+		})?;
+
+		fs::create_dir_all(&self.config.processed_dir).with_context(|| {
+			format!(
+				"Failed to create directory {}",
+				self.config.processed_dir.display(),
+			)
+		})?;
+		fs::create_dir_all(&self.config.light_dir).with_context(|| {
+			format!(
+				"Failed to create directory {}",
+				self.config.light_dir.display(),
+			)
+		})?;
+
+		let mut ret = Vec::new();
+
+		for entry in read_dir.filter_map(|entry| entry.ok()).filter(|entry| {
+			// We are only interested in regular files
+			entry
+				.file_type()
+				.map(|file_type| file_type.is_file())
+				.unwrap_or_default()
+		}) {
+			let path = entry.path();
+			let Some(coords) = Self::parse_region_filename(&path) else {
+				continue;
+			};
+
+			if let Err(err) = self.process_region(&path, coords) {
+				eprintln!(
+					"Failed to process region {}: {:?}",
+					path.file_name().unwrap_or_default().to_string_lossy(),
+					err,
+				);
+			}
+
+			ret.push(coords);
+		}
+
+		Ok(ret)
+	}
+}
diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
new file mode 100644
index 0000000..4a7b511
--- /dev/null
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -0,0 +1,113 @@
+use std::fs;
+
+use anyhow::{Context, Result};
+
+use minedmap::{io::storage, resource::Biome, types::*, world};
+
+use super::common::*;
+
+pub struct TileRenderer<'a> {
+	config: &'a Config,
+}
+
+impl<'a> TileRenderer<'a> {
+	pub fn new(config: &'a Config) -> Self {
+		TileRenderer { config }
+	}
+
+	fn load_region(&self, coords: RegionCoords) -> Result<ProcessedRegion> {
+		let processed_path = self.config.processed_path(coords, false);
+		storage::read(&processed_path).context("Failed to load processed region data")
+	}
+
+	fn block_color(block: &world::layer::BlockInfo, _biome: &Biome) -> [u8; 4] {
+		let h = block
+			.depth
+			.map(|depth| 0.5 + 0.005 * depth.0 as f32)
+			.unwrap_or_default();
+		let c = block
+			.block_type
+			.color
+			.0
+			.map(|v| (f32::from(v) * h).clamp(0.0, 255.0) as u8);
+		[c[0], c[1], c[2], 255]
+	}
+
+	fn render_chunk(
+		image: &mut image::RgbaImage,
+		coords: ChunkCoords,
+		blocks: &world::layer::BlockInfoArray,
+		biomes: &world::layer::BiomeArray,
+	) {
+		const N: u32 = BLOCKS_PER_CHUNK as u32;
+
+		let chunk_image = image::RgbaImage::from_fn(N, N, |x, z| {
+			let coords = LayerBlockCoords {
+				x: BlockX(x as u8),
+				z: BlockZ(z as u8),
+			};
+			image::Rgba(match (&blocks[coords], &biomes[coords]) {
+				(Some(block), Some(biome)) => Self::block_color(block, biome),
+				_ => [0, 0, 0, 0],
+			})
+		});
+		overlay_chunk(image, &chunk_image, coords);
+	}
+
+	fn render_region(image: &mut image::RgbaImage, region: &ProcessedRegion) {
+		for (coords, chunk) in region.iter() {
+			let Some((blocks, biomes)) = chunk else {
+				continue;
+			};
+
+			Self::render_chunk(image, coords, blocks, biomes);
+		}
+	}
+
+	fn render_tile(&self, coords: RegionCoords) -> Result<()> {
+		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
+
+		let tmp_path = self.config.map_path(coords, true);
+		let output_path = self.config.map_path(coords, false);
+		println!(
+			"Rendering tile {}",
+			output_path
+				.file_name()
+				.unwrap_or_default()
+				.to_string_lossy(),
+		);
+
+		let region = self.load_region(coords)?;
+		let mut image = image::RgbaImage::new(N, N);
+		Self::render_region(&mut image, &region);
+		image
+			.save_with_format(&tmp_path, image::ImageFormat::Png)
+			.context("Failed to save image")?;
+		fs::rename(&tmp_path, &output_path).with_context(|| {
+			format!(
+				"Failed to rename {} to {}",
+				tmp_path.display(),
+				output_path.display(),
+			)
+		})?;
+
+		Ok(())
+	}
+
+	pub fn run(self, regions: &[RegionCoords]) -> Result<()> {
+		fs::create_dir_all(&self.config.map_dir).with_context(|| {
+			format!(
+				"Failed to create directory {}",
+				self.config.map_dir.display(),
+			)
+		})?;
+
+		for &coords in regions {
+			if let Err(err) = self.render_tile(coords) {
+				eprintln!("Failed to render tile {:?}: {:?}", coords, err,);
+			}
+		}
+
+		Ok(())
+	}
+}

From 2dd9283d95a312b56c7f15056dae7928888dcedf Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 1 May 2023 17:51:38 +0200
Subject: [PATCH 163/460] minedmap: move some internal functions out of impl
 blocks

---
 src/bin/minedmap/region_processor.rs | 30 +++++++++++++++-------------
 src/bin/minedmap/tile_renderer.rs    | 28 +++++++++++++-------------
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/src/bin/minedmap/region_processor.rs b/src/bin/minedmap/region_processor.rs
index 640467c..e410013 100644
--- a/src/bin/minedmap/region_processor.rs
+++ b/src/bin/minedmap/region_processor.rs
@@ -6,6 +6,17 @@ use minedmap::{io::storage, resource, types::*, world};
 
 use super::common::*;
 
+/// Parses a filename in the format r.X.Z.mca into the contained X and Z values
+fn parse_region_filename(path: &Path) -> Option<RegionCoords> {
+	let file_name = path.file_name()?.to_str()?;
+	let parts: Vec<_> = file_name.split('.').collect();
+	let &["r", x, z, "mca"] = parts.as_slice() else {
+			return None;
+		};
+
+	Some((x.parse().ok()?, z.parse().ok()?))
+}
+
 /// Type with methods for processing the regions of a Minecraft save directory
 pub struct RegionProcessor<'a> {
 	block_types: resource::BlockTypes,
@@ -22,17 +33,6 @@ impl<'a> RegionProcessor<'a> {
 		}
 	}
 
-	/// Parses a filename in the format r.X.Z.mca into the contained X and Z values
-	fn parse_region_filename(path: &Path) -> Option<RegionCoords> {
-		let file_name = path.file_name()?.to_str()?;
-		let parts: Vec<_> = file_name.split('.').collect();
-		let &["r", x, z, "mca"] = parts.as_slice() else {
-			return None;
-		};
-
-		Some((x.parse().ok()?, z.parse().ok()?))
-	}
-
 	/// Processes a single chunk
 	fn process_chunk(
 		&self,
@@ -50,7 +50,9 @@ impl<'a> RegionProcessor<'a> {
 		world::layer::top_layer(&chunk)
 	}
 
-	fn chunk_lightmap(block_light: Box<world::layer::BlockLightArray>) -> image::GrayAlphaImage {
+	fn render_chunk_lightmap(
+		block_light: Box<world::layer::BlockLightArray>,
+	) -> image::GrayAlphaImage {
 		const N: u32 = BLOCKS_PER_CHUNK as u32;
 
 		image::GrayAlphaImage::from_fn(N, N, |x, z| {
@@ -116,7 +118,7 @@ impl<'a> RegionProcessor<'a> {
 				};
 				processed_region[chunk_coords] = Some(processed_chunk);
 
-				let chunk_lightmap = Self::chunk_lightmap(block_light);
+				let chunk_lightmap = Self::render_chunk_lightmap(block_light);
 				overlay_chunk(&mut lightmap, &chunk_lightmap, chunk_coords);
 
 				Ok(())
@@ -163,7 +165,7 @@ impl<'a> RegionProcessor<'a> {
 				.unwrap_or_default()
 		}) {
 			let path = entry.path();
-			let Some(coords) = Self::parse_region_filename(&path) else {
+			let Some(coords) = parse_region_filename(&path) else {
 				continue;
 			};
 
diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index 4a7b511..fcd3e85 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -6,6 +6,19 @@ use minedmap::{io::storage, resource::Biome, types::*, world};
 
 use super::common::*;
 
+fn block_color(block: &world::layer::BlockInfo, _biome: &Biome) -> [u8; 4] {
+	let h = block
+		.depth
+		.map(|depth| 0.5 + 0.005 * depth.0 as f32)
+		.unwrap_or_default();
+	let c = block
+		.block_type
+		.color
+		.0
+		.map(|v| (f32::from(v) * h).clamp(0.0, 255.0) as u8);
+	[c[0], c[1], c[2], 255]
+}
+
 pub struct TileRenderer<'a> {
 	config: &'a Config,
 }
@@ -20,19 +33,6 @@ impl<'a> TileRenderer<'a> {
 		storage::read(&processed_path).context("Failed to load processed region data")
 	}
 
-	fn block_color(block: &world::layer::BlockInfo, _biome: &Biome) -> [u8; 4] {
-		let h = block
-			.depth
-			.map(|depth| 0.5 + 0.005 * depth.0 as f32)
-			.unwrap_or_default();
-		let c = block
-			.block_type
-			.color
-			.0
-			.map(|v| (f32::from(v) * h).clamp(0.0, 255.0) as u8);
-		[c[0], c[1], c[2], 255]
-	}
-
 	fn render_chunk(
 		image: &mut image::RgbaImage,
 		coords: ChunkCoords,
@@ -47,7 +47,7 @@ impl<'a> TileRenderer<'a> {
 				z: BlockZ(z as u8),
 			};
 			image::Rgba(match (&blocks[coords], &biomes[coords]) {
-				(Some(block), Some(biome)) => Self::block_color(block, biome),
+				(Some(block), Some(biome)) => block_color(block, biome),
 				_ => [0, 0, 0, 0],
 			})
 		});

From e801631561c6163fbef4bdbba5bab2560e3edbf7 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 4 May 2023 20:56:39 +0200
Subject: [PATCH 164/460] Update dependencies

---
 Cargo.lock | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7531593..931bdf6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "anstream"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6342bd4f5a1205d7f41e94a41a901f5647c938cdfa96036338e8533c9d6c2450"
+checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -119,9 +119,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.2.5"
+version = "4.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a1f23fa97e1d1641371b51f35535cb26959b8e27ab50d167a8b996b5bada819"
+checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -130,9 +130,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.2.5"
+version = "4.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fdc5d93c358224b4d6867ef1356d740de2303e9892edc06c5340daeccd96bab"
+checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd"
 dependencies = [
  "anstream",
  "anstyle",
@@ -353,9 +353,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c"
+checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f"
 
 [[package]]
 name = "minedmap"
@@ -423,9 +423,9 @@ checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.26"
+version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
 [[package]]
 name = "png"
@@ -460,9 +460,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.37.18"
+version = "0.37.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bbfc1d1c7c40c01715f47d71444744a81669ca84e8b63e25a55e169b1f86433"
+checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d"
 dependencies = [
  "bitflags",
  "errno",

From 25710bb1ed7b2309b5d97ab197175c7046f00310 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 4 May 2023 20:53:06 +0200
Subject: [PATCH 165/460] Move block_color() to new module

---
 src/bin/minedmap/tile_renderer.rs | 24 +++++++++---------------
 src/resource/block_color.rs       | 10 ++++++++++
 src/resource/mod.rs               |  2 ++
 3 files changed, 21 insertions(+), 15 deletions(-)
 create mode 100644 src/resource/block_color.rs

diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index fcd3e85..64c9d55 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -2,23 +2,10 @@ use std::fs;
 
 use anyhow::{Context, Result};
 
-use minedmap::{io::storage, resource::Biome, types::*, world};
+use minedmap::{io::storage, resource::block_color, types::*, world};
 
 use super::common::*;
 
-fn block_color(block: &world::layer::BlockInfo, _biome: &Biome) -> [u8; 4] {
-	let h = block
-		.depth
-		.map(|depth| 0.5 + 0.005 * depth.0 as f32)
-		.unwrap_or_default();
-	let c = block
-		.block_type
-		.color
-		.0
-		.map(|v| (f32::from(v) * h).clamp(0.0, 255.0) as u8);
-	[c[0], c[1], c[2], 255]
-}
-
 pub struct TileRenderer<'a> {
 	config: &'a Config,
 }
@@ -47,7 +34,14 @@ impl<'a> TileRenderer<'a> {
 				z: BlockZ(z as u8),
 			};
 			image::Rgba(match (&blocks[coords], &biomes[coords]) {
-				(Some(block), Some(biome)) => block_color(block, biome),
+				(
+					Some(world::layer::BlockInfo {
+						block_type,
+						depth: Some(depth),
+						..
+					}),
+					Some(biome),
+				) => block_color(*block_type, biome, depth.0 as f32),
 				_ => [0, 0, 0, 0],
 			})
 		});
diff --git a/src/resource/block_color.rs b/src/resource/block_color.rs
new file mode 100644
index 0000000..31434de
--- /dev/null
+++ b/src/resource/block_color.rs
@@ -0,0 +1,10 @@
+use super::{Biome, BlockType};
+
+pub fn block_color(block: BlockType, _biome: &Biome, depth: f32) -> [u8; 4] {
+	let h = 0.5 + 0.005 * depth;
+	let c = block
+		.color
+		.0
+		.map(|v| (f32::from(v) * h).clamp(0.0, 255.0) as u8);
+	[c[0], c[1], c[2], 255]
+}
diff --git a/src/resource/mod.rs b/src/resource/mod.rs
index 62c5d9c..a1abaf8 100644
--- a/src/resource/mod.rs
+++ b/src/resource/mod.rs
@@ -1,4 +1,5 @@
 mod biomes;
+mod block_color;
 mod block_types;
 mod legacy_block_types;
 
@@ -90,6 +91,7 @@ impl BlockTypes {
 }
 
 pub use biomes::Biome;
+pub use block_color::block_color;
 
 #[derive(Debug)]
 pub struct BiomeTypes {

From b66bdf5ce10c1345a9f699fde03d15aa7e91e8a1 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 4 May 2023 22:08:33 +0200
Subject: [PATCH 166/460] resource: implement water/foliage/grass color
 computation

---
 Cargo.lock                  |   7 +++
 Cargo.toml                  |   1 +
 src/resource/biomes.rs      |  12 +++++
 src/resource/block_color.rs | 101 +++++++++++++++++++++++++++++++++---
 src/resource/mod.rs         |   2 +-
 5 files changed, 114 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 931bdf6..3c53295 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -268,6 +268,12 @@ dependencies = [
  "miniz_oxide",
 ]
 
+[[package]]
+name = "glam"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad83ab008a4fa3b31dfa713dd41b5a9bdea1e94e4cf1e2fc274ffbd49b0271d3"
+
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -368,6 +374,7 @@ dependencies = [
  "enumflags2",
  "fastnbt",
  "flate2",
+ "glam",
  "image",
  "itertools",
  "num-integer",
diff --git a/Cargo.toml b/Cargo.toml
index 9a82052..59b435c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,6 +15,7 @@ clap = { version = "4.1.4", features = ["derive"] }
 enumflags2 = "0.7.5"
 fastnbt = "2.3.2"
 flate2 = "1.0.25"
+glam = "0.24.0"
 image = { version = "0.24.5", default-features = false, features = ["png"] }
 itertools = "0.10.5"
 num-integer = "0.1.45"
diff --git a/src/resource/biomes.rs b/src/resource/biomes.rs
index 036cafc..cf0db4b 100644
--- a/src/resource/biomes.rs
+++ b/src/resource/biomes.rs
@@ -60,6 +60,18 @@ impl Biome {
 			..self
 		}
 	}
+
+	fn decode(val: i8) -> f32 {
+		f32::from(val) / 20.0
+	}
+
+	pub fn temp(&self) -> f32 {
+		Self::decode(self.temp)
+	}
+
+	pub fn downfall(&self) -> f32 {
+		Self::decode(self.downfall)
+	}
 }
 
 // Data extracted from Minecraft code decompiled using https://github.com/Hexeption/MCP-Reborn
diff --git a/src/resource/block_color.rs b/src/resource/block_color.rs
index 31434de..21cd5c7 100644
--- a/src/resource/block_color.rs
+++ b/src/resource/block_color.rs
@@ -1,10 +1,95 @@
-use super::{Biome, BlockType};
+use super::{Biome, BlockType, Color};
 
-pub fn block_color(block: BlockType, _biome: &Biome, depth: f32) -> [u8; 4] {
-	let h = 0.5 + 0.005 * depth;
-	let c = block
-		.color
-		.0
-		.map(|v| (f32::from(v) * h).clamp(0.0, 255.0) as u8);
-	[c[0], c[1], c[2], 255]
+use glam::Vec3;
+
+fn color_vec(color: Color) -> Vec3 {
+	Vec3::from_array(color.0.map(f32::from))
+}
+
+fn color_from_params(colors: &[Vec3; 3], biome: &Biome, depth: f32) -> Vec3 {
+	let temp = (biome.temp() - f32::max((depth - 64.0) / 600.0, 0.0)).clamp(0.0, 1.0);
+	let downfall = biome.downfall().clamp(0.0, 1.0) * temp;
+
+	colors[0] + temp * colors[1] + downfall * colors[2]
+}
+
+trait BiomeExt {
+	fn grass_color(&self, depth: f32) -> Vec3;
+	fn foliage_color(&self, depth: f32) -> Vec3;
+	fn water_color(&self) -> Vec3;
+}
+
+impl BiomeExt for Biome {
+	fn grass_color(&self, depth: f32) -> Vec3 {
+		const GRASS_COLORS: [Vec3; 3] = [
+			Vec3::new(0.502, 0.706, 0.592),   // lower right
+			Vec3::new(0.247, 0.012, -0.259),  // lower left - lower right
+			Vec3::new(-0.471, 0.086, -0.133), // upper left - lower left
+		];
+
+		self.grass_color
+			.map(color_vec)
+			.unwrap_or_else(|| color_from_params(&GRASS_COLORS, self, depth))
+	}
+
+	fn foliage_color(&self, depth: f32) -> Vec3 {
+		use super::BiomeGrassColorModifier::*;
+
+		const FOLIAGE_COLORS: [Vec3; 3] = [
+			Vec3::new(0.502, 0.706, 0.592),   // lower right
+			Vec3::new(0.247, 0.012, -0.259),  // lower left - lower right
+			Vec3::new(-0.471, 0.086, -0.133), // upper left - lower left
+		];
+		const DARK_FOREST_COLOR: Vec3 = Vec3::new(0.157, 0.204, 0.039); // == color_vec(Color([40, 52, 10]))
+		const SWAMP_FOLIAGE_COLOR: Vec3 = Vec3::new(0.416, 0.439, 0.224); // == color_vec(Color([106, 112, 57]))
+
+		let regular_color = || {
+			self.foliage_color
+				.map(color_vec)
+				.unwrap_or_else(|| color_from_params(&FOLIAGE_COLORS, self, depth))
+		};
+
+		match self.grass_color_modifier {
+			Some(DarkForest) => 0.5 * (regular_color() + DARK_FOREST_COLOR),
+			Some(Swamp) => SWAMP_FOLIAGE_COLOR,
+			None => regular_color(),
+		}
+	}
+
+	fn water_color(&self) -> Vec3 {
+		const DEFAULT_WATER_COLOR: Vec3 = Vec3::new(0.247, 0.463, 0.894); // == color_vec(Color([63, 118, 228]))
+
+		self.water_color
+			.map(color_vec)
+			.unwrap_or(DEFAULT_WATER_COLOR)
+	}
+}
+
+const BIRCH_COLOR: Vec3 = Vec3::new(0.502, 0.655, 0.333); // == color_vec(Color([128, 167, 85]))
+const EVERGREEN_COLOR: Vec3 = Vec3::new(0.380, 0.600, 0.380); // == color_vec(Color([97, 153, 97]))
+
+pub fn block_color(block: BlockType, biome: &Biome, depth: f32) -> [u8; 4] {
+	use super::BlockFlag::*;
+
+	let mut color = color_vec(block.color);
+
+	if block.is(Grass) {
+		color *= biome.grass_color(depth);
+	}
+	if block.is(Foliage) {
+		color *= biome.foliage_color(depth);
+	}
+	if block.is(Birch) {
+		color *= BIRCH_COLOR;
+	}
+	if block.is(Spruce) {
+		color *= EVERGREEN_COLOR;
+	}
+	if block.is(Water) {
+		color *= biome.water_color();
+	}
+
+	color *= 0.5 + 0.005 * depth;
+
+	[color[0] as u8, color[1] as u8, color[2] as u8, 255]
 }
diff --git a/src/resource/mod.rs b/src/resource/mod.rs
index a1abaf8..7095f68 100644
--- a/src/resource/mod.rs
+++ b/src/resource/mod.rs
@@ -90,7 +90,7 @@ impl BlockTypes {
 	}
 }
 
-pub use biomes::Biome;
+pub use biomes::{Biome, BiomeGrassColorModifier};
 pub use block_color::block_color;
 
 #[derive(Debug)]

From 924ee01f9188878d6ee7ad940ba81f16a132785a Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 5 May 2023 23:04:06 +0200
Subject: [PATCH 167/460] world/layer: introduce LayerData struct to fix clippy
 type complexity warning

---
 src/bin/minedmap/region_processor.rs | 26 ++++++++++----------------
 src/world/layer.rs                   | 23 +++++++++++++----------
 2 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/src/bin/minedmap/region_processor.rs b/src/bin/minedmap/region_processor.rs
index e410013..415cca0 100644
--- a/src/bin/minedmap/region_processor.rs
+++ b/src/bin/minedmap/region_processor.rs
@@ -2,7 +2,12 @@ use std::{fs, path::Path};
 
 use anyhow::{Context, Result};
 
-use minedmap::{io::storage, resource, types::*, world};
+use minedmap::{
+	io::storage,
+	resource,
+	types::*,
+	world::{self, layer::LayerData},
+};
 
 use super::common::*;
 
@@ -34,18 +39,7 @@ impl<'a> RegionProcessor<'a> {
 	}
 
 	/// Processes a single chunk
-	fn process_chunk(
-		&self,
-		data: world::de::Chunk,
-	) -> Result<
-		Option<(
-			(
-				Box<world::layer::BlockInfoArray>,
-				Box<world::layer::BiomeArray>,
-			),
-			Box<world::layer::BlockLightArray>,
-		)>,
-	> {
+	fn process_chunk(&self, data: world::de::Chunk) -> Result<Option<LayerData>> {
 		let chunk = world::chunk::Chunk::new(&data, &self.block_types, &self.biome_types)?;
 		world::layer::top_layer(&chunk)
 	}
@@ -110,15 +104,15 @@ impl<'a> RegionProcessor<'a> {
 
 		minedmap::io::region::from_file(path)?.foreach_chunk(
 			|chunk_coords, data: world::de::Chunk| {
-				let Some((processed_chunk, block_light)) = self
+				let Some(layer_data) = self
 					.process_chunk(data)
 					.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))?
 				else {
 					return Ok(());
 				};
-				processed_region[chunk_coords] = Some(processed_chunk);
+				processed_region[chunk_coords] = Some((layer_data.blocks, layer_data.biomes));
 
-				let chunk_lightmap = Self::render_chunk_lightmap(block_light);
+				let chunk_lightmap = Self::render_chunk_lightmap(layer_data.block_light);
 				overlay_chunk(&mut lightmap, &chunk_lightmap, chunk_coords);
 
 				Ok(())
diff --git a/src/world/layer.rs b/src/world/layer.rs
index a457191..89cff41 100644
--- a/src/world/layer.rs
+++ b/src/world/layer.rs
@@ -86,6 +86,13 @@ pub type BlockInfoArray = LayerBlockArray<Option<BlockInfo>>;
 pub type BiomeArray = LayerBlockArray<Option<Biome>>;
 pub type BlockLightArray = LayerBlockArray<u8>;
 
+#[derive(Debug, Default)]
+pub struct LayerData {
+	pub blocks: Box<BlockInfoArray>,
+	pub biomes: Box<BiomeArray>,
+	pub block_light: Box<BlockLightArray>,
+}
+
 /// Fills in a [BlockInfoArray] with the information of the chunk's top
 /// block layer
 ///
@@ -93,9 +100,7 @@ pub type BlockLightArray = LayerBlockArray<u8>;
 /// determined as the block that should be visible on the rendered
 /// map. For water blocks, the height of the first non-water block
 /// is additionally filled in as the water depth.
-pub fn top_layer(
-	chunk: &Chunk,
-) -> Result<Option<((Box<BlockInfoArray>, Box<BiomeArray>), Box<BlockLightArray>)>> {
+pub fn top_layer(chunk: &Chunk) -> Result<Option<LayerData>> {
 	use BLOCKS_PER_CHUNK as N;
 
 	if chunk.is_empty() {
@@ -103,9 +108,7 @@ pub fn top_layer(
 	}
 
 	let mut done = 0;
-	let mut blocks = Box::<BlockInfoArray>::default();
-	let mut block_biomes = Box::<BiomeArray>::default();
-	let mut light = Box::<BlockLightArray>::default();
+	let mut ret = LayerData::default();
 
 	for SectionIterItem {
 		y: section_y,
@@ -116,7 +119,7 @@ pub fn top_layer(
 	{
 		for y in BlockY::iter().rev() {
 			for xz in BlockInfoArray::keys() {
-				let entry = &mut blocks[xz];
+				let entry = &mut ret.blocks[xz];
 				if entry.done() {
 					continue;
 				}
@@ -137,13 +140,13 @@ pub fn top_layer(
 					done += 1;
 				};
 
-				let biome_entry = &mut block_biomes[xz];
+				let biome_entry = &mut ret.biomes[xz];
 				if !entry.is_none() && biome_entry.is_none() {
 					*biome_entry = biomes.biome_at(section_y, coords)?.copied();
 				}
 
 				if entry.is_none() {
-					light[xz] = block_light.block_light_at(coords);
+					ret.block_light[xz] = block_light.block_light_at(coords);
 				}
 
 				if done == N * N {
@@ -153,5 +156,5 @@ pub fn top_layer(
 		}
 	}
 
-	Ok(Some(((blocks, block_biomes), light)))
+	Ok(Some(ret))
 }

From 263fc6d6ced81836d84493ad60807198a05d609c Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 5 May 2023 23:15:34 +0200
Subject: [PATCH 168/460] world/layer: remove unused y coordinate from
 BlockInfo

---
 src/world/layer.rs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/world/layer.rs b/src/world/layer.rs
index 89cff41..4365e1f 100644
--- a/src/world/layer.rs
+++ b/src/world/layer.rs
@@ -28,7 +28,6 @@ impl BlockHeight {
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 pub struct BlockInfo {
 	pub block_type: BlockType,
-	pub y: BlockHeight,
 	pub depth: Option<BlockHeight>,
 }
 
@@ -66,7 +65,6 @@ impl OptionBlockInfoExt for Option<BlockInfo> {
 		if self.is_none() {
 			*self = Some(BlockInfo {
 				block_type,
-				y,
 				depth: None,
 			});
 		}

From 2d5eec13c2e0b0cb9fea2ba9d8097fba38573e4c Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 5 May 2023 23:29:57 +0200
Subject: [PATCH 169/460] world/layer: move Option into BlockInfo struct

Preparation for top_layer() cleanup.
---
 src/bin/minedmap/tile_renderer.rs |  6 ++--
 src/world/layer.rs                | 51 +++++++++----------------------
 2 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index 64c9d55..ac1193a 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -35,11 +35,11 @@ impl<'a> TileRenderer<'a> {
 			};
 			image::Rgba(match (&blocks[coords], &biomes[coords]) {
 				(
-					Some(world::layer::BlockInfo {
-						block_type,
+					world::layer::BlockInfo {
+						block_type: Some(block_type),
 						depth: Some(depth),
 						..
-					}),
+					},
 					Some(biome),
 				) => block_color(*block_type, biome, depth.0 as f32),
 				_ => [0, 0, 0, 0],
diff --git a/src/world/layer.rs b/src/world/layer.rs
index 4365e1f..7c8b9bb 100644
--- a/src/world/layer.rs
+++ b/src/world/layer.rs
@@ -25,36 +25,23 @@ impl BlockHeight {
 	}
 }
 
-#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy, Default, Serialize, Deserialize)]
 pub struct BlockInfo {
-	pub block_type: BlockType,
+	pub block_type: Option<BlockType>,
 	pub depth: Option<BlockHeight>,
 }
 
-/// Helper methods for [BlockInfo]
-trait OptionBlockInfoExt {
-	/// Checks if a [BlockInfo] has been filled in completely
-	///
-	/// Helper used by [top_layer]
-	fn done(&self) -> bool;
+pub type BlockInfoArray = LayerBlockArray<BlockInfo>;
+pub type BiomeArray = LayerBlockArray<Option<Biome>>;
+pub type BlockLightArray = LayerBlockArray<u8>;
 
-	/// Fills in a [BlockInfo] based on a [BlockType]
-	///
-	/// Only fills in data if the block is part of the visible top layer
-	/// of the rendered map.
-	///
-	/// Must be called on an incomplete [BlockInfo] entry. Returns `true`
-	/// if the entry has been filled in completely.
-	fn fill(&mut self, y: BlockHeight, block_type: BlockType) -> bool;
-}
+impl BlockInfo {
+	fn is_empty(&self) -> bool {
+		self.block_type.is_none()
+	}
 
-impl OptionBlockInfoExt for Option<BlockInfo> {
 	fn done(&self) -> bool {
-		let Some(info) = self else {
-			return false;
-		};
-
-		info.depth.is_some()
+		self.depth.is_some()
 	}
 
 	fn fill(&mut self, y: BlockHeight, block_type: BlockType) -> bool {
@@ -62,28 +49,20 @@ impl OptionBlockInfoExt for Option<BlockInfo> {
 			return false;
 		}
 
-		if self.is_none() {
-			*self = Some(BlockInfo {
-				block_type,
-				depth: None,
-			});
+		if self.block_type.is_none() {
+			self.block_type = Some(block_type);
 		}
 
 		if block_type.is(BlockFlag::Water) {
 			return false;
 		}
 
-		let info = self.as_mut().unwrap();
-		info.depth = Some(y);
+		self.depth = Some(y);
 
 		true
 	}
 }
 
-pub type BlockInfoArray = LayerBlockArray<Option<BlockInfo>>;
-pub type BiomeArray = LayerBlockArray<Option<Biome>>;
-pub type BlockLightArray = LayerBlockArray<u8>;
-
 #[derive(Debug, Default)]
 pub struct LayerData {
 	pub blocks: Box<BlockInfoArray>,
@@ -139,11 +118,11 @@ pub fn top_layer(chunk: &Chunk) -> Result<Option<LayerData>> {
 				};
 
 				let biome_entry = &mut ret.biomes[xz];
-				if !entry.is_none() && biome_entry.is_none() {
+				if !entry.is_empty() && biome_entry.is_none() {
 					*biome_entry = biomes.biome_at(section_y, coords)?.copied();
 				}
 
-				if entry.is_none() {
+				if entry.is_empty() {
 					ret.block_light[xz] = block_light.block_light_at(coords);
 				}
 

From 0437ec70b678da4340d2147c91e66c42fc07bed4 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 5 May 2023 23:57:14 +0200
Subject: [PATCH 170/460] world/layer: introduce LayerEntry struct

---
 src/world/layer.rs | 38 ++++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/world/layer.rs b/src/world/layer.rs
index 7c8b9bb..e6c0cb0 100644
--- a/src/world/layer.rs
+++ b/src/world/layer.rs
@@ -35,9 +35,16 @@ pub type BlockInfoArray = LayerBlockArray<BlockInfo>;
 pub type BiomeArray = LayerBlockArray<Option<Biome>>;
 pub type BlockLightArray = LayerBlockArray<u8>;
 
-impl BlockInfo {
+struct LayerEntry<'a> {
+	block: &'a mut Option<BlockType>,
+	biome: &'a mut Option<Biome>,
+	block_light: &'a mut u8,
+	depth: &'a mut Option<BlockHeight>,
+}
+
+impl<'a> LayerEntry<'a> {
 	fn is_empty(&self) -> bool {
-		self.block_type.is_none()
+		self.block.is_none()
 	}
 
 	fn done(&self) -> bool {
@@ -49,15 +56,15 @@ impl BlockInfo {
 			return false;
 		}
 
-		if self.block_type.is_none() {
-			self.block_type = Some(block_type);
+		if self.block.is_none() {
+			*self.block = Some(block_type);
 		}
 
 		if block_type.is(BlockFlag::Water) {
 			return false;
 		}
 
-		self.depth = Some(y);
+		*self.depth = Some(y);
 
 		true
 	}
@@ -70,6 +77,18 @@ pub struct LayerData {
 	pub block_light: Box<BlockLightArray>,
 }
 
+impl LayerData {
+	fn entry(&mut self, coords: LayerBlockCoords) -> LayerEntry {
+		let block_info = &mut self.blocks[coords];
+		LayerEntry {
+			block: &mut block_info.block_type,
+			biome: &mut self.biomes[coords],
+			block_light: &mut self.block_light[coords],
+			depth: &mut block_info.depth,
+		}
+	}
+}
+
 /// Fills in a [BlockInfoArray] with the information of the chunk's top
 /// block layer
 ///
@@ -96,7 +115,7 @@ pub fn top_layer(chunk: &Chunk) -> Result<Option<LayerData>> {
 	{
 		for y in BlockY::iter().rev() {
 			for xz in BlockInfoArray::keys() {
-				let entry = &mut ret.blocks[xz];
+				let mut entry = ret.entry(xz);
 				if entry.done() {
 					continue;
 				}
@@ -117,13 +136,12 @@ pub fn top_layer(chunk: &Chunk) -> Result<Option<LayerData>> {
 					done += 1;
 				};
 
-				let biome_entry = &mut ret.biomes[xz];
-				if !entry.is_empty() && biome_entry.is_none() {
-					*biome_entry = biomes.biome_at(section_y, coords)?.copied();
+				if !entry.is_empty() && entry.biome.is_none() {
+					*entry.biome = biomes.biome_at(section_y, coords)?.copied();
 				}
 
 				if entry.is_empty() {
-					ret.block_light[xz] = block_light.block_light_at(coords);
+					*entry.block_light = block_light.block_light_at(coords);
 				}
 
 				if done == N * N {

From 0b392d7a3a9ce2fd9fafcb783e00be568323ea54 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 6 May 2023 00:26:55 +0200
Subject: [PATCH 171/460] world/layer: move more top_layer() logic into
 LayerEntry::fill()

---
 src/world/layer.rs | 57 +++++++++++++++++-----------------------------
 1 file changed, 21 insertions(+), 36 deletions(-)

diff --git a/src/world/layer.rs b/src/world/layer.rs
index e6c0cb0..4a5fe46 100644
--- a/src/world/layer.rs
+++ b/src/world/layer.rs
@@ -51,22 +51,30 @@ impl<'a> LayerEntry<'a> {
 		self.depth.is_some()
 	}
 
-	fn fill(&mut self, y: BlockHeight, block_type: BlockType) -> bool {
-		if !block_type.is(BlockFlag::Opaque) {
-			return false;
-		}
+	fn fill(&mut self, section: SectionIterItem, coords: SectionBlockCoords) -> Result<bool> {
+		let Some(block_type) = section.section.block_at(coords)?
+			.filter(|block_type| block_type.is(BlockFlag::Opaque))
+		else {
+			if self.is_empty() {
+				*self.block_light = section.block_light.block_light_at(coords);
+			}
 
-		if self.block.is_none() {
+			return Ok(false);
+		};
+
+		if self.is_empty() {
 			*self.block = Some(block_type);
+			*self.biome = section.biomes.biome_at(section.y, coords)?.copied();
 		}
 
 		if block_type.is(BlockFlag::Water) {
-			return false;
+			return Ok(false);
 		}
 
-		*self.depth = Some(y);
+		let height = BlockHeight::new(section.y, coords.y)?;
+		*self.depth = Some(height);
 
-		true
+		Ok(true)
 	}
 }
 
@@ -106,13 +114,7 @@ pub fn top_layer(chunk: &Chunk) -> Result<Option<LayerData>> {
 	let mut done = 0;
 	let mut ret = LayerData::default();
 
-	for SectionIterItem {
-		y: section_y,
-		section,
-		biomes,
-		block_light,
-	} in chunk.sections().rev()
-	{
+	for section in chunk.sections().rev() {
 		for y in BlockY::iter().rev() {
 			for xz in BlockInfoArray::keys() {
 				let mut entry = ret.entry(xz);
@@ -121,29 +123,12 @@ pub fn top_layer(chunk: &Chunk) -> Result<Option<LayerData>> {
 				}
 
 				let coords = SectionBlockCoords { xz, y };
-
-				'check_block: {
-					let Some(block_type) = section.block_at(coords)? else {
-						break 'check_block;
-					};
-
-					let height = BlockHeight::new(section_y, y)?;
-					if !entry.fill(height, block_type) {
-						break 'check_block;
-					}
-
-					assert!(entry.done());
-					done += 1;
-				};
-
-				if !entry.is_empty() && entry.biome.is_none() {
-					*entry.biome = biomes.biome_at(section_y, coords)?.copied();
-				}
-
-				if entry.is_empty() {
-					*entry.block_light = block_light.block_light_at(coords);
+				if !entry.fill(section, coords)? {
+					continue;
 				}
 
+				assert!(entry.done());
+				done += 1;
 				if done == N * N {
 					break;
 				}

From 31eb92864ccb253319b8822c9cb89c1f23dc207f Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 6 May 2023 00:44:00 +0200
Subject: [PATCH 172/460] Split up BlockInfo type

By storing block types and depth values separately, the processed world
data can be compressed better, decreasing data size by ~10%.
---
 src/bin/minedmap/common.rs           | 18 ++++++++------
 src/bin/minedmap/region_processor.rs | 15 ++++++++----
 src/bin/minedmap/tile_renderer.rs    | 36 +++++++++++++---------------
 src/world/layer.rs                   | 19 ++++++---------
 4 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/src/bin/minedmap/common.rs b/src/bin/minedmap/common.rs
index ae645d1..eda782d 100644
--- a/src/bin/minedmap/common.rs
+++ b/src/bin/minedmap/common.rs
@@ -1,14 +1,18 @@
 use std::path::{Path, PathBuf};
 
-use minedmap::{types::*, world};
+use serde::{Deserialize, Serialize};
+
+use minedmap::{types::*, world::layer};
 
 pub type RegionCoords = (i32, i32);
-pub type ProcessedRegion = ChunkArray<
-	Option<(
-		Box<world::layer::BlockInfoArray>,
-		Box<world::layer::BiomeArray>,
-	)>,
->;
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ProcessedChunk {
+	pub blocks: Box<layer::BlockArray>,
+	pub biomes: Box<layer::BiomeArray>,
+	pub depths: Box<layer::DepthArray>,
+}
+pub type ProcessedRegion = ChunkArray<Option<ProcessedChunk>>;
 
 pub struct Config {
 	pub region_dir: PathBuf,
diff --git a/src/bin/minedmap/region_processor.rs b/src/bin/minedmap/region_processor.rs
index 415cca0..e1ea187 100644
--- a/src/bin/minedmap/region_processor.rs
+++ b/src/bin/minedmap/region_processor.rs
@@ -6,7 +6,10 @@ use minedmap::{
 	io::storage,
 	resource,
 	types::*,
-	world::{self, layer::LayerData},
+	world::{
+		self,
+		layer::{self, LayerData},
+	},
 };
 
 use super::common::*;
@@ -104,15 +107,19 @@ impl<'a> RegionProcessor<'a> {
 
 		minedmap::io::region::from_file(path)?.foreach_chunk(
 			|chunk_coords, data: world::de::Chunk| {
-				let Some(layer_data) = self
+				let Some(layer::LayerData{ blocks, biomes, block_light, depths }) = self
 					.process_chunk(data)
 					.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))?
 				else {
 					return Ok(());
 				};
-				processed_region[chunk_coords] = Some((layer_data.blocks, layer_data.biomes));
+				processed_region[chunk_coords] = Some(ProcessedChunk {
+					blocks,
+					biomes,
+					depths,
+				});
 
-				let chunk_lightmap = Self::render_chunk_lightmap(layer_data.block_light);
+				let chunk_lightmap = Self::render_chunk_lightmap(block_light);
 				overlay_chunk(&mut lightmap, &chunk_lightmap, chunk_coords);
 
 				Ok(())
diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index ac1193a..3ae51c6 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -2,7 +2,7 @@ use std::fs;
 
 use anyhow::{Context, Result};
 
-use minedmap::{io::storage, resource::block_color, types::*, world};
+use minedmap::{io::storage, resource::block_color, types::*};
 
 use super::common::*;
 
@@ -20,12 +20,7 @@ impl<'a> TileRenderer<'a> {
 		storage::read(&processed_path).context("Failed to load processed region data")
 	}
 
-	fn render_chunk(
-		image: &mut image::RgbaImage,
-		coords: ChunkCoords,
-		blocks: &world::layer::BlockInfoArray,
-		biomes: &world::layer::BiomeArray,
-	) {
+	fn render_chunk(image: &mut image::RgbaImage, coords: ChunkCoords, chunk: &ProcessedChunk) {
 		const N: u32 = BLOCKS_PER_CHUNK as u32;
 
 		let chunk_image = image::RgbaImage::from_fn(N, N, |x, z| {
@@ -33,28 +28,29 @@ impl<'a> TileRenderer<'a> {
 				x: BlockX(x as u8),
 				z: BlockZ(z as u8),
 			};
-			image::Rgba(match (&blocks[coords], &biomes[coords]) {
-				(
-					world::layer::BlockInfo {
-						block_type: Some(block_type),
-						depth: Some(depth),
-						..
-					},
-					Some(biome),
-				) => block_color(*block_type, biome, depth.0 as f32),
-				_ => [0, 0, 0, 0],
-			})
+			image::Rgba(
+				match (
+					&chunk.blocks[coords],
+					&chunk.biomes[coords],
+					&chunk.depths[coords],
+				) {
+					(Some(block), Some(biome), Some(depth)) => {
+						block_color(*block, biome, depth.0 as f32)
+					}
+					_ => [0, 0, 0, 0],
+				},
+			)
 		});
 		overlay_chunk(image, &chunk_image, coords);
 	}
 
 	fn render_region(image: &mut image::RgbaImage, region: &ProcessedRegion) {
 		for (coords, chunk) in region.iter() {
-			let Some((blocks, biomes)) = chunk else {
+			let Some(chunk) = chunk else {
 				continue;
 			};
 
-			Self::render_chunk(image, coords, blocks, biomes);
+			Self::render_chunk(image, coords, chunk);
 		}
 	}
 
diff --git a/src/world/layer.rs b/src/world/layer.rs
index 4a5fe46..440c137 100644
--- a/src/world/layer.rs
+++ b/src/world/layer.rs
@@ -25,15 +25,10 @@ impl BlockHeight {
 	}
 }
 
-#[derive(Debug, Clone, Copy, Default, Serialize, Deserialize)]
-pub struct BlockInfo {
-	pub block_type: Option<BlockType>,
-	pub depth: Option<BlockHeight>,
-}
-
-pub type BlockInfoArray = LayerBlockArray<BlockInfo>;
+pub type BlockArray = LayerBlockArray<Option<BlockType>>;
 pub type BiomeArray = LayerBlockArray<Option<Biome>>;
 pub type BlockLightArray = LayerBlockArray<u8>;
+pub type DepthArray = LayerBlockArray<Option<BlockHeight>>;
 
 struct LayerEntry<'a> {
 	block: &'a mut Option<BlockType>,
@@ -80,19 +75,19 @@ impl<'a> LayerEntry<'a> {
 
 #[derive(Debug, Default)]
 pub struct LayerData {
-	pub blocks: Box<BlockInfoArray>,
+	pub blocks: Box<BlockArray>,
 	pub biomes: Box<BiomeArray>,
 	pub block_light: Box<BlockLightArray>,
+	pub depths: Box<DepthArray>,
 }
 
 impl LayerData {
 	fn entry(&mut self, coords: LayerBlockCoords) -> LayerEntry {
-		let block_info = &mut self.blocks[coords];
 		LayerEntry {
-			block: &mut block_info.block_type,
+			block: &mut self.blocks[coords],
 			biome: &mut self.biomes[coords],
 			block_light: &mut self.block_light[coords],
-			depth: &mut block_info.depth,
+			depth: &mut self.depths[coords],
 		}
 	}
 }
@@ -116,7 +111,7 @@ pub fn top_layer(chunk: &Chunk) -> Result<Option<LayerData>> {
 
 	for section in chunk.sections().rev() {
 		for y in BlockY::iter().rev() {
-			for xz in BlockInfoArray::keys() {
+			for xz in LayerBlockArray::<()>::keys() {
 				let mut entry = ret.entry(xz);
 				if entry.done() {
 					continue;

From 42cb342749891d38e8207a09329be54740218d7e Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 10 May 2023 00:48:53 +0200
Subject: [PATCH 173/460] world/layer: avoid iproduct-based iterator in inner
 loop

iproduct iterators are fairly slow. As the iterator implementation is
now unused, it is removed as well.
---
 src/types.rs       | 14 --------------
 src/world/layer.rs | 30 +++++++++++++++++-------------
 2 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/src/types.rs b/src/types.rs
index 06e01f9..18045bb 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -73,20 +73,6 @@ impl LayerBlockCoords {
 #[derive(Debug, Clone, Copy, Default, Serialize, Deserialize)]
 pub struct LayerBlockArray<T>(pub [[T; BLOCKS_PER_CHUNK]; BLOCKS_PER_CHUNK]);
 
-impl<T> LayerBlockArray<T> {
-	pub fn keys() -> impl Iterator<Item = LayerBlockCoords> + Clone + Debug {
-		iproduct!(BlockZ::iter(), BlockX::iter()).map(|(z, x)| LayerBlockCoords { x, z })
-	}
-
-	pub fn values(&self) -> impl Iterator<Item = &T> + Clone + Debug {
-		Self::keys().map(|k| &self[k])
-	}
-
-	pub fn iter(&self) -> impl Iterator<Item = (LayerBlockCoords, &T)> + Clone + Debug {
-		Self::keys().map(|k| (k, &self[k]))
-	}
-}
-
 impl<T> Index<LayerBlockCoords> for LayerBlockArray<T> {
 	type Output = T;
 
diff --git a/src/world/layer.rs b/src/world/layer.rs
index 440c137..4b23f26 100644
--- a/src/world/layer.rs
+++ b/src/world/layer.rs
@@ -111,21 +111,25 @@ pub fn top_layer(chunk: &Chunk) -> Result<Option<LayerData>> {
 
 	for section in chunk.sections().rev() {
 		for y in BlockY::iter().rev() {
-			for xz in LayerBlockArray::<()>::keys() {
-				let mut entry = ret.entry(xz);
-				if entry.done() {
-					continue;
-				}
+			for z in BlockZ::iter() {
+				for x in BlockX::iter() {
+					let xz = LayerBlockCoords { x, z };
 
-				let coords = SectionBlockCoords { xz, y };
-				if !entry.fill(section, coords)? {
-					continue;
-				}
+					let mut entry = ret.entry(xz);
+					if entry.done() {
+						continue;
+					}
 
-				assert!(entry.done());
-				done += 1;
-				if done == N * N {
-					break;
+					let coords = SectionBlockCoords { xz, y };
+					if !entry.fill(section, coords)? {
+						continue;
+					}
+
+					assert!(entry.done());
+					done += 1;
+					if done == N * N {
+						break;
+					}
 				}
 			}
 		}

From 59e919e9eaff7b4b75f341877d45de86d389c031 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 1 Jun 2023 22:53:39 +0200
Subject: [PATCH 174/460] Update dependencies

---
 Cargo.lock | 56 +++++++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3c53295..10592be 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -119,9 +119,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.2.7"
+version = "4.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938"
+checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -130,9 +130,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.2.7"
+version = "4.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd"
+checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990"
 dependencies = [
  "anstream",
  "anstyle",
@@ -143,9 +143,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.2.0"
+version = "4.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4"
+checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -155,9 +155,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1"
+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
 
 [[package]]
 name = "cmake"
@@ -302,9 +302,9 @@ dependencies = [
 
 [[package]]
 name = "io-lifetimes"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
 dependencies = [
  "hermit-abi",
  "libc",
@@ -343,9 +343,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.142"
+version = "0.2.144"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317"
+checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
 
 [[package]]
 name = "libz-ng-sys"
@@ -359,9 +359,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ece97ea872ece730aed82664c424eb4c8291e1ff2480247ccf7409044bc6479f"
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
 [[package]]
 name = "minedmap"
@@ -424,9 +424,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.17.1"
+version = "1.17.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
+checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b"
 
 [[package]]
 name = "pkg-config"
@@ -449,18 +449,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.56"
+version = "1.0.59"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435"
+checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.26"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc"
+checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
 dependencies = [
  "proc-macro2",
 ]
@@ -481,9 +481,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.160"
+version = "1.0.163"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
+checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
 dependencies = [
  "serde_derive",
 ]
@@ -499,9 +499,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.160"
+version = "1.0.163"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
+checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -522,9 +522,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "syn"
-version = "2.0.15"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822"
+checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -533,9 +533,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
+checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
 
 [[package]]
 name = "utf8parse"

From 1abb26099772b4c23d03479ed5a76c3547e371dd Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 7 May 2023 16:25:05 +0200
Subject: [PATCH 175/460] io/fs: add new module with filesystem access helpers

Wrappers around std::fs with error messages, as well as a
create_with_tmpfile() helper.
---
 src/io/fs.rs  | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++
 src/io/mod.rs |  1 +
 2 files changed, 62 insertions(+)
 create mode 100644 src/io/fs.rs

diff --git a/src/io/fs.rs b/src/io/fs.rs
new file mode 100644
index 0000000..46e8726
--- /dev/null
+++ b/src/io/fs.rs
@@ -0,0 +1,61 @@
+use std::{
+	fs::{self, File},
+	io::{BufWriter, Write},
+	path::{Path, PathBuf},
+};
+
+use anyhow::{Context, Ok, Result};
+
+fn tmpfile_name(path: &Path) -> PathBuf {
+	let mut file_name = path.file_name().unwrap_or_default().to_os_string();
+	file_name.push(".tmp");
+
+	let mut ret = path.to_path_buf();
+	ret.set_file_name(file_name);
+	ret
+}
+
+pub fn create_dir_all(path: &Path) -> Result<()> {
+	fs::create_dir_all(path)
+		.with_context(|| format!("Failed to create directory {}", path.display(),))
+}
+
+pub fn rename(from: &Path, to: &Path) -> Result<()> {
+	fs::rename(from, to)
+		.with_context(|| format!("Failed to rename {} to {}", from.display(), to.display()))
+}
+
+pub fn create<T, F>(path: &Path, f: F) -> Result<T>
+where
+	F: FnOnce(&mut BufWriter<File>) -> Result<T>,
+{
+	(|| {
+		let file = File::create(path)?;
+		let mut writer = BufWriter::new(file);
+
+		let ret = f(&mut writer)?;
+		writer.flush()?;
+
+		Ok(ret)
+	})()
+	.with_context(|| format!("Failed to write file {}", path.display()))
+}
+
+pub fn create_with_tmpfile<T, F>(path: &Path, f: F) -> Result<T>
+where
+	F: FnOnce(&mut BufWriter<File>) -> Result<T>,
+{
+	let tmp_path = tmpfile_name(path);
+
+	let ret = (|| {
+		let ret = create(&tmp_path, f)?;
+		rename(&tmp_path, path)?;
+		Ok(ret)
+	})();
+
+	if ret.is_err() {
+		let _ = fs::remove_file(&tmp_path);
+	}
+
+	ret
+}
diff --git a/src/io/mod.rs b/src/io/mod.rs
index 4098f3b..681d75d 100644
--- a/src/io/mod.rs
+++ b/src/io/mod.rs
@@ -1,3 +1,4 @@
 pub mod data;
+pub mod fs;
 pub mod region;
 pub mod storage;

From 587db0464c064f2f29c974216f1ca464c7d54068 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 7 May 2023 16:32:13 +0200
Subject: [PATCH 176/460] io/storage: use fs::create_with_tmpfile() helper

---
 src/bin/minedmap/region_processor.rs | 13 +------------
 src/io/storage.rs                    |  9 ++++-----
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/bin/minedmap/region_processor.rs b/src/bin/minedmap/region_processor.rs
index e1ea187..d81994f 100644
--- a/src/bin/minedmap/region_processor.rs
+++ b/src/bin/minedmap/region_processor.rs
@@ -63,19 +63,8 @@ impl<'a> RegionProcessor<'a> {
 	}
 
 	fn save_region(&self, coords: RegionCoords, processed_region: &ProcessedRegion) -> Result<()> {
-		let tmp_path = self.config.processed_path(coords, true);
-		storage::write(&tmp_path, processed_region)?;
-
 		let output_path = self.config.processed_path(coords, false);
-		fs::rename(&tmp_path, &output_path).with_context(|| {
-			format!(
-				"Failed to rename {} to {}",
-				tmp_path.display(),
-				output_path.display(),
-			)
-		})?;
-
-		Ok(())
+		storage::write(&output_path, processed_region)
 	}
 
 	fn save_lightmap(&self, coords: RegionCoords, lightmap: &image::GrayAlphaImage) -> Result<()> {
diff --git a/src/io/storage.rs b/src/io/storage.rs
index f4b2eed..c1a9e5e 100644
--- a/src/io/storage.rs
+++ b/src/io/storage.rs
@@ -7,21 +7,20 @@ use std::{
 use anyhow::{Context, Result};
 use serde::{de::DeserializeOwned, Serialize};
 
+use super::fs;
+
 pub fn write<T: Serialize>(path: &Path, value: &T) -> Result<()> {
-	(|| -> Result<()> {
+	fs::create_with_tmpfile(path, |file| {
 		let data = bincode::serialize(value)?;
 		let len = u32::try_from(data.len())?;
 		let compressed = zstd::bulk::compress(&data, 1)?;
 		drop(data);
 
-		let mut file = File::create(path)?;
 		file.write_all(&len.to_be_bytes())?;
 		file.write_all(&compressed)?;
-		file.flush()?;
 
 		Ok(())
-	})()
-	.with_context(|| format!("Failed to write file {}", path.display()))
+	})
 }
 
 pub fn read<T: DeserializeOwned>(path: &Path) -> Result<T> {

From 17a02dc74c930a81a1b353aaed4c092b0bb71145 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 7 May 2023 16:38:52 +0200
Subject: [PATCH 177/460] minedmap: use fs helpers

---
 src/bin/minedmap/common.rs           | 31 +++++++--------------
 src/bin/minedmap/region_processor.rs | 40 +++++++---------------------
 src/bin/minedmap/tile_renderer.rs    | 37 ++++++++++---------------
 3 files changed, 34 insertions(+), 74 deletions(-)

diff --git a/src/bin/minedmap/common.rs b/src/bin/minedmap/common.rs
index eda782d..764fe4c 100644
--- a/src/bin/minedmap/common.rs
+++ b/src/bin/minedmap/common.rs
@@ -21,6 +21,10 @@ pub struct Config {
 	pub map_dir: PathBuf,
 }
 
+fn coord_filename(coords: RegionCoords, ext: &str) -> String {
+	format!("r.{}.{}.{}", coords.0, coords.1, ext)
+}
+
 impl Config {
 	pub fn new(args: super::Args) -> Self {
 		let region_dir = [&args.input_dir, Path::new("region")].iter().collect();
@@ -36,33 +40,18 @@ impl Config {
 		}
 	}
 
-	pub fn processed_path(&self, coords: RegionCoords, temp: bool) -> PathBuf {
-		let filename = format!(
-			"r.{}.{}.bin{}",
-			coords.0,
-			coords.1,
-			if temp { ".tmp" } else { "" },
-		);
+	pub fn processed_path(&self, coords: RegionCoords) -> PathBuf {
+		let filename = coord_filename(coords, "bin");
 		[&self.processed_dir, Path::new(&filename)].iter().collect()
 	}
 
-	pub fn light_path(&self, coords: RegionCoords, temp: bool) -> PathBuf {
-		let filename = format!(
-			"r.{}.{}.png{}",
-			coords.0,
-			coords.1,
-			if temp { ".tmp" } else { "" },
-		);
+	pub fn light_path(&self, coords: RegionCoords) -> PathBuf {
+		let filename = coord_filename(coords, "png");
 		[&self.light_dir, Path::new(&filename)].iter().collect()
 	}
 
-	pub fn map_path(&self, coords: RegionCoords, temp: bool) -> PathBuf {
-		let filename = format!(
-			"r.{}.{}.png{}",
-			coords.0,
-			coords.1,
-			if temp { ".tmp" } else { "" },
-		);
+	pub fn map_path(&self, coords: RegionCoords) -> PathBuf {
+		let filename = coord_filename(coords, "png");
 		[&self.map_dir, Path::new(&filename)].iter().collect()
 	}
 }
diff --git a/src/bin/minedmap/region_processor.rs b/src/bin/minedmap/region_processor.rs
index d81994f..03229be 100644
--- a/src/bin/minedmap/region_processor.rs
+++ b/src/bin/minedmap/region_processor.rs
@@ -1,9 +1,9 @@
-use std::{fs, path::Path};
+use std::path::Path;
 
 use anyhow::{Context, Result};
 
 use minedmap::{
-	io::storage,
+	io::{fs, storage},
 	resource,
 	types::*,
 	world::{
@@ -63,26 +63,16 @@ impl<'a> RegionProcessor<'a> {
 	}
 
 	fn save_region(&self, coords: RegionCoords, processed_region: &ProcessedRegion) -> Result<()> {
-		let output_path = self.config.processed_path(coords, false);
+		let output_path = self.config.processed_path(coords);
 		storage::write(&output_path, processed_region)
 	}
 
 	fn save_lightmap(&self, coords: RegionCoords, lightmap: &image::GrayAlphaImage) -> Result<()> {
-		let tmp_path = self.config.light_path(coords, true);
-		lightmap
-			.save_with_format(&tmp_path, image::ImageFormat::Png)
-			.context("Failed to save image")?;
-
-		let output_path = self.config.light_path(coords, false);
-		fs::rename(&tmp_path, &output_path).with_context(|| {
-			format!(
-				"Failed to rename {} to {}",
-				tmp_path.display(),
-				output_path.display(),
-			)
-		})?;
-
-		Ok(())
+		fs::create_with_tmpfile(&self.config.light_path(coords), |file| {
+			lightmap
+				.write_to(file, image::ImageFormat::Png)
+				.context("Failed to save image")
+		})
 	}
 
 	/// Processes a single region file
@@ -132,18 +122,8 @@ impl<'a> RegionProcessor<'a> {
 			)
 		})?;
 
-		fs::create_dir_all(&self.config.processed_dir).with_context(|| {
-			format!(
-				"Failed to create directory {}",
-				self.config.processed_dir.display(),
-			)
-		})?;
-		fs::create_dir_all(&self.config.light_dir).with_context(|| {
-			format!(
-				"Failed to create directory {}",
-				self.config.light_dir.display(),
-			)
-		})?;
+		fs::create_dir_all(&self.config.processed_dir)?;
+		fs::create_dir_all(&self.config.light_dir)?;
 
 		let mut ret = Vec::new();
 
diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index 3ae51c6..b4f4a3a 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -1,8 +1,10 @@
-use std::fs;
-
 use anyhow::{Context, Result};
 
-use minedmap::{io::storage, resource::block_color, types::*};
+use minedmap::{
+	io::{fs, storage},
+	resource::block_color,
+	types::*,
+};
 
 use super::common::*;
 
@@ -16,7 +18,7 @@ impl<'a> TileRenderer<'a> {
 	}
 
 	fn load_region(&self, coords: RegionCoords) -> Result<ProcessedRegion> {
-		let processed_path = self.config.processed_path(coords, false);
+		let processed_path = self.config.processed_path(coords);
 		storage::read(&processed_path).context("Failed to load processed region data")
 	}
 
@@ -57,8 +59,8 @@ impl<'a> TileRenderer<'a> {
 	fn render_tile(&self, coords: RegionCoords) -> Result<()> {
 		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
 
-		let tmp_path = self.config.map_path(coords, true);
-		let output_path = self.config.map_path(coords, false);
+		let output_path = self.config.map_path(coords);
+
 		println!(
 			"Rendering tile {}",
 			output_path
@@ -70,27 +72,16 @@ impl<'a> TileRenderer<'a> {
 		let region = self.load_region(coords)?;
 		let mut image = image::RgbaImage::new(N, N);
 		Self::render_region(&mut image, &region);
-		image
-			.save_with_format(&tmp_path, image::ImageFormat::Png)
-			.context("Failed to save image")?;
-		fs::rename(&tmp_path, &output_path).with_context(|| {
-			format!(
-				"Failed to rename {} to {}",
-				tmp_path.display(),
-				output_path.display(),
-			)
-		})?;
 
-		Ok(())
+		fs::create_with_tmpfile(&output_path, |file| {
+			image
+				.write_to(file, image::ImageFormat::Png)
+				.context("Failed to save image")
+		})
 	}
 
 	pub fn run(self, regions: &[RegionCoords]) -> Result<()> {
-		fs::create_dir_all(&self.config.map_dir).with_context(|| {
-			format!(
-				"Failed to create directory {}",
-				self.config.map_dir.display(),
-			)
-		})?;
+		fs::create_dir_all(&self.config.map_dir)?;
 
 		for &coords in regions {
 			if let Err(err) = self.render_tile(coords) {

From dede21806c4114208fa7edac194169aa7a35038e Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 1 Jul 2023 23:05:39 +0200
Subject: [PATCH 178/460] Update dependencies

---
 Cargo.lock | 100 ++++++++++++++++++++++++-----------------------------
 Cargo.toml |   2 +-
 2 files changed, 47 insertions(+), 55 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 10592be..d8fac2f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -25,15 +25,15 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
+checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee"
+checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
 dependencies = [
  "utf8parse",
 ]
@@ -84,6 +84,12 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "bitflags"
+version = "2.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
+
 [[package]]
 name = "bytemuck"
 version = "1.13.1"
@@ -119,9 +125,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.3.0"
+version = "4.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc"
+checksum = "384e169cc618c613d5e3ca6404dda77a8685a63e08660dcc64abaf7da7cb0c7a"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -130,22 +136,21 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.3.0"
+version = "4.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990"
+checksum = "ef137bbe35aab78bdb468ccfba75a5f4d8321ae011d34063770780545176af2d"
 dependencies = [
  "anstream",
  "anstyle",
- "bitflags",
  "clap_lex",
  "strsim",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.3.0"
+version = "4.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b"
+checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -270,9 +275,9 @@ dependencies = [
 
 [[package]]
 name = "glam"
-version = "0.24.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad83ab008a4fa3b31dfa713dd41b5a9bdea1e94e4cf1e2fc274ffbd49b0271d3"
+checksum = "42218cb640844e3872cc3c153dc975229e080a6c4733b34709ef445610550226"
 
 [[package]]
 name = "heck"
@@ -300,34 +305,22 @@ dependencies = [
  "png",
 ]
 
-[[package]]
-name = "io-lifetimes"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
-dependencies = [
- "hermit-abi",
- "libc",
- "windows-sys",
-]
-
 [[package]]
 name = "is-terminal"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
+checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb"
 dependencies = [
  "hermit-abi",
- "io-lifetimes",
  "rustix",
  "windows-sys",
 ]
 
 [[package]]
 name = "itertools"
-version = "0.10.5"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
 dependencies = [
  "either",
 ]
@@ -343,9 +336,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.144"
+version = "0.2.147"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
 
 [[package]]
 name = "libz-ng-sys"
@@ -359,9 +352,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.3.8"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
+checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
 
 [[package]]
 name = "minedmap"
@@ -424,9 +417,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.17.2"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
 [[package]]
 name = "pkg-config"
@@ -436,11 +429,11 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
 [[package]]
 name = "png"
-version = "0.17.8"
+version = "0.17.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa"
+checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "crc32fast",
  "fdeflate",
  "flate2",
@@ -449,31 +442,30 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.59"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
+checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.28"
+version = "1.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
+checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "rustix"
-version = "0.37.19"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d"
+checksum = "fbc6396159432b5c8490d4e301d8c705f61860b8b6c863bf79942ce5401968f3"
 dependencies = [
- "bitflags",
+ "bitflags 2.3.3",
  "errno",
- "io-lifetimes",
  "libc",
  "linux-raw-sys",
  "windows-sys",
@@ -481,9 +473,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.163"
+version = "1.0.164"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
+checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d"
 dependencies = [
  "serde_derive",
 ]
@@ -499,9 +491,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.163"
+version = "1.0.164"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
+checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -522,9 +514,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "syn"
-version = "2.0.18"
+version = "2.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
+checksum = "2efbeae7acf4eabd6bcdcbd11c92f45231ddda7539edc7806bd1a04a03b24616"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -554,9 +546,9 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.48.0"
+version = "0.48.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
 dependencies = [
  "windows_aarch64_gnullvm",
  "windows_aarch64_msvc",
diff --git a/Cargo.toml b/Cargo.toml
index 59b435c..60a20cc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,7 +17,7 @@ fastnbt = "2.3.2"
 flate2 = "1.0.25"
 glam = "0.24.0"
 image = { version = "0.24.5", default-features = false, features = ["png"] }
-itertools = "0.10.5"
+itertools = "0.11.0"
 num-integer = "0.1.45"
 serde = "1.0.152"
 zstd = "0.12.3"

From 007ce010d4400108a9f628a91cefb810805dc276 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 2 Jul 2023 15:11:16 +0200
Subject: [PATCH 179/460] minedmap: rename RegionCoords to TileCoords

With mipmapping, coords will not always correspond to regions anymore.
---
 src/bin/minedmap/common.rs           | 10 +++++-----
 src/bin/minedmap/region_processor.rs | 10 +++++-----
 src/bin/minedmap/tile_renderer.rs    |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/bin/minedmap/common.rs b/src/bin/minedmap/common.rs
index 764fe4c..c3e0c0e 100644
--- a/src/bin/minedmap/common.rs
+++ b/src/bin/minedmap/common.rs
@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 
 use minedmap::{types::*, world::layer};
 
-pub type RegionCoords = (i32, i32);
+pub type TileCoords = (i32, i32);
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ProcessedChunk {
@@ -21,7 +21,7 @@ pub struct Config {
 	pub map_dir: PathBuf,
 }
 
-fn coord_filename(coords: RegionCoords, ext: &str) -> String {
+fn coord_filename(coords: TileCoords, ext: &str) -> String {
 	format!("r.{}.{}.{}", coords.0, coords.1, ext)
 }
 
@@ -40,17 +40,17 @@ impl Config {
 		}
 	}
 
-	pub fn processed_path(&self, coords: RegionCoords) -> PathBuf {
+	pub fn processed_path(&self, coords: TileCoords) -> PathBuf {
 		let filename = coord_filename(coords, "bin");
 		[&self.processed_dir, Path::new(&filename)].iter().collect()
 	}
 
-	pub fn light_path(&self, coords: RegionCoords) -> PathBuf {
+	pub fn light_path(&self, coords: TileCoords) -> PathBuf {
 		let filename = coord_filename(coords, "png");
 		[&self.light_dir, Path::new(&filename)].iter().collect()
 	}
 
-	pub fn map_path(&self, coords: RegionCoords) -> PathBuf {
+	pub fn map_path(&self, coords: TileCoords) -> PathBuf {
 		let filename = coord_filename(coords, "png");
 		[&self.map_dir, Path::new(&filename)].iter().collect()
 	}
diff --git a/src/bin/minedmap/region_processor.rs b/src/bin/minedmap/region_processor.rs
index 03229be..a942817 100644
--- a/src/bin/minedmap/region_processor.rs
+++ b/src/bin/minedmap/region_processor.rs
@@ -15,7 +15,7 @@ use minedmap::{
 use super::common::*;
 
 /// Parses a filename in the format r.X.Z.mca into the contained X and Z values
-fn parse_region_filename(path: &Path) -> Option<RegionCoords> {
+fn parse_region_filename(path: &Path) -> Option<TileCoords> {
 	let file_name = path.file_name()?.to_str()?;
 	let parts: Vec<_> = file_name.split('.').collect();
 	let &["r", x, z, "mca"] = parts.as_slice() else {
@@ -62,12 +62,12 @@ impl<'a> RegionProcessor<'a> {
 		})
 	}
 
-	fn save_region(&self, coords: RegionCoords, processed_region: &ProcessedRegion) -> Result<()> {
+	fn save_region(&self, coords: TileCoords, processed_region: &ProcessedRegion) -> Result<()> {
 		let output_path = self.config.processed_path(coords);
 		storage::write(&output_path, processed_region)
 	}
 
-	fn save_lightmap(&self, coords: RegionCoords, lightmap: &image::GrayAlphaImage) -> Result<()> {
+	fn save_lightmap(&self, coords: TileCoords, lightmap: &image::GrayAlphaImage) -> Result<()> {
 		fs::create_with_tmpfile(&self.config.light_path(coords), |file| {
 			lightmap
 				.write_to(file, image::ImageFormat::Png)
@@ -76,7 +76,7 @@ impl<'a> RegionProcessor<'a> {
 	}
 
 	/// Processes a single region file
-	fn process_region(&self, path: &Path, coords: RegionCoords) -> Result<()> {
+	fn process_region(&self, path: &Path, coords: TileCoords) -> Result<()> {
 		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
 
 		println!("Processing region r.{}.{}.mca", coords.0, coords.1);
@@ -114,7 +114,7 @@ impl<'a> RegionProcessor<'a> {
 	/// Iterates over all region files of a Minecraft save directory
 	///
 	/// Returns a list of the coordinates of all processed regions
-	pub fn run(self) -> Result<Vec<RegionCoords>> {
+	pub fn run(self) -> Result<Vec<TileCoords>> {
 		let read_dir = self.config.region_dir.read_dir().with_context(|| {
 			format!(
 				"Failed to read directory {}",
diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index b4f4a3a..ef23547 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -17,7 +17,7 @@ impl<'a> TileRenderer<'a> {
 		TileRenderer { config }
 	}
 
-	fn load_region(&self, coords: RegionCoords) -> Result<ProcessedRegion> {
+	fn load_region(&self, coords: TileCoords) -> Result<ProcessedRegion> {
 		let processed_path = self.config.processed_path(coords);
 		storage::read(&processed_path).context("Failed to load processed region data")
 	}
@@ -56,7 +56,7 @@ impl<'a> TileRenderer<'a> {
 		}
 	}
 
-	fn render_tile(&self, coords: RegionCoords) -> Result<()> {
+	fn render_tile(&self, coords: TileCoords) -> Result<()> {
 		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
 
 		let output_path = self.config.map_path(coords);
@@ -80,7 +80,7 @@ impl<'a> TileRenderer<'a> {
 		})
 	}
 
-	pub fn run(self, regions: &[RegionCoords]) -> Result<()> {
+	pub fn run(self, regions: &[TileCoords]) -> Result<()> {
 		fs::create_dir_all(&self.config.map_dir)?;
 
 		for &coords in regions {

From e5c96ecb99e90aed1d72d09753372264b8b52bb2 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 2 Jul 2023 15:45:18 +0200
Subject: [PATCH 180/460] minedmap: replace TileCoords type alias with a struct

---
 src/bin/minedmap/common.rs           | 19 ++++++++++++++++---
 src/bin/minedmap/region_processor.rs |  7 +++++--
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/bin/minedmap/common.rs b/src/bin/minedmap/common.rs
index c3e0c0e..8d64171 100644
--- a/src/bin/minedmap/common.rs
+++ b/src/bin/minedmap/common.rs
@@ -1,10 +1,23 @@
-use std::path::{Path, PathBuf};
+use std::{
+	fmt::Debug,
+	path::{Path, PathBuf},
+};
 
 use serde::{Deserialize, Serialize};
 
 use minedmap::{types::*, world::layer};
 
-pub type TileCoords = (i32, i32);
+#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+pub struct TileCoords {
+	pub x: i32,
+	pub z: i32,
+}
+
+impl Debug for TileCoords {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		write!(f, "({}, {})", self.x, self.z)
+	}
+}
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ProcessedChunk {
@@ -22,7 +35,7 @@ pub struct Config {
 }
 
 fn coord_filename(coords: TileCoords, ext: &str) -> String {
-	format!("r.{}.{}.{}", coords.0, coords.1, ext)
+	format!("r.{}.{}.{}", coords.x, coords.z, ext)
 }
 
 impl Config {
diff --git a/src/bin/minedmap/region_processor.rs b/src/bin/minedmap/region_processor.rs
index a942817..6072636 100644
--- a/src/bin/minedmap/region_processor.rs
+++ b/src/bin/minedmap/region_processor.rs
@@ -22,7 +22,10 @@ fn parse_region_filename(path: &Path) -> Option<TileCoords> {
 			return None;
 		};
 
-	Some((x.parse().ok()?, z.parse().ok()?))
+	Some(TileCoords {
+		x: x.parse().ok()?,
+		z: z.parse().ok()?,
+	})
 }
 
 /// Type with methods for processing the regions of a Minecraft save directory
@@ -79,7 +82,7 @@ impl<'a> RegionProcessor<'a> {
 	fn process_region(&self, path: &Path, coords: TileCoords) -> Result<()> {
 		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
 
-		println!("Processing region r.{}.{}.mca", coords.0, coords.1);
+		println!("Processing region r.{}.{}.mca", coords.x, coords.z);
 
 		let mut processed_region = ProcessedRegion::default();
 		let mut lightmap = image::GrayAlphaImage::new(N, N);

From b53d34da3d0eae697491b7e4ffc40b828b9b0b9a Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 2 Jul 2023 18:16:35 +0200
Subject: [PATCH 181/460] minedmap: store region list in BTreeSet

We want to have a sorted list in the end anyways to make metadata
generation deterministic, and we don't have to worry about deduplication
of coordinates when generating mipmap tile lists.
---
 src/bin/minedmap/main.rs             | 2 +-
 src/bin/minedmap/region_processor.rs | 8 ++++----
 src/bin/minedmap/tile_renderer.rs    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/bin/minedmap/main.rs b/src/bin/minedmap/main.rs
index d0714ef..3aef0f8 100644
--- a/src/bin/minedmap/main.rs
+++ b/src/bin/minedmap/main.rs
@@ -24,7 +24,7 @@ fn main() -> Result<()> {
 	let config = Config::new(args);
 
 	let regions = RegionProcessor::new(&config).run()?;
-	TileRenderer::new(&config).run(&regions)?;
+	TileRenderer::new(&config).run(regions.iter().copied())?;
 
 	Ok(())
 }
diff --git a/src/bin/minedmap/region_processor.rs b/src/bin/minedmap/region_processor.rs
index 6072636..661c92a 100644
--- a/src/bin/minedmap/region_processor.rs
+++ b/src/bin/minedmap/region_processor.rs
@@ -1,4 +1,4 @@
-use std::path::Path;
+use std::{collections::BTreeSet, path::Path};
 
 use anyhow::{Context, Result};
 
@@ -117,7 +117,7 @@ impl<'a> RegionProcessor<'a> {
 	/// Iterates over all region files of a Minecraft save directory
 	///
 	/// Returns a list of the coordinates of all processed regions
-	pub fn run(self) -> Result<Vec<TileCoords>> {
+	pub fn run(self) -> Result<BTreeSet<TileCoords>> {
 		let read_dir = self.config.region_dir.read_dir().with_context(|| {
 			format!(
 				"Failed to read directory {}",
@@ -128,7 +128,7 @@ impl<'a> RegionProcessor<'a> {
 		fs::create_dir_all(&self.config.processed_dir)?;
 		fs::create_dir_all(&self.config.light_dir)?;
 
-		let mut ret = Vec::new();
+		let mut ret = BTreeSet::new();
 
 		for entry in read_dir.filter_map(|entry| entry.ok()).filter(|entry| {
 			// We are only interested in regular files
@@ -150,7 +150,7 @@ impl<'a> RegionProcessor<'a> {
 				);
 			}
 
-			ret.push(coords);
+			ret.insert(coords);
 		}
 
 		Ok(ret)
diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index ef23547..02376c7 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -80,10 +80,10 @@ impl<'a> TileRenderer<'a> {
 		})
 	}
 
-	pub fn run(self, regions: &[TileCoords]) -> Result<()> {
+	pub fn run(self, regions: impl IntoIterator<Item = TileCoords>) -> Result<()> {
 		fs::create_dir_all(&self.config.map_dir)?;
 
-		for &coords in regions {
+		for coords in regions {
 			if let Err(err) = self.render_tile(coords) {
 				eprintln!("Failed to render tile {:?}: {:?}", coords, err,);
 			}

From b1f7f759f1db209ca957d027831d8765af7ce56a Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 2 Jul 2023 18:51:17 +0200
Subject: [PATCH 182/460] minedmap: introduce generic tile path function, pass
 mipmap level

---
 src/bin/minedmap/common.rs           | 29 +++++++++++++++++-----------
 src/bin/minedmap/region_processor.rs | 15 ++++++++------
 src/bin/minedmap/tile_renderer.rs    |  4 ++--
 3 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/src/bin/minedmap/common.rs b/src/bin/minedmap/common.rs
index 8d64171..ee870d0 100644
--- a/src/bin/minedmap/common.rs
+++ b/src/bin/minedmap/common.rs
@@ -30,26 +30,28 @@ pub type ProcessedRegion = ChunkArray<Option<ProcessedChunk>>;
 pub struct Config {
 	pub region_dir: PathBuf,
 	pub processed_dir: PathBuf,
-	pub light_dir: PathBuf,
-	pub map_dir: PathBuf,
+	pub output_dir: PathBuf,
 }
 
 fn coord_filename(coords: TileCoords, ext: &str) -> String {
 	format!("r.{}.{}.{}", coords.x, coords.z, ext)
 }
 
+#[derive(Debug, Clone, Copy)]
+pub enum TileKind {
+	Map,
+	Lightmap,
+}
+
 impl Config {
 	pub fn new(args: super::Args) -> Self {
 		let region_dir = [&args.input_dir, Path::new("region")].iter().collect();
 		let processed_dir = [&args.output_dir, Path::new("processed")].iter().collect();
-		let light_dir = [&args.output_dir, Path::new("light/0")].iter().collect();
-		let map_dir = [&args.output_dir, Path::new("map/0")].iter().collect();
 
 		Config {
 			region_dir,
 			processed_dir,
-			light_dir,
-			map_dir,
+			output_dir: args.output_dir,
 		}
 	}
 
@@ -58,14 +60,19 @@ impl Config {
 		[&self.processed_dir, Path::new(&filename)].iter().collect()
 	}
 
-	pub fn light_path(&self, coords: TileCoords) -> PathBuf {
-		let filename = coord_filename(coords, "png");
-		[&self.light_dir, Path::new(&filename)].iter().collect()
+	pub fn tile_dir(&self, kind: TileKind, level: usize) -> PathBuf {
+		let prefix = match kind {
+			TileKind::Map => "map",
+			TileKind::Lightmap => "light",
+		};
+		let dir = format!("{}/{}", prefix, level);
+		[&self.output_dir, Path::new(&dir)].iter().collect()
 	}
 
-	pub fn map_path(&self, coords: TileCoords) -> PathBuf {
+	pub fn tile_path(&self, kind: TileKind, level: usize, coords: TileCoords) -> PathBuf {
 		let filename = coord_filename(coords, "png");
-		[&self.map_dir, Path::new(&filename)].iter().collect()
+		let dir = self.tile_dir(kind, level);
+		[Path::new(&dir), Path::new(&filename)].iter().collect()
 	}
 }
 
diff --git a/src/bin/minedmap/region_processor.rs b/src/bin/minedmap/region_processor.rs
index 661c92a..c5d2a7c 100644
--- a/src/bin/minedmap/region_processor.rs
+++ b/src/bin/minedmap/region_processor.rs
@@ -71,11 +71,14 @@ impl<'a> RegionProcessor<'a> {
 	}
 
 	fn save_lightmap(&self, coords: TileCoords, lightmap: &image::GrayAlphaImage) -> Result<()> {
-		fs::create_with_tmpfile(&self.config.light_path(coords), |file| {
-			lightmap
-				.write_to(file, image::ImageFormat::Png)
-				.context("Failed to save image")
-		})
+		fs::create_with_tmpfile(
+			&self.config.tile_path(TileKind::Lightmap, 0, coords),
+			|file| {
+				lightmap
+					.write_to(file, image::ImageFormat::Png)
+					.context("Failed to save image")
+			},
+		)
 	}
 
 	/// Processes a single region file
@@ -126,7 +129,7 @@ impl<'a> RegionProcessor<'a> {
 		})?;
 
 		fs::create_dir_all(&self.config.processed_dir)?;
-		fs::create_dir_all(&self.config.light_dir)?;
+		fs::create_dir_all(&self.config.tile_dir(TileKind::Lightmap, 0))?;
 
 		let mut ret = BTreeSet::new();
 
diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index 02376c7..bdd8113 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -59,7 +59,7 @@ impl<'a> TileRenderer<'a> {
 	fn render_tile(&self, coords: TileCoords) -> Result<()> {
 		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
 
-		let output_path = self.config.map_path(coords);
+		let output_path = self.config.tile_path(TileKind::Map, 0, coords);
 
 		println!(
 			"Rendering tile {}",
@@ -81,7 +81,7 @@ impl<'a> TileRenderer<'a> {
 	}
 
 	pub fn run(self, regions: impl IntoIterator<Item = TileCoords>) -> Result<()> {
-		fs::create_dir_all(&self.config.map_dir)?;
+		fs::create_dir_all(&self.config.tile_dir(TileKind::Map, 0))?;
 
 		for coords in regions {
 			if let Err(err) = self.render_tile(coords) {

From 86382772c35766f8d01447f58f0ae3251e4114bf Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 2 Jul 2023 19:45:40 +0200
Subject: [PATCH 183/460] minedmap/tile_renderer: print tile path relative to
 output directory

We will use strings of the same format for mipmap tile paths.
---
 src/bin/minedmap/tile_renderer.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index bdd8113..ee79883 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -64,9 +64,9 @@ impl<'a> TileRenderer<'a> {
 		println!(
 			"Rendering tile {}",
 			output_path
-				.file_name()
-				.unwrap_or_default()
-				.to_string_lossy(),
+				.strip_prefix(&self.config.output_dir)
+				.expect("tile path must be in output directory")
+				.display(),
 		);
 
 		let region = self.load_region(coords)?;
@@ -85,7 +85,7 @@ impl<'a> TileRenderer<'a> {
 
 		for coords in regions {
 			if let Err(err) = self.render_tile(coords) {
-				eprintln!("Failed to render tile {:?}: {:?}", coords, err,);
+				eprintln!("Failed to render tile {:?}: {:?}", coords, err);
 			}
 		}
 

From 216aa6ceec07eeb095767511258eacc1922f0757 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 2 Jul 2023 21:32:40 +0200
Subject: [PATCH 184/460] minedmap: add mipmapping

---
 src/bin/minedmap/main.rs           |   3 +
 src/bin/minedmap/tile_mipmapper.rs | 125 +++++++++++++++++++++++++++++
 2 files changed, 128 insertions(+)
 create mode 100644 src/bin/minedmap/tile_mipmapper.rs

diff --git a/src/bin/minedmap/main.rs b/src/bin/minedmap/main.rs
index 3aef0f8..22fed56 100644
--- a/src/bin/minedmap/main.rs
+++ b/src/bin/minedmap/main.rs
@@ -1,5 +1,6 @@
 mod common;
 mod region_processor;
+mod tile_mipmapper;
 mod tile_renderer;
 
 use std::path::PathBuf;
@@ -9,6 +10,7 @@ use clap::Parser;
 
 use common::Config;
 use region_processor::RegionProcessor;
+use tile_mipmapper::TileMipmapper;
 use tile_renderer::TileRenderer;
 
 #[derive(Debug, Parser)]
@@ -25,6 +27,7 @@ fn main() -> Result<()> {
 
 	let regions = RegionProcessor::new(&config).run()?;
 	TileRenderer::new(&config).run(regions.iter().copied())?;
+	TileMipmapper::new(&config).run(regions)?;
 
 	Ok(())
 }
diff --git a/src/bin/minedmap/tile_mipmapper.rs b/src/bin/minedmap/tile_mipmapper.rs
new file mode 100644
index 0000000..567c656
--- /dev/null
+++ b/src/bin/minedmap/tile_mipmapper.rs
@@ -0,0 +1,125 @@
+use std::collections::BTreeSet;
+
+use anyhow::{Context, Result};
+
+use minedmap::{io::fs, types::*};
+
+use super::common::*;
+
+pub struct TileMipmapper<'a> {
+	config: &'a Config,
+}
+
+impl<'a> TileMipmapper<'a> {
+	pub fn new(config: &'a Config) -> Self {
+		TileMipmapper { config }
+	}
+
+	fn done(tiles: &BTreeSet<TileCoords>) -> bool {
+		tiles
+			.into_iter()
+			.all(|TileCoords { x, z }| (-1..=0).contains(x) && (-1..=0).contains(z))
+	}
+
+	fn map_coords(tiles: &BTreeSet<TileCoords>) -> BTreeSet<TileCoords> {
+		let mut ret = BTreeSet::new();
+
+		for coords in tiles {
+			ret.insert(TileCoords {
+				x: coords.x >> 1,
+				z: coords.z >> 1,
+			});
+		}
+
+		ret
+	}
+
+	fn render_mipmap<P: image::PixelWithColorType>(
+		&self,
+		kind: TileKind,
+		level: usize,
+		coords: TileCoords,
+		prev: &BTreeSet<TileCoords>,
+	) -> Result<()>
+	where
+		[P::Subpixel]: image::EncodableLayout,
+		image::ImageBuffer<P, Vec<P::Subpixel>>: Into<image::DynamicImage>,
+	{
+		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
+
+		let output_path = self.config.tile_path(kind, level, coords);
+
+		println!(
+			"Rendering mipmap tile {}",
+			output_path
+				.strip_prefix(&self.config.output_dir)
+				.expect("tile path must be in output directory")
+				.display(),
+		);
+
+		let mut image: image::DynamicImage =
+			image::ImageBuffer::<P, Vec<P::Subpixel>>::new(N, N).into();
+
+		for (dx, dz) in [(0, 0), (0, 1), (1, 0), (1, 1)] {
+			let source_coords = TileCoords {
+				x: 2 * coords.x + dx,
+				z: 2 * coords.z + dz,
+			};
+			if !prev.contains(&source_coords) {
+				continue;
+			}
+
+			let source_path = self.config.tile_path(kind, level - 1, source_coords);
+			let source = match image::open(&source_path) {
+				Ok(source) => source,
+				Err(err) => {
+					eprintln!(
+						"Failed to read source image {}: {}",
+						source_path.display(),
+						err,
+					);
+					continue;
+				}
+			};
+			let resized = source.resize(N / 2, N / 2, image::imageops::FilterType::Triangle);
+			image::imageops::overlay(
+				&mut image,
+				&resized,
+				dx as i64 * (N / 2) as i64,
+				dz as i64 * (N / 2) as i64,
+			);
+		}
+
+		fs::create_with_tmpfile(&output_path, |file| {
+			image
+				.write_to(file, image::ImageFormat::Png)
+				.context("Failed to save image")
+		})
+	}
+
+	pub fn run(self, tiles: BTreeSet<TileCoords>) -> Result<Vec<BTreeSet<TileCoords>>> {
+		let mut tile_stack = vec![tiles];
+
+		loop {
+			let level = tile_stack.len();
+			let prev = &tile_stack[level - 1];
+			if Self::done(prev) {
+				break;
+			}
+
+			fs::create_dir_all(&self.config.tile_dir(TileKind::Map, level))?;
+			fs::create_dir_all(&self.config.tile_dir(TileKind::Lightmap, level))?;
+
+			let next = Self::map_coords(prev);
+
+			for &coords in &next {
+				self.render_mipmap::<image::Rgba<u8>>(TileKind::Map, level, coords, prev)?;
+				self.render_mipmap::<image::LumaA<u8>>(TileKind::Lightmap, level, coords, prev)?;
+			}
+
+			tile_stack.push(next);
+		}
+
+		Ok(tile_stack)
+	}
+}

From b63a18ad6fbaca09705012f046d59c74b7ca1858 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 2 Jul 2023 22:15:25 +0200
Subject: [PATCH 185/460] tile_mipmapper: store tile coordinates in nested
 map/set

Use the same data structure as the frontend.
---
 src/bin/minedmap/common.rs         | 14 ++++++++
 src/bin/minedmap/tile_mipmapper.rs | 53 ++++++++++++++++++++----------
 2 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/src/bin/minedmap/common.rs b/src/bin/minedmap/common.rs
index ee870d0..7062d45 100644
--- a/src/bin/minedmap/common.rs
+++ b/src/bin/minedmap/common.rs
@@ -1,4 +1,5 @@
 use std::{
+	collections::{BTreeMap, BTreeSet},
 	fmt::Debug,
 	path::{Path, PathBuf},
 };
@@ -19,6 +20,19 @@ impl Debug for TileCoords {
 	}
 }
 
+#[derive(Debug, Clone, Default)]
+pub struct TileCoordMap(pub BTreeMap<i32, BTreeSet<i32>>);
+
+impl TileCoordMap {
+	pub fn contains(&self, coords: TileCoords) -> bool {
+		let Some(xs) = self.0.get(&coords.z) else {
+			return false;
+		};
+
+		xs.contains(&coords.x)
+	}
+}
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ProcessedChunk {
 	pub blocks: Box<layer::BlockArray>,
diff --git a/src/bin/minedmap/tile_mipmapper.rs b/src/bin/minedmap/tile_mipmapper.rs
index 567c656..8e1415e 100644
--- a/src/bin/minedmap/tile_mipmapper.rs
+++ b/src/bin/minedmap/tile_mipmapper.rs
@@ -15,20 +15,23 @@ impl<'a> TileMipmapper<'a> {
 		TileMipmapper { config }
 	}
 
-	fn done(tiles: &BTreeSet<TileCoords>) -> bool {
+	fn done(tiles: &TileCoordMap) -> bool {
 		tiles
-			.into_iter()
-			.all(|TileCoords { x, z }| (-1..=0).contains(x) && (-1..=0).contains(z))
+			.0
+			.iter()
+			.all(|(z, xs)| (-1..=0).contains(z) && xs.iter().all(|x| (-1..=0).contains(x)))
 	}
 
-	fn map_coords(tiles: &BTreeSet<TileCoords>) -> BTreeSet<TileCoords> {
-		let mut ret = BTreeSet::new();
+	fn map_coords(tiles: &TileCoordMap) -> TileCoordMap {
+		let mut ret = TileCoordMap::default();
 
-		for coords in tiles {
-			ret.insert(TileCoords {
-				x: coords.x >> 1,
-				z: coords.z >> 1,
-			});
+		for (&z, xs) in &tiles.0 {
+			for &x in xs {
+				let xt = x >> 1;
+				let zt = z >> 1;
+
+				ret.0.entry(zt).or_default().insert(xt);
+			}
 		}
 
 		ret
@@ -39,7 +42,7 @@ impl<'a> TileMipmapper<'a> {
 		kind: TileKind,
 		level: usize,
 		coords: TileCoords,
-		prev: &BTreeSet<TileCoords>,
+		prev: &TileCoordMap,
 	) -> Result<()>
 	where
 		[P::Subpixel]: image::EncodableLayout,
@@ -65,7 +68,7 @@ impl<'a> TileMipmapper<'a> {
 				x: 2 * coords.x + dx,
 				z: 2 * coords.z + dz,
 			};
-			if !prev.contains(&source_coords) {
+			if !prev.contains(source_coords) {
 				continue;
 			}
 
@@ -97,8 +100,16 @@ impl<'a> TileMipmapper<'a> {
 		})
 	}
 
-	pub fn run(self, tiles: BTreeSet<TileCoords>) -> Result<Vec<BTreeSet<TileCoords>>> {
-		let mut tile_stack = vec![tiles];
+	pub fn run(self, tiles: BTreeSet<TileCoords>) -> Result<Vec<TileCoordMap>> {
+		let mut tile_stack = {
+			let mut tile_map = TileCoordMap::default();
+
+			for TileCoords { x, z } in tiles {
+				tile_map.0.entry(z).or_default().insert(x);
+			}
+
+			vec![tile_map]
+		};
 
 		loop {
 			let level = tile_stack.len();
@@ -112,9 +123,17 @@ impl<'a> TileMipmapper<'a> {
 
 			let next = Self::map_coords(prev);
 
-			for &coords in &next {
-				self.render_mipmap::<image::Rgba<u8>>(TileKind::Map, level, coords, prev)?;
-				self.render_mipmap::<image::LumaA<u8>>(TileKind::Lightmap, level, coords, prev)?;
+			for (&z, xs) in &next.0 {
+				for &x in xs {
+					let coords = TileCoords { x, z };
+					self.render_mipmap::<image::Rgba<u8>>(TileKind::Map, level, coords, prev)?;
+					self.render_mipmap::<image::LumaA<u8>>(
+						TileKind::Lightmap,
+						level,
+						coords,
+						prev,
+					)?;
+				}
 			}
 
 			tile_stack.push(next);

From f9fc9efe8d58b045b8305cf161dde4577c321c1d Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 2 Jul 2023 22:19:35 +0200
Subject: [PATCH 186/460] Revert "minedmap: store region list in BTreeSet"

This reverts commit b53d34da3d0eae697491b7e4ffc40b828b9b0b9a.

With the change of the mipmapper data structure, we need a conversion
step anyways, so we can keep using the Vec before mipmapping.
---
 src/bin/minedmap/main.rs             | 4 ++--
 src/bin/minedmap/region_processor.rs | 8 ++++----
 src/bin/minedmap/tile_mipmapper.rs   | 6 ++----
 src/bin/minedmap/tile_renderer.rs    | 4 ++--
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/bin/minedmap/main.rs b/src/bin/minedmap/main.rs
index 22fed56..5e89025 100644
--- a/src/bin/minedmap/main.rs
+++ b/src/bin/minedmap/main.rs
@@ -26,8 +26,8 @@ fn main() -> Result<()> {
 	let config = Config::new(args);
 
 	let regions = RegionProcessor::new(&config).run()?;
-	TileRenderer::new(&config).run(regions.iter().copied())?;
-	TileMipmapper::new(&config).run(regions)?;
+	TileRenderer::new(&config).run(&regions)?;
+	TileMipmapper::new(&config).run(&regions)?;
 
 	Ok(())
 }
diff --git a/src/bin/minedmap/region_processor.rs b/src/bin/minedmap/region_processor.rs
index c5d2a7c..854c506 100644
--- a/src/bin/minedmap/region_processor.rs
+++ b/src/bin/minedmap/region_processor.rs
@@ -1,4 +1,4 @@
-use std::{collections::BTreeSet, path::Path};
+use std::path::Path;
 
 use anyhow::{Context, Result};
 
@@ -120,7 +120,7 @@ impl<'a> RegionProcessor<'a> {
 	/// Iterates over all region files of a Minecraft save directory
 	///
 	/// Returns a list of the coordinates of all processed regions
-	pub fn run(self) -> Result<BTreeSet<TileCoords>> {
+	pub fn run(self) -> Result<Vec<TileCoords>> {
 		let read_dir = self.config.region_dir.read_dir().with_context(|| {
 			format!(
 				"Failed to read directory {}",
@@ -131,7 +131,7 @@ impl<'a> RegionProcessor<'a> {
 		fs::create_dir_all(&self.config.processed_dir)?;
 		fs::create_dir_all(&self.config.tile_dir(TileKind::Lightmap, 0))?;
 
-		let mut ret = BTreeSet::new();
+		let mut ret = Vec::new();
 
 		for entry in read_dir.filter_map(|entry| entry.ok()).filter(|entry| {
 			// We are only interested in regular files
@@ -153,7 +153,7 @@ impl<'a> RegionProcessor<'a> {
 				);
 			}
 
-			ret.insert(coords);
+			ret.push(coords);
 		}
 
 		Ok(ret)
diff --git a/src/bin/minedmap/tile_mipmapper.rs b/src/bin/minedmap/tile_mipmapper.rs
index 8e1415e..f24a41e 100644
--- a/src/bin/minedmap/tile_mipmapper.rs
+++ b/src/bin/minedmap/tile_mipmapper.rs
@@ -1,5 +1,3 @@
-use std::collections::BTreeSet;
-
 use anyhow::{Context, Result};
 
 use minedmap::{io::fs, types::*};
@@ -100,11 +98,11 @@ impl<'a> TileMipmapper<'a> {
 		})
 	}
 
-	pub fn run(self, tiles: BTreeSet<TileCoords>) -> Result<Vec<TileCoordMap>> {
+	pub fn run(self, tiles: &[TileCoords]) -> Result<Vec<TileCoordMap>> {
 		let mut tile_stack = {
 			let mut tile_map = TileCoordMap::default();
 
-			for TileCoords { x, z } in tiles {
+			for &TileCoords { x, z } in tiles {
 				tile_map.0.entry(z).or_default().insert(x);
 			}
 
diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index ee79883..2956081 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -80,10 +80,10 @@ impl<'a> TileRenderer<'a> {
 		})
 	}
 
-	pub fn run(self, regions: impl IntoIterator<Item = TileCoords>) -> Result<()> {
+	pub fn run(self, regions: &[TileCoords]) -> Result<()> {
 		fs::create_dir_all(&self.config.tile_dir(TileKind::Map, 0))?;
 
-		for coords in regions {
+		for &coords in regions {
 			if let Err(err) = self.render_tile(coords) {
 				eprintln!("Failed to render tile {:?}: {:?}", coords, err);
 			}

From 429b7888f62f747e5393f50c6e7e5f825c29dd2a Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 2 Jul 2023 23:08:43 +0200
Subject: [PATCH 187/460] world/de: add level.dat data structures

We only need the spawn point from level.dat.
---
 src/world/de.rs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/world/de.rs b/src/world/de.rs
index 844bd29..82aa11c 100644
--- a/src/world/de.rs
+++ b/src/world/de.rs
@@ -99,3 +99,18 @@ pub struct Chunk {
 	#[serde(flatten)]
 	pub chunk: ChunkVariants,
 }
+
+/// "Data" compound element of level.dat
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "PascalCase")]
+pub struct LevelDatData {
+	pub spawn_x: i32,
+	pub spawn_z: i32,
+}
+
+/// Toplevel compound element of level.dat
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "PascalCase")]
+pub struct LevelDat {
+	pub data: LevelDatData,
+}

From 757f6ff16665b20574e35c440240826a76aa9ee0 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 2 Jul 2023 23:09:14 +0200
Subject: [PATCH 188/460] minedmap: write info.json file with tilemap metadata

With this change, the new minedmap implementation can generate all
necessary data for the frontend to work.
---
 Cargo.lock                          |  24 +++++++
 Cargo.toml                          |   1 +
 src/bin/minedmap/common.rs          |   9 ++-
 src/bin/minedmap/main.rs            |   5 +-
 src/bin/minedmap/metadata_writer.rs | 106 ++++++++++++++++++++++++++++
 5 files changed, 143 insertions(+), 2 deletions(-)
 create mode 100644 src/bin/minedmap/metadata_writer.rs

diff --git a/Cargo.lock b/Cargo.lock
index d8fac2f..a0b4d5b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -325,6 +325,12 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itoa"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+
 [[package]]
 name = "jobserver"
 version = "0.1.26"
@@ -372,6 +378,7 @@ dependencies = [
  "itertools",
  "num-integer",
  "serde",
+ "serde_json",
  "zstd",
 ]
 
@@ -471,6 +478,12 @@ dependencies = [
  "windows-sys",
 ]
 
+[[package]]
+name = "ryu"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+
 [[package]]
 name = "serde"
 version = "1.0.164"
@@ -500,6 +513,17 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "serde_json"
+version = "1.0.99"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
 [[package]]
 name = "simd-adler32"
 version = "0.3.5"
diff --git a/Cargo.toml b/Cargo.toml
index 60a20cc..5e04100 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,6 +20,7 @@ image = { version = "0.24.5", default-features = false, features = ["png"] }
 itertools = "0.11.0"
 num-integer = "0.1.45"
 serde = "1.0.152"
+serde_json = "1.0.99"
 zstd = "0.12.3"
 
 [features]
diff --git a/src/bin/minedmap/common.rs b/src/bin/minedmap/common.rs
index 7062d45..4aed1c0 100644
--- a/src/bin/minedmap/common.rs
+++ b/src/bin/minedmap/common.rs
@@ -20,7 +20,8 @@ impl Debug for TileCoords {
 	}
 }
 
-#[derive(Debug, Clone, Default)]
+#[derive(Debug, Clone, Default, Serialize)]
+#[serde(transparent)]
 pub struct TileCoordMap(pub BTreeMap<i32, BTreeSet<i32>>);
 
 impl TileCoordMap {
@@ -45,6 +46,8 @@ pub struct Config {
 	pub region_dir: PathBuf,
 	pub processed_dir: PathBuf,
 	pub output_dir: PathBuf,
+	pub level_dat_path: PathBuf,
+	pub metadata_path: PathBuf,
 }
 
 fn coord_filename(coords: TileCoords, ext: &str) -> String {
@@ -61,11 +64,15 @@ impl Config {
 	pub fn new(args: super::Args) -> Self {
 		let region_dir = [&args.input_dir, Path::new("region")].iter().collect();
 		let processed_dir = [&args.output_dir, Path::new("processed")].iter().collect();
+		let level_dat_path = [&args.input_dir, Path::new("level.dat")].iter().collect();
+		let metadata_path = [&args.output_dir, Path::new("info.json")].iter().collect();
 
 		Config {
 			region_dir,
 			processed_dir,
 			output_dir: args.output_dir,
+			level_dat_path,
+			metadata_path,
 		}
 	}
 
diff --git a/src/bin/minedmap/main.rs b/src/bin/minedmap/main.rs
index 5e89025..34aa985 100644
--- a/src/bin/minedmap/main.rs
+++ b/src/bin/minedmap/main.rs
@@ -1,4 +1,5 @@
 mod common;
+mod metadata_writer;
 mod region_processor;
 mod tile_mipmapper;
 mod tile_renderer;
@@ -9,6 +10,7 @@ use anyhow::Result;
 use clap::Parser;
 
 use common::Config;
+use metadata_writer::MetadataWriter;
 use region_processor::RegionProcessor;
 use tile_mipmapper::TileMipmapper;
 use tile_renderer::TileRenderer;
@@ -27,7 +29,8 @@ fn main() -> Result<()> {
 
 	let regions = RegionProcessor::new(&config).run()?;
 	TileRenderer::new(&config).run(&regions)?;
-	TileMipmapper::new(&config).run(&regions)?;
+	let tiles = TileMipmapper::new(&config).run(&regions)?;
+	MetadataWriter::new(&config).run(tiles)?;
 
 	Ok(())
 }
diff --git a/src/bin/minedmap/metadata_writer.rs b/src/bin/minedmap/metadata_writer.rs
new file mode 100644
index 0000000..437152a
--- /dev/null
+++ b/src/bin/minedmap/metadata_writer.rs
@@ -0,0 +1,106 @@
+use anyhow::{Context, Result};
+use minedmap::{io::fs, world::de};
+use serde::Serialize;
+
+use super::common::*;
+
+pub struct MetadataWriter<'a> {
+	config: &'a Config,
+}
+
+#[derive(Debug, Serialize)]
+#[serde(rename_all = "camelCase")]
+struct Bounds {
+	min_x: i32,
+	max_x: i32,
+	min_z: i32,
+	max_z: i32,
+}
+
+#[derive(Debug, Serialize)]
+struct Mipmap<'t> {
+	bounds: Bounds,
+	regions: &'t TileCoordMap,
+}
+
+#[derive(Debug, Serialize)]
+struct Spawn {
+	x: i32,
+	z: i32,
+}
+
+#[derive(Debug, Serialize)]
+struct Metadata<'t> {
+	mipmaps: Vec<Mipmap<'t>>,
+	spawn: Spawn,
+}
+
+impl<'a> MetadataWriter<'a> {
+	pub fn new(config: &'a Config) -> Self {
+		MetadataWriter { config }
+	}
+
+	fn mipmap_entry(regions: &TileCoordMap) -> Mipmap {
+		let mut min_x = i32::MAX;
+		let mut max_x = i32::MIN;
+		let mut min_z = i32::MAX;
+		let mut max_z = i32::MIN;
+
+		for (&z, xs) in &regions.0 {
+			if z < min_z {
+				min_z = z;
+			}
+			if z > max_z {
+				max_z = z;
+			}
+
+			for &x in xs {
+				if x < min_x {
+					min_x = x;
+				}
+				if x > max_x {
+					max_x = x;
+				}
+			}
+		}
+
+		Mipmap {
+			bounds: Bounds {
+				min_x,
+				max_x,
+				min_z,
+				max_z,
+			},
+			regions,
+		}
+	}
+
+	fn read_level_dat(&self) -> Result<de::LevelDat> {
+		minedmap::io::data::from_file(&self.config.level_dat_path)
+			.context("Failed to read level.dat")
+	}
+
+	fn spawn(level_dat: &de::LevelDat) -> Spawn {
+		Spawn {
+			x: level_dat.data.spawn_x,
+			z: level_dat.data.spawn_z,
+		}
+	}
+
+	pub fn run(&self, tiles: Vec<TileCoordMap>) -> Result<()> {
+		let level_dat = self.read_level_dat()?;
+
+		let mut metadata = Metadata {
+			mipmaps: Vec::new(),
+			spawn: Self::spawn(&level_dat),
+		};
+
+		for tile_map in tiles.iter() {
+			metadata.mipmaps.push(Self::mipmap_entry(tile_map));
+		}
+
+		fs::create_with_tmpfile(&self.config.metadata_path, |file| {
+			serde_json::to_writer(file, &metadata).context("Failed to write metadata")
+		})
+	}
+}

From 99c4de0b07c3bb9eafbf1810a7ca3c9670fa67fd Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 3 Jul 2023 23:27:59 +0200
Subject: [PATCH 189/460] Update dependencies

---
 Cargo.lock | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a0b4d5b..3cf1afc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -327,9 +327,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.6"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a"
 
 [[package]]
 name = "jobserver"
@@ -467,9 +467,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.1"
+version = "0.38.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc6396159432b5c8490d4e301d8c705f61860b8b6c863bf79942ce5401968f3"
+checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4"
 dependencies = [
  "bitflags 2.3.3",
  "errno",
@@ -480,33 +480,33 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.13"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9"
 
 [[package]]
 name = "serde"
-version = "1.0.164"
+version = "1.0.166"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d"
+checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_bytes"
-version = "0.11.9"
+version = "0.11.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "416bda436f9aab92e02c8e10d49a15ddd339cea90b6e340fe51ed97abb548294"
+checksum = "f3c5113243e4a3a1c96587342d067f3e6b0f50790b6cf40d2868eb647a3eef0e"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.164"
+version = "1.0.166"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68"
+checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -538,9 +538,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "syn"
-version = "2.0.22"
+version = "2.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2efbeae7acf4eabd6bcdcbd11c92f45231ddda7539edc7806bd1a04a03b24616"
+checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -549,9 +549,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
+checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73"
 
 [[package]]
 name = "utf8parse"

From c471f84573a573b46db76e7a018eec2e9a6deaac Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 3 Jul 2023 23:45:00 +0200
Subject: [PATCH 190/460] resource/block_color: fix scaling of biome-specific
 colors

All biome-specific colors (water/foliage/grass) were too bright by a
factor of 255 (i.e., white).
---
 src/resource/block_color.rs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/resource/block_color.rs b/src/resource/block_color.rs
index 21cd5c7..3cb8e22 100644
--- a/src/resource/block_color.rs
+++ b/src/resource/block_color.rs
@@ -2,10 +2,14 @@ use super::{Biome, BlockType, Color};
 
 use glam::Vec3;
 
-fn color_vec(color: Color) -> Vec3 {
+fn color_vec_unscaled(color: Color) -> Vec3 {
 	Vec3::from_array(color.0.map(f32::from))
 }
 
+fn color_vec(color: Color) -> Vec3 {
+	color_vec_unscaled(color) / 255.0
+}
+
 fn color_from_params(colors: &[Vec3; 3], biome: &Biome, depth: f32) -> Vec3 {
 	let temp = (biome.temp() - f32::max((depth - 64.0) / 600.0, 0.0)).clamp(0.0, 1.0);
 	let downfall = biome.downfall().clamp(0.0, 1.0) * temp;
@@ -71,7 +75,7 @@ const EVERGREEN_COLOR: Vec3 = Vec3::new(0.380, 0.600, 0.380); // == color_vec(Co
 pub fn block_color(block: BlockType, biome: &Biome, depth: f32) -> [u8; 4] {
 	use super::BlockFlag::*;
 
-	let mut color = color_vec(block.color);
+	let mut color = color_vec_unscaled(block.color);
 
 	if block.is(Grass) {
 		color *= biome.grass_color(depth);

From d84e2ca49d7200b04f00c24f06799e8cabcaf1cf Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 3 Jul 2023 23:49:36 +0200
Subject: [PATCH 191/460] resource/block_color: fix default foliage colors

The code accidentally used the grass colors.
---
 src/resource/block_color.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/resource/block_color.rs b/src/resource/block_color.rs
index 3cb8e22..23bd61e 100644
--- a/src/resource/block_color.rs
+++ b/src/resource/block_color.rs
@@ -40,9 +40,9 @@ impl BiomeExt for Biome {
 		use super::BiomeGrassColorModifier::*;
 
 		const FOLIAGE_COLORS: [Vec3; 3] = [
-			Vec3::new(0.502, 0.706, 0.592),   // lower right
-			Vec3::new(0.247, 0.012, -0.259),  // lower left - lower right
-			Vec3::new(-0.471, 0.086, -0.133), // upper left - lower left
+			Vec3::new(0.376, 0.631, 0.482),   // lower right
+			Vec3::new(0.306, 0.012, -0.317),  // lower left - lower right
+			Vec3::new(-0.580, 0.106, -0.165), // upper left - lower left
 		];
 		const DARK_FOREST_COLOR: Vec3 = Vec3::new(0.157, 0.204, 0.039); // == color_vec(Color([40, 52, 10]))
 		const SWAMP_FOLIAGE_COLOR: Vec3 = Vec3::new(0.416, 0.439, 0.224); // == color_vec(Color([106, 112, 57]))

From c472b61ef7bcd6e2a27313bf724281058b4ffa3d Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 4 Jul 2023 00:21:27 +0200
Subject: [PATCH 192/460] resource/block_color: actually apply grass color
 modifiers to grass

Apply the modifiers to grass, not to foliage.
---
 src/resource/block_color.rs | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/resource/block_color.rs b/src/resource/block_color.rs
index 23bd61e..c239d96 100644
--- a/src/resource/block_color.rs
+++ b/src/resource/block_color.rs
@@ -25,39 +25,39 @@ trait BiomeExt {
 
 impl BiomeExt for Biome {
 	fn grass_color(&self, depth: f32) -> Vec3 {
+		use super::BiomeGrassColorModifier::*;
+
 		const GRASS_COLORS: [Vec3; 3] = [
 			Vec3::new(0.502, 0.706, 0.592),   // lower right
 			Vec3::new(0.247, 0.012, -0.259),  // lower left - lower right
 			Vec3::new(-0.471, 0.086, -0.133), // upper left - lower left
 		];
+		const DARK_FOREST_GRASS_COLOR: Vec3 = Vec3::new(0.157, 0.204, 0.039); // == color_vec(Color([40, 52, 10]))
+		const SWAMP_GRASS_COLOR: Vec3 = Vec3::new(0.416, 0.439, 0.224); // == color_vec(Color([106, 112, 57]))
 
-		self.grass_color
-			.map(color_vec)
-			.unwrap_or_else(|| color_from_params(&GRASS_COLORS, self, depth))
+		let regular_color = || {
+			self.grass_color
+				.map(color_vec)
+				.unwrap_or_else(|| color_from_params(&GRASS_COLORS, self, depth))
+		};
+
+		match self.grass_color_modifier {
+			Some(DarkForest) => 0.5 * (regular_color() + DARK_FOREST_GRASS_COLOR),
+			Some(Swamp) => SWAMP_GRASS_COLOR,
+			None => regular_color(),
+		}
 	}
 
 	fn foliage_color(&self, depth: f32) -> Vec3 {
-		use super::BiomeGrassColorModifier::*;
-
 		const FOLIAGE_COLORS: [Vec3; 3] = [
 			Vec3::new(0.376, 0.631, 0.482),   // lower right
 			Vec3::new(0.306, 0.012, -0.317),  // lower left - lower right
 			Vec3::new(-0.580, 0.106, -0.165), // upper left - lower left
 		];
-		const DARK_FOREST_COLOR: Vec3 = Vec3::new(0.157, 0.204, 0.039); // == color_vec(Color([40, 52, 10]))
-		const SWAMP_FOLIAGE_COLOR: Vec3 = Vec3::new(0.416, 0.439, 0.224); // == color_vec(Color([106, 112, 57]))
 
-		let regular_color = || {
-			self.foliage_color
-				.map(color_vec)
-				.unwrap_or_else(|| color_from_params(&FOLIAGE_COLORS, self, depth))
-		};
-
-		match self.grass_color_modifier {
-			Some(DarkForest) => 0.5 * (regular_color() + DARK_FOREST_COLOR),
-			Some(Swamp) => SWAMP_FOLIAGE_COLOR,
-			None => regular_color(),
-		}
+		self.foliage_color
+			.map(color_vec)
+			.unwrap_or_else(|| color_from_params(&FOLIAGE_COLORS, self, depth))
 	}
 
 	fn water_color(&self) -> Vec3 {

From cb791f48e91e99b703d5ac383ccb5d0b416ee94f Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 30 Jul 2023 20:03:23 +0200
Subject: [PATCH 193/460] Update dependencies

---
 Cargo.lock | 96 +++++++++++++++++++++++++++---------------------------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3cf1afc..b286664 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -59,9 +59,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.71"
+version = "1.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
+checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
 
 [[package]]
 name = "autocfg"
@@ -125,9 +125,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.3.10"
+version = "4.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "384e169cc618c613d5e3ca6404dda77a8685a63e08660dcc64abaf7da7cb0c7a"
+checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -136,9 +136,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.3.10"
+version = "4.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef137bbe35aab78bdb468ccfba75a5f4d8321ae011d34063770780545176af2d"
+checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1"
 dependencies = [
  "anstream",
  "anstyle",
@@ -148,9 +148,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.3.2"
+version = "4.3.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f"
+checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -196,9 +196,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.8.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 
 [[package]]
 name = "enumflags2"
@@ -222,9 +222,9 @@ dependencies = [
 
 [[package]]
 name = "errno"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
+checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f"
 dependencies = [
  "errno-dragonfly",
  "libc",
@@ -287,9 +287,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.1"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
 
 [[package]]
 name = "image"
@@ -307,9 +307,9 @@ dependencies = [
 
 [[package]]
 name = "is-terminal"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb"
+checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
  "hermit-abi",
  "rustix",
@@ -327,9 +327,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
 name = "jobserver"
@@ -348,9 +348,9 @@ checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
 
 [[package]]
 name = "libz-ng-sys"
-version = "1.1.9"
+version = "1.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2468756f34903b582fe7154dc1ffdebd89d0562c4a43b53c621bb0f1b1043ccb"
+checksum = "3dd9f43e75536a46ee0f92b758f6b63846e594e86638c61a9251338a65baea63"
 dependencies = [
  "cmake",
  "libc",
@@ -415,9 +415,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
 dependencies = [
  "autocfg",
 ]
@@ -449,27 +449,27 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.63"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb"
+checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.29"
+version = "1.0.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105"
+checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "rustix"
-version = "0.38.2"
+version = "0.38.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aabcb0461ebd01d6b79945797c27f8529082226cb630a9865a71870ff63532a4"
+checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5"
 dependencies = [
  "bitflags 2.3.3",
  "errno",
@@ -480,33 +480,33 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 
 [[package]]
 name = "serde"
-version = "1.0.166"
+version = "1.0.178"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d01b7404f9d441d3ad40e6a636a7782c377d2abdbe4fa2440e2edcc2f4f10db8"
+checksum = "60363bdd39a7be0266a520dab25fdc9241d2f987b08a01e01f0ec6d06a981348"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_bytes"
-version = "0.11.10"
+version = "0.11.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c5113243e4a3a1c96587342d067f3e6b0f50790b6cf40d2868eb647a3eef0e"
+checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.166"
+version = "1.0.178"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dd83d6dde2b6b2d466e14d9d1acce8816dedee94f735eac6395808b3483c6d6"
+checksum = "f28482318d6641454cb273da158647922d1be6b5a2fcc6165cd89ebdd7ed576b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -515,9 +515,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.99"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3"
+checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
 dependencies = [
  "itoa",
  "ryu",
@@ -526,9 +526,9 @@ dependencies = [
 
 [[package]]
 name = "simd-adler32"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
 
 [[package]]
 name = "strsim"
@@ -538,9 +538,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "syn"
-version = "2.0.23"
+version = "2.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59fb7d6d8281a51045d62b8eb3a7d1ce347b76f312af50cd3dc0af39c87c1737"
+checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -549,9 +549,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73"
+checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
 
 [[package]]
 name = "utf8parse"
@@ -627,18 +627,18 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
 
 [[package]]
 name = "zstd"
-version = "0.12.3+zstd.1.5.2"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806"
+checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c"
 dependencies = [
  "zstd-safe",
 ]
 
 [[package]]
 name = "zstd-safe"
-version = "6.0.5+zstd.1.5.4"
+version = "6.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b"
+checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581"
 dependencies = [
  "libc",
  "zstd-sys",

From e18d4cea824e5b5a820b137eea65d57898283d22 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 30 Jul 2023 20:31:40 +0200
Subject: [PATCH 194/460] io/fs: do not replace files with unchanged contents

Do not update file timestamps when contents have not actually changed.
---
 src/io/fs.rs | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/io/fs.rs b/src/io/fs.rs
index 46e8726..2109961 100644
--- a/src/io/fs.rs
+++ b/src/io/fs.rs
@@ -1,6 +1,6 @@
 use std::{
 	fs::{self, File},
-	io::{BufWriter, Write},
+	io::{BufReader, BufWriter, Read, Write},
 	path::{Path, PathBuf},
 };
 
@@ -41,19 +41,44 @@ where
 	.with_context(|| format!("Failed to write file {}", path.display()))
 }
 
+pub fn equal(path1: &Path, path2: &Path) -> Result<bool> {
+	let mut file1 = BufReader::new(
+		fs::File::open(path1)
+			.with_context(|| format!("Failed to open file {}", path1.display()))?,
+	)
+	.bytes();
+	let mut file2 = BufReader::new(
+		fs::File::open(path2)
+			.with_context(|| format!("Failed to open file {}", path2.display()))?,
+	)
+	.bytes();
+
+	Ok(loop {
+		match (file1.next().transpose()?, file2.next().transpose()?) {
+			(Some(b1), Some(b2)) if b1 == b2 => continue,
+			(None, None) => break true,
+			_ => break false,
+		};
+	})
+}
+
 pub fn create_with_tmpfile<T, F>(path: &Path, f: F) -> Result<T>
 where
 	F: FnOnce(&mut BufWriter<File>) -> Result<T>,
 {
 	let tmp_path = tmpfile_name(path);
+	let mut cleanup = true;
 
 	let ret = (|| {
 		let ret = create(&tmp_path, f)?;
-		rename(&tmp_path, path)?;
+		if !matches!(equal(path, &tmp_path), Result::Ok(true)) {
+			rename(&tmp_path, path)?;
+			cleanup = false;
+		}
 		Ok(ret)
 	})();
 
-	if ret.is_err() {
+	if cleanup {
 		let _ = fs::remove_file(&tmp_path);
 	}
 

From 628a702fd74cae06aa53aa480a6bae5e4a716360 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 30 Jul 2023 21:19:24 +0200
Subject: [PATCH 195/460] Store source modified timestamp with processed,
 lightmap and map tiles

Allows to check whether the source is newer than the last update of the
output files.
---
 src/bin/minedmap/region_processor.rs | 27 ++++++++++++-----
 src/bin/minedmap/tile_renderer.rs    | 13 +++++---
 src/io/fs.rs                         | 45 ++++++++++++++++++++++++++--
 src/io/storage.rs                    |  5 ++--
 4 files changed, 75 insertions(+), 15 deletions(-)

diff --git a/src/bin/minedmap/region_processor.rs b/src/bin/minedmap/region_processor.rs
index 854c506..2081785 100644
--- a/src/bin/minedmap/region_processor.rs
+++ b/src/bin/minedmap/region_processor.rs
@@ -1,4 +1,4 @@
-use std::path::Path;
+use std::{path::Path, time::SystemTime};
 
 use anyhow::{Context, Result};
 
@@ -65,14 +65,25 @@ impl<'a> RegionProcessor<'a> {
 		})
 	}
 
-	fn save_region(&self, coords: TileCoords, processed_region: &ProcessedRegion) -> Result<()> {
+	fn save_region(
+		&self,
+		coords: TileCoords,
+		processed_region: &ProcessedRegion,
+		timestamp: SystemTime,
+	) -> Result<()> {
 		let output_path = self.config.processed_path(coords);
-		storage::write(&output_path, processed_region)
+		storage::write(&output_path, processed_region, timestamp)
 	}
 
-	fn save_lightmap(&self, coords: TileCoords, lightmap: &image::GrayAlphaImage) -> Result<()> {
-		fs::create_with_tmpfile(
+	fn save_lightmap(
+		&self,
+		coords: TileCoords,
+		lightmap: &image::GrayAlphaImage,
+		timestamp: SystemTime,
+	) -> Result<()> {
+		fs::create_with_timestamp(
 			&self.config.tile_path(TileKind::Lightmap, 0, coords),
+			timestamp,
 			|file| {
 				lightmap
 					.write_to(file, image::ImageFormat::Png)
@@ -90,6 +101,8 @@ impl<'a> RegionProcessor<'a> {
 		let mut processed_region = ProcessedRegion::default();
 		let mut lightmap = image::GrayAlphaImage::new(N, N);
 
+		let timestamp = fs::modified_timestamp(path)?;
+
 		minedmap::io::region::from_file(path)?.foreach_chunk(
 			|chunk_coords, data: world::de::Chunk| {
 				let Some(layer::LayerData{ blocks, biomes, block_light, depths }) = self
@@ -111,8 +124,8 @@ impl<'a> RegionProcessor<'a> {
 			},
 		)?;
 
-		self.save_region(coords, &processed_region)?;
-		self.save_lightmap(coords, &lightmap)?;
+		self.save_region(coords, &processed_region, timestamp)?;
+		self.save_lightmap(coords, &lightmap, timestamp)?;
 
 		Ok(())
 	}
diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index 2956081..0b804c8 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -1,3 +1,5 @@
+use std::time::SystemTime;
+
 use anyhow::{Context, Result};
 
 use minedmap::{
@@ -17,9 +19,12 @@ impl<'a> TileRenderer<'a> {
 		TileRenderer { config }
 	}
 
-	fn load_region(&self, coords: TileCoords) -> Result<ProcessedRegion> {
+	fn load_region(&self, coords: TileCoords) -> Result<(ProcessedRegion, SystemTime)> {
 		let processed_path = self.config.processed_path(coords);
-		storage::read(&processed_path).context("Failed to load processed region data")
+		let timestamp = fs::modified_timestamp(&processed_path)?;
+		let region =
+			storage::read(&processed_path).context("Failed to load processed region data")?;
+		Ok((region, timestamp))
 	}
 
 	fn render_chunk(image: &mut image::RgbaImage, coords: ChunkCoords, chunk: &ProcessedChunk) {
@@ -69,11 +74,11 @@ impl<'a> TileRenderer<'a> {
 				.display(),
 		);
 
-		let region = self.load_region(coords)?;
+		let (region, timestamp) = self.load_region(coords)?;
 		let mut image = image::RgbaImage::new(N, N);
 		Self::render_region(&mut image, &region);
 
-		fs::create_with_tmpfile(&output_path, |file| {
+		fs::create_with_timestamp(&output_path, timestamp, |file| {
 			image
 				.write_to(file, image::ImageFormat::Png)
 				.context("Failed to save image")
diff --git a/src/io/fs.rs b/src/io/fs.rs
index 2109961..0cb2a4d 100644
--- a/src/io/fs.rs
+++ b/src/io/fs.rs
@@ -2,19 +2,34 @@ use std::{
 	fs::{self, File},
 	io::{BufReader, BufWriter, Read, Write},
 	path::{Path, PathBuf},
+	time::SystemTime,
 };
 
 use anyhow::{Context, Ok, Result};
+use serde::Serialize;
 
-fn tmpfile_name(path: &Path) -> PathBuf {
+#[derive(Debug, Serialize)]
+struct FileMeta {
+	timestamp: SystemTime,
+}
+
+fn suffix_name(path: &Path, suffix: &str) -> PathBuf {
 	let mut file_name = path.file_name().unwrap_or_default().to_os_string();
-	file_name.push(".tmp");
+	file_name.push(suffix);
 
 	let mut ret = path.to_path_buf();
 	ret.set_file_name(file_name);
 	ret
 }
 
+fn tmpfile_name(path: &Path) -> PathBuf {
+	suffix_name(path, ".tmp")
+}
+
+fn metafile_name(path: &Path) -> PathBuf {
+	suffix_name(path, ".meta")
+}
+
 pub fn create_dir_all(path: &Path) -> Result<()> {
 	fs::create_dir_all(path)
 		.with_context(|| format!("Failed to create directory {}", path.display(),))
@@ -84,3 +99,29 @@ where
 
 	ret
 }
+
+pub fn modified_timestamp(path: &Path) -> Result<SystemTime> {
+	fs::metadata(path)
+		.and_then(|meta| meta.modified())
+		.with_context(|| {
+			format!(
+				"Failed to get modified timestamp of file {}",
+				path.display()
+			)
+		})
+}
+
+pub fn create_with_timestamp<T, F>(path: &Path, timestamp: SystemTime, f: F) -> Result<T>
+where
+	F: FnOnce(&mut BufWriter<File>) -> Result<T>,
+{
+	let ret = create_with_tmpfile(path, f)?;
+
+	let meta_path = metafile_name(path);
+	create(&meta_path, |file| {
+		serde_json::to_writer(file, &FileMeta { timestamp })?;
+		Ok(())
+	})?;
+
+	Ok(ret)
+}
diff --git a/src/io/storage.rs b/src/io/storage.rs
index c1a9e5e..b889231 100644
--- a/src/io/storage.rs
+++ b/src/io/storage.rs
@@ -2,6 +2,7 @@ use std::{
 	fs::File,
 	io::{Read, Write},
 	path::Path,
+	time::SystemTime,
 };
 
 use anyhow::{Context, Result};
@@ -9,8 +10,8 @@ use serde::{de::DeserializeOwned, Serialize};
 
 use super::fs;
 
-pub fn write<T: Serialize>(path: &Path, value: &T) -> Result<()> {
-	fs::create_with_tmpfile(path, |file| {
+pub fn write<T: Serialize>(path: &Path, value: &T, timestamp: SystemTime) -> Result<()> {
+	fs::create_with_timestamp(path, timestamp, |file| {
 		let data = bincode::serialize(value)?;
 		let len = u32::try_from(data.len())?;
 		let compressed = zstd::bulk::compress(&data, 1)?;

From 4d6644f42772d0164e640c29d18f769c94c883ef Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 30 Jul 2023 21:38:42 +0200
Subject: [PATCH 196/460] minedmap/tile_mipmapper: store source modified
 timestamp with mipmapped tiles

---
 src/bin/minedmap/tile_mipmapper.rs | 38 ++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/bin/minedmap/tile_mipmapper.rs b/src/bin/minedmap/tile_mipmapper.rs
index f24a41e..51eebd9 100644
--- a/src/bin/minedmap/tile_mipmapper.rs
+++ b/src/bin/minedmap/tile_mipmapper.rs
@@ -61,16 +61,34 @@ impl<'a> TileMipmapper<'a> {
 		let mut image: image::DynamicImage =
 			image::ImageBuffer::<P, Vec<P::Subpixel>>::new(N, N).into();
 
-		for (dx, dz) in [(0, 0), (0, 1), (1, 0), (1, 1)] {
-			let source_coords = TileCoords {
-				x: 2 * coords.x + dx,
-				z: 2 * coords.z + dz,
-			};
-			if !prev.contains(source_coords) {
-				continue;
-			}
+		let sources: Vec<_> = [(0, 0), (0, 1), (1, 0), (1, 1)]
+			.into_iter()
+			.filter_map(|(dx, dz)| {
+				let source_coords = TileCoords {
+					x: 2 * coords.x + dx,
+					z: 2 * coords.z + dz,
+				};
+				if !prev.contains(source_coords) {
+					return None;
+				}
 
-			let source_path = self.config.tile_path(kind, level - 1, source_coords);
+				let source_path = self.config.tile_path(kind, level - 1, source_coords);
+				let timestamp = match fs::modified_timestamp(&source_path) {
+					Ok(timestamp) => timestamp,
+					Err(err) => {
+						eprintln!("{}", err);
+						return None;
+					}
+				};
+				Some(((dx, dz), source_path, timestamp))
+			})
+			.collect();
+
+		let Some(timestamp) = sources.iter().map(|(_, _, ts)| *ts).max() else {
+			return Ok(());
+		};
+
+		for ((dx, dz), source_path, _) in sources {
 			let source = match image::open(&source_path) {
 				Ok(source) => source,
 				Err(err) => {
@@ -91,7 +109,7 @@ impl<'a> TileMipmapper<'a> {
 			);
 		}
 
-		fs::create_with_tmpfile(&output_path, |file| {
+		fs::create_with_timestamp(&output_path, timestamp, |file| {
 			image
 				.write_to(file, image::ImageFormat::Png)
 				.context("Failed to save image")

From 60771382920b9178ef60d0f20c3c898a52f274de Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 30 Jul 2023 21:48:58 +0200
Subject: [PATCH 197/460] Add version field to file metadata

---
 src/bin/minedmap/common.rs           |  5 ++++-
 src/bin/minedmap/region_processor.rs |  3 ++-
 src/bin/minedmap/tile_mipmapper.rs   |  2 +-
 src/bin/minedmap/tile_renderer.rs    |  2 +-
 src/io/fs.rs                         | 13 +++++++++++--
 src/io/storage.rs                    |  9 +++++++--
 6 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/bin/minedmap/common.rs b/src/bin/minedmap/common.rs
index 4aed1c0..a108e8d 100644
--- a/src/bin/minedmap/common.rs
+++ b/src/bin/minedmap/common.rs
@@ -6,7 +6,10 @@ use std::{
 
 use serde::{Deserialize, Serialize};
 
-use minedmap::{types::*, world::layer};
+use minedmap::{io::fs::FileMetaVersion, types::*, world::layer};
+
+// Increase to force regeneration of all output files
+pub const FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
 
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub struct TileCoords {
diff --git a/src/bin/minedmap/region_processor.rs b/src/bin/minedmap/region_processor.rs
index 2081785..d20f82b 100644
--- a/src/bin/minedmap/region_processor.rs
+++ b/src/bin/minedmap/region_processor.rs
@@ -72,7 +72,7 @@ impl<'a> RegionProcessor<'a> {
 		timestamp: SystemTime,
 	) -> Result<()> {
 		let output_path = self.config.processed_path(coords);
-		storage::write(&output_path, processed_region, timestamp)
+		storage::write(&output_path, processed_region, FILE_META_VERSION, timestamp)
 	}
 
 	fn save_lightmap(
@@ -83,6 +83,7 @@ impl<'a> RegionProcessor<'a> {
 	) -> Result<()> {
 		fs::create_with_timestamp(
 			&self.config.tile_path(TileKind::Lightmap, 0, coords),
+			FILE_META_VERSION,
 			timestamp,
 			|file| {
 				lightmap
diff --git a/src/bin/minedmap/tile_mipmapper.rs b/src/bin/minedmap/tile_mipmapper.rs
index 51eebd9..22b942d 100644
--- a/src/bin/minedmap/tile_mipmapper.rs
+++ b/src/bin/minedmap/tile_mipmapper.rs
@@ -109,7 +109,7 @@ impl<'a> TileMipmapper<'a> {
 			);
 		}
 
-		fs::create_with_timestamp(&output_path, timestamp, |file| {
+		fs::create_with_timestamp(&output_path, FILE_META_VERSION, timestamp, |file| {
 			image
 				.write_to(file, image::ImageFormat::Png)
 				.context("Failed to save image")
diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index 0b804c8..0e91054 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -78,7 +78,7 @@ impl<'a> TileRenderer<'a> {
 		let mut image = image::RgbaImage::new(N, N);
 		Self::render_region(&mut image, &region);
 
-		fs::create_with_timestamp(&output_path, timestamp, |file| {
+		fs::create_with_timestamp(&output_path, FILE_META_VERSION, timestamp, |file| {
 			image
 				.write_to(file, image::ImageFormat::Png)
 				.context("Failed to save image")
diff --git a/src/io/fs.rs b/src/io/fs.rs
index 0cb2a4d..dfb2e78 100644
--- a/src/io/fs.rs
+++ b/src/io/fs.rs
@@ -8,8 +8,12 @@ use std::{
 use anyhow::{Context, Ok, Result};
 use serde::Serialize;
 
+#[derive(Debug, Clone, Copy, Serialize)]
+pub struct FileMetaVersion(pub u32);
+
 #[derive(Debug, Serialize)]
 struct FileMeta {
+	version: FileMetaVersion,
 	timestamp: SystemTime,
 }
 
@@ -111,7 +115,12 @@ pub fn modified_timestamp(path: &Path) -> Result<SystemTime> {
 		})
 }
 
-pub fn create_with_timestamp<T, F>(path: &Path, timestamp: SystemTime, f: F) -> Result<T>
+pub fn create_with_timestamp<T, F>(
+	path: &Path,
+	version: FileMetaVersion,
+	timestamp: SystemTime,
+	f: F,
+) -> Result<T>
 where
 	F: FnOnce(&mut BufWriter<File>) -> Result<T>,
 {
@@ -119,7 +128,7 @@ where
 
 	let meta_path = metafile_name(path);
 	create(&meta_path, |file| {
-		serde_json::to_writer(file, &FileMeta { timestamp })?;
+		serde_json::to_writer(file, &FileMeta { version, timestamp })?;
 		Ok(())
 	})?;
 
diff --git a/src/io/storage.rs b/src/io/storage.rs
index b889231..4ba6050 100644
--- a/src/io/storage.rs
+++ b/src/io/storage.rs
@@ -10,8 +10,13 @@ use serde::{de::DeserializeOwned, Serialize};
 
 use super::fs;
 
-pub fn write<T: Serialize>(path: &Path, value: &T, timestamp: SystemTime) -> Result<()> {
-	fs::create_with_timestamp(path, timestamp, |file| {
+pub fn write<T: Serialize>(
+	path: &Path,
+	value: &T,
+	version: fs::FileMetaVersion,
+	timestamp: SystemTime,
+) -> Result<()> {
+	fs::create_with_timestamp(path, version, timestamp, |file| {
 		let data = bincode::serialize(value)?;
 		let len = u32::try_from(data.len())?;
 		let compressed = zstd::bulk::compress(&data, 1)?;

From 80781c9c203aae666846cbdd1aa4a39c6191dacb Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 31 Jul 2023 00:23:06 +0200
Subject: [PATCH 198/460] minedmap: skip generation steps when the inputs are
 unchanged

---
 src/bin/minedmap/region_processor.rs | 49 ++++++++++++++++------------
 src/bin/minedmap/tile_mipmapper.rs   | 38 +++++++++++++--------
 src/bin/minedmap/tile_renderer.rs    | 42 ++++++++++++++++--------
 src/io/fs.rs                         | 18 ++++++++--
 4 files changed, 97 insertions(+), 50 deletions(-)

diff --git a/src/bin/minedmap/region_processor.rs b/src/bin/minedmap/region_processor.rs
index d20f82b..a95f6ea 100644
--- a/src/bin/minedmap/region_processor.rs
+++ b/src/bin/minedmap/region_processor.rs
@@ -66,43 +66,46 @@ impl<'a> RegionProcessor<'a> {
 	}
 
 	fn save_region(
-		&self,
-		coords: TileCoords,
+		path: &Path,
 		processed_region: &ProcessedRegion,
 		timestamp: SystemTime,
 	) -> Result<()> {
-		let output_path = self.config.processed_path(coords);
-		storage::write(&output_path, processed_region, FILE_META_VERSION, timestamp)
+		storage::write(path, processed_region, FILE_META_VERSION, timestamp)
 	}
 
 	fn save_lightmap(
-		&self,
-		coords: TileCoords,
+		path: &Path,
 		lightmap: &image::GrayAlphaImage,
 		timestamp: SystemTime,
 	) -> Result<()> {
-		fs::create_with_timestamp(
-			&self.config.tile_path(TileKind::Lightmap, 0, coords),
-			FILE_META_VERSION,
-			timestamp,
-			|file| {
-				lightmap
-					.write_to(file, image::ImageFormat::Png)
-					.context("Failed to save image")
-			},
-		)
+		fs::create_with_timestamp(path, FILE_META_VERSION, timestamp, |file| {
+			lightmap
+				.write_to(file, image::ImageFormat::Png)
+				.context("Failed to save image")
+		})
 	}
 
 	/// Processes a single region file
 	fn process_region(&self, path: &Path, coords: TileCoords) -> Result<()> {
 		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
 
-		println!("Processing region r.{}.{}.mca", coords.x, coords.z);
-
 		let mut processed_region = ProcessedRegion::default();
 		let mut lightmap = image::GrayAlphaImage::new(N, N);
 
-		let timestamp = fs::modified_timestamp(path)?;
+		let input_timestamp = fs::modified_timestamp(path)?;
+
+		let output_path = self.config.processed_path(coords);
+		let output_timestamp = fs::read_timestamp(&output_path, FILE_META_VERSION);
+		let lightmap_path = self.config.tile_path(TileKind::Lightmap, 0, coords);
+		let lightmap_timestamp = fs::read_timestamp(&lightmap_path, FILE_META_VERSION);
+
+		if Some(input_timestamp) <= output_timestamp && Some(input_timestamp) <= lightmap_timestamp
+		{
+			println!("Skipping unchanged region r.{}.{}.mca", coords.x, coords.z);
+			return Ok(());
+		}
+
+		println!("Processing region r.{}.{}.mca", coords.x, coords.z);
 
 		minedmap::io::region::from_file(path)?.foreach_chunk(
 			|chunk_coords, data: world::de::Chunk| {
@@ -125,8 +128,12 @@ impl<'a> RegionProcessor<'a> {
 			},
 		)?;
 
-		self.save_region(coords, &processed_region, timestamp)?;
-		self.save_lightmap(coords, &lightmap, timestamp)?;
+		if Some(input_timestamp) > output_timestamp {
+			Self::save_region(&output_path, &processed_region, input_timestamp)?;
+		}
+		if Some(input_timestamp) > lightmap_timestamp {
+			Self::save_lightmap(&lightmap_path, &lightmap, input_timestamp)?;
+		}
 
 		Ok(())
 	}
diff --git a/src/bin/minedmap/tile_mipmapper.rs b/src/bin/minedmap/tile_mipmapper.rs
index 22b942d..40add3a 100644
--- a/src/bin/minedmap/tile_mipmapper.rs
+++ b/src/bin/minedmap/tile_mipmapper.rs
@@ -49,17 +49,7 @@ impl<'a> TileMipmapper<'a> {
 		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
 
 		let output_path = self.config.tile_path(kind, level, coords);
-
-		println!(
-			"Rendering mipmap tile {}",
-			output_path
-				.strip_prefix(&self.config.output_dir)
-				.expect("tile path must be in output directory")
-				.display(),
-		);
-
-		let mut image: image::DynamicImage =
-			image::ImageBuffer::<P, Vec<P::Subpixel>>::new(N, N).into();
+		let output_timestamp = fs::read_timestamp(&output_path, FILE_META_VERSION);
 
 		let sources: Vec<_> = [(0, 0), (0, 1), (1, 0), (1, 1)]
 			.into_iter()
@@ -84,10 +74,32 @@ impl<'a> TileMipmapper<'a> {
 			})
 			.collect();
 
-		let Some(timestamp) = sources.iter().map(|(_, _, ts)| *ts).max() else {
+		let Some(input_timestamp) = sources.iter().map(|(_, _, ts)| *ts).max() else {
 			return Ok(());
 		};
 
+		if Some(input_timestamp) <= output_timestamp {
+			println!(
+				"Skipping unchanged mipmap tile {}",
+				output_path
+					.strip_prefix(&self.config.output_dir)
+					.expect("tile path must be in output directory")
+					.display(),
+			);
+			return Ok(());
+		}
+
+		println!(
+			"Rendering mipmap tile {}",
+			output_path
+				.strip_prefix(&self.config.output_dir)
+				.expect("tile path must be in output directory")
+				.display(),
+		);
+
+		let mut image: image::DynamicImage =
+			image::ImageBuffer::<P, Vec<P::Subpixel>>::new(N, N).into();
+
 		for ((dx, dz), source_path, _) in sources {
 			let source = match image::open(&source_path) {
 				Ok(source) => source,
@@ -109,7 +121,7 @@ impl<'a> TileMipmapper<'a> {
 			);
 		}
 
-		fs::create_with_timestamp(&output_path, FILE_META_VERSION, timestamp, |file| {
+		fs::create_with_timestamp(&output_path, FILE_META_VERSION, input_timestamp, |file| {
 			image
 				.write_to(file, image::ImageFormat::Png)
 				.context("Failed to save image")
diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index 0e91054..955c964 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -1,4 +1,4 @@
-use std::time::SystemTime;
+use std::path::Path;
 
 use anyhow::{Context, Result};
 
@@ -19,12 +19,8 @@ impl<'a> TileRenderer<'a> {
 		TileRenderer { config }
 	}
 
-	fn load_region(&self, coords: TileCoords) -> Result<(ProcessedRegion, SystemTime)> {
-		let processed_path = self.config.processed_path(coords);
-		let timestamp = fs::modified_timestamp(&processed_path)?;
-		let region =
-			storage::read(&processed_path).context("Failed to load processed region data")?;
-		Ok((region, timestamp))
+	fn load_region(processed_path: &Path) -> Result<ProcessedRegion> {
+		storage::read(processed_path).context("Failed to load processed region data")
 	}
 
 	fn render_chunk(image: &mut image::RgbaImage, coords: ChunkCoords, chunk: &ProcessedChunk) {
@@ -64,7 +60,22 @@ impl<'a> TileRenderer<'a> {
 	fn render_tile(&self, coords: TileCoords) -> Result<()> {
 		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
 
+		let processed_path = self.config.processed_path(coords);
+		let processed_timestamp = fs::modified_timestamp(&processed_path)?;
+
 		let output_path = self.config.tile_path(TileKind::Map, 0, coords);
+		let output_timestamp = fs::read_timestamp(&output_path, FILE_META_VERSION);
+
+		if Some(processed_timestamp) <= output_timestamp {
+			println!(
+				"Skipping unchanged tile {}",
+				output_path
+					.strip_prefix(&self.config.output_dir)
+					.expect("tile path must be in output directory")
+					.display(),
+			);
+			return Ok(());
+		}
 
 		println!(
 			"Rendering tile {}",
@@ -74,15 +85,20 @@ impl<'a> TileRenderer<'a> {
 				.display(),
 		);
 
-		let (region, timestamp) = self.load_region(coords)?;
+		let region = Self::load_region(&processed_path)?;
 		let mut image = image::RgbaImage::new(N, N);
 		Self::render_region(&mut image, &region);
 
-		fs::create_with_timestamp(&output_path, FILE_META_VERSION, timestamp, |file| {
-			image
-				.write_to(file, image::ImageFormat::Png)
-				.context("Failed to save image")
-		})
+		fs::create_with_timestamp(
+			&output_path,
+			FILE_META_VERSION,
+			processed_timestamp,
+			|file| {
+				image
+					.write_to(file, image::ImageFormat::Png)
+					.context("Failed to save image")
+			},
+		)
 	}
 
 	pub fn run(self, regions: &[TileCoords]) -> Result<()> {
diff --git a/src/io/fs.rs b/src/io/fs.rs
index dfb2e78..8f6a79a 100644
--- a/src/io/fs.rs
+++ b/src/io/fs.rs
@@ -6,12 +6,12 @@ use std::{
 };
 
 use anyhow::{Context, Ok, Result};
-use serde::Serialize;
+use serde::{Deserialize, Serialize};
 
-#[derive(Debug, Clone, Copy, Serialize)]
+#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
 pub struct FileMetaVersion(pub u32);
 
-#[derive(Debug, Serialize)]
+#[derive(Debug, Serialize, Deserialize)]
 struct FileMeta {
 	version: FileMetaVersion,
 	timestamp: SystemTime,
@@ -115,6 +115,18 @@ pub fn modified_timestamp(path: &Path) -> Result<SystemTime> {
 		})
 }
 
+pub fn read_timestamp(path: &Path, version: FileMetaVersion) -> Option<SystemTime> {
+	let meta_path = metafile_name(path);
+	let mut file = BufReader::new(fs::File::open(meta_path).ok()?);
+
+	let meta: FileMeta = serde_json::from_reader(&mut file).ok()?;
+	if meta.version != version {
+		return None;
+	}
+
+	Some(meta.timestamp)
+}
+
 pub fn create_with_timestamp<T, F>(
 	path: &Path,
 	version: FileMetaVersion,

From e39f48d8fed66cb811030f500ea8ae13f0e2bb4d Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 2 Aug 2023 00:14:37 +0200
Subject: [PATCH 199/460] types: use const generics for more generic coordinate
 types

Enum support in const generics would be even nicer, but for now the
integer generic is the best Rust can do.
---
 src/bin/minedmap/region_processor.rs |  4 +--
 src/bin/minedmap/tile_renderer.rs    |  4 +--
 src/types.rs                         | 54 ++++++++++++++++++----------
 3 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/src/bin/minedmap/region_processor.rs b/src/bin/minedmap/region_processor.rs
index a95f6ea..f2720c7 100644
--- a/src/bin/minedmap/region_processor.rs
+++ b/src/bin/minedmap/region_processor.rs
@@ -57,8 +57,8 @@ impl<'a> RegionProcessor<'a> {
 
 		image::GrayAlphaImage::from_fn(N, N, |x, z| {
 			let v: f32 = block_light[LayerBlockCoords {
-				x: BlockX(x as u8),
-				z: BlockZ(z as u8),
+				x: BlockX::new(x),
+				z: BlockZ::new(z),
 			}]
 			.into();
 			image::LumaA([0, (192.0 * (1.0 - v / 15.0)) as u8])
diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index 955c964..70b55de 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -28,8 +28,8 @@ impl<'a> TileRenderer<'a> {
 
 		let chunk_image = image::RgbaImage::from_fn(N, N, |x, z| {
 			let coords = LayerBlockCoords {
-				x: BlockX(x as u8),
-				z: BlockZ(z as u8),
+				x: BlockX::new(x),
+				z: BlockZ::new(z),
 			};
 			image::Rgba(
 				match (
diff --git a/src/types.rs b/src/types.rs
index 18045bb..465dd2a 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -7,38 +7,57 @@ use std::{
 use itertools::iproduct;
 use serde::{Deserialize, Serialize};
 
-macro_rules! coord_impl {
+pub mod axis {
+	pub const X: u8 = 0;
+	pub const Y: u8 = 1;
+	pub const Z: u8 = 2;
+}
+
+macro_rules! coord_type {
 	($t:ident, $max:expr) => {
-		impl $t {
+		#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+		pub struct $t<const AXIS: u8>(pub u8);
+
+		impl<const AXIS: u8> $t<AXIS> {
+			const MAX: usize = $max;
+
+			/// Constructs a new value
+			///
+			/// Will panic if the value is not in the valid range
+			pub fn new<T: TryInto<u8>>(value: T) -> Self {
+				Self(
+					value
+						.try_into()
+						.ok()
+						.filter(|&v| (v as usize) < Self::MAX)
+						.expect("coordinate should be in the valid range"),
+				)
+			}
+
 			/// Returns an iterator over all possible values of the type
-			pub fn iter() -> impl Iterator<Item = $t>
+			pub fn iter() -> impl Iterator<Item = $t<AXIS>>
 			       + DoubleEndedIterator
 			       + ExactSizeIterator
 			       + FusedIterator
 			       + Clone
 			       + Debug {
-				(0..$max as u8).map($t)
+				(0..Self::MAX as u8).map($t)
 			}
 		}
 	};
 }
 
 pub const BLOCKS_PER_CHUNK: usize = 16;
+coord_type!(BlockCoord, BLOCKS_PER_CHUNK);
 
 /// A block X coordinate relative to a chunk
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct BlockX(pub u8);
-coord_impl!(BlockX, BLOCKS_PER_CHUNK);
+pub type BlockX = BlockCoord<{ axis::X }>;
 
 /// A block Y coordinate relative to a chunk section
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct BlockY(pub u8);
-coord_impl!(BlockY, BLOCKS_PER_CHUNK);
+pub type BlockY = BlockCoord<{ axis::Y }>;
 
 /// A block Z coordinate relative to a chunk
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct BlockZ(pub u8);
-coord_impl!(BlockZ, BLOCKS_PER_CHUNK);
+pub type BlockZ = BlockCoord<{ axis::Z }>;
 
 /// X and Z coordinates of a block in a chunk
 #[derive(Clone, Copy, PartialEq, Eq)]
@@ -118,16 +137,13 @@ impl Debug for SectionBlockCoords {
 pub struct SectionY(pub i32);
 
 pub const CHUNKS_PER_REGION: usize = 32;
+coord_type!(ChunkCoord, CHUNKS_PER_REGION);
 
 /// A chunk X coordinate relative to a region
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct ChunkX(pub u8);
-coord_impl!(ChunkX, CHUNKS_PER_REGION);
+pub type ChunkX = ChunkCoord<{ axis::X }>;
 
 /// A chunk Z coordinate relative to a region
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct ChunkZ(pub u8);
-coord_impl!(ChunkZ, CHUNKS_PER_REGION);
+pub type ChunkZ = ChunkCoord<{ axis::Z }>;
 
 /// A pair of chunk coordinates relative to a region
 #[derive(Clone, Copy, PartialEq, Eq)]

From 5a765c3862a7f3233e53a20393c9cf2071cb3e4e Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 3 Aug 2023 00:54:28 +0200
Subject: [PATCH 200/460] minedmap/region_group: add RegionGroup type

A generic array of 3x3 elements.
---
 src/bin/minedmap/main.rs         |  1 +
 src/bin/minedmap/region_group.rs | 80 ++++++++++++++++++++++++++++++++
 2 files changed, 81 insertions(+)
 create mode 100644 src/bin/minedmap/region_group.rs

diff --git a/src/bin/minedmap/main.rs b/src/bin/minedmap/main.rs
index 34aa985..8d3bbea 100644
--- a/src/bin/minedmap/main.rs
+++ b/src/bin/minedmap/main.rs
@@ -1,5 +1,6 @@
 mod common;
 mod metadata_writer;
+mod region_group;
 mod region_processor;
 mod tile_mipmapper;
 mod tile_renderer;
diff --git a/src/bin/minedmap/region_group.rs b/src/bin/minedmap/region_group.rs
new file mode 100644
index 0000000..0a12fd8
--- /dev/null
+++ b/src/bin/minedmap/region_group.rs
@@ -0,0 +1,80 @@
+use std::iter;
+
+use anyhow::Result;
+
+/// A generic array of 3x3 elements
+///
+/// A RegionGroup is used to store information about a 3x3 neighbourhood of
+/// regions.
+///
+/// The center element is always populated, while the 8 adjacent elements may be None.
+#[derive(Debug, Clone, Copy)]
+pub struct RegionGroup<T> {
+	center: T,
+	neighs: [Option<T>; 8],
+}
+
+impl<T> RegionGroup<T> {
+	pub fn new<F>(f: F) -> Result<Self>
+	where
+		F: Fn(i8, i8) -> Result<T>,
+	{
+		RegionGroup {
+			center: (0, 0),
+			neighs: [
+				Some((-1, -1)),
+				Some((-1, 0)),
+				Some((-1, 1)),
+				Some((0, -1)),
+				Some((0, 1)),
+				Some((1, -1)),
+				Some((1, 0)),
+				Some((1, 1)),
+			],
+		}
+		.try_map(|(x, z)| f(x, z))
+	}
+
+	pub fn center(&self) -> &T {
+		&self.center
+	}
+
+	pub fn get(&self, x: i8, z: i8) -> Option<&T> {
+		match (x, z) {
+			(0, 0) => Some(&self.center),
+			(-1, -1) => self.neighs[0].as_ref(),
+			(-1, 0) => self.neighs[1].as_ref(),
+			(-1, 1) => self.neighs[2].as_ref(),
+			(0, -1) => self.neighs[3].as_ref(),
+			(0, 1) => self.neighs[4].as_ref(),
+			(1, -1) => self.neighs[5].as_ref(),
+			(1, 0) => self.neighs[6].as_ref(),
+			(1, 1) => self.neighs[7].as_ref(),
+			_ => panic!("index out of bounds"),
+		}
+	}
+
+	pub fn map<U, F>(self, mut f: F) -> RegionGroup<U>
+	where
+		F: FnMut(T) -> U,
+	{
+		RegionGroup {
+			center: f(self.center),
+			neighs: self.neighs.map(|entry| entry.map(|v| f(v))),
+		}
+	}
+
+	pub fn try_map<U, F>(self, mut f: F) -> Result<RegionGroup<U>>
+	where
+		F: FnMut(T) -> Result<U>,
+	{
+		let RegionGroup { center, neighs } = self;
+		let center = f(center)?;
+		let neighs = neighs.map(|entry| entry.map(|value| f(value).ok()).flatten());
+		Ok(RegionGroup { center, neighs })
+	}
+
+	pub fn iter(&self) -> impl Iterator<Item = &T> {
+		iter::once(&self.center).chain(self.neighs.iter().filter_map(Option::as_ref))
+	}
+}

From a30266f67f417bba0e646b3caebbefaa2f7ac8ac Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 2 Aug 2023 23:15:52 +0200
Subject: [PATCH 201/460] minedmap/tile_renderer: take into account neighboring
 regions

Biome smoothing uses biome data from neighboring regions. Collect paths
and timestamps from 3x3 region groups.
---
 src/bin/minedmap/tile_renderer.rs | 37 ++++++++++++++++++++++++++-----
 1 file changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index 70b55de..e416d50 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -1,4 +1,7 @@
-use std::path::Path;
+use std::{
+	path::{Path, PathBuf},
+	time::SystemTime,
+};
 
 use anyhow::{Context, Result};
 
@@ -8,7 +11,7 @@ use minedmap::{
 	types::*,
 };
 
-use super::common::*;
+use super::{common::*, region_group::RegionGroup};
 
 pub struct TileRenderer<'a> {
 	config: &'a Config,
@@ -57,11 +60,35 @@ impl<'a> TileRenderer<'a> {
 		}
 	}
 
+	fn processed_source(&self, coords: TileCoords) -> Result<(PathBuf, SystemTime)> {
+		let path = self.config.processed_path(coords);
+		let timestamp = fs::modified_timestamp(&path)?;
+		Ok((path, timestamp))
+	}
+
+	fn processed_sources(&self, coords: TileCoords) -> Result<(RegionGroup<PathBuf>, SystemTime)> {
+		let sources = RegionGroup::new(|x, z| {
+			self.processed_source(TileCoords {
+				x: coords.x + (x as i32),
+				z: coords.z + (z as i32),
+			})
+		})
+		.with_context(|| format!("Region {:?} from previous step must exist", coords))?;
+
+		let max_timestamp = *sources
+			.iter()
+			.map(|(_, timestamp)| timestamp)
+			.max()
+			.expect("at least one timestamp must exist");
+
+		let paths = sources.map(|(path, _)| path);
+		Ok((paths, max_timestamp))
+	}
+
 	fn render_tile(&self, coords: TileCoords) -> Result<()> {
 		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
 
-		let processed_path = self.config.processed_path(coords);
-		let processed_timestamp = fs::modified_timestamp(&processed_path)?;
+		let (processed_paths, processed_timestamp) = self.processed_sources(coords)?;
 
 		let output_path = self.config.tile_path(TileKind::Map, 0, coords);
 		let output_timestamp = fs::read_timestamp(&output_path, FILE_META_VERSION);
@@ -85,7 +112,7 @@ impl<'a> TileRenderer<'a> {
 				.display(),
 		);
 
-		let region = Self::load_region(&processed_path)?;
+		let region = Self::load_region(processed_paths.center())?;
 		let mut image = image::RgbaImage::new(N, N);
 		Self::render_region(&mut image, &region);
 

From 35bbd167bae771a8a870864f49c51073591da25f Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 3 Aug 2023 18:01:29 +0200
Subject: [PATCH 202/460] minedmap/tile_renderer: load 3x3 neighbourhoods of
 regions

Prepare for biome smoothing by always loading neighbouring regions.
---
 src/bin/minedmap/tile_renderer.rs | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index e416d50..9737e7b 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -26,6 +26,12 @@ impl<'a> TileRenderer<'a> {
 		storage::read(processed_path).context("Failed to load processed region data")
 	}
 
+	fn load_region_group(
+		processed_paths: RegionGroup<PathBuf>,
+	) -> Result<RegionGroup<ProcessedRegion>> {
+		processed_paths.try_map(|path| Self::load_region(&path))
+	}
+
 	fn render_chunk(image: &mut image::RgbaImage, coords: ChunkCoords, chunk: &ProcessedChunk) {
 		const N: u32 = BLOCKS_PER_CHUNK as u32;
 
@@ -50,8 +56,8 @@ impl<'a> TileRenderer<'a> {
 		overlay_chunk(image, &chunk_image, coords);
 	}
 
-	fn render_region(image: &mut image::RgbaImage, region: &ProcessedRegion) {
-		for (coords, chunk) in region.iter() {
+	fn render_region(image: &mut image::RgbaImage, region_group: &RegionGroup<ProcessedRegion>) {
+		for (coords, chunk) in region_group.center().iter() {
 			let Some(chunk) = chunk else {
 				continue;
 			};
@@ -112,9 +118,10 @@ impl<'a> TileRenderer<'a> {
 				.display(),
 		);
 
-		let region = Self::load_region(processed_paths.center())?;
+		let region_group = Self::load_region_group(processed_paths)
+			.with_context(|| format!("Region {:?} from previous step must be loadable", coords))?;
 		let mut image = image::RgbaImage::new(N, N);
-		Self::render_region(&mut image, &region);
+		Self::render_region(&mut image, &region_group);
 
 		fs::create_with_timestamp(
 			&output_path,

From dee00e7a02d6e7f853abb817e56b56f6133a3c57 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 2 Aug 2023 21:51:59 +0200
Subject: [PATCH 203/460] minedmap/tile_renderer: add coord_offset() helper

---
 src/bin/minedmap/tile_renderer.rs | 58 +++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index 9737e7b..8988425 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -4,6 +4,7 @@ use std::{
 };
 
 use anyhow::{Context, Result};
+use num_integer::div_mod_floor;
 
 use minedmap::{
 	io::{fs, storage},
@@ -13,6 +14,29 @@ use minedmap::{
 
 use super::{common::*, region_group::RegionGroup};
 
+/// Offsets a chunk and block coordinate pair by a number of blocks
+///
+/// As the new coordinate may end up in a different region, a region offset
+/// is returned together with the new chunk and block coordinates.
+fn coord_offset<const AXIS: u8>(
+	chunk: ChunkCoord<AXIS>,
+	block: BlockCoord<AXIS>,
+	offset: i32,
+) -> (i8, ChunkCoord<AXIS>, BlockCoord<AXIS>) {
+	const CHUNKS: i32 = CHUNKS_PER_REGION as i32;
+	const BLOCKS: i32 = BLOCKS_PER_CHUNK as i32;
+	let coord = chunk.0 as i32 * BLOCKS + block.0 as i32 + offset;
+	let (region_chunk, block) = div_mod_floor(coord, BLOCKS);
+	let (region, chunk) = div_mod_floor(region_chunk, CHUNKS);
+	(
+		region
+			.try_into()
+			.expect("the region coordinate should be in the valid range"),
+		ChunkCoord::new(chunk),
+		BlockCoord::new(block),
+	)
+}
+
 pub struct TileRenderer<'a> {
 	config: &'a Config,
 }
@@ -147,3 +171,37 @@ impl<'a> TileRenderer<'a> {
 		Ok(())
 	}
 }
+
+#[cfg(test)]
+mod test {
+	use super::*;
+
+	#[test]
+	fn test_coord_offset() {
+		const CHUNKS: i32 = CHUNKS_PER_REGION as i32;
+		const BLOCKS: i32 = BLOCKS_PER_CHUNK as i32;
+
+		for chunk in ChunkX::iter() {
+			for block in BlockX::iter() {
+				assert_eq!(coord_offset(chunk, block, 0), (0, chunk, block));
+				assert_eq!(
+					coord_offset(chunk, block, -(CHUNKS * BLOCKS)),
+					(-1, chunk, block)
+				);
+				assert_eq!(
+					coord_offset(chunk, block, CHUNKS * BLOCKS),
+					(1, chunk, block)
+				);
+
+				for offset in -(CHUNKS * BLOCKS)..(CHUNKS * BLOCKS) {
+					let (region2, chunk2, block2) = coord_offset(chunk, block, offset);
+					assert!((-1..=1).contains(&region2));
+					let coord = chunk.0 as i32 * BLOCKS + block.0 as i32 + offset;
+					let coord2 =
+						((region2 as i32 * CHUNKS) + chunk2.0 as i32) * BLOCKS + block2.0 as i32;
+					assert_eq!(coord2, coord);
+				}
+			}
+		}
+	}
+}

From 8e848394cdb9f201742e5541a7f82660f389cc7c Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 3 Aug 2023 17:51:44 +0200
Subject: [PATCH 204/460] minedmap/tile_renderer: add biome_at() helper

Retrieve the biome at a given coordinate, possibly offset by a number of
blocks.
---
 src/bin/minedmap/tile_renderer.rs | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index 8988425..50105cd 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -8,7 +8,7 @@ use num_integer::div_mod_floor;
 
 use minedmap::{
 	io::{fs, storage},
-	resource::block_color,
+	resource::{block_color, Biome},
 	types::*,
 };
 
@@ -37,6 +37,27 @@ fn coord_offset<const AXIS: u8>(
 	)
 }
 
+fn biome_at(
+	region_group: &RegionGroup<ProcessedRegion>,
+	chunk: ChunkCoords,
+	block: LayerBlockCoords,
+	dx: i32,
+	dz: i32,
+) -> Option<&Biome> {
+	let (region_x, chunk_x, block_x) = coord_offset(chunk.x, block.x, dx);
+	let (region_z, chunk_z, block_z) = coord_offset(chunk.z, block.z, dz);
+	let chunk = ChunkCoords {
+		x: chunk_x,
+		z: chunk_z,
+	};
+	let block = LayerBlockCoords {
+		x: block_x,
+		z: block_z,
+	};
+	let region = region_group.get(region_x, region_z)?;
+	region[chunk].as_ref()?.biomes[block].as_ref()
+}
+
 pub struct TileRenderer<'a> {
 	config: &'a Config,
 }

From 45171aa26a0c0d21cbd518d08d53851d2acbd009 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 3 Aug 2023 18:12:56 +0200
Subject: [PATCH 205/460] minedmap/tile_renderer: factor out block_color_at()
 from render_chunk()

Also pass in a few more values to prepare for biome smoothing.
---
 src/bin/minedmap/tile_renderer.rs | 39 ++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index 50105cd..2dcdedd 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -77,28 +77,35 @@ impl<'a> TileRenderer<'a> {
 		processed_paths.try_map(|path| Self::load_region(&path))
 	}
 
-	fn render_chunk(image: &mut image::RgbaImage, coords: ChunkCoords, chunk: &ProcessedChunk) {
+	fn block_color_at(
+		_region_group: &RegionGroup<ProcessedRegion>,
+		chunk: &ProcessedChunk,
+		_chunk_coords: ChunkCoords,
+		block_coords: LayerBlockCoords,
+	) -> Option<[u8; 4]> {
+		let block = chunk.blocks[block_coords]?;
+		let depth = chunk.depths[block_coords]?;
+		let biome = chunk.biomes[block_coords].as_ref()?;
+		Some(block_color(block, biome, depth.0 as f32))
+	}
+
+	fn render_chunk(
+		image: &mut image::RgbaImage,
+		region_group: &RegionGroup<ProcessedRegion>,
+		chunk: &ProcessedChunk,
+		chunk_coords: ChunkCoords,
+	) {
 		const N: u32 = BLOCKS_PER_CHUNK as u32;
 
 		let chunk_image = image::RgbaImage::from_fn(N, N, |x, z| {
-			let coords = LayerBlockCoords {
+			let block_coords = LayerBlockCoords {
 				x: BlockX::new(x),
 				z: BlockZ::new(z),
 			};
-			image::Rgba(
-				match (
-					&chunk.blocks[coords],
-					&chunk.biomes[coords],
-					&chunk.depths[coords],
-				) {
-					(Some(block), Some(biome), Some(depth)) => {
-						block_color(*block, biome, depth.0 as f32)
-					}
-					_ => [0, 0, 0, 0],
-				},
-			)
+			let color = Self::block_color_at(region_group, chunk, chunk_coords, block_coords);
+			image::Rgba(color.unwrap_or_default())
 		});
-		overlay_chunk(image, &chunk_image, coords);
+		overlay_chunk(image, &chunk_image, chunk_coords);
 	}
 
 	fn render_region(image: &mut image::RgbaImage, region_group: &RegionGroup<ProcessedRegion>) {
@@ -107,7 +114,7 @@ impl<'a> TileRenderer<'a> {
 				continue;
 			};
 
-			Self::render_chunk(image, coords, chunk);
+			Self::render_chunk(image, region_group, chunk, coords);
 		}
 	}
 

From 0a485343a047890cb6342a254e6f0e71a34dc6fc Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 3 Aug 2023 18:28:57 +0200
Subject: [PATCH 206/460] resource: do not require Biome to get color for all
 block types

Only grass, foliage and water have biome-dependent colors.
---
 src/bin/minedmap/tile_renderer.rs | 10 ++++++++--
 src/resource/block_color.rs       | 16 ++++++++++++----
 src/resource/mod.rs               |  2 +-
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index 2dcdedd..fed99bb 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -8,7 +8,7 @@ use num_integer::div_mod_floor;
 
 use minedmap::{
 	io::{fs, storage},
-	resource::{block_color, Biome},
+	resource::{block_color, needs_biome, Biome},
 	types::*,
 };
 
@@ -85,8 +85,14 @@ impl<'a> TileRenderer<'a> {
 	) -> Option<[u8; 4]> {
 		let block = chunk.blocks[block_coords]?;
 		let depth = chunk.depths[block_coords]?;
+
+		if !needs_biome(block) {
+			return Some(block_color(block, None, depth.0 as f32));
+		}
+
 		let biome = chunk.biomes[block_coords].as_ref()?;
-		Some(block_color(block, biome, depth.0 as f32))
+
+		Some(block_color(block, Some(biome), depth.0 as f32))
 	}
 
 	fn render_chunk(
diff --git a/src/resource/block_color.rs b/src/resource/block_color.rs
index c239d96..0b6e935 100644
--- a/src/resource/block_color.rs
+++ b/src/resource/block_color.rs
@@ -72,16 +72,24 @@ impl BiomeExt for Biome {
 const BIRCH_COLOR: Vec3 = Vec3::new(0.502, 0.655, 0.333); // == color_vec(Color([128, 167, 85]))
 const EVERGREEN_COLOR: Vec3 = Vec3::new(0.380, 0.600, 0.380); // == color_vec(Color([97, 153, 97]))
 
-pub fn block_color(block: BlockType, biome: &Biome, depth: f32) -> [u8; 4] {
+pub fn needs_biome(block: BlockType) -> bool {
 	use super::BlockFlag::*;
 
+	block.is(Grass) || block.is(Foliage) || block.is(Water)
+}
+
+pub fn block_color(block: BlockType, biome: Option<&Biome>, depth: f32) -> [u8; 4] {
+	use super::BlockFlag::*;
+
+	let get_biome = || biome.expect("needs biome to determine block color");
+
 	let mut color = color_vec_unscaled(block.color);
 
 	if block.is(Grass) {
-		color *= biome.grass_color(depth);
+		color *= get_biome().grass_color(depth);
 	}
 	if block.is(Foliage) {
-		color *= biome.foliage_color(depth);
+		color *= get_biome().foliage_color(depth);
 	}
 	if block.is(Birch) {
 		color *= BIRCH_COLOR;
@@ -90,7 +98,7 @@ pub fn block_color(block: BlockType, biome: &Biome, depth: f32) -> [u8; 4] {
 		color *= EVERGREEN_COLOR;
 	}
 	if block.is(Water) {
-		color *= biome.water_color();
+		color *= get_biome().water_color();
 	}
 
 	color *= 0.5 + 0.005 * depth;
diff --git a/src/resource/mod.rs b/src/resource/mod.rs
index 7095f68..921fdc2 100644
--- a/src/resource/mod.rs
+++ b/src/resource/mod.rs
@@ -91,7 +91,7 @@ impl BlockTypes {
 }
 
 pub use biomes::{Biome, BiomeGrassColorModifier};
-pub use block_color::block_color;
+pub use block_color::{block_color, needs_biome};
 
 #[derive(Debug)]
 pub struct BiomeTypes {

From b650b096ef13563d017d41151ad14323dda3fc8e Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 3 Aug 2023 18:31:45 +0200
Subject: [PATCH 207/460] resource: return block color as float vector

Deferring conversion to integers is convenient for biome smoothing.
---
 src/bin/minedmap/tile_renderer.rs | 9 +++++++--
 src/resource/block_color.rs       | 6 ++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index fed99bb..c931c72 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -4,6 +4,7 @@ use std::{
 };
 
 use anyhow::{Context, Result};
+use glam::Vec3;
 use num_integer::div_mod_floor;
 
 use minedmap::{
@@ -82,7 +83,7 @@ impl<'a> TileRenderer<'a> {
 		chunk: &ProcessedChunk,
 		_chunk_coords: ChunkCoords,
 		block_coords: LayerBlockCoords,
-	) -> Option<[u8; 4]> {
+	) -> Option<Vec3> {
 		let block = chunk.blocks[block_coords]?;
 		let depth = chunk.depths[block_coords]?;
 
@@ -109,7 +110,11 @@ impl<'a> TileRenderer<'a> {
 				z: BlockZ::new(z),
 			};
 			let color = Self::block_color_at(region_group, chunk, chunk_coords, block_coords);
-			image::Rgba(color.unwrap_or_default())
+			image::Rgba(
+				color
+					.map(|c| [c[0] as u8, c[1] as u8, c[2] as u8, 255])
+					.unwrap_or_default(),
+			)
 		});
 		overlay_chunk(image, &chunk_image, chunk_coords);
 	}
diff --git a/src/resource/block_color.rs b/src/resource/block_color.rs
index 0b6e935..b98aec9 100644
--- a/src/resource/block_color.rs
+++ b/src/resource/block_color.rs
@@ -78,7 +78,7 @@ pub fn needs_biome(block: BlockType) -> bool {
 	block.is(Grass) || block.is(Foliage) || block.is(Water)
 }
 
-pub fn block_color(block: BlockType, biome: Option<&Biome>, depth: f32) -> [u8; 4] {
+pub fn block_color(block: BlockType, biome: Option<&Biome>, depth: f32) -> Vec3 {
 	use super::BlockFlag::*;
 
 	let get_biome = || biome.expect("needs biome to determine block color");
@@ -101,7 +101,5 @@ pub fn block_color(block: BlockType, biome: Option<&Biome>, depth: f32) -> [u8;
 		color *= get_biome().water_color();
 	}
 
-	color *= 0.5 + 0.005 * depth;
-
-	[color[0] as u8, color[1] as u8, color[2] as u8, 255]
+	color * (0.5 + 0.005 * depth)
 }

From c38f00e4114c071463429801b9bb5fcb314b3291 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 3 Aug 2023 19:06:20 +0200
Subject: [PATCH 208/460] minedmap/tile_renderer: implement biome smoothing

Rather than the diamond-shaped kernel used by the old implemenation, we
now use the approximation of a Gauss filter. In addition, the kernel
size is decreased, reducing the strength of the blur effect.
---
 src/bin/minedmap/tile_renderer.rs | 32 +++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index c931c72..c66431f 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -79,11 +79,15 @@ impl<'a> TileRenderer<'a> {
 	}
 
 	fn block_color_at(
-		_region_group: &RegionGroup<ProcessedRegion>,
+		region_group: &RegionGroup<ProcessedRegion>,
 		chunk: &ProcessedChunk,
-		_chunk_coords: ChunkCoords,
+		chunk_coords: ChunkCoords,
 		block_coords: LayerBlockCoords,
 	) -> Option<Vec3> {
+		const SMOOTH: [[f32; 3]; 3] = [[41.0, 26.0, 7.0], [26.0, 16.0, 4.0], [7.0, 4.0, 1.0]];
+		const X: isize = SMOOTH[0].len() as isize - 1;
+		const Z: isize = SMOOTH.len() as isize - 1;
+
 		let block = chunk.blocks[block_coords]?;
 		let depth = chunk.depths[block_coords]?;
 
@@ -91,9 +95,29 @@ impl<'a> TileRenderer<'a> {
 			return Some(block_color(block, None, depth.0 as f32));
 		}
 
-		let biome = chunk.biomes[block_coords].as_ref()?;
+		let mut total = 0.0;
+		let mut color = Vec3::ZERO;
+		for dz in -Z..=Z {
+			for dx in -X..=X {
+				let w = SMOOTH[dz.unsigned_abs()][dx.unsigned_abs()];
+				if w == 0.0 {
+					continue;
+				}
 
-		Some(block_color(block, Some(biome), depth.0 as f32))
+				let Some(biome) = biome_at(region_group, chunk_coords, block_coords, dx as i32, dz as i32) else {
+					continue;
+				};
+
+				total += w;
+				color += w * block_color(block, Some(biome), depth.0 as f32);
+			}
+		}
+
+		if total == 0.0 {
+			return None;
+		}
+
+		Some(color / total)
 	}
 
 	fn render_chunk(

From fb712cd2f5a15dedf29bd68bb54add9684352acc Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 3 Aug 2023 21:27:08 +0200
Subject: [PATCH 209/460] Store per-region biome list in IndexSet

Index into the biome list instead of duplicating the biome data for each
coordinate. This reduces the size of the processed data and speeds up
encoding/decoding.
---
 Cargo.lock                           | 24 ++++++++++++++++++++++++
 Cargo.toml                           |  1 +
 src/bin/minedmap/common.rs           | 10 ++++++++--
 src/bin/minedmap/region_processor.rs | 15 ++++++++++-----
 src/bin/minedmap/tile_renderer.rs    |  5 +++--
 src/resource/biomes.rs               |  4 ++--
 src/resource/mod.rs                  |  2 +-
 src/world/layer.rs                   | 27 +++++++++++++++++++++------
 8 files changed, 70 insertions(+), 18 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b286664..d771fd3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -220,6 +220,12 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
 [[package]]
 name = "errno"
 version = "0.3.2"
@@ -279,6 +285,12 @@ version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42218cb640844e3872cc3c153dc975229e080a6c4733b34709ef445610550226"
 
+[[package]]
+name = "hashbrown"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -305,6 +317,17 @@ dependencies = [
  "png",
 ]
 
+[[package]]
+name = "indexmap"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+ "serde",
+]
+
 [[package]]
 name = "is-terminal"
 version = "0.4.9"
@@ -375,6 +398,7 @@ dependencies = [
  "flate2",
  "glam",
  "image",
+ "indexmap",
  "itertools",
  "num-integer",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index 5e04100..aad8ff8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,6 +17,7 @@ fastnbt = "2.3.2"
 flate2 = "1.0.25"
 glam = "0.24.0"
 image = { version = "0.24.5", default-features = false, features = ["png"] }
+indexmap = { version = "2.0.0", features = ["serde"] }
 itertools = "0.11.0"
 num-integer = "0.1.45"
 serde = "1.0.152"
diff --git a/src/bin/minedmap/common.rs b/src/bin/minedmap/common.rs
index a108e8d..eb1613e 100644
--- a/src/bin/minedmap/common.rs
+++ b/src/bin/minedmap/common.rs
@@ -4,9 +4,10 @@ use std::{
 	path::{Path, PathBuf},
 };
 
+use indexmap::IndexSet;
 use serde::{Deserialize, Serialize};
 
-use minedmap::{io::fs::FileMetaVersion, types::*, world::layer};
+use minedmap::{io::fs::FileMetaVersion, resource::Biome, types::*, world::layer};
 
 // Increase to force regeneration of all output files
 pub const FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
@@ -43,7 +44,12 @@ pub struct ProcessedChunk {
 	pub biomes: Box<layer::BiomeArray>,
 	pub depths: Box<layer::DepthArray>,
 }
-pub type ProcessedRegion = ChunkArray<Option<ProcessedChunk>>;
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+pub struct ProcessedRegion {
+	pub biome_list: IndexSet<Biome>,
+	pub chunks: ChunkArray<Option<ProcessedChunk>>,
+}
 
 pub struct Config {
 	pub region_dir: PathBuf,
diff --git a/src/bin/minedmap/region_processor.rs b/src/bin/minedmap/region_processor.rs
index f2720c7..8a77a73 100644
--- a/src/bin/minedmap/region_processor.rs
+++ b/src/bin/minedmap/region_processor.rs
@@ -2,9 +2,10 @@ use std::{path::Path, time::SystemTime};
 
 use anyhow::{Context, Result};
 
+use indexmap::IndexSet;
 use minedmap::{
 	io::{fs, storage},
-	resource,
+	resource::{self, Biome},
 	types::*,
 	world::{
 		self,
@@ -45,9 +46,13 @@ impl<'a> RegionProcessor<'a> {
 	}
 
 	/// Processes a single chunk
-	fn process_chunk(&self, data: world::de::Chunk) -> Result<Option<LayerData>> {
+	fn process_chunk(
+		&self,
+		biome_list: &mut IndexSet<Biome>,
+		data: world::de::Chunk,
+	) -> Result<Option<LayerData>> {
 		let chunk = world::chunk::Chunk::new(&data, &self.block_types, &self.biome_types)?;
-		world::layer::top_layer(&chunk)
+		world::layer::top_layer(biome_list, &chunk)
 	}
 
 	fn render_chunk_lightmap(
@@ -110,12 +115,12 @@ impl<'a> RegionProcessor<'a> {
 		minedmap::io::region::from_file(path)?.foreach_chunk(
 			|chunk_coords, data: world::de::Chunk| {
 				let Some(layer::LayerData{ blocks, biomes, block_light, depths }) = self
-					.process_chunk(data)
+					.process_chunk(&mut processed_region.biome_list, data)
 					.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))?
 				else {
 					return Ok(());
 				};
-				processed_region[chunk_coords] = Some(ProcessedChunk {
+				processed_region.chunks[chunk_coords] = Some(ProcessedChunk {
 					blocks,
 					biomes,
 					depths,
diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index c66431f..556483b 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -56,7 +56,8 @@ fn biome_at(
 		z: block_z,
 	};
 	let region = region_group.get(region_x, region_z)?;
-	region[chunk].as_ref()?.biomes[block].as_ref()
+	let index = region.chunks[chunk].as_ref()?.biomes[block]?.get() - 1;
+	region.biome_list.get_index(index.into())
 }
 
 pub struct TileRenderer<'a> {
@@ -144,7 +145,7 @@ impl<'a> TileRenderer<'a> {
 	}
 
 	fn render_region(image: &mut image::RgbaImage, region_group: &RegionGroup<ProcessedRegion>) {
-		for (coords, chunk) in region_group.center().iter() {
+		for (coords, chunk) in region_group.center().chunks.iter() {
 			let Some(chunk) = chunk else {
 				continue;
 			};
diff --git a/src/resource/biomes.rs b/src/resource/biomes.rs
index cf0db4b..0515e93 100644
--- a/src/resource/biomes.rs
+++ b/src/resource/biomes.rs
@@ -2,13 +2,13 @@ use serde::{Deserialize, Serialize};
 
 use super::Color;
 
-#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub enum BiomeGrassColorModifier {
 	DarkForest,
 	Swamp,
 }
 
-#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct Biome {
 	pub temp: i8,
 	pub downfall: i8,
diff --git a/src/resource/mod.rs b/src/resource/mod.rs
index 921fdc2..5eb2838 100644
--- a/src/resource/mod.rs
+++ b/src/resource/mod.rs
@@ -35,7 +35,7 @@ where
 	BitFlags::<BlockFlag>::from_bits(bits).map_err(de::Error::custom)
 }
 
-#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct Color(pub [u8; 3]);
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
diff --git a/src/world/layer.rs b/src/world/layer.rs
index 4b23f26..fa9a4f7 100644
--- a/src/world/layer.rs
+++ b/src/world/layer.rs
@@ -1,4 +1,7 @@
+use std::num::NonZeroU16;
+
 use anyhow::{Context, Result};
+use indexmap::IndexSet;
 use serde::{Deserialize, Serialize};
 
 use super::chunk::{Chunk, SectionIterItem};
@@ -26,13 +29,13 @@ impl BlockHeight {
 }
 
 pub type BlockArray = LayerBlockArray<Option<BlockType>>;
-pub type BiomeArray = LayerBlockArray<Option<Biome>>;
+pub type BiomeArray = LayerBlockArray<Option<NonZeroU16>>;
 pub type BlockLightArray = LayerBlockArray<u8>;
 pub type DepthArray = LayerBlockArray<Option<BlockHeight>>;
 
 struct LayerEntry<'a> {
 	block: &'a mut Option<BlockType>,
-	biome: &'a mut Option<Biome>,
+	biome: &'a mut Option<NonZeroU16>,
 	block_light: &'a mut u8,
 	depth: &'a mut Option<BlockHeight>,
 }
@@ -46,7 +49,12 @@ impl<'a> LayerEntry<'a> {
 		self.depth.is_some()
 	}
 
-	fn fill(&mut self, section: SectionIterItem, coords: SectionBlockCoords) -> Result<bool> {
+	fn fill(
+		&mut self,
+		biome_list: &mut IndexSet<Biome>,
+		section: SectionIterItem,
+		coords: SectionBlockCoords,
+	) -> Result<bool> {
 		let Some(block_type) = section.section.block_at(coords)?
 			.filter(|block_type| block_type.is(BlockFlag::Opaque))
 		else {
@@ -59,7 +67,14 @@ impl<'a> LayerEntry<'a> {
 
 		if self.is_empty() {
 			*self.block = Some(block_type);
-			*self.biome = section.biomes.biome_at(section.y, coords)?.copied();
+			if let Some(biome) = section.biomes.biome_at(section.y, coords)? {
+				let (biome_index, _) = biome_list.insert_full(*biome);
+				*self.biome = NonZeroU16::new(
+					(biome_index + 1)
+						.try_into()
+						.expect("biome index not in range"),
+				);
+			}
 		}
 
 		if block_type.is(BlockFlag::Water) {
@@ -99,7 +114,7 @@ impl LayerData {
 /// determined as the block that should be visible on the rendered
 /// map. For water blocks, the height of the first non-water block
 /// is additionally filled in as the water depth.
-pub fn top_layer(chunk: &Chunk) -> Result<Option<LayerData>> {
+pub fn top_layer(biome_list: &mut IndexSet<Biome>, chunk: &Chunk) -> Result<Option<LayerData>> {
 	use BLOCKS_PER_CHUNK as N;
 
 	if chunk.is_empty() {
@@ -121,7 +136,7 @@ pub fn top_layer(chunk: &Chunk) -> Result<Option<LayerData>> {
 					}
 
 					let coords = SectionBlockCoords { xz, y };
-					if !entry.fill(section, coords)? {
+					if !entry.fill(biome_list, section, coords)? {
 						continue;
 					}
 

From deb33814eef34046dda53cf597a4d80842fea90d Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 3 Aug 2023 23:02:49 +0200
Subject: [PATCH 210/460] minedmap/tile_renderer: avoid calling block_color()
 more often than necessary

Collect all biome indices/weights for a chunk and deduplicate using a
hash map.
---
 Cargo.lock                        |  7 +++++++
 Cargo.toml                        |  1 +
 src/bin/minedmap/tile_renderer.rs | 30 +++++++++++++++++++++---------
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d771fd3..b525be4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -401,6 +401,7 @@ dependencies = [
  "indexmap",
  "itertools",
  "num-integer",
+ "rustc-hash",
  "serde",
  "serde_json",
  "zstd",
@@ -489,6 +490,12 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
 [[package]]
 name = "rustix"
 version = "0.38.4"
diff --git a/Cargo.toml b/Cargo.toml
index aad8ff8..c74b56a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,6 +20,7 @@ image = { version = "0.24.5", default-features = false, features = ["png"] }
 indexmap = { version = "2.0.0", features = ["serde"] }
 itertools = "0.11.0"
 num-integer = "0.1.45"
+rustc-hash = "1.1.0"
 serde = "1.0.152"
 serde_json = "1.0.99"
 zstd = "0.12.3"
diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index 556483b..76485bb 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -9,7 +9,7 @@ use num_integer::div_mod_floor;
 
 use minedmap::{
 	io::{fs, storage},
-	resource::{block_color, needs_biome, Biome},
+	resource::{block_color, needs_biome},
 	types::*,
 };
 
@@ -44,7 +44,7 @@ fn biome_at(
 	block: LayerBlockCoords,
 	dx: i32,
 	dz: i32,
-) -> Option<&Biome> {
+) -> Option<(i8, i8, u16)> {
 	let (region_x, chunk_x, block_x) = coord_offset(chunk.x, block.x, dx);
 	let (region_z, chunk_z, block_z) = coord_offset(chunk.z, block.z, dz);
 	let chunk = ChunkCoords {
@@ -56,8 +56,11 @@ fn biome_at(
 		z: block_z,
 	};
 	let region = region_group.get(region_x, region_z)?;
-	let index = region.chunks[chunk].as_ref()?.biomes[block]?.get() - 1;
-	region.biome_list.get_index(index.into())
+	Some((
+		region_x,
+		region_z,
+		region.chunks[chunk].as_ref()?.biomes[block]?.get() - 1,
+	))
 }
 
 pub struct TileRenderer<'a> {
@@ -96,8 +99,7 @@ impl<'a> TileRenderer<'a> {
 			return Some(block_color(block, None, depth.0 as f32));
 		}
 
-		let mut total = 0.0;
-		let mut color = Vec3::ZERO;
+		let mut weights = rustc_hash::FxHashMap::<(i8, i8, u16), f32>::default();
 		for dz in -Z..=Z {
 			for dx in -X..=X {
 				let w = SMOOTH[dz.unsigned_abs()][dx.unsigned_abs()];
@@ -109,15 +111,25 @@ impl<'a> TileRenderer<'a> {
 					continue;
 				};
 
-				total += w;
-				color += w * block_color(block, Some(biome), depth.0 as f32);
+				*weights.entry(biome).or_default() += w;
 			}
 		}
 
-		if total == 0.0 {
+		if weights.is_empty() {
 			return None;
 		}
 
+		let mut color = Vec3::ZERO;
+		let mut total = 0.0;
+
+		for ((region_x, region_z, index), w) in weights {
+			let region = region_group.get(region_x, region_z)?;
+			let biome = region.biome_list.get_index(index.into())?;
+
+			total += w;
+			color += w * block_color(block, Some(biome), depth.0 as f32);
+		}
+
 		Some(color / total)
 	}
 

From dc68e67a234c044b0c608e923d46f92ef8139977 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 4 Aug 2023 00:46:58 +0200
Subject: [PATCH 211/460] minedmap/region_group: clippy fixes

---
 src/bin/minedmap/region_group.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/bin/minedmap/region_group.rs b/src/bin/minedmap/region_group.rs
index 0a12fd8..1c08296 100644
--- a/src/bin/minedmap/region_group.rs
+++ b/src/bin/minedmap/region_group.rs
@@ -60,7 +60,7 @@ impl<T> RegionGroup<T> {
 	{
 		RegionGroup {
 			center: f(self.center),
-			neighs: self.neighs.map(|entry| entry.map(|v| f(v))),
+			neighs: self.neighs.map(|entry| entry.map(&mut f)),
 		}
 	}
 
@@ -70,7 +70,7 @@ impl<T> RegionGroup<T> {
 	{
 		let RegionGroup { center, neighs } = self;
 		let center = f(center)?;
-		let neighs = neighs.map(|entry| entry.map(|value| f(value).ok()).flatten());
+		let neighs = neighs.map(|entry| entry.and_then(|value| f(value).ok()));
 		Ok(RegionGroup { center, neighs })
 	}
 

From ab3b273992137afe525ed2bb1e3bda23b47636dd Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 4 Aug 2023 16:13:08 +0200
Subject: [PATCH 212/460] Update dependencies

---
 Cargo.lock | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b525be4..b1bfe6e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -104,11 +104,12 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "cc"
-version = "1.0.79"
+version = "1.0.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "6c6b2562119bf28c3439f7f02db99faf0aa1a8cdfe5772a2ee155d32227239f0"
 dependencies = [
  "jobserver",
+ "libc",
 ]
 
 [[package]]
@@ -381,9 +382,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.3"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
+checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
 
 [[package]]
 name = "minedmap"
@@ -498,9 +499,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustix"
-version = "0.38.4"
+version = "0.38.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5"
+checksum = "1ee020b1716f0a80e2ace9b03441a749e402e86712f15f16fe8a8f75afac732f"
 dependencies = [
  "bitflags 2.3.3",
  "errno",
@@ -517,9 +518,9 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 
 [[package]]
 name = "serde"
-version = "1.0.178"
+version = "1.0.181"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60363bdd39a7be0266a520dab25fdc9241d2f987b08a01e01f0ec6d06a981348"
+checksum = "6d3e73c93c3240c0bda063c239298e633114c69a888c3e37ca8bb33f343e9890"
 dependencies = [
  "serde_derive",
 ]
@@ -535,9 +536,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.178"
+version = "1.0.181"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f28482318d6641454cb273da158647922d1be6b5a2fcc6165cd89ebdd7ed576b"
+checksum = "be02f6cb0cd3a5ec20bbcfbcbd749f57daddb1a0882dc2e46a6c236c90b977ed"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -569,9 +570,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "syn"
-version = "2.0.27"
+version = "2.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0"
+checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
 dependencies = [
  "proc-macro2",
  "quote",

From 7d231b92ea1ae524907e13ff4320450194bc9ab0 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 5 Aug 2023 10:46:47 +0200
Subject: [PATCH 213/460] Format let-else blocks

Use nightly rustfmt to format let-else.
---
 src/bin/minedmap/region_processor.rs | 11 ++++++++---
 src/bin/minedmap/tile_renderer.rs    |  8 +++++++-
 src/world/layer.rs                   |  4 +++-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/bin/minedmap/region_processor.rs b/src/bin/minedmap/region_processor.rs
index 8a77a73..6600844 100644
--- a/src/bin/minedmap/region_processor.rs
+++ b/src/bin/minedmap/region_processor.rs
@@ -20,8 +20,8 @@ fn parse_region_filename(path: &Path) -> Option<TileCoords> {
 	let file_name = path.file_name()?.to_str()?;
 	let parts: Vec<_> = file_name.split('.').collect();
 	let &["r", x, z, "mca"] = parts.as_slice() else {
-			return None;
-		};
+		return None;
+	};
 
 	Some(TileCoords {
 		x: x.parse().ok()?,
@@ -114,7 +114,12 @@ impl<'a> RegionProcessor<'a> {
 
 		minedmap::io::region::from_file(path)?.foreach_chunk(
 			|chunk_coords, data: world::de::Chunk| {
-				let Some(layer::LayerData{ blocks, biomes, block_light, depths }) = self
+				let Some(layer::LayerData {
+					blocks,
+					biomes,
+					block_light,
+					depths,
+				}) = self
 					.process_chunk(&mut processed_region.biome_list, data)
 					.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))?
 				else {
diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index 76485bb..efede58 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -107,7 +107,13 @@ impl<'a> TileRenderer<'a> {
 					continue;
 				}
 
-				let Some(biome) = biome_at(region_group, chunk_coords, block_coords, dx as i32, dz as i32) else {
+				let Some(biome) = biome_at(
+					region_group,
+					chunk_coords,
+					block_coords,
+					dx as i32,
+					dz as i32,
+				) else {
 					continue;
 				};
 
diff --git a/src/world/layer.rs b/src/world/layer.rs
index fa9a4f7..3abc30b 100644
--- a/src/world/layer.rs
+++ b/src/world/layer.rs
@@ -55,7 +55,9 @@ impl<'a> LayerEntry<'a> {
 		section: SectionIterItem,
 		coords: SectionBlockCoords,
 	) -> Result<bool> {
-		let Some(block_type) = section.section.block_at(coords)?
+		let Some(block_type) = section
+			.section
+			.block_at(coords)?
 			.filter(|block_type| block_type.is(BlockFlag::Opaque))
 		else {
 			if self.is_empty() {

From cd1a5e869dbafa11a50e99e193e05bcc5da7c334 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 5 Aug 2023 11:17:52 +0200
Subject: [PATCH 214/460] minedmap/region_group: optimize get() implementation

---
 src/bin/minedmap/region_group.rs | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/bin/minedmap/region_group.rs b/src/bin/minedmap/region_group.rs
index 1c08296..4e7c636 100644
--- a/src/bin/minedmap/region_group.rs
+++ b/src/bin/minedmap/region_group.rs
@@ -40,18 +40,23 @@ impl<T> RegionGroup<T> {
 	}
 
 	pub fn get(&self, x: i8, z: i8) -> Option<&T> {
-		match (x, z) {
-			(0, 0) => Some(&self.center),
-			(-1, -1) => self.neighs[0].as_ref(),
-			(-1, 0) => self.neighs[1].as_ref(),
-			(-1, 1) => self.neighs[2].as_ref(),
-			(0, -1) => self.neighs[3].as_ref(),
-			(0, 1) => self.neighs[4].as_ref(),
-			(1, -1) => self.neighs[5].as_ref(),
-			(1, 0) => self.neighs[6].as_ref(),
-			(1, 1) => self.neighs[7].as_ref(),
-			_ => panic!("index out of bounds"),
-		}
+		let index = match (x, z) {
+			(0, 0) => {
+				return Some(&self.center);
+			}
+			(-1, -1) => 0,
+			(-1, 0) => 1,
+			(-1, 1) => 2,
+			(0, -1) => 3,
+			(0, 1) => 4,
+			(1, -1) => 5,
+			(1, 0) => 6,
+			(1, 1) => 7,
+			_ => {
+				return None;
+			}
+		};
+		self.neighs[index].as_ref()
 	}
 
 	pub fn map<U, F>(self, mut f: F) -> RegionGroup<U>

From 7b46adf6e78c6638b69ebfbf2e133589b0d00067 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 5 Aug 2023 14:21:51 +0200
Subject: [PATCH 215/460] minedmap: split up big types by adding Boxes

Make these values faster to move around, and optimize their size when
used in Options.
---
 src/bin/minedmap/common.rs           |  2 +-
 src/bin/minedmap/region_processor.rs |  4 ++--
 src/bin/minedmap/tile_renderer.rs    | 15 +++++++++------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/bin/minedmap/common.rs b/src/bin/minedmap/common.rs
index eb1613e..44c7ae4 100644
--- a/src/bin/minedmap/common.rs
+++ b/src/bin/minedmap/common.rs
@@ -48,7 +48,7 @@ pub struct ProcessedChunk {
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 pub struct ProcessedRegion {
 	pub biome_list: IndexSet<Biome>,
-	pub chunks: ChunkArray<Option<ProcessedChunk>>,
+	pub chunks: ChunkArray<Option<Box<ProcessedChunk>>>,
 }
 
 pub struct Config {
diff --git a/src/bin/minedmap/region_processor.rs b/src/bin/minedmap/region_processor.rs
index 6600844..34c9555 100644
--- a/src/bin/minedmap/region_processor.rs
+++ b/src/bin/minedmap/region_processor.rs
@@ -125,11 +125,11 @@ impl<'a> RegionProcessor<'a> {
 				else {
 					return Ok(());
 				};
-				processed_region.chunks[chunk_coords] = Some(ProcessedChunk {
+				processed_region.chunks[chunk_coords] = Some(Box::new(ProcessedChunk {
 					blocks,
 					biomes,
 					depths,
-				});
+				}));
 
 				let chunk_lightmap = Self::render_chunk_lightmap(block_light);
 				overlay_chunk(&mut lightmap, &chunk_lightmap, chunk_coords);
diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index efede58..646e098 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -39,7 +39,7 @@ fn coord_offset<const AXIS: u8>(
 }
 
 fn biome_at(
-	region_group: &RegionGroup<ProcessedRegion>,
+	region_group: &RegionGroup<Box<ProcessedRegion>>,
 	chunk: ChunkCoords,
 	block: LayerBlockCoords,
 	dx: i32,
@@ -72,18 +72,18 @@ impl<'a> TileRenderer<'a> {
 		TileRenderer { config }
 	}
 
-	fn load_region(processed_path: &Path) -> Result<ProcessedRegion> {
+	fn load_region(processed_path: &Path) -> Result<Box<ProcessedRegion>> {
 		storage::read(processed_path).context("Failed to load processed region data")
 	}
 
 	fn load_region_group(
 		processed_paths: RegionGroup<PathBuf>,
-	) -> Result<RegionGroup<ProcessedRegion>> {
+	) -> Result<RegionGroup<Box<ProcessedRegion>>> {
 		processed_paths.try_map(|path| Self::load_region(&path))
 	}
 
 	fn block_color_at(
-		region_group: &RegionGroup<ProcessedRegion>,
+		region_group: &RegionGroup<Box<ProcessedRegion>>,
 		chunk: &ProcessedChunk,
 		chunk_coords: ChunkCoords,
 		block_coords: LayerBlockCoords,
@@ -141,7 +141,7 @@ impl<'a> TileRenderer<'a> {
 
 	fn render_chunk(
 		image: &mut image::RgbaImage,
-		region_group: &RegionGroup<ProcessedRegion>,
+		region_group: &RegionGroup<Box<ProcessedRegion>>,
 		chunk: &ProcessedChunk,
 		chunk_coords: ChunkCoords,
 	) {
@@ -162,7 +162,10 @@ impl<'a> TileRenderer<'a> {
 		overlay_chunk(image, &chunk_image, chunk_coords);
 	}
 
-	fn render_region(image: &mut image::RgbaImage, region_group: &RegionGroup<ProcessedRegion>) {
+	fn render_region(
+		image: &mut image::RgbaImage,
+		region_group: &RegionGroup<Box<ProcessedRegion>>,
+	) {
 		for (coords, chunk) in region_group.center().chunks.iter() {
 			let Some(chunk) = chunk else {
 				continue;

From 521e799d4b7c071bfef4645f06f8c8f9b9ca4d84 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 5 Aug 2023 14:36:59 +0200
Subject: [PATCH 216/460] minedmap/region_group: make indexing into the
 neighbor array more uniform

Add a 9th element, so the 3x3 entries can always be indexed the same way,
leading to a slight performance improvement.

The center element is always None.
---
 src/bin/minedmap/region_group.rs | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/src/bin/minedmap/region_group.rs b/src/bin/minedmap/region_group.rs
index 4e7c636..aa7088c 100644
--- a/src/bin/minedmap/region_group.rs
+++ b/src/bin/minedmap/region_group.rs
@@ -11,7 +11,7 @@ use anyhow::Result;
 #[derive(Debug, Clone, Copy)]
 pub struct RegionGroup<T> {
 	center: T,
-	neighs: [Option<T>; 8],
+	neighs: [Option<T>; 9],
 }
 
 impl<T> RegionGroup<T> {
@@ -26,6 +26,7 @@ impl<T> RegionGroup<T> {
 				Some((-1, 0)),
 				Some((-1, 1)),
 				Some((0, -1)),
+				None,
 				Some((0, 1)),
 				Some((1, -1)),
 				Some((1, 0)),
@@ -40,23 +41,13 @@ impl<T> RegionGroup<T> {
 	}
 
 	pub fn get(&self, x: i8, z: i8) -> Option<&T> {
-		let index = match (x, z) {
-			(0, 0) => {
-				return Some(&self.center);
-			}
-			(-1, -1) => 0,
-			(-1, 0) => 1,
-			(-1, 1) => 2,
-			(0, -1) => 3,
-			(0, 1) => 4,
-			(1, -1) => 5,
-			(1, 0) => 6,
-			(1, 1) => 7,
-			_ => {
-				return None;
-			}
-		};
-		self.neighs[index].as_ref()
+		if (x, z) == (0, 0) {
+			return Some(&self.center);
+		}
+		if !(-1..=1).contains(&x) || !(-1..=1).contains(&z) {
+			return None;
+		}
+		self.neighs.get((3 * x + z + 4) as usize)?.as_ref()
 	}
 
 	pub fn map<U, F>(self, mut f: F) -> RegionGroup<U>

From 84bee6d6d99baca742675613e04e2bf9ccd6e3c9 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 5 Aug 2023 20:13:35 +0200
Subject: [PATCH 217/460] minedmap: add region cache

Cache the last loaded processed regions.
---
 Cargo.lock                        | 37 ++++++++++++++++++++++++++
 Cargo.toml                        |  3 ++-
 src/bin/minedmap/main.rs          |  8 ++++--
 src/bin/minedmap/tile_renderer.rs | 43 +++++++++++++++++++++++--------
 4 files changed, 77 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b1bfe6e..839c9ae 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -8,6 +8,23 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
+[[package]]
+name = "ahash"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "version_check",
+]
+
+[[package]]
+name = "allocator-api2"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+
 [[package]]
 name = "anstream"
 version = "0.3.2"
@@ -291,6 +308,10 @@ name = "hashbrown"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+dependencies = [
+ "ahash",
+ "allocator-api2",
+]
 
 [[package]]
 name = "heck"
@@ -386,6 +407,15 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
 
+[[package]]
+name = "lru"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eedb2bdbad7e0634f83989bf596f497b070130daaa398ab22d84c39e266deec5"
+dependencies = [
+ "hashbrown",
+]
+
 [[package]]
 name = "minedmap"
 version = "0.1.0"
@@ -401,6 +431,7 @@ dependencies = [
  "image",
  "indexmap",
  "itertools",
+ "lru",
  "num-integer",
  "rustc-hash",
  "serde",
@@ -591,6 +622,12 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
diff --git a/Cargo.toml b/Cargo.toml
index c74b56a..5d74ce8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,9 +19,10 @@ glam = "0.24.0"
 image = { version = "0.24.5", default-features = false, features = ["png"] }
 indexmap = { version = "2.0.0", features = ["serde"] }
 itertools = "0.11.0"
+lru = "0.11.0"
 num-integer = "0.1.45"
 rustc-hash = "1.1.0"
-serde = "1.0.152"
+serde = { version = "1.0.152", features = ["rc"] }
 serde_json = "1.0.99"
 zstd = "0.12.3"
 
diff --git a/src/bin/minedmap/main.rs b/src/bin/minedmap/main.rs
index 8d3bbea..838728c 100644
--- a/src/bin/minedmap/main.rs
+++ b/src/bin/minedmap/main.rs
@@ -10,7 +10,7 @@ use std::path::PathBuf;
 use anyhow::Result;
 use clap::Parser;
 
-use common::Config;
+use common::{Config, TileCoords};
 use metadata_writer::MetadataWriter;
 use region_processor::RegionProcessor;
 use tile_mipmapper::TileMipmapper;
@@ -28,7 +28,11 @@ fn main() -> Result<()> {
 	let args = Args::parse();
 	let config = Config::new(args);
 
-	let regions = RegionProcessor::new(&config).run()?;
+	let mut regions = RegionProcessor::new(&config).run()?;
+
+	// Sort regions in a zig-zag pattern to optimize cache usage
+	regions.sort_unstable_by_key(|&TileCoords { x, z }| (x, if x % 2 == 0 { z } else { -z }));
+
 	TileRenderer::new(&config).run(&regions)?;
 	let tiles = TileMipmapper::new(&config).run(&regions)?;
 	MetadataWriter::new(&config).run(tiles)?;
diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index 646e098..abacffd 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -1,10 +1,13 @@
 use std::{
+	num::NonZeroUsize,
 	path::{Path, PathBuf},
+	rc::Rc,
 	time::SystemTime,
 };
 
 use anyhow::{Context, Result};
 use glam::Vec3;
+use lru::LruCache;
 use num_integer::div_mod_floor;
 
 use minedmap::{
@@ -39,7 +42,7 @@ fn coord_offset<const AXIS: u8>(
 }
 
 fn biome_at(
-	region_group: &RegionGroup<Box<ProcessedRegion>>,
+	region_group: &RegionGroup<Rc<ProcessedRegion>>,
 	chunk: ChunkCoords,
 	block: LayerBlockCoords,
 	dx: i32,
@@ -72,18 +75,30 @@ impl<'a> TileRenderer<'a> {
 		TileRenderer { config }
 	}
 
-	fn load_region(processed_path: &Path) -> Result<Box<ProcessedRegion>> {
-		storage::read(processed_path).context("Failed to load processed region data")
+	fn load_region(
+		region_cache: &mut LruCache<PathBuf, Rc<ProcessedRegion>>,
+		processed_path: &Path,
+	) -> Result<Rc<ProcessedRegion>> {
+		if let Some(region) = region_cache.get(processed_path) {
+			return Ok(region.clone());
+		}
+
+		let region: Rc<ProcessedRegion> =
+			storage::read(processed_path).context("Failed to load processed region data")?;
+		region_cache.put(processed_path.to_owned(), region.clone());
+
+		Ok(region)
 	}
 
 	fn load_region_group(
+		region_cache: &mut LruCache<PathBuf, Rc<ProcessedRegion>>,
 		processed_paths: RegionGroup<PathBuf>,
-	) -> Result<RegionGroup<Box<ProcessedRegion>>> {
-		processed_paths.try_map(|path| Self::load_region(&path))
+	) -> Result<RegionGroup<Rc<ProcessedRegion>>> {
+		processed_paths.try_map(|path| Self::load_region(region_cache, &path))
 	}
 
 	fn block_color_at(
-		region_group: &RegionGroup<Box<ProcessedRegion>>,
+		region_group: &RegionGroup<Rc<ProcessedRegion>>,
 		chunk: &ProcessedChunk,
 		chunk_coords: ChunkCoords,
 		block_coords: LayerBlockCoords,
@@ -141,7 +156,7 @@ impl<'a> TileRenderer<'a> {
 
 	fn render_chunk(
 		image: &mut image::RgbaImage,
-		region_group: &RegionGroup<Box<ProcessedRegion>>,
+		region_group: &RegionGroup<Rc<ProcessedRegion>>,
 		chunk: &ProcessedChunk,
 		chunk_coords: ChunkCoords,
 	) {
@@ -164,7 +179,7 @@ impl<'a> TileRenderer<'a> {
 
 	fn render_region(
 		image: &mut image::RgbaImage,
-		region_group: &RegionGroup<Box<ProcessedRegion>>,
+		region_group: &RegionGroup<Rc<ProcessedRegion>>,
 	) {
 		for (coords, chunk) in region_group.center().chunks.iter() {
 			let Some(chunk) = chunk else {
@@ -200,7 +215,11 @@ impl<'a> TileRenderer<'a> {
 		Ok((paths, max_timestamp))
 	}
 
-	fn render_tile(&self, coords: TileCoords) -> Result<()> {
+	fn render_tile(
+		&self,
+		region_cache: &mut LruCache<PathBuf, Rc<ProcessedRegion>>,
+		coords: TileCoords,
+	) -> Result<()> {
 		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
 
 		let (processed_paths, processed_timestamp) = self.processed_sources(coords)?;
@@ -227,7 +246,7 @@ impl<'a> TileRenderer<'a> {
 				.display(),
 		);
 
-		let region_group = Self::load_region_group(processed_paths)
+		let region_group = Self::load_region_group(region_cache, processed_paths)
 			.with_context(|| format!("Region {:?} from previous step must be loadable", coords))?;
 		let mut image = image::RgbaImage::new(N, N);
 		Self::render_region(&mut image, &region_group);
@@ -247,8 +266,10 @@ impl<'a> TileRenderer<'a> {
 	pub fn run(self, regions: &[TileCoords]) -> Result<()> {
 		fs::create_dir_all(&self.config.tile_dir(TileKind::Map, 0))?;
 
+		let mut region_cache = LruCache::new(NonZeroUsize::new(12).unwrap());
+
 		for &coords in regions {
-			if let Err(err) = self.render_tile(coords) {
+			if let Err(err) = self.render_tile(&mut region_cache, coords) {
 				eprintln!("Failed to render tile {:?}: {:?}", coords, err);
 			}
 		}

From b80d9ee420290db2437d1632668a37ee8d741241 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 5 Aug 2023 23:56:37 +0200
Subject: [PATCH 218/460] minedmap/tile_renderer: make biome HashMap more
 efficient

Using a u32 instead of a tuple makes the hash calculation faster,
because the fields don't have to be hashed separately.
---
 src/bin/minedmap/tile_renderer.rs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index abacffd..e9a4a13 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -103,6 +103,10 @@ impl<'a> TileRenderer<'a> {
 		chunk_coords: ChunkCoords,
 		block_coords: LayerBlockCoords,
 	) -> Option<Vec3> {
+		fn biome_key((dx, dz, index): (i8, i8, u16)) -> u32 {
+			(dx as u8 as u32) | (dz as u8 as u32) << 8 | (index as u32) << 16
+		}
+
 		const SMOOTH: [[f32; 3]; 3] = [[41.0, 26.0, 7.0], [26.0, 16.0, 4.0], [7.0, 4.0, 1.0]];
 		const X: isize = SMOOTH[0].len() as isize - 1;
 		const Z: isize = SMOOTH.len() as isize - 1;
@@ -114,7 +118,7 @@ impl<'a> TileRenderer<'a> {
 			return Some(block_color(block, None, depth.0 as f32));
 		}
 
-		let mut weights = rustc_hash::FxHashMap::<(i8, i8, u16), f32>::default();
+		let mut weights = rustc_hash::FxHashMap::<u32, ((i8, i8, u16), f32)>::default();
 		for dz in -Z..=Z {
 			for dx in -X..=X {
 				let w = SMOOTH[dz.unsigned_abs()][dx.unsigned_abs()];
@@ -132,7 +136,9 @@ impl<'a> TileRenderer<'a> {
 					continue;
 				};
 
-				*weights.entry(biome).or_default() += w;
+				let value = weights.entry(biome_key(biome)).or_default();
+				value.0 = biome;
+				value.1 += w;
 			}
 		}
 
@@ -143,7 +149,7 @@ impl<'a> TileRenderer<'a> {
 		let mut color = Vec3::ZERO;
 		let mut total = 0.0;
 
-		for ((region_x, region_z, index), w) in weights {
+		for ((region_x, region_z, index), w) in weights.into_values() {
 			let region = region_group.get(region_x, region_z)?;
 			let biome = region.biome_list.get_index(index.into())?;
 

From 21035a1f7f37a35c488face88ec04db4e087ba55 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 6 Aug 2023 11:26:08 +0200
Subject: [PATCH 219/460] Move coord offset to new util module, make more
 efficient

div_floor_mod() generates inefficient code. For power-of-2 divisors,
shift and mask can be used instead.
---
 src/bin/minedmap/tile_renderer.rs | 59 +---------------------
 src/lib.rs                        |  1 +
 src/types.rs                      |  6 ++-
 src/util.rs                       | 84 +++++++++++++++++++++++++++++++
 4 files changed, 90 insertions(+), 60 deletions(-)
 create mode 100644 src/util.rs

diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index e9a4a13..def56b4 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -8,39 +8,16 @@ use std::{
 use anyhow::{Context, Result};
 use glam::Vec3;
 use lru::LruCache;
-use num_integer::div_mod_floor;
 
 use minedmap::{
 	io::{fs, storage},
 	resource::{block_color, needs_biome},
 	types::*,
+	util::coord_offset,
 };
 
 use super::{common::*, region_group::RegionGroup};
 
-/// Offsets a chunk and block coordinate pair by a number of blocks
-///
-/// As the new coordinate may end up in a different region, a region offset
-/// is returned together with the new chunk and block coordinates.
-fn coord_offset<const AXIS: u8>(
-	chunk: ChunkCoord<AXIS>,
-	block: BlockCoord<AXIS>,
-	offset: i32,
-) -> (i8, ChunkCoord<AXIS>, BlockCoord<AXIS>) {
-	const CHUNKS: i32 = CHUNKS_PER_REGION as i32;
-	const BLOCKS: i32 = BLOCKS_PER_CHUNK as i32;
-	let coord = chunk.0 as i32 * BLOCKS + block.0 as i32 + offset;
-	let (region_chunk, block) = div_mod_floor(coord, BLOCKS);
-	let (region, chunk) = div_mod_floor(region_chunk, CHUNKS);
-	(
-		region
-			.try_into()
-			.expect("the region coordinate should be in the valid range"),
-		ChunkCoord::new(chunk),
-		BlockCoord::new(block),
-	)
-}
-
 fn biome_at(
 	region_group: &RegionGroup<Rc<ProcessedRegion>>,
 	chunk: ChunkCoords,
@@ -283,37 +260,3 @@ impl<'a> TileRenderer<'a> {
 		Ok(())
 	}
 }
-
-#[cfg(test)]
-mod test {
-	use super::*;
-
-	#[test]
-	fn test_coord_offset() {
-		const CHUNKS: i32 = CHUNKS_PER_REGION as i32;
-		const BLOCKS: i32 = BLOCKS_PER_CHUNK as i32;
-
-		for chunk in ChunkX::iter() {
-			for block in BlockX::iter() {
-				assert_eq!(coord_offset(chunk, block, 0), (0, chunk, block));
-				assert_eq!(
-					coord_offset(chunk, block, -(CHUNKS * BLOCKS)),
-					(-1, chunk, block)
-				);
-				assert_eq!(
-					coord_offset(chunk, block, CHUNKS * BLOCKS),
-					(1, chunk, block)
-				);
-
-				for offset in -(CHUNKS * BLOCKS)..(CHUNKS * BLOCKS) {
-					let (region2, chunk2, block2) = coord_offset(chunk, block, offset);
-					assert!((-1..=1).contains(&region2));
-					let coord = chunk.0 as i32 * BLOCKS + block.0 as i32 + offset;
-					let coord2 =
-						((region2 as i32 * CHUNKS) + chunk2.0 as i32) * BLOCKS + block2.0 as i32;
-					assert_eq!(coord2, coord);
-				}
-			}
-		}
-	}
-}
diff --git a/src/lib.rs b/src/lib.rs
index 8342ba8..f46a9d2 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,5 @@
 pub mod io;
 pub mod resource;
 pub mod types;
+pub mod util;
 pub mod world;
diff --git a/src/types.rs b/src/types.rs
index 465dd2a..a28583d 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -47,7 +47,8 @@ macro_rules! coord_type {
 	};
 }
 
-pub const BLOCKS_PER_CHUNK: usize = 16;
+pub const BLOCK_BITS: u8 = 4;
+pub const BLOCKS_PER_CHUNK: usize = 1 << BLOCK_BITS;
 coord_type!(BlockCoord, BLOCKS_PER_CHUNK);
 
 /// A block X coordinate relative to a chunk
@@ -136,7 +137,8 @@ impl Debug for SectionBlockCoords {
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub struct SectionY(pub i32);
 
-pub const CHUNKS_PER_REGION: usize = 32;
+pub const CHUNK_BITS: u8 = 5;
+pub const CHUNKS_PER_REGION: usize = 1 << CHUNK_BITS;
 coord_type!(ChunkCoord, CHUNKS_PER_REGION);
 
 /// A chunk X coordinate relative to a region
diff --git a/src/util.rs b/src/util.rs
new file mode 100644
index 0000000..436c070
--- /dev/null
+++ b/src/util.rs
@@ -0,0 +1,84 @@
+use crate::types::*;
+
+pub trait ShiftMask: Sized {
+	type MaskedOutput;
+
+	/// Apply a right shift to a value, and return both the result and the
+	/// bytes that were shifted out
+	fn shift_mask(self, shift: u8) -> (Self, Self::MaskedOutput);
+}
+
+impl ShiftMask for u32 {
+	type MaskedOutput = u32;
+
+	fn shift_mask(self, shift: u8) -> (u32, u32) {
+		let mask = (1 << shift) - 1;
+		(self >> shift, self & mask)
+	}
+}
+
+impl ShiftMask for i32 {
+	type MaskedOutput = u32;
+
+	#[inline]
+	fn shift_mask(self, shift: u8) -> (i32, u32) {
+		let mask = (1 << shift) - 1;
+		(self >> shift, (self as u32) & mask)
+	}
+}
+
+/// Offsets a chunk and block coordinate pair by a number of blocks
+///
+/// As the new coordinate may end up in a different region, a region offset
+/// is returned together with the new chunk and block coordinates.
+#[inline]
+pub fn coord_offset<const AXIS: u8>(
+	chunk: ChunkCoord<AXIS>,
+	block: BlockCoord<AXIS>,
+	offset: i32,
+) -> (i8, ChunkCoord<AXIS>, BlockCoord<AXIS>) {
+	let coord = ((chunk.0 as i32) << BLOCK_BITS | block.0 as i32) + offset;
+	let (region_chunk, block) = coord.shift_mask(BLOCK_BITS);
+	let (region, chunk) = region_chunk.shift_mask(CHUNK_BITS);
+	(
+		region
+			.try_into()
+			.expect("the region coordinate should be in the valid range"),
+		ChunkCoord::new(chunk),
+		BlockCoord::new(block),
+	)
+}
+
+#[cfg(test)]
+mod test {
+	use super::*;
+
+	#[test]
+	fn test_coord_offset() {
+		const CHUNKS: i32 = CHUNKS_PER_REGION as i32;
+		const BLOCKS: i32 = BLOCKS_PER_CHUNK as i32;
+
+		for chunk in ChunkX::iter() {
+			for block in BlockX::iter() {
+				assert_eq!(coord_offset(chunk, block, 0), (0, chunk, block));
+				assert_eq!(
+					coord_offset(chunk, block, -(CHUNKS * BLOCKS)),
+					(-1, chunk, block)
+				);
+				assert_eq!(
+					coord_offset(chunk, block, CHUNKS * BLOCKS),
+					(1, chunk, block)
+				);
+
+				for offset in -(CHUNKS * BLOCKS)..(CHUNKS * BLOCKS) {
+					let (region2, chunk2, block2) = coord_offset(chunk, block, offset);
+					assert!((-1..=1).contains(&region2));
+					let coord = chunk.0 as i32 * BLOCKS + block.0 as i32 + offset;
+					let coord2 =
+						((region2 as i32 * CHUNKS) + chunk2.0 as i32) * BLOCKS + block2.0 as i32;
+					assert_eq!(coord2, coord);
+				}
+			}
+		}
+	}
+}

From 9c4161f6885e312a06282750bec294283b26b857 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 6 Aug 2023 12:32:14 +0200
Subject: [PATCH 220/460] util: turn range check into debug_assert!()

More performance optimization.
---
 src/util.rs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/util.rs b/src/util.rs
index 436c070..43245ca 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -40,13 +40,8 @@ pub fn coord_offset<const AXIS: u8>(
 	let coord = ((chunk.0 as i32) << BLOCK_BITS | block.0 as i32) + offset;
 	let (region_chunk, block) = coord.shift_mask(BLOCK_BITS);
 	let (region, chunk) = region_chunk.shift_mask(CHUNK_BITS);
-	(
-		region
-			.try_into()
-			.expect("the region coordinate should be in the valid range"),
-		ChunkCoord::new(chunk),
-		BlockCoord::new(block),
-	)
+	debug_assert!(i8::try_from(region).is_ok());
+	(region as i8, ChunkCoord::new(chunk), BlockCoord::new(block))
 }
 
 #[cfg(test)]

From 4a824680a9629ac365478d94f0418c7a16105981 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 13 Aug 2023 12:16:11 +0200
Subject: [PATCH 221/460] Update dependencies

---
 Cargo.lock | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 839c9ae..9e73977 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -66,9 +66,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle-wincon"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
+checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c"
 dependencies = [
  "anstyle",
  "windows-sys",
@@ -103,9 +103,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.3.3"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
+checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
 
 [[package]]
 name = "bytemuck"
@@ -121,9 +121,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "cc"
-version = "1.0.81"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c6b2562119bf28c3439f7f02db99faf0aa1a8cdfe5772a2ee155d32227239f0"
+checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01"
 dependencies = [
  "jobserver",
  "libc",
@@ -143,9 +143,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.3.19"
+version = "4.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d"
+checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -154,9 +154,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.3.19"
+version = "4.3.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1"
+checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa"
 dependencies = [
  "anstream",
  "anstyle",
@@ -327,9 +327,9 @@ checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
 
 [[package]]
 name = "image"
-version = "0.24.6"
+version = "0.24.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a"
+checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711"
 dependencies = [
  "bytemuck",
  "byteorder",
@@ -530,11 +530,11 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustix"
-version = "0.38.6"
+version = "0.38.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee020b1716f0a80e2ace9b03441a749e402e86712f15f16fe8a8f75afac732f"
+checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f"
 dependencies = [
- "bitflags 2.3.3",
+ "bitflags 2.4.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -549,9 +549,9 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 
 [[package]]
 name = "serde"
-version = "1.0.181"
+version = "1.0.183"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d3e73c93c3240c0bda063c239298e633114c69a888c3e37ca8bb33f343e9890"
+checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c"
 dependencies = [
  "serde_derive",
 ]
@@ -567,9 +567,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.181"
+version = "1.0.183"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be02f6cb0cd3a5ec20bbcfbcbd749f57daddb1a0882dc2e46a6c236c90b977ed"
+checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816"
 dependencies = [
  "proc-macro2",
  "quote",

From d5ac38ed9bb3454089f7fe4a4dc4a032aac39220 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 13 Aug 2023 21:51:12 +0200
Subject: [PATCH 222/460] util: split to_flat_coord() and from_flat_coord() out
 of coord_offset()

---
 src/util.rs | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/util.rs b/src/util.rs
index 43245ca..b4fdefe 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -27,6 +27,23 @@ impl ShiftMask for i32 {
 	}
 }
 
+#[inline]
+pub fn to_flat_coord<const AXIS: u8>(
+	region: i8,
+	chunk: ChunkCoord<AXIS>,
+	block: BlockCoord<AXIS>,
+) -> i32 {
+	(region as i32) << (BLOCK_BITS + CHUNK_BITS) | ((chunk.0 as i32) << BLOCK_BITS | block.0 as i32)
+}
+
+#[inline]
+pub fn from_flat_coord<const AXIS: u8>(coord: i32) -> (i8, ChunkCoord<AXIS>, BlockCoord<AXIS>) {
+	let (region_chunk, block) = coord.shift_mask(BLOCK_BITS);
+	let (region, chunk) = region_chunk.shift_mask(CHUNK_BITS);
+	debug_assert!(i8::try_from(region).is_ok());
+	(region as i8, ChunkCoord::new(chunk), BlockCoord::new(block))
+}
+
 /// Offsets a chunk and block coordinate pair by a number of blocks
 ///
 /// As the new coordinate may end up in a different region, a region offset
@@ -37,11 +54,7 @@ pub fn coord_offset<const AXIS: u8>(
 	block: BlockCoord<AXIS>,
 	offset: i32,
 ) -> (i8, ChunkCoord<AXIS>, BlockCoord<AXIS>) {
-	let coord = ((chunk.0 as i32) << BLOCK_BITS | block.0 as i32) + offset;
-	let (region_chunk, block) = coord.shift_mask(BLOCK_BITS);
-	let (region, chunk) = region_chunk.shift_mask(CHUNK_BITS);
-	debug_assert!(i8::try_from(region).is_ok());
-	(region as i8, ChunkCoord::new(chunk), BlockCoord::new(block))
+	from_flat_coord(to_flat_coord(0, chunk, block) + offset)
 }
 
 #[cfg(test)]

From c1260a63b5ce859bfa101c93bc5ce4fc1a01e0e9 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 14 Aug 2023 14:27:52 +0200
Subject: [PATCH 223/460] minedmap: separate collection for region list from
 preprocessing

Preparation for parallel processing, as well as a fix for regions
missing from later steps when the initial processing failed (rather than
using the processed data from a previous run).
---
 src/bin/minedmap/common.rs           |  5 ++
 src/bin/minedmap/main.rs             |  8 +---
 src/bin/minedmap/region_processor.rs | 72 ++++++++++++++--------------
 3 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/src/bin/minedmap/common.rs b/src/bin/minedmap/common.rs
index 44c7ae4..a063bf8 100644
--- a/src/bin/minedmap/common.rs
+++ b/src/bin/minedmap/common.rs
@@ -85,6 +85,11 @@ impl Config {
 		}
 	}
 
+	pub fn region_path(&self, coords: TileCoords) -> PathBuf {
+		let filename = coord_filename(coords, "mca");
+		[&self.region_dir, Path::new(&filename)].iter().collect()
+	}
+
 	pub fn processed_path(&self, coords: TileCoords) -> PathBuf {
 		let filename = coord_filename(coords, "bin");
 		[&self.processed_dir, Path::new(&filename)].iter().collect()
diff --git a/src/bin/minedmap/main.rs b/src/bin/minedmap/main.rs
index 838728c..8d3bbea 100644
--- a/src/bin/minedmap/main.rs
+++ b/src/bin/minedmap/main.rs
@@ -10,7 +10,7 @@ use std::path::PathBuf;
 use anyhow::Result;
 use clap::Parser;
 
-use common::{Config, TileCoords};
+use common::Config;
 use metadata_writer::MetadataWriter;
 use region_processor::RegionProcessor;
 use tile_mipmapper::TileMipmapper;
@@ -28,11 +28,7 @@ fn main() -> Result<()> {
 	let args = Args::parse();
 	let config = Config::new(args);
 
-	let mut regions = RegionProcessor::new(&config).run()?;
-
-	// Sort regions in a zig-zag pattern to optimize cache usage
-	regions.sort_unstable_by_key(|&TileCoords { x, z }| (x, if x % 2 == 0 { z } else { -z }));
-
+	let regions = RegionProcessor::new(&config).run()?;
 	TileRenderer::new(&config).run(&regions)?;
 	let tiles = TileMipmapper::new(&config).run(&regions)?;
 	MetadataWriter::new(&config).run(tiles)?;
diff --git a/src/bin/minedmap/region_processor.rs b/src/bin/minedmap/region_processor.rs
index 34c9555..639dac7 100644
--- a/src/bin/minedmap/region_processor.rs
+++ b/src/bin/minedmap/region_processor.rs
@@ -1,4 +1,4 @@
-use std::{path::Path, time::SystemTime};
+use std::{ffi::OsStr, path::Path, time::SystemTime};
 
 use anyhow::{Context, Result};
 
@@ -16,9 +16,8 @@ use minedmap::{
 use super::common::*;
 
 /// Parses a filename in the format r.X.Z.mca into the contained X and Z values
-fn parse_region_filename(path: &Path) -> Option<TileCoords> {
-	let file_name = path.file_name()?.to_str()?;
-	let parts: Vec<_> = file_name.split('.').collect();
+fn parse_region_filename(file_name: &OsStr) -> Option<TileCoords> {
+	let parts: Vec<_> = file_name.to_str()?.split('.').collect();
 	let &["r", x, z, "mca"] = parts.as_slice() else {
 		return None;
 	};
@@ -45,6 +44,29 @@ impl<'a> RegionProcessor<'a> {
 		}
 	}
 
+	fn collect_regions(&self) -> Result<Vec<TileCoords>> {
+		Ok(self
+			.config
+			.region_dir
+			.read_dir()
+			.with_context(|| {
+				format!(
+					"Failed to read directory {}",
+					self.config.region_dir.display()
+				)
+			})?
+			.filter_map(|entry| entry.ok())
+			.filter(|entry| {
+				// We are only interested in regular files
+				matches!(
+					entry.file_type().map(|file_type| file_type.is_file()),
+					Ok(true)
+				)
+			})
+			.filter_map(|entry| parse_region_filename(&entry.file_name()))
+			.collect())
+	}
+
 	/// Processes a single chunk
 	fn process_chunk(
 		&self,
@@ -91,13 +113,14 @@ impl<'a> RegionProcessor<'a> {
 	}
 
 	/// Processes a single region file
-	fn process_region(&self, path: &Path, coords: TileCoords) -> Result<()> {
+	fn process_region(&self, coords: TileCoords) -> Result<()> {
 		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
 
 		let mut processed_region = ProcessedRegion::default();
 		let mut lightmap = image::GrayAlphaImage::new(N, N);
 
-		let input_timestamp = fs::modified_timestamp(path)?;
+		let path = self.config.region_path(coords);
+		let input_timestamp = fs::modified_timestamp(&path)?;
 
 		let output_path = self.config.processed_path(coords);
 		let output_timestamp = fs::read_timestamp(&output_path, FILE_META_VERSION);
@@ -152,41 +175,20 @@ impl<'a> RegionProcessor<'a> {
 	///
 	/// Returns a list of the coordinates of all processed regions
 	pub fn run(self) -> Result<Vec<TileCoords>> {
-		let read_dir = self.config.region_dir.read_dir().with_context(|| {
-			format!(
-				"Failed to read directory {}",
-				self.config.region_dir.display()
-			)
-		})?;
+		let mut regions = self.collect_regions()?;
+
+		// Sort regions in a zig-zag pattern to optimize cache usage
+		regions.sort_unstable_by_key(|&TileCoords { x, z }| (x, if x % 2 == 0 { z } else { -z }));
 
 		fs::create_dir_all(&self.config.processed_dir)?;
 		fs::create_dir_all(&self.config.tile_dir(TileKind::Lightmap, 0))?;
 
-		let mut ret = Vec::new();
-
-		for entry in read_dir.filter_map(|entry| entry.ok()).filter(|entry| {
-			// We are only interested in regular files
-			entry
-				.file_type()
-				.map(|file_type| file_type.is_file())
-				.unwrap_or_default()
-		}) {
-			let path = entry.path();
-			let Some(coords) = parse_region_filename(&path) else {
-				continue;
-			};
-
-			if let Err(err) = self.process_region(&path, coords) {
-				eprintln!(
-					"Failed to process region {}: {:?}",
-					path.file_name().unwrap_or_default().to_string_lossy(),
-					err,
-				);
+		for &coords in &regions {
+			if let Err(err) = self.process_region(coords) {
+				eprintln!("Failed to process region {:?}: {:?}", coords, err);
 			}
-
-			ret.push(coords);
 		}
 
-		Ok(ret)
+		Ok(regions)
 	}
 }

From 78fe1ec50efc3c4f912e5e28f1590e1c2b84b4e2 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 14 Aug 2023 15:48:05 +0200
Subject: [PATCH 224/460] minedmap: add support for parallel processing

For now, only RegionProcessor and TileMipmapper are run in parallel.
---
 Cargo.lock                           | 151 +++++++++++++++++++++++++++
 Cargo.toml                           |   3 +
 src/bin/minedmap/common.rs           |  12 ++-
 src/bin/minedmap/main.rs             |  19 +++-
 src/bin/minedmap/region_processor.rs |   7 +-
 src/bin/minedmap/tile_mipmapper.rs   |  10 +-
 6 files changed, 191 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9e73977..c6cae9f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -212,6 +212,49 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
+dependencies = [
+ "cfg-if",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
+dependencies = [
+ "autocfg",
+ "cfg-if",
+ "crossbeam-utils",
+ "memoffset",
+ "scopeguard",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "either"
 version = "1.9.0"
@@ -297,6 +340,43 @@ dependencies = [
  "miniz_oxide",
 ]
 
+[[package]]
+name = "futures-core"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "futures-task"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+
+[[package]]
+name = "futures-util"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+dependencies = [
+ "futures-core",
+ "futures-macro",
+ "futures-task",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
 [[package]]
 name = "glam"
 version = "0.24.1"
@@ -416,6 +496,15 @@ dependencies = [
  "hashbrown",
 ]
 
+[[package]]
+name = "memoffset"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "minedmap"
 version = "0.1.0"
@@ -427,12 +516,15 @@ dependencies = [
  "enumflags2",
  "fastnbt",
  "flate2",
+ "futures-util",
  "glam",
  "image",
  "indexmap",
  "itertools",
  "lru",
  "num-integer",
+ "num_cpus",
+ "rayon",
  "rustc-hash",
  "serde",
  "serde_json",
@@ -479,12 +571,34 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
+[[package]]
+name = "pin-project-lite"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
 [[package]]
 name = "pkg-config"
 version = "0.3.27"
@@ -522,6 +636,28 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "rayon"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-utils",
+ "num_cpus",
+]
+
 [[package]]
 name = "rustc-hash"
 version = "1.1.0"
@@ -547,6 +683,12 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
 [[package]]
 name = "serde"
 version = "1.0.183"
@@ -593,6 +735,15 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
 
+[[package]]
+name = "slab"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "strsim"
 version = "0.10.0"
diff --git a/Cargo.toml b/Cargo.toml
index 5d74ce8..c6013ac 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,12 +15,15 @@ clap = { version = "4.1.4", features = ["derive"] }
 enumflags2 = "0.7.5"
 fastnbt = "2.3.2"
 flate2 = "1.0.25"
+futures-util = "0.3.28"
 glam = "0.24.0"
 image = { version = "0.24.5", default-features = false, features = ["png"] }
 indexmap = { version = "2.0.0", features = ["serde"] }
 itertools = "0.11.0"
 lru = "0.11.0"
 num-integer = "0.1.45"
+num_cpus = "1.16.0"
+rayon = "1.7.0"
 rustc-hash = "1.1.0"
 serde = { version = "1.0.152", features = ["rc"] }
 serde_json = "1.0.99"
diff --git a/src/bin/minedmap/common.rs b/src/bin/minedmap/common.rs
index a063bf8..c0c4c8c 100644
--- a/src/bin/minedmap/common.rs
+++ b/src/bin/minedmap/common.rs
@@ -52,6 +52,7 @@ pub struct ProcessedRegion {
 }
 
 pub struct Config {
+	pub num_threads: usize,
 	pub region_dir: PathBuf,
 	pub processed_dir: PathBuf,
 	pub output_dir: PathBuf,
@@ -70,16 +71,23 @@ pub enum TileKind {
 }
 
 impl Config {
-	pub fn new(args: super::Args) -> Self {
+	pub fn new(args: &super::Args) -> Self {
+		let num_threads = match args.jobs {
+			Some(0) => num_cpus::get(),
+			Some(threads) => threads,
+			None => 1,
+		};
+
 		let region_dir = [&args.input_dir, Path::new("region")].iter().collect();
 		let processed_dir = [&args.output_dir, Path::new("processed")].iter().collect();
 		let level_dat_path = [&args.input_dir, Path::new("level.dat")].iter().collect();
 		let metadata_path = [&args.output_dir, Path::new("info.json")].iter().collect();
 
 		Config {
+			num_threads,
 			region_dir,
 			processed_dir,
-			output_dir: args.output_dir,
+			output_dir: args.output_dir.clone(),
 			level_dat_path,
 			metadata_path,
 		}
diff --git a/src/bin/minedmap/main.rs b/src/bin/minedmap/main.rs
index 8d3bbea..55158ed 100644
--- a/src/bin/minedmap/main.rs
+++ b/src/bin/minedmap/main.rs
@@ -7,7 +7,7 @@ mod tile_renderer;
 
 use std::path::PathBuf;
 
-use anyhow::Result;
+use anyhow::{Context, Result};
 use clap::Parser;
 
 use common::Config;
@@ -18,15 +18,30 @@ use tile_renderer::TileRenderer;
 
 #[derive(Debug, Parser)]
 pub struct Args {
+	/// Number of parallel threads to use for processing
+	///
+	/// If not given, only a single thread is used. Pass 0 to
+	/// use one thread per logical CPU core.
+	#[arg(short, long)]
+	pub jobs: Option<usize>,
 	/// Minecraft save directory
 	pub input_dir: PathBuf,
 	/// MinedMap data directory
 	pub output_dir: PathBuf,
 }
 
+fn setup_threads(num_threads: usize) -> Result<()> {
+	rayon::ThreadPoolBuilder::new()
+		.num_threads(num_threads)
+		.build_global()
+		.context("Failed to configure thread pool")
+}
+
 fn main() -> Result<()> {
 	let args = Args::parse();
-	let config = Config::new(args);
+	let config = Config::new(&args);
+
+	setup_threads(config.num_threads)?;
 
 	let regions = RegionProcessor::new(&config).run()?;
 	TileRenderer::new(&config).run(&regions)?;
diff --git a/src/bin/minedmap/region_processor.rs b/src/bin/minedmap/region_processor.rs
index 639dac7..6aa2cb4 100644
--- a/src/bin/minedmap/region_processor.rs
+++ b/src/bin/minedmap/region_processor.rs
@@ -1,8 +1,9 @@
 use std::{ffi::OsStr, path::Path, time::SystemTime};
 
 use anyhow::{Context, Result};
-
 use indexmap::IndexSet;
+use rayon::prelude::*;
+
 use minedmap::{
 	io::{fs, storage},
 	resource::{self, Biome},
@@ -183,11 +184,11 @@ impl<'a> RegionProcessor<'a> {
 		fs::create_dir_all(&self.config.processed_dir)?;
 		fs::create_dir_all(&self.config.tile_dir(TileKind::Lightmap, 0))?;
 
-		for &coords in &regions {
+		regions.par_iter().for_each(|&coords| {
 			if let Err(err) = self.process_region(coords) {
 				eprintln!("Failed to process region {:?}: {:?}", coords, err);
 			}
-		}
+		});
 
 		Ok(regions)
 	}
diff --git a/src/bin/minedmap/tile_mipmapper.rs b/src/bin/minedmap/tile_mipmapper.rs
index 40add3a..2c1e9d6 100644
--- a/src/bin/minedmap/tile_mipmapper.rs
+++ b/src/bin/minedmap/tile_mipmapper.rs
@@ -1,4 +1,5 @@
 use anyhow::{Context, Result};
+use rayon::prelude::*;
 
 use minedmap::{io::fs, types::*};
 
@@ -151,8 +152,8 @@ impl<'a> TileMipmapper<'a> {
 
 			let next = Self::map_coords(prev);
 
-			for (&z, xs) in &next.0 {
-				for &x in xs {
+			next.0.par_iter().try_for_each(|(&z, xs)| {
+				xs.par_iter().try_for_each(|&x| {
 					let coords = TileCoords { x, z };
 					self.render_mipmap::<image::Rgba<u8>>(TileKind::Map, level, coords, prev)?;
 					self.render_mipmap::<image::LumaA<u8>>(
@@ -161,8 +162,9 @@ impl<'a> TileMipmapper<'a> {
 						coords,
 						prev,
 					)?;
-				}
-			}
+					anyhow::Ok(())
+				})
+			})?;
 
 			tile_stack.push(next);
 		}

From dcc9e6e794c46efb9b0fa368d3b771f55857520b Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 14 Aug 2023 22:32:06 +0200
Subject: [PATCH 225/460] minedmap/region_group: add async map functions

---
 src/bin/minedmap/region_group.rs | 43 +++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/bin/minedmap/region_group.rs b/src/bin/minedmap/region_group.rs
index aa7088c..1f87b1c 100644
--- a/src/bin/minedmap/region_group.rs
+++ b/src/bin/minedmap/region_group.rs
@@ -1,6 +1,7 @@
-use std::iter;
+use std::{future::Future, iter};
 
 use anyhow::Result;
+use futures_util::future::OptionFuture;
 
 /// A generic array of 3x3 elements
 ///
@@ -70,6 +71,46 @@ impl<T> RegionGroup<T> {
 		Ok(RegionGroup { center, neighs })
 	}
 
+	#[allow(dead_code)]
+	pub async fn async_map<U, F, Fut>(self, mut f: F) -> RegionGroup<U>
+	where
+		Fut: Future<Output = U>,
+		F: FnMut(T) -> Fut,
+	{
+		let center = f(self.center);
+		let neighs = futures_util::future::join_all(
+			self.neighs
+				.map(|entry| OptionFuture::from(entry.map(&mut f))),
+		);
+		let (center, neighs) = futures_util::join!(center, neighs);
+		RegionGroup {
+			center,
+			neighs: <[Option<_>; 9]>::try_from(neighs).ok().unwrap(),
+		}
+	}
+
+	pub async fn async_try_map<U, F, Fut>(self, mut f: F) -> Result<RegionGroup<U>>
+	where
+		Fut: Future<Output = Result<U>>,
+		F: FnMut(T) -> Fut,
+	{
+		let center = f(self.center);
+		let neighs = futures_util::future::join_all(
+			self.neighs
+				.map(|entry| OptionFuture::from(entry.map(&mut f))),
+		);
+		let (center, neighs) = futures_util::join!(center, neighs);
+		let center = center?;
+
+		let neighs: Vec<_> = neighs
+			.into_iter()
+			.map(|entry| entry.and_then(Result::ok))
+			.collect();
+		let neighs = <[Option<_>; 9]>::try_from(neighs).ok().unwrap();
+
+		Ok(RegionGroup { center, neighs })
+	}
+
 	pub fn iter(&self) -> impl Iterator<Item = &T> {
 		iter::once(&self.center).chain(self.neighs.iter().filter_map(Option::as_ref))
 	}

From b5980b82af95443a4a7f8bfdd73d7015535f93c1 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 14 Aug 2023 21:59:16 +0200
Subject: [PATCH 226/460] minedmap/tile_renderer: async region cache

Prepare for sharing the region cache between multiple threads by making
lookup/load async.
---
 Cargo.lock                        | 111 ++++++++++++++++++++++++++++++
 Cargo.toml                        |   1 +
 src/bin/minedmap/main.rs          |   6 +-
 src/bin/minedmap/tile_renderer.rs |  86 +++++++++++++----------
 4 files changed, 165 insertions(+), 39 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c6cae9f..fcf88f7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,6 +2,15 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "addr2line"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
+dependencies = [
+ "gimli",
+]
+
 [[package]]
 name = "adler"
 version = "1.0.2"
@@ -86,6 +95,21 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
+[[package]]
+name = "backtrace"
+version = "0.3.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
 [[package]]
 name = "bincode"
 version = "1.3.3"
@@ -377,6 +401,12 @@ dependencies = [
  "slab",
 ]
 
+[[package]]
+name = "gimli"
+version = "0.27.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
+
 [[package]]
 name = "glam"
 version = "0.24.1"
@@ -487,6 +517,16 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
 
+[[package]]
+name = "lock_api"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
 [[package]]
 name = "lru"
 version = "0.11.0"
@@ -496,6 +536,12 @@ dependencies = [
  "hashbrown",
 ]
 
+[[package]]
+name = "memchr"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+
 [[package]]
 name = "memoffset"
 version = "0.9.0"
@@ -528,6 +574,7 @@ dependencies = [
  "rustc-hash",
  "serde",
  "serde_json",
+ "tokio",
  "zstd",
 ]
 
@@ -581,12 +628,44 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "object"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
+[[package]]
+name = "parking_lot"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-targets",
+]
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.12"
@@ -658,6 +737,21 @@ dependencies = [
  "num_cpus",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+
 [[package]]
 name = "rustc-hash"
 version = "1.1.0"
@@ -744,6 +838,12 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "smallvec"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
+
 [[package]]
 name = "strsim"
 version = "0.10.0"
@@ -761,6 +861,17 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "tokio"
+version = "1.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40de3a2ba249dcb097e01be5e67a5ff53cf250397715a071a81543e8a832a920"
+dependencies = [
+ "backtrace",
+ "parking_lot",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.11"
diff --git a/Cargo.toml b/Cargo.toml
index c6013ac..111ee92 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,6 +27,7 @@ rayon = "1.7.0"
 rustc-hash = "1.1.0"
 serde = { version = "1.0.152", features = ["rc"] }
 serde_json = "1.0.99"
+tokio = { version = "1.31.0", features = ["rt", "parking_lot", "sync"] }
 zstd = "0.12.3"
 
 [features]
diff --git a/src/bin/minedmap/main.rs b/src/bin/minedmap/main.rs
index 55158ed..05a0a38 100644
--- a/src/bin/minedmap/main.rs
+++ b/src/bin/minedmap/main.rs
@@ -43,8 +43,12 @@ fn main() -> Result<()> {
 
 	setup_threads(config.num_threads)?;
 
+	let rt = tokio::runtime::Builder::new_current_thread()
+		.build()
+		.unwrap();
+
 	let regions = RegionProcessor::new(&config).run()?;
-	TileRenderer::new(&config).run(&regions)?;
+	TileRenderer::new(&config, &rt).run(&regions)?;
 	let tiles = TileMipmapper::new(&config).run(&regions)?;
 	MetadataWriter::new(&config).run(tiles)?;
 
diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index def56b4..3596e0a 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -1,13 +1,14 @@
 use std::{
 	num::NonZeroUsize,
-	path::{Path, PathBuf},
-	rc::Rc,
+	path::PathBuf,
+	sync::{Arc, Mutex},
 	time::SystemTime,
 };
 
 use anyhow::{Context, Result};
 use glam::Vec3;
 use lru::LruCache;
+use tokio::sync::OnceCell;
 
 use minedmap::{
 	io::{fs, storage},
@@ -18,8 +19,10 @@ use minedmap::{
 
 use super::{common::*, region_group::RegionGroup};
 
+type RegionRef = Arc<ProcessedRegion>;
+
 fn biome_at(
-	region_group: &RegionGroup<Rc<ProcessedRegion>>,
+	region_group: &RegionGroup<RegionRef>,
 	chunk: ChunkCoords,
 	block: LayerBlockCoords,
 	dx: i32,
@@ -45,37 +48,51 @@ fn biome_at(
 
 pub struct TileRenderer<'a> {
 	config: &'a Config,
+	rt: &'a tokio::runtime::Runtime,
+	region_cache: Mutex<LruCache<PathBuf, Arc<OnceCell<RegionRef>>>>,
 }
 
 impl<'a> TileRenderer<'a> {
-	pub fn new(config: &'a Config) -> Self {
-		TileRenderer { config }
-	}
-
-	fn load_region(
-		region_cache: &mut LruCache<PathBuf, Rc<ProcessedRegion>>,
-		processed_path: &Path,
-	) -> Result<Rc<ProcessedRegion>> {
-		if let Some(region) = region_cache.get(processed_path) {
-			return Ok(region.clone());
+	pub fn new(config: &'a Config, rt: &'a tokio::runtime::Runtime) -> Self {
+		let region_cache = Mutex::new(LruCache::new(NonZeroUsize::new(12).unwrap()));
+		TileRenderer {
+			config,
+			rt,
+			region_cache,
 		}
-
-		let region: Rc<ProcessedRegion> =
-			storage::read(processed_path).context("Failed to load processed region data")?;
-		region_cache.put(processed_path.to_owned(), region.clone());
-
-		Ok(region)
 	}
 
-	fn load_region_group(
-		region_cache: &mut LruCache<PathBuf, Rc<ProcessedRegion>>,
+	async fn load_region(&self, processed_path: PathBuf) -> Result<RegionRef> {
+		let region_loader = {
+			let mut region_cache = self.region_cache.lock().unwrap();
+			if let Some(region_loader) = region_cache.get(&processed_path) {
+				Arc::clone(region_loader)
+			} else {
+				let region_loader = Default::default();
+				region_cache.put(processed_path.clone(), Arc::clone(&region_loader));
+				region_loader
+			}
+		};
+
+		region_loader
+			.get_or_try_init(|| async {
+				storage::read(&processed_path).context("Failed to load processed region data")
+			})
+			.await
+			.cloned()
+	}
+
+	async fn load_region_group(
+		&self,
 		processed_paths: RegionGroup<PathBuf>,
-	) -> Result<RegionGroup<Rc<ProcessedRegion>>> {
-		processed_paths.try_map(|path| Self::load_region(region_cache, &path))
+	) -> Result<RegionGroup<RegionRef>> {
+		processed_paths
+			.async_try_map(move |path| self.load_region(path))
+			.await
 	}
 
 	fn block_color_at(
-		region_group: &RegionGroup<Rc<ProcessedRegion>>,
+		region_group: &RegionGroup<RegionRef>,
 		chunk: &ProcessedChunk,
 		chunk_coords: ChunkCoords,
 		block_coords: LayerBlockCoords,
@@ -139,7 +156,7 @@ impl<'a> TileRenderer<'a> {
 
 	fn render_chunk(
 		image: &mut image::RgbaImage,
-		region_group: &RegionGroup<Rc<ProcessedRegion>>,
+		region_group: &RegionGroup<RegionRef>,
 		chunk: &ProcessedChunk,
 		chunk_coords: ChunkCoords,
 	) {
@@ -160,10 +177,7 @@ impl<'a> TileRenderer<'a> {
 		overlay_chunk(image, &chunk_image, chunk_coords);
 	}
 
-	fn render_region(
-		image: &mut image::RgbaImage,
-		region_group: &RegionGroup<Rc<ProcessedRegion>>,
-	) {
+	fn render_region(image: &mut image::RgbaImage, region_group: &RegionGroup<RegionRef>) {
 		for (coords, chunk) in region_group.center().chunks.iter() {
 			let Some(chunk) = chunk else {
 				continue;
@@ -198,11 +212,7 @@ impl<'a> TileRenderer<'a> {
 		Ok((paths, max_timestamp))
 	}
 
-	fn render_tile(
-		&self,
-		region_cache: &mut LruCache<PathBuf, Rc<ProcessedRegion>>,
-		coords: TileCoords,
-	) -> Result<()> {
+	fn render_tile(&self, coords: TileCoords) -> Result<()> {
 		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
 
 		let (processed_paths, processed_timestamp) = self.processed_sources(coords)?;
@@ -229,7 +239,9 @@ impl<'a> TileRenderer<'a> {
 				.display(),
 		);
 
-		let region_group = Self::load_region_group(region_cache, processed_paths)
+		let region_group = self
+			.rt
+			.block_on(self.load_region_group(processed_paths))
 			.with_context(|| format!("Region {:?} from previous step must be loadable", coords))?;
 		let mut image = image::RgbaImage::new(N, N);
 		Self::render_region(&mut image, &region_group);
@@ -249,10 +261,8 @@ impl<'a> TileRenderer<'a> {
 	pub fn run(self, regions: &[TileCoords]) -> Result<()> {
 		fs::create_dir_all(&self.config.tile_dir(TileKind::Map, 0))?;
 
-		let mut region_cache = LruCache::new(NonZeroUsize::new(12).unwrap());
-
 		for &coords in regions {
-			if let Err(err) = self.render_tile(&mut region_cache, coords) {
+			if let Err(err) = self.render_tile(coords) {
 				eprintln!("Failed to render tile {:?}: {:?}", coords, err);
 			}
 		}

From 155171803df021fd3dd5cff25c608ac95d1bf7a9 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 14 Aug 2023 22:40:20 +0200
Subject: [PATCH 227/460] minedmap/tile_renderer: parallel processing

---
 src/bin/minedmap/tile_renderer.rs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index 3596e0a..30276a8 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -8,6 +8,7 @@ use std::{
 use anyhow::{Context, Result};
 use glam::Vec3;
 use lru::LruCache;
+use rayon::prelude::*;
 use tokio::sync::OnceCell;
 
 use minedmap::{
@@ -54,7 +55,9 @@ pub struct TileRenderer<'a> {
 
 impl<'a> TileRenderer<'a> {
 	pub fn new(config: &'a Config, rt: &'a tokio::runtime::Runtime) -> Self {
-		let region_cache = Mutex::new(LruCache::new(NonZeroUsize::new(12).unwrap()));
+		let region_cache = Mutex::new(LruCache::new(
+			NonZeroUsize::new(6 + 6 * config.num_threads).unwrap(),
+		));
 		TileRenderer {
 			config,
 			rt,
@@ -261,11 +264,12 @@ impl<'a> TileRenderer<'a> {
 	pub fn run(self, regions: &[TileCoords]) -> Result<()> {
 		fs::create_dir_all(&self.config.tile_dir(TileKind::Map, 0))?;
 
-		for &coords in regions {
+		// Use par_bridge to process items in order (for better use of region cache)
+		regions.iter().par_bridge().for_each(|&coords| {
 			if let Err(err) = self.render_tile(coords) {
 				eprintln!("Failed to render tile {:?}: {:?}", coords, err);
 			}
-		}
+		});
 
 		Ok(())
 	}

From 6a82fcc9b48e0bf4efd3dc679c59a008937130a1 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 15 Aug 2023 18:31:53 +0200
Subject: [PATCH 228/460] minedmap/tile_renderer: terminate on errors

Only the processing step may fail for individual tiles (when a region is
currently being saved when attempting to process it), the other steps
should never fail.
---
 src/bin/minedmap/tile_renderer.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index 30276a8..a7c3121 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -265,11 +265,10 @@ impl<'a> TileRenderer<'a> {
 		fs::create_dir_all(&self.config.tile_dir(TileKind::Map, 0))?;
 
 		// Use par_bridge to process items in order (for better use of region cache)
-		regions.iter().par_bridge().for_each(|&coords| {
-			if let Err(err) = self.render_tile(coords) {
-				eprintln!("Failed to render tile {:?}: {:?}", coords, err);
-			}
-		});
+		regions.iter().par_bridge().try_for_each(|&coords| {
+			self.render_tile(coords)
+				.with_context(|| format!("Failed to render tile {:?}", coords))
+		})?;
 
 		Ok(())
 	}

From 722fe00d77763f0db99e5d566d61d7ed0c86becd Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 15 Aug 2023 18:45:38 +0200
Subject: [PATCH 229/460] minedmap: move inputs to processing steps from run()
 to new()

---
 src/bin/minedmap/main.rs            |  6 +++---
 src/bin/minedmap/metadata_writer.rs | 17 +++++++++--------
 src/bin/minedmap/tile_mipmapper.rs  |  9 +++++----
 src/bin/minedmap/tile_renderer.rs   | 12 +++++++++---
 4 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/bin/minedmap/main.rs b/src/bin/minedmap/main.rs
index 05a0a38..ebeae87 100644
--- a/src/bin/minedmap/main.rs
+++ b/src/bin/minedmap/main.rs
@@ -48,9 +48,9 @@ fn main() -> Result<()> {
 		.unwrap();
 
 	let regions = RegionProcessor::new(&config).run()?;
-	TileRenderer::new(&config, &rt).run(&regions)?;
-	let tiles = TileMipmapper::new(&config).run(&regions)?;
-	MetadataWriter::new(&config).run(tiles)?;
+	TileRenderer::new(&config, &rt, &regions).run()?;
+	let tiles = TileMipmapper::new(&config, &regions).run()?;
+	MetadataWriter::new(&config, &tiles).run()?;
 
 	Ok(())
 }
diff --git a/src/bin/minedmap/metadata_writer.rs b/src/bin/minedmap/metadata_writer.rs
index 437152a..3862362 100644
--- a/src/bin/minedmap/metadata_writer.rs
+++ b/src/bin/minedmap/metadata_writer.rs
@@ -4,10 +4,6 @@ use serde::Serialize;
 
 use super::common::*;
 
-pub struct MetadataWriter<'a> {
-	config: &'a Config,
-}
-
 #[derive(Debug, Serialize)]
 #[serde(rename_all = "camelCase")]
 struct Bounds {
@@ -35,9 +31,14 @@ struct Metadata<'t> {
 	spawn: Spawn,
 }
 
+pub struct MetadataWriter<'a> {
+	config: &'a Config,
+	tiles: &'a [TileCoordMap],
+}
+
 impl<'a> MetadataWriter<'a> {
-	pub fn new(config: &'a Config) -> Self {
-		MetadataWriter { config }
+	pub fn new(config: &'a Config, tiles: &'a [TileCoordMap]) -> Self {
+		MetadataWriter { config, tiles }
 	}
 
 	fn mipmap_entry(regions: &TileCoordMap) -> Mipmap {
@@ -87,7 +88,7 @@ impl<'a> MetadataWriter<'a> {
 		}
 	}
 
-	pub fn run(&self, tiles: Vec<TileCoordMap>) -> Result<()> {
+	pub fn run(self) -> Result<()> {
 		let level_dat = self.read_level_dat()?;
 
 		let mut metadata = Metadata {
@@ -95,7 +96,7 @@ impl<'a> MetadataWriter<'a> {
 			spawn: Self::spawn(&level_dat),
 		};
 
-		for tile_map in tiles.iter() {
+		for tile_map in self.tiles.iter() {
 			metadata.mipmaps.push(Self::mipmap_entry(tile_map));
 		}
 
diff --git a/src/bin/minedmap/tile_mipmapper.rs b/src/bin/minedmap/tile_mipmapper.rs
index 2c1e9d6..4a8cf63 100644
--- a/src/bin/minedmap/tile_mipmapper.rs
+++ b/src/bin/minedmap/tile_mipmapper.rs
@@ -7,11 +7,12 @@ use super::common::*;
 
 pub struct TileMipmapper<'a> {
 	config: &'a Config,
+	regions: &'a [TileCoords],
 }
 
 impl<'a> TileMipmapper<'a> {
-	pub fn new(config: &'a Config) -> Self {
-		TileMipmapper { config }
+	pub fn new(config: &'a Config, regions: &'a [TileCoords]) -> Self {
+		TileMipmapper { config, regions }
 	}
 
 	fn done(tiles: &TileCoordMap) -> bool {
@@ -129,11 +130,11 @@ impl<'a> TileMipmapper<'a> {
 		})
 	}
 
-	pub fn run(self, tiles: &[TileCoords]) -> Result<Vec<TileCoordMap>> {
+	pub fn run(self) -> Result<Vec<TileCoordMap>> {
 		let mut tile_stack = {
 			let mut tile_map = TileCoordMap::default();
 
-			for &TileCoords { x, z } in tiles {
+			for &TileCoords { x, z } in self.regions {
 				tile_map.0.entry(z).or_default().insert(x);
 			}
 
diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index a7c3121..048cf77 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -50,17 +50,23 @@ fn biome_at(
 pub struct TileRenderer<'a> {
 	config: &'a Config,
 	rt: &'a tokio::runtime::Runtime,
+	regions: &'a [TileCoords],
 	region_cache: Mutex<LruCache<PathBuf, Arc<OnceCell<RegionRef>>>>,
 }
 
 impl<'a> TileRenderer<'a> {
-	pub fn new(config: &'a Config, rt: &'a tokio::runtime::Runtime) -> Self {
+	pub fn new(
+		config: &'a Config,
+		rt: &'a tokio::runtime::Runtime,
+		regions: &'a [TileCoords],
+	) -> Self {
 		let region_cache = Mutex::new(LruCache::new(
 			NonZeroUsize::new(6 + 6 * config.num_threads).unwrap(),
 		));
 		TileRenderer {
 			config,
 			rt,
+			regions,
 			region_cache,
 		}
 	}
@@ -261,11 +267,11 @@ impl<'a> TileRenderer<'a> {
 		)
 	}
 
-	pub fn run(self, regions: &[TileCoords]) -> Result<()> {
+	pub fn run(self) -> Result<()> {
 		fs::create_dir_all(&self.config.tile_dir(TileKind::Map, 0))?;
 
 		// Use par_bridge to process items in order (for better use of region cache)
-		regions.iter().par_bridge().try_for_each(|&coords| {
+		self.regions.iter().par_bridge().try_for_each(|&coords| {
 			self.render_tile(coords)
 				.with_context(|| format!("Failed to render tile {:?}", coords))
 		})?;

From 427a992897781bd0fbcd7085227fdd86788936c4 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 15 Aug 2023 20:48:41 +0200
Subject: [PATCH 230/460] minedmap/tile_renderer: keep HashSet of populated
 regions

Rather than attemping to read the file metadata, it's more elegant to
check whether a tile is supposed to be available first.
---
 src/bin/minedmap/common.rs        |  2 +-
 src/bin/minedmap/region_group.rs  | 23 +++++++++++------------
 src/bin/minedmap/tile_renderer.rs |  7 ++++++-
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/bin/minedmap/common.rs b/src/bin/minedmap/common.rs
index c0c4c8c..48cebf8 100644
--- a/src/bin/minedmap/common.rs
+++ b/src/bin/minedmap/common.rs
@@ -12,7 +12,7 @@ use minedmap::{io::fs::FileMetaVersion, resource::Biome, types::*, world::layer}
 // Increase to force regeneration of all output files
 pub const FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
 
-#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct TileCoords {
 	pub x: i32,
 	pub z: i32,
diff --git a/src/bin/minedmap/region_group.rs b/src/bin/minedmap/region_group.rs
index 1f87b1c..be46511 100644
--- a/src/bin/minedmap/region_group.rs
+++ b/src/bin/minedmap/region_group.rs
@@ -16,25 +16,24 @@ pub struct RegionGroup<T> {
 }
 
 impl<T> RegionGroup<T> {
-	pub fn new<F>(f: F) -> Result<Self>
+	pub fn new<F>(f: F) -> Self
 	where
-		F: Fn(i8, i8) -> Result<T>,
+		F: Fn(i8, i8) -> Option<T>,
 	{
 		RegionGroup {
-			center: (0, 0),
+			center: f(0, 0).expect("Center element of RegionGroup must not be None"),
 			neighs: [
-				Some((-1, -1)),
-				Some((-1, 0)),
-				Some((-1, 1)),
-				Some((0, -1)),
+				f(-1, -1),
+				f(-1, 0),
+				f(-1, 1),
+				f(0, -1),
 				None,
-				Some((0, 1)),
-				Some((1, -1)),
-				Some((1, 0)),
-				Some((1, 1)),
+				f(0, 1),
+				f(1, -1),
+				f(1, 0),
+				f(1, 1),
 			],
 		}
-		.try_map(|(x, z)| f(x, z))
 	}
 
 	pub fn center(&self) -> &T {
diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index 048cf77..bc59b23 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -51,6 +51,7 @@ pub struct TileRenderer<'a> {
 	config: &'a Config,
 	rt: &'a tokio::runtime::Runtime,
 	regions: &'a [TileCoords],
+	region_set: rustc_hash::FxHashSet<TileCoords>,
 	region_cache: Mutex<LruCache<PathBuf, Arc<OnceCell<RegionRef>>>>,
 }
 
@@ -63,10 +64,12 @@ impl<'a> TileRenderer<'a> {
 		let region_cache = Mutex::new(LruCache::new(
 			NonZeroUsize::new(6 + 6 * config.num_threads).unwrap(),
 		));
+		let region_set = regions.iter().copied().collect();
 		TileRenderer {
 			config,
 			rt,
 			regions,
+			region_set,
 			region_cache,
 		}
 	}
@@ -204,11 +207,13 @@ impl<'a> TileRenderer<'a> {
 
 	fn processed_sources(&self, coords: TileCoords) -> Result<(RegionGroup<PathBuf>, SystemTime)> {
 		let sources = RegionGroup::new(|x, z| {
-			self.processed_source(TileCoords {
+			Some(TileCoords {
 				x: coords.x + (x as i32),
 				z: coords.z + (z as i32),
 			})
+			.filter(|entry| self.region_set.contains(entry))
 		})
+		.try_map(|entry| self.processed_source(entry))
 		.with_context(|| format!("Region {:?} from previous step must exist", coords))?;
 
 		let max_timestamp = *sources

From 2a92eefd09f3e75787d68a7cd95dea2e3f707a9d Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 18 Aug 2023 18:34:12 +0200
Subject: [PATCH 231/460] resource/generate.py: fix usage message

---
 resource/generate.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resource/generate.py b/resource/generate.py
index fabff63..73bb91d 100755
--- a/resource/generate.py
+++ b/resource/generate.py
@@ -6,7 +6,7 @@ import sys
 
 
 if len(sys.argv) != 3:
-	sys.exit('Usage: extract.py <colors.json> <block_types.rs>')
+	sys.exit('Usage: generate.py <colors.json> <block_types.rs>')
 
 with open(sys.argv[1]) as f:
 	colors = json.load(f)

From 0542f2ea1199f326df05de8655910bcdf3f68343 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 18 Aug 2023 18:34:22 +0200
Subject: [PATCH 232/460] resource/README.md: update for Rust implementation

---
 resource/README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/resource/README.md b/resource/README.md
index f9dc955..5211fd3 100644
--- a/resource/README.md
+++ b/resource/README.md
@@ -10,7 +10,7 @@ work.
   of two different versions
 - `extract.py`: Takes the block type information from `blocks.json` and texture data
   from an unpacked Minecraft JAR, storing the result in `colors.json`
-- `generate.py`: Generates `BlockType.inc.cpp` from `colors.json`
+- `generate.py`: Generates `block_types.rs` from `colors.json`
 
 In addition to these scripts, the JSON processor *jq* is a useful tool to work
 with MinedMap's resource metadata.
@@ -63,7 +63,8 @@ with MinedMap's resource metadata.
 7. Update the source code with the new block colors:
 
      ```sh
-     ./generate.py colors.json ../src/Resource/BlockType.inc.cpp
+     ./generate.py colors.json ../src/resource/block_types.rs
+     cargo fmt
      ```
 
 After the update, the new version should be tested with old savegames (both

From 0842cb4ec2c193f0ba5a00018221ca3881d4607b Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 18 Aug 2023 19:20:21 +0200
Subject: [PATCH 233/460] Rename library crate to minedmap-core

Rustdoc can't deal with a bin and lib crate with the same name.
---
 Cargo.lock                           |  2 +-
 Cargo.toml                           |  2 +-
 src/bin/minedmap/common.rs           |  2 +-
 src/bin/minedmap/main.rs             |  2 ++
 src/bin/minedmap/metadata_writer.rs  |  9 +++++----
 src/bin/minedmap/region_processor.rs | 20 +++++++++++---------
 src/bin/minedmap/tile_mipmapper.rs   |  7 ++++---
 src/bin/minedmap/tile_renderer.rs    | 16 +++++++++-------
 src/bin/nbtdump.rs                   |  2 +-
 src/bin/regiondump.rs                |  2 +-
 10 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index fcf88f7..e6735e0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -552,7 +552,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "minedmap"
+name = "minedmap-core"
 version = "0.1.0"
 dependencies = [
  "anyhow",
diff --git a/Cargo.toml b/Cargo.toml
index 111ee92..62fcd3c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "minedmap"
+name = "minedmap-core"
 version = "0.1.0"
 edition = "2021"
 license = "MIT"
diff --git a/src/bin/minedmap/common.rs b/src/bin/minedmap/common.rs
index 48cebf8..df15d99 100644
--- a/src/bin/minedmap/common.rs
+++ b/src/bin/minedmap/common.rs
@@ -7,7 +7,7 @@ use std::{
 use indexmap::IndexSet;
 use serde::{Deserialize, Serialize};
 
-use minedmap::{io::fs::FileMetaVersion, resource::Biome, types::*, world::layer};
+use super::core::{io::fs::FileMetaVersion, resource::Biome, types::*, world::layer};
 
 // Increase to force regeneration of all output files
 pub const FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
diff --git a/src/bin/minedmap/main.rs b/src/bin/minedmap/main.rs
index ebeae87..046fbb5 100644
--- a/src/bin/minedmap/main.rs
+++ b/src/bin/minedmap/main.rs
@@ -5,6 +5,8 @@ mod region_processor;
 mod tile_mipmapper;
 mod tile_renderer;
 
+use minedmap_core as core;
+
 use std::path::PathBuf;
 
 use anyhow::{Context, Result};
diff --git a/src/bin/minedmap/metadata_writer.rs b/src/bin/minedmap/metadata_writer.rs
index 3862362..98b086a 100644
--- a/src/bin/minedmap/metadata_writer.rs
+++ b/src/bin/minedmap/metadata_writer.rs
@@ -1,8 +1,10 @@
 use anyhow::{Context, Result};
-use minedmap::{io::fs, world::de};
 use serde::Serialize;
 
-use super::common::*;
+use super::{
+	common::*,
+	core::{self, io::fs, world::de},
+};
 
 #[derive(Debug, Serialize)]
 #[serde(rename_all = "camelCase")]
@@ -77,8 +79,7 @@ impl<'a> MetadataWriter<'a> {
 	}
 
 	fn read_level_dat(&self) -> Result<de::LevelDat> {
-		minedmap::io::data::from_file(&self.config.level_dat_path)
-			.context("Failed to read level.dat")
+		core::io::data::from_file(&self.config.level_dat_path).context("Failed to read level.dat")
 	}
 
 	fn spawn(level_dat: &de::LevelDat) -> Spawn {
diff --git a/src/bin/minedmap/region_processor.rs b/src/bin/minedmap/region_processor.rs
index 6aa2cb4..983aa03 100644
--- a/src/bin/minedmap/region_processor.rs
+++ b/src/bin/minedmap/region_processor.rs
@@ -4,18 +4,20 @@ use anyhow::{Context, Result};
 use indexmap::IndexSet;
 use rayon::prelude::*;
 
-use minedmap::{
-	io::{fs, storage},
-	resource::{self, Biome},
-	types::*,
-	world::{
+use super::{
+	common::*,
+	core::{
 		self,
-		layer::{self, LayerData},
+		io::{fs, storage},
+		resource::{self, Biome},
+		types::*,
+		world::{
+			self,
+			layer::{self, LayerData},
+		},
 	},
 };
 
-use super::common::*;
-
 /// Parses a filename in the format r.X.Z.mca into the contained X and Z values
 fn parse_region_filename(file_name: &OsStr) -> Option<TileCoords> {
 	let parts: Vec<_> = file_name.to_str()?.split('.').collect();
@@ -136,7 +138,7 @@ impl<'a> RegionProcessor<'a> {
 
 		println!("Processing region r.{}.{}.mca", coords.x, coords.z);
 
-		minedmap::io::region::from_file(path)?.foreach_chunk(
+		core::io::region::from_file(path)?.foreach_chunk(
 			|chunk_coords, data: world::de::Chunk| {
 				let Some(layer::LayerData {
 					blocks,
diff --git a/src/bin/minedmap/tile_mipmapper.rs b/src/bin/minedmap/tile_mipmapper.rs
index 4a8cf63..14a2ec0 100644
--- a/src/bin/minedmap/tile_mipmapper.rs
+++ b/src/bin/minedmap/tile_mipmapper.rs
@@ -1,9 +1,10 @@
 use anyhow::{Context, Result};
 use rayon::prelude::*;
 
-use minedmap::{io::fs, types::*};
-
-use super::common::*;
+use super::{
+	common::*,
+	core::{io::fs, types::*},
+};
 
 pub struct TileMipmapper<'a> {
 	config: &'a Config,
diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index bc59b23..409db6d 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -11,15 +11,17 @@ use lru::LruCache;
 use rayon::prelude::*;
 use tokio::sync::OnceCell;
 
-use minedmap::{
-	io::{fs, storage},
-	resource::{block_color, needs_biome},
-	types::*,
-	util::coord_offset,
+use super::{
+	common::*,
+	core::{
+		io::{fs, storage},
+		resource::{block_color, needs_biome},
+		types::*,
+		util::coord_offset,
+	},
+	region_group::RegionGroup,
 };
 
-use super::{common::*, region_group::RegionGroup};
-
 type RegionRef = Arc<ProcessedRegion>;
 
 fn biome_at(
diff --git a/src/bin/nbtdump.rs b/src/bin/nbtdump.rs
index d944cf2..e68c376 100644
--- a/src/bin/nbtdump.rs
+++ b/src/bin/nbtdump.rs
@@ -12,7 +12,7 @@ struct Args {
 fn main() -> Result<()> {
 	let args = Args::parse();
 
-	let value: fastnbt::Value = minedmap::io::data::from_file(args.file.as_path())?;
+	let value: fastnbt::Value = minedmap_core::io::data::from_file(args.file.as_path())?;
 	println!("{:#x?}", value);
 
 	Ok(())
diff --git a/src/bin/regiondump.rs b/src/bin/regiondump.rs
index f3b7210..9dfac2f 100644
--- a/src/bin/regiondump.rs
+++ b/src/bin/regiondump.rs
@@ -12,7 +12,7 @@ struct Args {
 fn main() -> Result<()> {
 	let args = Args::parse();
 
-	minedmap::io::region::from_file(args.file.as_path())?.foreach_chunk(
+	minedmap_core::io::region::from_file(args.file.as_path())?.foreach_chunk(
 		|coords, value: fastnbt::Value| {
 			println!("Chunk {:?}: {:#x?}", coords, value);
 			Ok(())

From ba86dc8c062b9811c994fbc03955799bbbd0851d Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 19 Aug 2023 16:01:51 +0200
Subject: [PATCH 234/460] resource: use serde feature of enumflags2 crate

---
 Cargo.lock          |  1 +
 Cargo.toml          |  2 +-
 src/resource/mod.rs | 23 ++---------------------
 3 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e6735e0..06f1283 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -292,6 +292,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2"
 dependencies = [
  "enumflags2_derive",
+ "serde",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 62fcd3c..664b976 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@ anyhow = "1.0.68"
 bincode = "1.3.3"
 bytemuck = "1.13.0"
 clap = { version = "4.1.4", features = ["derive"] }
-enumflags2 = "0.7.5"
+enumflags2 = { version = "0.7.5", features = ["serde"] }
 fastnbt = "2.3.2"
 flate2 = "1.0.25"
 futures-util = "0.3.28"
diff --git a/src/resource/mod.rs b/src/resource/mod.rs
index 5eb2838..501156a 100644
--- a/src/resource/mod.rs
+++ b/src/resource/mod.rs
@@ -6,12 +6,11 @@ mod legacy_block_types;
 use std::collections::HashMap;
 
 use enumflags2::{bitflags, BitFlags};
-
-use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
+use serde::{Deserialize, Serialize};
 
 #[bitflags]
 #[repr(u8)]
-#[derive(Debug, Clone, Copy, PartialEq)]
+#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
 pub enum BlockFlag {
 	Opaque,
 	Grass,
@@ -21,29 +20,11 @@ pub enum BlockFlag {
 	Water,
 }
 
-fn serialize_block_flags<S>(flags: &BitFlags<BlockFlag>, serializer: S) -> Result<S::Ok, S::Error>
-where
-	S: Serializer,
-{
-	flags.bits().serialize(serializer)
-}
-fn deserialize_block_flags<'de, D>(deserializer: D) -> Result<BitFlags<BlockFlag>, D::Error>
-where
-	D: Deserializer<'de>,
-{
-	let bits = u8::deserialize(deserializer)?;
-	BitFlags::<BlockFlag>::from_bits(bits).map_err(de::Error::custom)
-}
-
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct Color(pub [u8; 3]);
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 pub struct BlockType {
-	#[serde(
-		serialize_with = "serialize_block_flags",
-		deserialize_with = "deserialize_block_flags"
-	)]
 	pub flags: BitFlags<BlockFlag>,
 	pub color: Color,
 }

From 05a8056cbf17ed3efcdc0f558901891b560809c8 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 18 Aug 2023 19:13:43 +0200
Subject: [PATCH 235/460] Add documentation comments for all items

---
 src/bin/minedmap/common.rs           | 68 +++++++++++++++++++++-----
 src/bin/minedmap/main.rs             |  7 +++
 src/bin/minedmap/metadata_writer.rs  | 24 ++++++++++
 src/bin/minedmap/region_group.rs     | 29 ++++++++++-
 src/bin/minedmap/region_processor.rs | 19 ++++++++
 src/bin/minedmap/tile_mipmapper.rs   | 17 +++++++
 src/bin/minedmap/tile_renderer.rs    | 39 +++++++++++++++
 src/bin/nbtdump.rs                   |  6 +++
 src/bin/regiondump.rs                |  6 +++
 src/io/data.rs                       |  4 ++
 src/io/fs.rs                         | 38 +++++++++++++++
 src/io/mod.rs                        |  2 +
 src/io/region.rs                     | 20 ++++++++
 src/io/storage.rs                    |  8 ++++
 src/lib.rs                           |  5 ++
 src/resource/biomes.rs               | 50 +++++++++++++++++--
 src/resource/block_color.rs          | 26 ++++++++++
 src/resource/legacy_block_types.rs   |  6 +++
 src/resource/mod.rs                  | 28 ++++++++++-
 src/types.rs                         | 35 ++++++++++++--
 src/util.rs                          |  7 +++
 src/world/chunk.rs                   | 24 ++++++++++
 src/world/de.rs                      | 34 ++++++++++++-
 src/world/layer.rs                   | 42 +++++++++++++++-
 src/world/mod.rs                     |  2 +
 src/world/section.rs                 | 72 +++++++++++++++++++++-------
 26 files changed, 576 insertions(+), 42 deletions(-)

diff --git a/src/bin/minedmap/common.rs b/src/bin/minedmap/common.rs
index df15d99..4183b64 100644
--- a/src/bin/minedmap/common.rs
+++ b/src/bin/minedmap/common.rs
@@ -1,3 +1,5 @@
+//! Common data types and functions used by multiple generation steps
+
 use std::{
 	collections::{BTreeMap, BTreeSet},
 	fmt::Debug,
@@ -9,12 +11,19 @@ use serde::{Deserialize, Serialize};
 
 use super::core::{io::fs::FileMetaVersion, resource::Biome, types::*, world::layer};
 
-// Increase to force regeneration of all output files
+/// MinedMap data version number
+///
+/// Increase to force regeneration of all output files
 pub const FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
 
+/// Coordinate pair of a generated tile
+///
+/// Each tile corresponds to one Minecraft region file
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct TileCoords {
+	/// The X coordinate
 	pub x: i32,
+	/// The Z coordinate
 	pub z: i32,
 }
 
@@ -24,11 +33,16 @@ impl Debug for TileCoords {
 	}
 }
 
+/// Set of tile coordinates
+///
+/// Used to store list of populated tiles for each mipmap level in the
+/// viewer metadata file.
 #[derive(Debug, Clone, Default, Serialize)]
 #[serde(transparent)]
 pub struct TileCoordMap(pub BTreeMap<i32, BTreeSet<i32>>);
 
 impl TileCoordMap {
+	/// Checks whether the map contains a given coordinate pair
 	pub fn contains(&self, coords: TileCoords) -> bool {
 		let Some(xs) = self.0.get(&coords.z) else {
 			return false;
@@ -38,39 +52,62 @@ impl TileCoordMap {
 	}
 }
 
+/// Data structure for storing chunk data between processing and rendering steps
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ProcessedChunk {
+	/// Block type data
 	pub blocks: Box<layer::BlockArray>,
+	/// Biome data
 	pub biomes: Box<layer::BiomeArray>,
+	/// Block height/depth data
 	pub depths: Box<layer::DepthArray>,
 }
 
+/// Data structure for storing region data between processing and rendering steps
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 pub struct ProcessedRegion {
+	/// List of biomes used in the region
+	///
+	/// Indexed by [ProcessedChunk] biome data
 	pub biome_list: IndexSet<Biome>,
+	/// Processed chunk data
 	pub chunks: ChunkArray<Option<Box<ProcessedChunk>>>,
 }
 
-pub struct Config {
-	pub num_threads: usize,
-	pub region_dir: PathBuf,
-	pub processed_dir: PathBuf,
-	pub output_dir: PathBuf,
-	pub level_dat_path: PathBuf,
-	pub metadata_path: PathBuf,
-}
-
+/// Derives a filename from region coordinates and a file extension
+///
+/// Can be used for input regions, processed data or rendered tiles
 fn coord_filename(coords: TileCoords, ext: &str) -> String {
 	format!("r.{}.{}.{}", coords.x, coords.z, ext)
 }
 
+/// Tile kind corresponding to a map layer
 #[derive(Debug, Clone, Copy)]
 pub enum TileKind {
+	/// Regular map tile contains block colors
 	Map,
+	/// Lightmap tile for illumination layer
 	Lightmap,
 }
 
+/// Common configuration based on command line arguments
+pub struct Config {
+	/// Number of threads for parallel processing
+	pub num_threads: usize,
+	/// Path of input region directory
+	pub region_dir: PathBuf,
+	/// Path of input `level.dat` file
+	pub level_dat_path: PathBuf,
+	/// Base path for storage of rendered tile data
+	pub output_dir: PathBuf,
+	/// Path for storage of intermediate processed data files
+	pub processed_dir: PathBuf,
+	/// Path of viewer metadata file
+	pub metadata_path: PathBuf,
+}
+
 impl Config {
+	/// Crates a new [Config] from [command line arguments](super::Args)
 	pub fn new(args: &super::Args) -> Self {
 		let num_threads = match args.jobs {
 			Some(0) => num_cpus::get(),
@@ -79,30 +116,33 @@ impl Config {
 		};
 
 		let region_dir = [&args.input_dir, Path::new("region")].iter().collect();
-		let processed_dir = [&args.output_dir, Path::new("processed")].iter().collect();
 		let level_dat_path = [&args.input_dir, Path::new("level.dat")].iter().collect();
+		let processed_dir = [&args.output_dir, Path::new("processed")].iter().collect();
 		let metadata_path = [&args.output_dir, Path::new("info.json")].iter().collect();
 
 		Config {
 			num_threads,
 			region_dir,
-			processed_dir,
-			output_dir: args.output_dir.clone(),
 			level_dat_path,
+			output_dir: args.output_dir.clone(),
+			processed_dir,
 			metadata_path,
 		}
 	}
 
+	/// Constructs the path to an input region file
 	pub fn region_path(&self, coords: TileCoords) -> PathBuf {
 		let filename = coord_filename(coords, "mca");
 		[&self.region_dir, Path::new(&filename)].iter().collect()
 	}
 
+	/// Constructs the path of an intermediate processed region file
 	pub fn processed_path(&self, coords: TileCoords) -> PathBuf {
 		let filename = coord_filename(coords, "bin");
 		[&self.processed_dir, Path::new(&filename)].iter().collect()
 	}
 
+	/// Constructs the base output path for a [TileKind] and mipmap level
 	pub fn tile_dir(&self, kind: TileKind, level: usize) -> PathBuf {
 		let prefix = match kind {
 			TileKind::Map => "map",
@@ -112,6 +152,7 @@ impl Config {
 		[&self.output_dir, Path::new(&dir)].iter().collect()
 	}
 
+	/// Constructs the path of an output tile image
 	pub fn tile_path(&self, kind: TileKind, level: usize, coords: TileCoords) -> PathBuf {
 		let filename = coord_filename(coords, "png");
 		let dir = self.tile_dir(kind, level);
@@ -119,6 +160,7 @@ impl Config {
 	}
 }
 
+/// Copies a chunk image into a region tile
 pub fn overlay_chunk<I, J>(image: &mut I, chunk: &J, coords: ChunkCoords)
 where
 	I: image::GenericImage,
diff --git a/src/bin/minedmap/main.rs b/src/bin/minedmap/main.rs
index 046fbb5..925a38b 100644
--- a/src/bin/minedmap/main.rs
+++ b/src/bin/minedmap/main.rs
@@ -1,3 +1,8 @@
+//! The minedmap generator renders map tile images from Minecraft save data
+
+#![warn(missing_docs)]
+#![warn(clippy::missing_docs_in_private_items)]
+
 mod common;
 mod metadata_writer;
 mod region_group;
@@ -18,6 +23,7 @@ use region_processor::RegionProcessor;
 use tile_mipmapper::TileMipmapper;
 use tile_renderer::TileRenderer;
 
+/// Command line arguments for minedmap
 #[derive(Debug, Parser)]
 pub struct Args {
 	/// Number of parallel threads to use for processing
@@ -32,6 +38,7 @@ pub struct Args {
 	pub output_dir: PathBuf,
 }
 
+/// Configures the Rayon thread pool for parallel processing
 fn setup_threads(num_threads: usize) -> Result<()> {
 	rayon::ThreadPoolBuilder::new()
 		.num_threads(num_threads)
diff --git a/src/bin/minedmap/metadata_writer.rs b/src/bin/minedmap/metadata_writer.rs
index 98b086a..2ba6038 100644
--- a/src/bin/minedmap/metadata_writer.rs
+++ b/src/bin/minedmap/metadata_writer.rs
@@ -1,3 +1,5 @@
+//! The [MetadataWriter] and related types
+
 use anyhow::{Context, Result};
 use serde::Serialize;
 
@@ -6,43 +8,62 @@ use super::{
 	core::{self, io::fs, world::de},
 };
 
+/// Minimum and maximum X and Z tile coordinates for a mipmap level
 #[derive(Debug, Serialize)]
 #[serde(rename_all = "camelCase")]
 struct Bounds {
+	/// Minimum X coordinate
 	min_x: i32,
+	/// Maximum X coordinate
 	max_x: i32,
+	/// Minimum Z coordinate
 	min_z: i32,
+	/// Maximum Z coordinate
 	max_z: i32,
 }
 
+/// Mipmap level information in viewer metadata file
 #[derive(Debug, Serialize)]
 struct Mipmap<'t> {
+	/// Minimum and maximum tile coordinates of the mipmap level
 	bounds: Bounds,
+	/// Map of populated tiles for the mipmap level
 	regions: &'t TileCoordMap,
 }
 
+/// Initial spawn point for new players
 #[derive(Debug, Serialize)]
 struct Spawn {
+	/// Spawn X coordinate
 	x: i32,
+	/// Spawn Z coordinate
 	z: i32,
 }
 
+/// Viewer metadata JSON data structure
 #[derive(Debug, Serialize)]
 struct Metadata<'t> {
+	/// Tile information for each mipmap level
 	mipmaps: Vec<Mipmap<'t>>,
+	/// Initial spawn point for new players
 	spawn: Spawn,
 }
 
+/// The MetadataWriter is used to generate the viewer metadata file
 pub struct MetadataWriter<'a> {
+	/// Common MinedMap configuration from command line
 	config: &'a Config,
+	/// Map of generated tiles for each mipmap level
 	tiles: &'a [TileCoordMap],
 }
 
 impl<'a> MetadataWriter<'a> {
+	/// Creates a new MetadataWriter
 	pub fn new(config: &'a Config, tiles: &'a [TileCoordMap]) -> Self {
 		MetadataWriter { config, tiles }
 	}
 
+	/// Helper to construct a [Mipmap] data structure from a [TileCoordMap]
 	fn mipmap_entry(regions: &TileCoordMap) -> Mipmap {
 		let mut min_x = i32::MAX;
 		let mut max_x = i32::MIN;
@@ -78,10 +99,12 @@ impl<'a> MetadataWriter<'a> {
 		}
 	}
 
+	/// Reads and deserializes the `level.dat` of the Minecraft save data
 	fn read_level_dat(&self) -> Result<de::LevelDat> {
 		core::io::data::from_file(&self.config.level_dat_path).context("Failed to read level.dat")
 	}
 
+	/// Generates [Spawn] data from a [de::LevelDat]
 	fn spawn(level_dat: &de::LevelDat) -> Spawn {
 		Spawn {
 			x: level_dat.data.spawn_x,
@@ -89,6 +112,7 @@ impl<'a> MetadataWriter<'a> {
 		}
 	}
 
+	/// Runs the viewer metadata file generation
 	pub fn run(self) -> Result<()> {
 		let level_dat = self.read_level_dat()?;
 
diff --git a/src/bin/minedmap/region_group.rs b/src/bin/minedmap/region_group.rs
index be46511..4357a8f 100644
--- a/src/bin/minedmap/region_group.rs
+++ b/src/bin/minedmap/region_group.rs
@@ -1,3 +1,5 @@
+//! The generic [RegionGroup] data structure
+
 use std::{future::Future, iter};
 
 use anyhow::Result;
@@ -5,17 +7,27 @@ use futures_util::future::OptionFuture;
 
 /// A generic array of 3x3 elements
 ///
-/// A RegionGroup is used to store information about a 3x3 neighbourhood of
+/// A RegionGroup is used to store information about a 3x3 neighborhood of
 /// regions.
 ///
 /// The center element is always populated, while the 8 adjacent elements may be None.
 #[derive(Debug, Clone, Copy)]
 pub struct RegionGroup<T> {
+	/// The element corresponding to the center of the 9x9 neighborhood
 	center: T,
+	/// The remaining elements, stored in row-first order
+	///
+	/// The center element is always None.
 	neighs: [Option<T>; 9],
 }
 
 impl<T> RegionGroup<T> {
+	/// Constructs a new RegionGroup from a closure called for each element
+	///
+	/// The X and Z coordinates relative to the center (in the range -1..1)
+	/// are passed to the closure.
+	///
+	/// Panics of the closure returns None for the center element.
 	pub fn new<F>(f: F) -> Self
 	where
 		F: Fn(i8, i8) -> Option<T>,
@@ -36,10 +48,14 @@ impl<T> RegionGroup<T> {
 		}
 	}
 
+	/// Returns a reference to the center element
 	pub fn center(&self) -> &T {
 		&self.center
 	}
 
+	/// Returns a reference to an element of the RegionGroup, if populated
+	///
+	/// Always returns None for X and Z coordinates outside of the -1..1 range.
 	pub fn get(&self, x: i8, z: i8) -> Option<&T> {
 		if (x, z) == (0, 0) {
 			return Some(&self.center);
@@ -50,6 +66,7 @@ impl<T> RegionGroup<T> {
 		self.neighs.get((3 * x + z + 4) as usize)?.as_ref()
 	}
 
+	/// Runs a closure on each element to construct a new RegionGroup
 	pub fn map<U, F>(self, mut f: F) -> RegionGroup<U>
 	where
 		F: FnMut(T) -> U,
@@ -60,6 +77,10 @@ impl<T> RegionGroup<T> {
 		}
 	}
 
+	/// Runs a fallible closure on each element to construct a new RegionGroup
+	///
+	/// [Err] return values for the center element are passed up. Outer elements
+	/// become unpopulated when the closure fails.
 	pub fn try_map<U, F>(self, mut f: F) -> Result<RegionGroup<U>>
 	where
 		F: FnMut(T) -> Result<U>,
@@ -70,6 +91,7 @@ impl<T> RegionGroup<T> {
 		Ok(RegionGroup { center, neighs })
 	}
 
+	/// Runs an asynchronous closure on each element to construct a new RegionGroup
 	#[allow(dead_code)]
 	pub async fn async_map<U, F, Fut>(self, mut f: F) -> RegionGroup<U>
 	where
@@ -88,6 +110,10 @@ impl<T> RegionGroup<T> {
 		}
 	}
 
+	/// Runs a fallible asynchronous closure on each element to construct a new RegionGroup
+	///
+	/// [Err] return values for the center element are passed up. Outer elements
+	/// become unpopulated when the closure fails.
 	pub async fn async_try_map<U, F, Fut>(self, mut f: F) -> Result<RegionGroup<U>>
 	where
 		Fut: Future<Output = Result<U>>,
@@ -110,6 +136,7 @@ impl<T> RegionGroup<T> {
 		Ok(RegionGroup { center, neighs })
 	}
 
+	/// Returns an [Iterator] over all populated elements
 	pub fn iter(&self) -> impl Iterator<Item = &T> {
 		iter::once(&self.center).chain(self.neighs.iter().filter_map(Option::as_ref))
 	}
diff --git a/src/bin/minedmap/region_processor.rs b/src/bin/minedmap/region_processor.rs
index 983aa03..7168ebd 100644
--- a/src/bin/minedmap/region_processor.rs
+++ b/src/bin/minedmap/region_processor.rs
@@ -1,3 +1,5 @@
+//! The [RegionProcessor] and related functions
+
 use std::{ffi::OsStr, path::Path, time::SystemTime};
 
 use anyhow::{Context, Result};
@@ -32,13 +34,20 @@ fn parse_region_filename(file_name: &OsStr) -> Option<TileCoords> {
 }
 
 /// Type with methods for processing the regions of a Minecraft save directory
+///
+/// The RegionProcessor builds lightmap tiles as well as processed region data
+/// consumed by subsequent generation steps.
 pub struct RegionProcessor<'a> {
+	/// Registry of known block types
 	block_types: resource::BlockTypes,
+	/// Registry of known biome types
 	biome_types: resource::BiomeTypes,
+	/// Common MinedMap configuration from command line
 	config: &'a Config,
 }
 
 impl<'a> RegionProcessor<'a> {
+	/// Constructs a new RegionProcessor
 	pub fn new(config: &'a Config) -> Self {
 		RegionProcessor {
 			block_types: resource::BlockTypes::default(),
@@ -47,6 +56,7 @@ impl<'a> RegionProcessor<'a> {
 		}
 	}
 
+	/// Generates a list of all regions of the input Minecraft save data
 	fn collect_regions(&self) -> Result<Vec<TileCoords>> {
 		Ok(self
 			.config
@@ -80,9 +90,11 @@ impl<'a> RegionProcessor<'a> {
 		world::layer::top_layer(biome_list, &chunk)
 	}
 
+	/// Renders a lightmap subtile from chunk block light data
 	fn render_chunk_lightmap(
 		block_light: Box<world::layer::BlockLightArray>,
 	) -> image::GrayAlphaImage {
+		/// Width/height of generated chunk lightmap
 		const N: u32 = BLOCKS_PER_CHUNK as u32;
 
 		image::GrayAlphaImage::from_fn(N, N, |x, z| {
@@ -95,6 +107,9 @@ impl<'a> RegionProcessor<'a> {
 		})
 	}
 
+	/// Saves processed region data
+	///
+	/// The timestamp is the time of the last modification of the input region data.
 	fn save_region(
 		path: &Path,
 		processed_region: &ProcessedRegion,
@@ -103,6 +118,9 @@ impl<'a> RegionProcessor<'a> {
 		storage::write(path, processed_region, FILE_META_VERSION, timestamp)
 	}
 
+	/// Saves a lightmap tile
+	///
+	/// The timestamp is the time of the last modification of the input region data.
 	fn save_lightmap(
 		path: &Path,
 		lightmap: &image::GrayAlphaImage,
@@ -117,6 +135,7 @@ impl<'a> RegionProcessor<'a> {
 
 	/// Processes a single region file
 	fn process_region(&self, coords: TileCoords) -> Result<()> {
+		/// Width/height of the region data
 		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
 
 		let mut processed_region = ProcessedRegion::default();
diff --git a/src/bin/minedmap/tile_mipmapper.rs b/src/bin/minedmap/tile_mipmapper.rs
index 14a2ec0..59c2880 100644
--- a/src/bin/minedmap/tile_mipmapper.rs
+++ b/src/bin/minedmap/tile_mipmapper.rs
@@ -1,3 +1,5 @@
+//! The [TileMipmapper]
+
 use anyhow::{Context, Result};
 use rayon::prelude::*;
 
@@ -6,16 +8,24 @@ use super::{
 	core::{io::fs, types::*},
 };
 
+/// Generates mipmap tiles from full-resolution tile images
 pub struct TileMipmapper<'a> {
+	/// Common MinedMap configuration from command line
 	config: &'a Config,
+	/// List of populated tiles for base mipmap level (level 0)
 	regions: &'a [TileCoords],
 }
 
 impl<'a> TileMipmapper<'a> {
+	/// Constructs a new TileMipmapper
 	pub fn new(config: &'a Config, regions: &'a [TileCoords]) -> Self {
 		TileMipmapper { config, regions }
 	}
 
+	/// Helper to determine if no further mipmap levels are needed
+	///
+	/// If all tile coordinates are -1 or 0, further mipmap levels will not
+	/// decrease the number of tiles and mipmap generated is considered finished.
 	fn done(tiles: &TileCoordMap) -> bool {
 		tiles
 			.0
@@ -23,6 +33,7 @@ impl<'a> TileMipmapper<'a> {
 			.all(|(z, xs)| (-1..=0).contains(z) && xs.iter().all(|x| (-1..=0).contains(x)))
 	}
 
+	/// Derives the map of populated tile coordinates for the next mipmap level
 	fn map_coords(tiles: &TileCoordMap) -> TileCoordMap {
 		let mut ret = TileCoordMap::default();
 
@@ -38,6 +49,10 @@ impl<'a> TileMipmapper<'a> {
 		ret
 	}
 
+	/// Renders and saves a single mipmap tile image
+	///
+	/// Each mipmap tile is rendered by taking 2x2 tiles from the
+	/// previous level and scaling them down by 50%.
 	fn render_mipmap<P: image::PixelWithColorType>(
 		&self,
 		kind: TileKind,
@@ -49,6 +64,7 @@ impl<'a> TileMipmapper<'a> {
 		[P::Subpixel]: image::EncodableLayout,
 		image::ImageBuffer<P, Vec<P::Subpixel>>: Into<image::DynamicImage>,
 	{
+		/// Tile width/height
 		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
 
 		let output_path = self.config.tile_path(kind, level, coords);
@@ -131,6 +147,7 @@ impl<'a> TileMipmapper<'a> {
 		})
 	}
 
+	/// Runs the mipmap generation
 	pub fn run(self) -> Result<Vec<TileCoordMap>> {
 		let mut tile_stack = {
 			let mut tile_map = TileCoordMap::default();
diff --git a/src/bin/minedmap/tile_renderer.rs b/src/bin/minedmap/tile_renderer.rs
index 409db6d..d5b7644 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/bin/minedmap/tile_renderer.rs
@@ -1,3 +1,5 @@
+//! The [TileRenderer] and related types and functions
+
 use std::{
 	num::NonZeroUsize,
 	path::PathBuf,
@@ -22,8 +24,16 @@ use super::{
 	region_group::RegionGroup,
 };
 
+/// Type for referencing loaded [ProcessedRegion] data
 type RegionRef = Arc<ProcessedRegion>;
 
+/// Returns the index of the biome at a block coordinate
+///
+/// The passed chunk and block coordinates relative to the center of the
+/// region group is offset by *dx* and *dz*.
+///
+/// The returned tuple contains the relative region coordinates the offset coordinate
+/// ends up in (in the range -1..1) and the index in that region's biome list.
 fn biome_at(
 	region_group: &RegionGroup<RegionRef>,
 	chunk: ChunkCoords,
@@ -49,15 +59,22 @@ fn biome_at(
 	))
 }
 
+/// The TileRenderer generates map tiles from processed region data
 pub struct TileRenderer<'a> {
+	/// Common MinedMap configuration from command line
 	config: &'a Config,
+	/// Runtime for asynchronous region loading
 	rt: &'a tokio::runtime::Runtime,
+	/// List of populated regions to render tiles for
 	regions: &'a [TileCoords],
+	/// Set of populated regions for fast existence checking
 	region_set: rustc_hash::FxHashSet<TileCoords>,
+	/// Cache of previously loaded regions
 	region_cache: Mutex<LruCache<PathBuf, Arc<OnceCell<RegionRef>>>>,
 }
 
 impl<'a> TileRenderer<'a> {
+	/// Constructs a new TileRenderer
 	pub fn new(
 		config: &'a Config,
 		rt: &'a tokio::runtime::Runtime,
@@ -76,6 +93,7 @@ impl<'a> TileRenderer<'a> {
 		}
 	}
 
+	/// Loads [ProcessedRegion] for a region or returns previously loaded data from the region cache
 	async fn load_region(&self, processed_path: PathBuf) -> Result<RegionRef> {
 		let region_loader = {
 			let mut region_cache = self.region_cache.lock().unwrap();
@@ -96,6 +114,7 @@ impl<'a> TileRenderer<'a> {
 			.cloned()
 	}
 
+	/// Loads a 3x3 neighborhood of processed region data
 	async fn load_region_group(
 		&self,
 		processed_paths: RegionGroup<PathBuf>,
@@ -105,18 +124,29 @@ impl<'a> TileRenderer<'a> {
 			.await
 	}
 
+	/// Computes the color of a tile pixel
 	fn block_color_at(
 		region_group: &RegionGroup<RegionRef>,
 		chunk: &ProcessedChunk,
 		chunk_coords: ChunkCoords,
 		block_coords: LayerBlockCoords,
 	) -> Option<Vec3> {
+		/// Helper for keys in the weight table
+		///
+		/// Hashing the value as a single u32 is more efficient than hashing
+		/// the tuple elements separately.
 		fn biome_key((dx, dz, index): (i8, i8, u16)) -> u32 {
 			(dx as u8 as u32) | (dz as u8 as u32) << 8 | (index as u32) << 16
 		}
 
+		/// One quadrant of the kernel used to smooth biome edges
+		///
+		/// The kernel is mirrored in X und Z direction to build the full 5x5
+		/// smoothing kernel.
 		const SMOOTH: [[f32; 3]; 3] = [[41.0, 26.0, 7.0], [26.0, 16.0, 4.0], [7.0, 4.0, 1.0]];
+		/// Maximum X coordinate offset to take into account for biome smoothing
 		const X: isize = SMOOTH[0].len() as isize - 1;
+		/// Maximum Z coordinate offset to take into account for biome smoothing
 		const Z: isize = SMOOTH.len() as isize - 1;
 
 		let block = chunk.blocks[block_coords]?;
@@ -168,12 +198,14 @@ impl<'a> TileRenderer<'a> {
 		Some(color / total)
 	}
 
+	/// Renders a chunk subtile into a region tile image
 	fn render_chunk(
 		image: &mut image::RgbaImage,
 		region_group: &RegionGroup<RegionRef>,
 		chunk: &ProcessedChunk,
 		chunk_coords: ChunkCoords,
 	) {
+		/// Width/height of a chunk subtile
 		const N: u32 = BLOCKS_PER_CHUNK as u32;
 
 		let chunk_image = image::RgbaImage::from_fn(N, N, |x, z| {
@@ -191,6 +223,7 @@ impl<'a> TileRenderer<'a> {
 		overlay_chunk(image, &chunk_image, chunk_coords);
 	}
 
+	/// Renders a region tile image
 	fn render_region(image: &mut image::RgbaImage, region_group: &RegionGroup<RegionRef>) {
 		for (coords, chunk) in region_group.center().chunks.iter() {
 			let Some(chunk) = chunk else {
@@ -201,12 +234,15 @@ impl<'a> TileRenderer<'a> {
 		}
 	}
 
+	/// Returns the filename of the processed data for a region and the time of its last modification
 	fn processed_source(&self, coords: TileCoords) -> Result<(PathBuf, SystemTime)> {
 		let path = self.config.processed_path(coords);
 		let timestamp = fs::modified_timestamp(&path)?;
 		Ok((path, timestamp))
 	}
 
+	/// Returns the filenames of the processed data for a 3x3 neighborhood of a region
+	/// and the time of last modification for any of them
 	fn processed_sources(&self, coords: TileCoords) -> Result<(RegionGroup<PathBuf>, SystemTime)> {
 		let sources = RegionGroup::new(|x, z| {
 			Some(TileCoords {
@@ -228,7 +264,9 @@ impl<'a> TileRenderer<'a> {
 		Ok((paths, max_timestamp))
 	}
 
+	/// Renders and saves a region tile image
 	fn render_tile(&self, coords: TileCoords) -> Result<()> {
+		/// Width/height of a tile image
 		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
 
 		let (processed_paths, processed_timestamp) = self.processed_sources(coords)?;
@@ -274,6 +312,7 @@ impl<'a> TileRenderer<'a> {
 		)
 	}
 
+	/// Runs the tile generation
 	pub fn run(self) -> Result<()> {
 		fs::create_dir_all(&self.config.tile_dir(TileKind::Map, 0))?;
 
diff --git a/src/bin/nbtdump.rs b/src/bin/nbtdump.rs
index e68c376..da5e502 100644
--- a/src/bin/nbtdump.rs
+++ b/src/bin/nbtdump.rs
@@ -1,8 +1,14 @@
+//! Dumps data from a NBT data file in a human-readable format
+
+#![warn(missing_docs)]
+#![warn(clippy::missing_docs_in_private_items)]
+
 use std::path::PathBuf;
 
 use anyhow::Result;
 use clap::Parser;
 
+/// Command line arguments for nbtdump
 #[derive(Debug, Parser)]
 struct Args {
 	/// Filename to dump
diff --git a/src/bin/regiondump.rs b/src/bin/regiondump.rs
index 9dfac2f..21351f7 100644
--- a/src/bin/regiondump.rs
+++ b/src/bin/regiondump.rs
@@ -1,8 +1,14 @@
+//! Dumps data from a region data file in a human-readable format
+
+#![warn(missing_docs)]
+#![warn(clippy::missing_docs_in_private_items)]
+
 use std::path::PathBuf;
 
 use anyhow::Result;
 use clap::Parser;
 
+/// Command line arguments for regiondump
 #[derive(Debug, Parser)]
 struct Args {
 	/// Filename to dump
diff --git a/src/io/data.rs b/src/io/data.rs
index d475465..bb2ac3b 100644
--- a/src/io/data.rs
+++ b/src/io/data.rs
@@ -1,9 +1,12 @@
+//! Functions for reading and deserializing compressed NBT data
+
 use std::{fs::File, io::prelude::*, path::Path};
 
 use anyhow::{Context, Result};
 use flate2::read::GzDecoder;
 use serde::de::DeserializeOwned;
 
+/// Reads compressed NBT data from a reader and deserializes to a given data structure
 pub fn from_reader<R, T>(reader: R) -> Result<T>
 where
 	R: Read,
@@ -18,6 +21,7 @@ where
 	fastnbt::from_bytes(&buf).context("Failed to decode NBT data")
 }
 
+/// Reads compressed NBT data from a file and deserializes to a given data structure
 pub fn from_file<P, T>(path: P) -> Result<T>
 where
 	P: AsRef<Path>,
diff --git a/src/io/fs.rs b/src/io/fs.rs
index 8f6a79a..7960b25 100644
--- a/src/io/fs.rs
+++ b/src/io/fs.rs
@@ -1,3 +1,5 @@
+//! Helpers and common functions for filesystem access
+
 use std::{
 	fs::{self, File},
 	io::{BufReader, BufWriter, Read, Write},
@@ -8,15 +10,25 @@ use std::{
 use anyhow::{Context, Ok, Result};
 use serde::{Deserialize, Serialize};
 
+/// A file metadata version number
+///
+/// Deserialized metadata with non-current version number are considered invalid
 #[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
 pub struct FileMetaVersion(pub u32);
 
+/// Metadata stored with generated files to track required incremental updates
 #[derive(Debug, Serialize, Deserialize)]
 struct FileMeta {
+	/// Version of data described by the FileMeta
 	version: FileMetaVersion,
+	/// Timestamp stored with generated data
+	///
+	/// This timestamp is always the time of last modification of the inputs
+	/// that were used to generate the file described by the FileMeta.
 	timestamp: SystemTime,
 }
 
+/// Helper for creating suffixed file paths
 fn suffix_name(path: &Path, suffix: &str) -> PathBuf {
 	let mut file_name = path.file_name().unwrap_or_default().to_os_string();
 	file_name.push(suffix);
@@ -26,24 +38,35 @@ fn suffix_name(path: &Path, suffix: &str) -> PathBuf {
 	ret
 }
 
+/// Derives the filename for temporary storage of data during generation
 fn tmpfile_name(path: &Path) -> PathBuf {
 	suffix_name(path, ".tmp")
 }
 
+/// Derives the filename for associated metadata for generated files
 fn metafile_name(path: &Path) -> PathBuf {
 	suffix_name(path, ".meta")
 }
 
+/// Creates a directory including all its parents
+///
+/// Wrapper around [fs::create_dir_all] that adds a more descriptive error message
 pub fn create_dir_all(path: &Path) -> Result<()> {
 	fs::create_dir_all(path)
 		.with_context(|| format!("Failed to create directory {}", path.display(),))
 }
 
+/// Renames a file or directory
+///
+/// Wrapper around [fs::rename] that adds a more descriptive error message
 pub fn rename(from: &Path, to: &Path) -> Result<()> {
 	fs::rename(from, to)
 		.with_context(|| format!("Failed to rename {} to {}", from.display(), to.display()))
 }
 
+/// Creates a new file
+///
+/// The contents of the file are defined by the passed function.
 pub fn create<T, F>(path: &Path, f: F) -> Result<T>
 where
 	F: FnOnce(&mut BufWriter<File>) -> Result<T>,
@@ -60,6 +83,7 @@ where
 	.with_context(|| format!("Failed to write file {}", path.display()))
 }
 
+/// Checks whether the contents of two files are equal
 pub fn equal(path1: &Path, path2: &Path) -> Result<bool> {
 	let mut file1 = BufReader::new(
 		fs::File::open(path1)
@@ -81,6 +105,12 @@ pub fn equal(path1: &Path, path2: &Path) -> Result<bool> {
 	})
 }
 
+/// Creates a new file, temporarily storing its contents in a temporary file
+///
+/// Storing the data in a temporary file prevents leaving half-written files
+/// when the function is interrupted. In addition, the old and new contents of
+/// the file are compared if a file with the same name already exists, and the
+/// file timestamp is only updated if the contents have changed.
 pub fn create_with_tmpfile<T, F>(path: &Path, f: F) -> Result<T>
 where
 	F: FnOnce(&mut BufWriter<File>) -> Result<T>,
@@ -104,6 +134,7 @@ where
 	ret
 }
 
+/// Returns the time of last modification for a given file path
 pub fn modified_timestamp(path: &Path) -> Result<SystemTime> {
 	fs::metadata(path)
 		.and_then(|meta| meta.modified())
@@ -115,6 +146,8 @@ pub fn modified_timestamp(path: &Path) -> Result<SystemTime> {
 		})
 }
 
+/// Reads the stored timestamp from file metadata for a file previously written
+/// using [create_with_timestamp]
 pub fn read_timestamp(path: &Path, version: FileMetaVersion) -> Option<SystemTime> {
 	let meta_path = metafile_name(path);
 	let mut file = BufReader::new(fs::File::open(meta_path).ok()?);
@@ -127,6 +160,11 @@ pub fn read_timestamp(path: &Path, version: FileMetaVersion) -> Option<SystemTim
 	Some(meta.timestamp)
 }
 
+/// Creates a new file, temporarily storing its contents in a temporary file
+/// like [create_with_tmpfile], and storing a timestamp in a metadata file
+/// if successful
+///
+/// The timestamp can be retrieved later using [read_timestamp].
 pub fn create_with_timestamp<T, F>(
 	path: &Path,
 	version: FileMetaVersion,
diff --git a/src/io/mod.rs b/src/io/mod.rs
index 681d75d..590ca2a 100644
--- a/src/io/mod.rs
+++ b/src/io/mod.rs
@@ -1,3 +1,5 @@
+//! Input/output functions
+
 pub mod data;
 pub mod fs;
 pub mod region;
diff --git a/src/io/region.rs b/src/io/region.rs
index e5c2528..82f5604 100644
--- a/src/io/region.rs
+++ b/src/io/region.rs
@@ -1,3 +1,5 @@
+//! Functions for reading and deserializing region data
+
 use std::{
 	fs::File,
 	io::{prelude::*, SeekFrom},
@@ -10,15 +12,24 @@ use serde::de::DeserializeOwned;
 
 use crate::types::*;
 
+/// Data block size of region data files
+///
+/// After one header block, the region file consists of one or more consecutive blocks
+/// of data for each populated chunk.
 const BLOCKSIZE: usize = 4096;
 
+/// Chunk descriptor extracted from region file header
 #[derive(Debug)]
 struct ChunkDesc {
+	/// Offset of data block where the chunk starts
 	offset: u32,
+	/// Number of data block used by the chunk
 	len: u8,
+	/// Coodinates of chunk described by this descriptor
 	coords: ChunkCoords,
 }
 
+/// Parses the header of a region data file
 fn parse_header(header: &ChunkArray<u32>) -> Vec<ChunkDesc> {
 	let mut chunks: Vec<_> = header
 		.iter()
@@ -45,6 +56,7 @@ fn parse_header(header: &ChunkArray<u32>) -> Vec<ChunkDesc> {
 	chunks
 }
 
+/// Decompresses chunk data and deserializes to a given data structure
 fn decode_chunk<T>(buf: &[u8]) -> Result<T>
 where
 	T: DeserializeOwned,
@@ -63,12 +75,18 @@ where
 	fastnbt::from_bytes(&decode_buffer).context("Failed to decode NBT data")
 }
 
+/// Wraps a reader used to read a region data file
 #[derive(Debug)]
 pub struct Region<R: Read + Seek> {
+	/// The wrapper reader
 	reader: R,
 }
 
 impl<R: Read + Seek> Region<R> {
+	/// Iterates over the chunks of the region data
+	///
+	/// The order of iteration is based on the order the chunks appear in the
+	/// data file.
 	pub fn foreach_chunk<T, F>(self, mut f: F) -> Result<()>
 	where
 		R: Read + Seek,
@@ -126,6 +144,7 @@ impl<R: Read + Seek> Region<R> {
 	}
 }
 
+/// Creates a new [Region] from a reader
 pub fn from_reader<R>(reader: R) -> Region<R>
 where
 	R: Read + Seek,
@@ -133,6 +152,7 @@ where
 	Region { reader }
 }
 
+/// Creates a new [Region] for a file
 pub fn from_file<P>(path: P) -> Result<Region<File>>
 where
 	P: AsRef<Path>,
diff --git a/src/io/storage.rs b/src/io/storage.rs
index 4ba6050..99a8d63 100644
--- a/src/io/storage.rs
+++ b/src/io/storage.rs
@@ -1,3 +1,7 @@
+//! Functions for serializing and deserializing MinedMap data structures efficiently
+//!
+//! Data is serialized using Bincode and compressed using zstd.
+
 use std::{
 	fs::File,
 	io::{Read, Write},
@@ -10,6 +14,9 @@ use serde::{de::DeserializeOwned, Serialize};
 
 use super::fs;
 
+/// Serializes data and stores it in a file
+///
+/// A timestamp is stored in an assiciated metadata file.
 pub fn write<T: Serialize>(
 	path: &Path,
 	value: &T,
@@ -29,6 +36,7 @@ pub fn write<T: Serialize>(
 	})
 }
 
+/// Reads data from a file and deserializes it
 pub fn read<T: DeserializeOwned>(path: &Path) -> Result<T> {
 	(|| -> Result<T> {
 		let mut file = File::open(path)?;
diff --git a/src/lib.rs b/src/lib.rs
index f46a9d2..14d97f9 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,3 +1,8 @@
+//! Common library for MinedMap generator and dump utilities
+
+#![warn(missing_docs)]
+#![warn(clippy::missing_docs_in_private_items)]
+
 pub mod io;
 pub mod resource;
 pub mod types;
diff --git a/src/resource/biomes.rs b/src/resource/biomes.rs
index 0515e93..54859df 100644
--- a/src/resource/biomes.rs
+++ b/src/resource/biomes.rs
@@ -1,25 +1,51 @@
+//! Biome data structures
+
 use serde::{Deserialize, Serialize};
 
 use super::Color;
 
+/// Grass color modifier used by a biome
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub enum BiomeGrassColorModifier {
+	/// Grass color modifier used by the dark forest biome
 	DarkForest,
+	/// Grass color modifier used by swamp biomes
 	Swamp,
 }
 
+/// A biome specification
+///
+/// A Biome contains all information about a biome necessary to compute a block
+/// color given a block type and depth
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct Biome {
+	/// Temperature value
+	///
+	/// For more efficient storage, the temperature is stored as an integer
+	/// after mutiplying the raw value by 20
 	pub temp: i8,
+	/// Downfall value
+	///
+	/// For more efficient storage, the downfall is stored as an integer
+	/// after mutiplying the raw value by 20
 	pub downfall: i8,
+	/// Water color override
 	pub water_color: Option<Color>,
+	/// Foliage color override
 	pub foliage_color: Option<Color>,
+	/// Grass color override
 	pub grass_color: Option<Color>,
+	/// Grass color modifier
 	pub grass_color_modifier: Option<BiomeGrassColorModifier>,
 }
 
 impl Biome {
+	/// Constructs a new Biome
 	const fn new(temp: i16, downfall: i16) -> Biome {
+		/// Helper to encode temperature and downfall values
+		///
+		/// Converts temperatue and downfall from the input format
+		/// (mutiplied by 100) to i8 range for more efficient storage.
 		const fn encode(v: i16) -> i8 {
 			(v / 5) as i8
 		}
@@ -33,6 +59,7 @@ impl Biome {
 		}
 	}
 
+	/// Builder function to override the biome water color
 	const fn water(self, water_color: [u8; 3]) -> Biome {
 		Biome {
 			water_color: Some(Color(water_color)),
@@ -40,6 +67,7 @@ impl Biome {
 		}
 	}
 
+	/// Builder function to override the biome foliage color
 	const fn foliage(self, foliage_color: [u8; 3]) -> Biome {
 		Biome {
 			foliage_color: Some(Color(foliage_color)),
@@ -47,6 +75,7 @@ impl Biome {
 		}
 	}
 
+	/// Builder function to override the biome grass color
 	const fn grass(self, grass_color: [u8; 3]) -> Biome {
 		Biome {
 			grass_color: Some(Color(grass_color)),
@@ -54,6 +83,7 @@ impl Biome {
 		}
 	}
 
+	/// Builder function to set a grass color modifier
 	const fn modify(self, grass_color_modifier: BiomeGrassColorModifier) -> Biome {
 		Biome {
 			grass_color_modifier: Some(grass_color_modifier),
@@ -61,25 +91,34 @@ impl Biome {
 		}
 	}
 
+	/// Decodes a temperature or downfall value from the storage format to
+	/// f32 for further calculation
 	fn decode(val: i8) -> f32 {
 		f32::from(val) / 20.0
 	}
 
+	/// Returns the biome's temperature decoded to its original float value
 	pub fn temp(&self) -> f32 {
 		Self::decode(self.temp)
 	}
 
+	/// Returns the biome's downfall decoded to its original float value
 	pub fn downfall(&self) -> f32 {
 		Self::decode(self.downfall)
 	}
 }
 
-// Data extracted from Minecraft code decompiled using https://github.com/Hexeption/MCP-Reborn
-
-#[allow(clippy::zero_prefixed_literal)]
+/// Standard biome specifications
 pub const BIOMES: &[(&str, Biome)] = {
 	use BiomeGrassColorModifier::*;
 
+	// Data extracted from Minecraft code decompiled using https://github.com/Hexeption/MCP-Reborn
+
+	// We can't use floats in const functions, to temperature and downfall values
+	// are specified multipled by 100. The underscore is used in place of the decimal point
+	// of the original values.
+
+	#[allow(clippy::zero_prefixed_literal)]
 	&[
 		// Overworld
 		(
@@ -189,6 +228,10 @@ pub const BIOMES: &[(&str, Biome)] = {
 	]
 };
 
+/// Biome ID aliases
+///
+/// Some biomes have been renamed or merged in recent Minecraft versions.
+/// Maintain a list of aliases to support chunks saved by older versions.
 pub const BIOME_ALIASES: &[(&str, &str)] = &[
 	// Biomes fix
 	("beaches", "beach"),
@@ -292,6 +335,7 @@ pub const BIOME_ALIASES: &[(&str, &str)] = &[
 	("deep_warm_ocean", "warm_ocean"),
 ];
 
+/// Maps old numeric biome IDs to new string IDs
 pub fn legacy_biome(index: u8) -> &'static str {
 	match index {
 		0 => "ocean",
diff --git a/src/resource/block_color.rs b/src/resource/block_color.rs
index b98aec9..3df9a54 100644
--- a/src/resource/block_color.rs
+++ b/src/resource/block_color.rs
@@ -1,15 +1,23 @@
+//! Functions for computations of block colors
+
 use super::{Biome, BlockType, Color};
 
 use glam::Vec3;
 
+/// Converts an u8 RGB color to a float vector
 fn color_vec_unscaled(color: Color) -> Vec3 {
 	Vec3::from_array(color.0.map(f32::from))
 }
 
+/// Converts an u8 RGB color to a float vector, scaling the components to 0.0..1.0
 fn color_vec(color: Color) -> Vec3 {
 	color_vec_unscaled(color) / 255.0
 }
 
+/// Helper for grass and foliage colors
+///
+/// Biome temperature and downfall are modified based on the depth value
+/// before using them to compute the final color
 fn color_from_params(colors: &[Vec3; 3], biome: &Biome, depth: f32) -> Vec3 {
 	let temp = (biome.temp() - f32::max((depth - 64.0) / 600.0, 0.0)).clamp(0.0, 1.0);
 	let downfall = biome.downfall().clamp(0.0, 1.0) * temp;
@@ -17,9 +25,13 @@ fn color_from_params(colors: &[Vec3; 3], biome: &Biome, depth: f32) -> Vec3 {
 	colors[0] + temp * colors[1] + downfall * colors[2]
 }
 
+/// Extension trait with helpers for computing biome-specific block colors
 trait BiomeExt {
+	/// Returns the grass color of the biome at a given depth
 	fn grass_color(&self, depth: f32) -> Vec3;
+	/// Returns the foliage color of the biome at a given depth
 	fn foliage_color(&self, depth: f32) -> Vec3;
+	/// Returns the water color of the biome
 	fn water_color(&self) -> Vec3;
 }
 
@@ -27,12 +39,15 @@ impl BiomeExt for Biome {
 	fn grass_color(&self, depth: f32) -> Vec3 {
 		use super::BiomeGrassColorModifier::*;
 
+		/// Color matrix extracted from grass color texture
 		const GRASS_COLORS: [Vec3; 3] = [
 			Vec3::new(0.502, 0.706, 0.592),   // lower right
 			Vec3::new(0.247, 0.012, -0.259),  // lower left - lower right
 			Vec3::new(-0.471, 0.086, -0.133), // upper left - lower left
 		];
+		/// Used for dark forst grass color modifier
 		const DARK_FOREST_GRASS_COLOR: Vec3 = Vec3::new(0.157, 0.204, 0.039); // == color_vec(Color([40, 52, 10]))
+		/// Grass color in swamp biomes
 		const SWAMP_GRASS_COLOR: Vec3 = Vec3::new(0.416, 0.439, 0.224); // == color_vec(Color([106, 112, 57]))
 
 		let regular_color = || {
@@ -49,6 +64,7 @@ impl BiomeExt for Biome {
 	}
 
 	fn foliage_color(&self, depth: f32) -> Vec3 {
+		/// Color matrix extracted from foliage color texture
 		const FOLIAGE_COLORS: [Vec3; 3] = [
 			Vec3::new(0.376, 0.631, 0.482),   // lower right
 			Vec3::new(0.306, 0.012, -0.317),  // lower left - lower right
@@ -61,6 +77,9 @@ impl BiomeExt for Biome {
 	}
 
 	fn water_color(&self) -> Vec3 {
+		/// Default biome water color
+		///
+		/// Used for biomes that don't explicitly set a water color
 		const DEFAULT_WATER_COLOR: Vec3 = Vec3::new(0.247, 0.463, 0.894); // == color_vec(Color([63, 118, 228]))
 
 		self.water_color
@@ -69,15 +88,22 @@ impl BiomeExt for Biome {
 	}
 }
 
+/// Color multiplier for birch leaves
 const BIRCH_COLOR: Vec3 = Vec3::new(0.502, 0.655, 0.333); // == color_vec(Color([128, 167, 85]))
+/// Color multiplier for spruce leaves
 const EVERGREEN_COLOR: Vec3 = Vec3::new(0.380, 0.600, 0.380); // == color_vec(Color([97, 153, 97]))
 
+/// Determined if calling [block_color] for a given [BlockType] needs biome information
 pub fn needs_biome(block: BlockType) -> bool {
 	use super::BlockFlag::*;
 
 	block.is(Grass) || block.is(Foliage) || block.is(Water)
 }
 
+/// Determined the block color to display for a given [BlockType]
+///
+/// [needs_biome] must be used to determine whether passing a [Biome] is necessary.
+/// Will panic if a [Biome] is necessary, but none is passed.
 pub fn block_color(block: BlockType, biome: Option<&Biome>, depth: f32) -> Vec3 {
 	use super::BlockFlag::*;
 
diff --git a/src/resource/legacy_block_types.rs b/src/resource/legacy_block_types.rs
index c5d9462..c027ac3 100644
--- a/src/resource/legacy_block_types.rs
+++ b/src/resource/legacy_block_types.rs
@@ -1,12 +1,18 @@
+//! Mapping of old numeric block type and damage/subtype IDs to new string IDs
+
+/// Helper for block types that don't use the damage/subtype data
 const fn simple(id: &str) -> [&str; 16] {
 	[
 		id, id, id, id, id, id, id, id, id, id, id, id, id, id, id, id,
 	]
 }
 
+/// Default block type for unassigned numeric IDs
 const DEF: &str = "air";
+/// Default entry for block type numbers that are unassigned regardless of subtype
 const EMPTY: [&str; 16] = simple(DEF);
 
+/// Mapping from each numeric block type and damage/subtype ID to new string ID
 pub const LEGACY_BLOCK_TYPES: [[&str; 16]; 256] = [
 	/* 0 */
 	simple("air"),
diff --git a/src/resource/mod.rs b/src/resource/mod.rs
index 501156a..459e783 100644
--- a/src/resource/mod.rs
+++ b/src/resource/mod.rs
@@ -1,43 +1,62 @@
+//! Data describing Minecraft biomes and block types
+
 mod biomes;
 mod block_color;
-mod block_types;
 mod legacy_block_types;
 
+#[allow(clippy::missing_docs_in_private_items)] // Generated module
+mod block_types;
+
 use std::collections::HashMap;
 
 use enumflags2::{bitflags, BitFlags};
 use serde::{Deserialize, Serialize};
 
+/// Flags describing special properties of [BlockType]s
 #[bitflags]
 #[repr(u8)]
 #[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
 pub enum BlockFlag {
+	/// The block type is opaque
 	Opaque,
+	/// The block type is colored using biome grass colors
 	Grass,
+	/// The block type is colored using biome foliage colors
 	Foliage,
+	/// The block type is birch foliage
 	Birch,
+	/// The block type is spurce foliage
 	Spruce,
+	/// The block type is colored using biome water colors
 	Water,
 }
 
+/// An RGB color
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct Color(pub [u8; 3]);
 
+/// A block type specification
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 pub struct BlockType {
+	/// Bit set of [BlockFlag]s describing special properties of the block type
 	pub flags: BitFlags<BlockFlag>,
+	/// Base color of the block type
 	pub color: Color,
 }
 
 impl BlockType {
+	/// Checks whether a block type has a given [BlockFlag] set
 	pub fn is(&self, flag: BlockFlag) -> bool {
 		self.flags.contains(flag)
 	}
 }
 
+/// Used to look up standard Minecraft block types
 #[derive(Debug)]
 pub struct BlockTypes {
+	/// Map of string IDs to block types
 	block_type_map: HashMap<String, BlockType>,
+	/// Array used to look up old numeric block type and subtype values
 	legacy_block_types: Box<[[BlockType; 16]; 256]>,
 }
 
@@ -59,12 +78,14 @@ impl Default for BlockTypes {
 }
 
 impl BlockTypes {
+	/// Resolves a Minecraft 1.13+ string block type ID
 	#[inline]
 	pub fn get(&self, id: &str) -> Option<BlockType> {
 		let suffix = id.strip_prefix("minecraft:")?;
 		self.block_type_map.get(suffix).copied()
 	}
 
+	/// Resolves a Minecraft pre-1.13 numeric block type ID
 	#[inline]
 	pub fn get_legacy(&self, id: u8, data: u8) -> Option<BlockType> {
 		Some(self.legacy_block_types[id as usize][data as usize])
@@ -74,9 +95,12 @@ impl BlockTypes {
 pub use biomes::{Biome, BiomeGrassColorModifier};
 pub use block_color::{block_color, needs_biome};
 
+/// Used to look up standard Minecraft biome types
 #[derive(Debug)]
 pub struct BiomeTypes {
+	/// Map of string IDs to biome types
 	biome_map: HashMap<String, &'static Biome>,
+	/// Array used to look up old numeric biome IDs
 	legacy_biomes: Box<[&'static Biome; 256]>,
 }
 
@@ -112,12 +136,14 @@ impl Default for BiomeTypes {
 }
 
 impl BiomeTypes {
+	/// Resolves a Minecraft 1.18+ string biome type ID
 	#[inline]
 	pub fn get(&self, id: &str) -> Option<&Biome> {
 		let suffix = id.strip_prefix("minecraft:")?;
 		self.biome_map.get(suffix).copied()
 	}
 
+	/// Resolves a Minecraft pre-1.18 numeric biome type ID
 	#[inline]
 	pub fn get_legacy(&self, id: u8) -> Option<&Biome> {
 		Some(self.legacy_biomes[id as usize])
diff --git a/src/types.rs b/src/types.rs
index a28583d..045750b 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -1,3 +1,5 @@
+//! Common types used by MinedMap
+
 use std::{
 	fmt::Debug,
 	iter::FusedIterator,
@@ -7,14 +9,20 @@ use std::{
 use itertools::iproduct;
 use serde::{Deserialize, Serialize};
 
+/// Const generic AXIS arguments for coordinate types
 pub mod axis {
+	/// The X axis
 	pub const X: u8 = 0;
+	/// The Y axis (height)
 	pub const Y: u8 = 1;
+	/// The Z axis
 	pub const Z: u8 = 2;
 }
 
+/// Generates a generic coordinate type with a given range
 macro_rules! coord_type {
-	($t:ident, $max:expr) => {
+	($t:ident, $max:expr, $doc:expr $(,)?) => {
+		#[doc = $doc]
 		#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 		pub struct $t<const AXIS: u8>(pub u8);
 
@@ -47,9 +55,15 @@ macro_rules! coord_type {
 	};
 }
 
+/// Number of bits required to store a block coordinate
 pub const BLOCK_BITS: u8 = 4;
+/// Number of blocks per chunk in each dimension
 pub const BLOCKS_PER_CHUNK: usize = 1 << BLOCK_BITS;
-coord_type!(BlockCoord, BLOCKS_PER_CHUNK);
+coord_type!(
+	BlockCoord,
+	BLOCKS_PER_CHUNK,
+	"A block coordinate relative to a chunk",
+);
 
 /// A block X coordinate relative to a chunk
 pub type BlockX = BlockCoord<{ axis::X }>;
@@ -63,7 +77,9 @@ pub type BlockZ = BlockCoord<{ axis::Z }>;
 /// X and Z coordinates of a block in a chunk
 #[derive(Clone, Copy, PartialEq, Eq)]
 pub struct LayerBlockCoords {
+	/// The X coordinate
 	pub x: BlockX,
+	/// The Z coordinate
 	pub z: BlockZ,
 }
 
@@ -110,7 +126,9 @@ impl<T> IndexMut<LayerBlockCoords> for LayerBlockArray<T> {
 /// X, Y and Z coordinates of a block in a chunk section
 #[derive(Clone, Copy, PartialEq, Eq)]
 pub struct SectionBlockCoords {
+	/// The X and Z coordinates
 	pub xz: LayerBlockCoords,
+	/// The Y coordinate
 	pub y: BlockY,
 }
 
@@ -137,9 +155,15 @@ impl Debug for SectionBlockCoords {
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub struct SectionY(pub i32);
 
+/// Number of bits required to store a chunk coordinate
 pub const CHUNK_BITS: u8 = 5;
+/// Number of chunks per region in each dimension
 pub const CHUNKS_PER_REGION: usize = 1 << CHUNK_BITS;
-coord_type!(ChunkCoord, CHUNKS_PER_REGION);
+coord_type!(
+	ChunkCoord,
+	CHUNKS_PER_REGION,
+	"A chunk coordinate relative to a region",
+);
 
 /// A chunk X coordinate relative to a region
 pub type ChunkX = ChunkCoord<{ axis::X }>;
@@ -150,7 +174,9 @@ pub type ChunkZ = ChunkCoord<{ axis::Z }>;
 /// A pair of chunk coordinates relative to a region
 #[derive(Clone, Copy, PartialEq, Eq)]
 pub struct ChunkCoords {
+	/// The X coordinate
 	pub x: ChunkX,
+	/// The Z coordinate
 	pub z: ChunkZ,
 }
 
@@ -167,14 +193,17 @@ impl Debug for ChunkCoords {
 pub struct ChunkArray<T>(pub [[T; CHUNKS_PER_REGION]; CHUNKS_PER_REGION]);
 
 impl<T> ChunkArray<T> {
+	/// Iterates over all possible chunk coordinate pairs used as [ChunkArray] keys
 	pub fn keys() -> impl Iterator<Item = ChunkCoords> + Clone + Debug {
 		iproduct!(ChunkZ::iter(), ChunkX::iter()).map(|(z, x)| ChunkCoords { x, z })
 	}
 
+	/// Iterates over all values stored in the [ChunkArray]
 	pub fn values(&self) -> impl Iterator<Item = &T> + Clone + Debug {
 		Self::keys().map(|k| &self[k])
 	}
 
+	/// Iterates over pairs of chunk coordinate pairs and corresponding stored values
 	pub fn iter(&self) -> impl Iterator<Item = (ChunkCoords, &T)> + Clone + Debug {
 		Self::keys().map(|k| (k, &self[k]))
 	}
diff --git a/src/util.rs b/src/util.rs
index b4fdefe..a128ef9 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -1,6 +1,10 @@
+//! Utility functions and extension traits
+
 use crate::types::*;
 
+/// Extension trait for combined bit shift and mask
 pub trait ShiftMask: Sized {
+	/// Output type of shift operation
 	type MaskedOutput;
 
 	/// Apply a right shift to a value, and return both the result and the
@@ -27,6 +31,8 @@ impl ShiftMask for i32 {
 	}
 }
 
+/// Combines a coordinate split into region, chunk and block number to
+/// a single linear coordinate
 #[inline]
 pub fn to_flat_coord<const AXIS: u8>(
 	region: i8,
@@ -36,6 +42,7 @@ pub fn to_flat_coord<const AXIS: u8>(
 	(region as i32) << (BLOCK_BITS + CHUNK_BITS) | ((chunk.0 as i32) << BLOCK_BITS | block.0 as i32)
 }
 
+/// Splits a flat (linear) coordinate into region, chunk and block numbers
 #[inline]
 pub fn from_flat_coord<const AXIS: u8>(coord: i32) -> (i8, ChunkCoord<AXIS>, BlockCoord<AXIS>) {
 	let (region_chunk, block) = coord.shift_mask(BLOCK_BITS);
diff --git a/src/world/chunk.rs b/src/world/chunk.rs
index 4f743fc..53ee165 100644
--- a/src/world/chunk.rs
+++ b/src/world/chunk.rs
@@ -1,3 +1,8 @@
+//! Higher-level interfaces to chunk data
+//!
+//! The data types in this module attempt to provide interfaces abstracting
+//! over different data versions as much as possible.
+
 use std::{
 	collections::{btree_map, BTreeMap},
 	iter::{self, FusedIterator},
@@ -17,6 +22,7 @@ use crate::{
 pub enum Chunk<'a> {
 	/// Minecraft v1.18+ chunk with biome data moved into sections
 	V1_18 {
+		/// Section data
 		section_map: BTreeMap<SectionY, (SectionV1_13<'a>, BiomesV1_18<'a>, BlockLight<'a>)>,
 	},
 	/// Minecraft v1.13+ chunk
@@ -26,14 +32,18 @@ pub enum Chunk<'a> {
 	/// section), and a palette mapping these indices to namespaced
 	/// block IDs
 	V1_13 {
+		/// Section data
 		section_map: BTreeMap<SectionY, (SectionV1_13<'a>, BlockLight<'a>)>,
+		/// Biome data
 		biomes: BiomesV0<'a>,
 	},
 	/// Original pre-1.13 chunk
 	///
 	/// The original chunk format with fixed 8-bit numeric block IDs
 	V0 {
+		/// Section data
 		section_map: BTreeMap<SectionY, (SectionV0<'a>, BlockLight<'a>)>,
+		/// Biome data
 		biomes: BiomesV0<'a>,
 	},
 	/// Unpopulated chunk without any block data
@@ -45,16 +55,21 @@ pub enum Chunk<'a> {
 enum SectionIterInner<'a> {
 	/// Iterator over sections of [Chunk::V1_18]
 	V1_18 {
+		/// Inner iterator into section map
 		iter: btree_map::Iter<'a, SectionY, (SectionV1_13<'a>, BiomesV1_18<'a>, BlockLight<'a>)>,
 	},
 	/// Iterator over sections of [Chunk::V1_13]
 	V1_13 {
+		/// Inner iterator into section map
 		iter: btree_map::Iter<'a, SectionY, (SectionV1_13<'a>, BlockLight<'a>)>,
+		/// Chunk biome data
 		biomes: &'a BiomesV0<'a>,
 	},
 	/// Iterator over sections of [Chunk::V0]
 	V0 {
+		/// Inner iterator into section map
 		iter: btree_map::Iter<'a, SectionY, (SectionV0<'a>, BlockLight<'a>)>,
+		/// Chunk biome data
 		biomes: &'a BiomesV0<'a>,
 	},
 	/// Empty iterator over an unpopulated chunk ([Chunk::Empty])
@@ -64,6 +79,7 @@ enum SectionIterInner<'a> {
 /// Iterator over the sections of a [Chunk]
 #[derive(Debug, Clone)]
 pub struct SectionIter<'a> {
+	/// Inner iterator enum
 	inner: SectionIterInner<'a>,
 }
 
@@ -193,6 +209,7 @@ impl<'a> Chunk<'a> {
 		)
 	}
 
+	/// Returns true if the chunk does not contain any sections
 	pub fn is_empty(&self) -> bool {
 		match self {
 			Chunk::V1_18 { section_map } => section_map.is_empty(),
@@ -230,14 +247,20 @@ impl<'a> Chunk<'a> {
 	}
 }
 
+/// Reference to block, biome and block light data of a section
 #[derive(Debug, Clone, Copy)]
 pub struct SectionIterItem<'a> {
+	/// The Y coordinate of the section
 	pub y: SectionY,
+	/// Section block data
 	pub section: &'a dyn Section,
+	/// Section biome data
 	pub biomes: &'a dyn Biomes,
+	/// Section block light data
 	pub block_light: BlockLight<'a>,
 }
 
+/// Helper trait to specify section iterator trait bounds
 trait SectionIterTrait<'a>:
 	Iterator<Item = SectionIterItem<'a>> + DoubleEndedIterator + ExactSizeIterator + FusedIterator
 {
@@ -252,6 +275,7 @@ impl<'a, T> SectionIterTrait<'a> for T where
 }
 
 impl<'a> SectionIter<'a> {
+	/// Helper to run a closure on the inner section iterator
 	fn with_iter<F, T>(&mut self, f: F) -> T
 	where
 		F: FnOnce(&mut dyn SectionIterTrait<'a>) -> T,
diff --git a/src/world/de.rs b/src/world/de.rs
index 82aa11c..cbedf31 100644
--- a/src/world/de.rs
+++ b/src/world/de.rs
@@ -6,30 +6,39 @@ use serde::Deserialize;
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "PascalCase")]
 pub struct BlockStatePaletteEntry {
+	/// Block type ID
 	pub name: String,
 }
 
 /// 1.18+ `block_states` element found in a [section](SectionV1_18)
 #[derive(Debug, Deserialize)]
 pub struct BlockStatesV1_18 {
+	/// Palette of block types, indexed by block data
 	pub palette: Vec<BlockStatePaletteEntry>,
+	/// Block data
 	pub data: Option<fastnbt::LongArray>,
 }
 
 /// 1.18+ `biomes` element found in a [section](SectionV1_18)
 #[derive(Debug, Deserialize)]
 pub struct BiomesV1_18 {
+	/// Palette of biome types, indexed by biome data
 	pub palette: Vec<String>,
+	/// Biome data
 	pub data: Option<fastnbt::LongArray>,
 }
 
 /// Element of the 1.18+ `sections` list found in a [Chunk]
 #[derive(Debug, Deserialize)]
 pub struct SectionV1_18 {
+	/// Y coordinate
 	#[serde(rename = "Y")]
 	pub y: i32,
+	/// Block type data
 	pub block_states: BlockStatesV1_18,
+	/// Biome data
 	pub biomes: BiomesV1_18,
+	/// Block light data
 	#[serde(rename = "BlockLight")]
 	pub block_light: Option<fastnbt::ByteArray>,
 }
@@ -38,16 +47,23 @@ pub struct SectionV1_18 {
 #[derive(Debug, Deserialize)]
 #[serde(untagged)]
 pub enum SectionV0Variants {
+	/// v1.13+ data
 	#[serde(rename_all = "PascalCase")]
 	V1_13 {
+		/// Block data
 		block_states: fastnbt::LongArray,
+		/// Block type palette, indexed by block data
 		palette: Vec<BlockStatePaletteEntry>,
 	},
+	/// Pre-1.13 data
 	#[serde(rename_all = "PascalCase")]
 	V0 {
+		/// Block type data
 		blocks: fastnbt::ByteArray,
+		/// Block damage / subtype data
 		data: fastnbt::ByteArray,
 	},
+	/// Empty section
 	Empty {},
 }
 
@@ -55,8 +71,11 @@ pub enum SectionV0Variants {
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "PascalCase")]
 pub struct SectionV0 {
+	/// Y coordinate
 	pub y: i8,
+	/// Block light data
 	pub block_light: Option<fastnbt::ByteArray>,
+	/// Version-specific data
 	#[serde(flatten)]
 	pub section: SectionV0Variants,
 }
@@ -65,7 +84,9 @@ pub struct SectionV0 {
 #[derive(Debug, Deserialize)]
 #[serde(untagged)]
 pub enum BiomesV0 {
+	/// Data for Minecraft versions storing biome data as an IntArray
 	IntArray(fastnbt::IntArray),
+	/// Data for Minecraft versions storing biome data as an ByteArray
 	ByteArray(fastnbt::ByteArray),
 }
 
@@ -73,8 +94,10 @@ pub enum BiomesV0 {
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "PascalCase")]
 pub struct LevelV0 {
+	/// Section data
 	#[serde(default)]
 	pub sections: Vec<SectionV0>,
+	/// Biome data
 	pub biomes: Option<BiomesV0>,
 }
 
@@ -82,11 +105,15 @@ pub struct LevelV0 {
 #[derive(Debug, Deserialize)]
 #[serde(untagged)]
 pub enum ChunkVariants {
+	/// 1.18+ chunk data
 	V1_18 {
+		/// List of chunk sections
 		sections: Vec<SectionV1_18>,
 	},
+	/// Pre-1.18 chunk data
 	#[serde(rename_all = "PascalCase")]
 	V0 {
+		/// `Level` field of the chunk
 		level: LevelV0,
 	},
 }
@@ -95,16 +122,20 @@ pub enum ChunkVariants {
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "PascalCase")]
 pub struct Chunk {
+	/// The data version of the chunk
 	pub data_version: Option<u32>,
+	/// Version-specific chunk data
 	#[serde(flatten)]
 	pub chunk: ChunkVariants,
 }
 
-/// "Data" compound element of level.dat
+/// `Data` compound element of level.dat
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "PascalCase")]
 pub struct LevelDatData {
+	/// X coordinate of spawn point for new players
 	pub spawn_x: i32,
+	/// Z coordinate of spawn point for new players
 	pub spawn_z: i32,
 }
 
@@ -112,5 +143,6 @@ pub struct LevelDatData {
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "PascalCase")]
 pub struct LevelDat {
+	/// The `Data` field
 	pub data: LevelDatData,
 }
diff --git a/src/world/layer.rs b/src/world/layer.rs
index 3abc30b..ce88107 100644
--- a/src/world/layer.rs
+++ b/src/world/layer.rs
@@ -1,3 +1,5 @@
+//! Functions to search the "top" layer of a chunk
+
 use std::num::NonZeroU16;
 
 use anyhow::{Context, Result};
@@ -10,6 +12,7 @@ use crate::{
 	types::*,
 };
 
+/// Height (Y coordinate) of a block
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
 pub struct BlockHeight(pub i32);
 
@@ -28,27 +31,52 @@ impl BlockHeight {
 	}
 }
 
+/// Array optionally storing a [BlockType] for each coordinate of a chunk
 pub type BlockArray = LayerBlockArray<Option<BlockType>>;
+
+/// Array optionally storing a biome index for each coordinate of a chunk
+///
+/// The entries refer to a biome list generated with the top layer data.
+/// Indices are stored incremented by 1 to allow using a [NonZeroU16].
 pub type BiomeArray = LayerBlockArray<Option<NonZeroU16>>;
+
+/// Array storing a block light value for each coordinate for a chunk
 pub type BlockLightArray = LayerBlockArray<u8>;
+
+/// Array optionally storing a depth value for each coordinate for a chunk
 pub type DepthArray = LayerBlockArray<Option<BlockHeight>>;
 
+/// References to LayerData entries for a single coordinate pair
 struct LayerEntry<'a> {
+	/// The block type of the referenced entry
 	block: &'a mut Option<BlockType>,
+	/// The biome type of the referenced entry
 	biome: &'a mut Option<NonZeroU16>,
+	/// The block light of the referenced entry
 	block_light: &'a mut u8,
+	/// The depth value of the referenced entry
 	depth: &'a mut Option<BlockHeight>,
 }
 
 impl<'a> LayerEntry<'a> {
+	/// Returns true if the entry has not been filled yet (no opaque block has been encountered)
+	///
+	/// The depth value is filled separately when a non-water block is encountered after the block type
+	/// has already been filled.
 	fn is_empty(&self) -> bool {
 		self.block.is_none()
 	}
 
+	/// Returns true if the entry has been filled including its depth (an opaque non-water block has been
+	/// encountered)
 	fn done(&self) -> bool {
 		self.depth.is_some()
 	}
 
+	/// Fills in the LayerEntry
+	///
+	/// Checks whether the passed coordinates point at an opaque or non-water block and
+	/// fills in the entry accordingly. Returns true when the block has been filled including its depth.
 	fn fill(
 		&mut self,
 		biome_list: &mut IndexSet<Biome>,
@@ -90,15 +118,24 @@ impl<'a> LayerEntry<'a> {
 	}
 }
 
+/// Top layer data
+///
+/// A LayerData stores block type, biome, block light and depth data for
+/// each coordinate of a chunk.
 #[derive(Debug, Default)]
 pub struct LayerData {
+	/// Block type data
 	pub blocks: Box<BlockArray>,
+	/// Biome data
 	pub biomes: Box<BiomeArray>,
+	/// Block light data
 	pub block_light: Box<BlockLightArray>,
+	/// Depth data
 	pub depths: Box<DepthArray>,
 }
 
 impl LayerData {
+	/// Builds a [LayerEntry] referencing the LayerData at a given coordinate pair
 	fn entry(&mut self, coords: LayerBlockCoords) -> LayerEntry {
 		LayerEntry {
 			block: &mut self.blocks[coords],
@@ -109,13 +146,14 @@ impl LayerData {
 	}
 }
 
-/// Fills in a [BlockInfoArray] with the information of the chunk's top
+/// Fills in a [LayerData] with the information of the chunk's top
 /// block layer
 ///
 /// For each (X, Z) coordinate pair, the topmost opaque block is
 /// determined as the block that should be visible on the rendered
 /// map. For water blocks, the height of the first non-water block
-/// is additionally filled in as the water depth.
+/// is additionally filled in as the water depth (the block height is
+/// used as depth otherwise).
 pub fn top_layer(biome_list: &mut IndexSet<Biome>, chunk: &Chunk) -> Result<Option<LayerData>> {
 	use BLOCKS_PER_CHUNK as N;
 
diff --git a/src/world/mod.rs b/src/world/mod.rs
index 9879066..57aa7ed 100644
--- a/src/world/mod.rs
+++ b/src/world/mod.rs
@@ -1,3 +1,5 @@
+//! Data structures describing Minecraft save data
+
 pub mod chunk;
 pub mod de;
 pub mod layer;
diff --git a/src/world/section.rs b/src/world/section.rs
index 5f6553d..8f47216 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -1,3 +1,8 @@
+//! Higher-level interfaces to section data
+//!
+//! The data types in this module attempt to provide interfaces abstracting
+//! over different data versions as much as possible.
+
 use std::fmt::Debug;
 
 use anyhow::{bail, Context, Result};
@@ -9,6 +14,14 @@ use crate::{
 	types::*,
 };
 
+use BLOCKS_PER_CHUNK as N;
+/// Maximum height of pre-1.18 levels
+const HEIGHT: usize = 256;
+/// Number of biome entries per chunk in each direction
+const BN: usize = N >> 2;
+/// Pre-1.18 height of level measured in 4-block spans (resolution of 1.15+ biome data)
+const BHEIGHT: usize = HEIGHT >> 2;
+
 /// Determine the number of bits required for indexing into a palette of a given length
 ///
 /// This is basically a base-2 logarithm, with clamping to a minimum value and
@@ -29,20 +42,31 @@ fn palette_bits(len: usize, min: u8, max: u8) -> Option<u8> {
 
 /// Trait for common functions of [SectionV1_13] and [SectionV0]
 pub trait Section: Debug {
+	/// Returns the [BlockType] at a coordinate tuple inside the section
 	fn block_at(&self, coords: SectionBlockCoords) -> Result<Option<BlockType>>;
 }
 
 /// Minecraft v1.13+ section block data
 #[derive(Debug)]
 pub struct SectionV1_13<'a> {
+	/// Packed block type data
 	block_states: Option<&'a [i64]>,
+	/// List of block types indexed by entries encoded in *block_states*
 	palette: Vec<Option<BlockType>>,
+	/// Number of bits per block in *block_states*
 	bits: u8,
+	/// Set to true if packed block entries in *block_states* are aligned to i64
+	///
+	/// In older data formats, entries are unaligned and a single block can span
+	/// two i64 entries.
 	aligned_blocks: bool,
 }
 
 impl<'a> SectionV1_13<'a> {
 	/// Constructs a new [SectionV1_13] from deserialized data structures
+	///
+	/// The block IDs in the section's palette are resolved to their [BlockType]s
+	/// to allow for faster lookup later.
 	pub fn new(
 		data_version: u32,
 		block_states: Option<&'a [i64]>,
@@ -127,16 +151,21 @@ impl<'a> Section for SectionV1_13<'a> {
 /// Pre-1.13 section block data
 #[derive(Debug)]
 pub struct SectionV0<'a> {
+	/// Block type data
+	///
+	/// Each i8 entry corresponds to a block in the 16x16x16 section
 	blocks: &'a [i8],
+	/// Block damage/subtype data
+	///
+	/// Uses 4 bits for each block in the 16x16x16 section
 	data: &'a [i8],
+	/// Used to look up block type IDs
 	block_types: &'a BlockTypes,
 }
 
 impl<'a> SectionV0<'a> {
 	/// Constructs a new [SectionV0] from deserialized data structures
 	pub fn new(blocks: &'a [i8], data: &'a [i8], block_types: &'a BlockTypes) -> Result<Self> {
-		use BLOCKS_PER_CHUNK as N;
-
 		if blocks.len() != N * N * N {
 			bail!("Invalid section block data");
 		}
@@ -171,6 +200,7 @@ impl<'a> Section for SectionV0<'a> {
 
 /// Trait for common functions of [BiomesV1_18] and [BiomesV0]
 pub trait Biomes: Debug {
+	/// Returns the [Biome] at a coordinate tuple inside the chunk
 	fn biome_at(&self, section: SectionY, coords: SectionBlockCoords) -> Result<Option<&Biome>>;
 }
 
@@ -181,13 +211,21 @@ pub trait Biomes: Debug {
 /// v1.13+ block data.
 #[derive(Debug)]
 pub struct BiomesV1_18<'a> {
+	/// Packed biome data
+	///
+	/// Each entry specifies the biome of a 4x4x4 block area.
+	///
+	/// Unlike block type data in [SectionV1_13], biome data is always aligned
+	/// to whole i64 values.
 	biomes: Option<&'a [i64]>,
+	/// Biome palette indexed by entries encoded in *biomes*
 	palette: Vec<Option<&'a Biome>>,
+	/// Number of bits used for each entry in *biomes*
 	bits: u8,
 }
 
 impl<'a> BiomesV1_18<'a> {
-	/// Constructs a new [BiomesV18] from deserialized data structures
+	/// Constructs a new [BiomesV1_18] from deserialized data structures
 	pub fn new(
 		biomes: Option<&'a [i64]>,
 		palette: &'a [String],
@@ -223,9 +261,6 @@ impl<'a> BiomesV1_18<'a> {
 
 	/// Looks up the block type palette index at the given coordinates
 	fn palette_index_at(&self, coords: SectionBlockCoords) -> usize {
-		const N: usize = BLOCKS_PER_CHUNK;
-		const BN: usize = N >> 2;
-
 		let Some(biomes) = self.biomes else {
 			return 0;
 		};
@@ -262,28 +297,31 @@ impl<'a> Biomes for BiomesV1_18<'a> {
 /// different pre-v1.18 Minecraft versions
 #[derive(Debug)]
 enum BiomesV0Data<'a> {
+	/// Biome data stored as IntArray in 1.15+ format
+	///
+	/// Minecraft 1.15 switched to 3-dimensional biome information, but reduced
+	/// the resolution to only use one entry for every 4x4x4 block area.
 	IntArrayV15(&'a fastnbt::IntArray),
+	/// Biome data stored as IntArray in some pre-1.15 versions
 	IntArrayV0(&'a fastnbt::IntArray),
+	/// Biome data stored as ByteArray in some pre-1.15 versions
 	ByteArray(&'a fastnbt::ByteArray),
 }
 
 /// Pre-v1.18 section biome data
 #[derive(Debug)]
 pub struct BiomesV0<'a> {
+	/// Biome data from save data
 	data: BiomesV0Data<'a>,
+	/// Used to look up biome IDs
 	biome_types: &'a BiomeTypes,
 }
 
 impl<'a> BiomesV0<'a> {
 	/// Constructs a new [BiomesV0] from deserialized data structures
 	pub fn new(biomes: Option<&'a de::BiomesV0>, biome_types: &'a BiomeTypes) -> Result<Self> {
-		const N: usize = BLOCKS_PER_CHUNK;
-		const MAXY: usize = 256;
-		const BN: usize = N >> 2;
-		const BMAXY: usize = MAXY >> 2;
-
 		let data = match biomes {
-			Some(de::BiomesV0::IntArray(data)) if data.len() == BN * BN * BMAXY => {
+			Some(de::BiomesV0::IntArray(data)) if data.len() == BN * BN * BHEIGHT => {
 				BiomesV0Data::IntArrayV15(data)
 			}
 			Some(de::BiomesV0::IntArray(data)) if data.len() == N * N => {
@@ -302,16 +340,12 @@ impl<'a> Biomes for BiomesV0<'a> {
 	fn biome_at(&self, section: SectionY, coords: SectionBlockCoords) -> Result<Option<&Biome>> {
 		let id = match self.data {
 			BiomesV0Data::IntArrayV15(data) => {
-				const N: usize = BLOCKS_PER_CHUNK;
-				const MAXY: usize = 256;
-				const BN: usize = N >> 2;
-
 				let LayerBlockCoords { x, z } = coords.xz;
 				let y = section
 					.0
 					.checked_mul(BLOCKS_PER_CHUNK as i32)
 					.and_then(|y| y.checked_add_unsigned(coords.y.0.into()))
-					.filter(|&height| height >= 0 && (height as usize) < MAXY)
+					.filter(|&height| height >= 0 && (height as usize) < HEIGHT)
 					.context("Y coordinate out of range")? as usize;
 				let offset = (y >> 2) * BN * BN + (z.0 >> 2) as usize * BN + (x.0 >> 2) as usize;
 				let id = data[offset] as u32;
@@ -327,12 +361,13 @@ impl<'a> Biomes for BiomesV0<'a> {
 	}
 }
 
+/// Wrapper around chunk block light data array
 #[derive(Debug, Clone, Copy)]
 pub struct BlockLight<'a>(Option<&'a [i8]>);
 
 impl<'a> BlockLight<'a> {
+	/// Creates a new [BlockLight], checking validity
 	pub fn new(block_light: Option<&'a [i8]>) -> Result<Self> {
-		use BLOCKS_PER_CHUNK as N;
 		if let Some(block_light) = block_light {
 			if block_light.len() != N * N * N / 2 {
 				bail!("Invalid section block light data");
@@ -341,6 +376,7 @@ impl<'a> BlockLight<'a> {
 		Ok(BlockLight(block_light))
 	}
 
+	/// Returns the block light value at the given coordinates
 	pub fn block_light_at(&self, coords: SectionBlockCoords) -> u8 {
 		let Some(block_light) = self.0 else {
 			return 0;

From 204d0d06d510b5ca957205de381d6a8e78f228e8 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 20 Aug 2023 12:20:57 +0200
Subject: [PATCH 236/460] resource/biomes: add Minecraft 1.20 support

Add the new Cherry Grove biome.
---
 src/resource/biomes.rs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/resource/biomes.rs b/src/resource/biomes.rs
index 54859df..61f8339 100644
--- a/src/resource/biomes.rs
+++ b/src/resource/biomes.rs
@@ -130,6 +130,13 @@ pub const BIOMES: &[(&str, Biome)] = {
 		("bamboo_jungle", Biome::new(0_95, 0_90)),
 		("beach", Biome::new(0_80, 0_40)),
 		("birch_forest", Biome::new(0_60, 0_60)),
+		(
+			"cherry_grove",
+			Biome::new(0_50, 0_80)
+				.water([93, 183, 239])
+				.grass([182, 219, 97])
+				.foliage([182, 219, 97]),
+		),
 		("cold_ocean", Biome::new(0_50, 0_50).water([61, 87, 214])),
 		("dark_forest", Biome::new(0_70, 0_80).modify(DarkForest)),
 		(

From 3cb65ec70e4ba6e4237b3820a28b43d8e67ad7e5 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 20 Aug 2023 13:41:37 +0200
Subject: [PATCH 237/460] resource/block_types: update for Minecraft 1.20

---
 resource/blocks.json        | 134 ++++++++++
 src/resource/block_types.rs | 494 +++++++++++++++++++++++++++++++++++-
 2 files changed, 626 insertions(+), 2 deletions(-)

diff --git a/resource/blocks.json b/resource/blocks.json
index cfb908f..8e87750 100644
--- a/resource/blocks.json
+++ b/resource/blocks.json
@@ -9,6 +9,7 @@
 	"acacia_fence_gate": {
 		"texture": "acacia_planks"
 	},
+	"acacia_hanging_sign": null,
 	"acacia_leaves": {
 		"foliage": true
 	},
@@ -30,6 +31,7 @@
 		"texture": "acacia_planks"
 	},
 	"acacia_trapdoor": {},
+	"acacia_wall_hanging_sign": null,
 	"acacia_wall_sign": null,
 	"acacia_wood": {
 		"texture": "acacia_log"
@@ -69,7 +71,44 @@
 	"bamboo": {
 		"texture": "bamboo_stalk"
 	},
+	"bamboo_block": {
+		"texture": "bamboo_block_top"
+	},
+	"bamboo_button": null,
+	"bamboo_door": {
+		"texture": "bamboo_door_top"
+	},
+	"bamboo_fence": {
+		"texture": "bamboo_planks"
+	},
+	"bamboo_fence_gate": {
+		"texture": "bamboo_planks"
+	},
+	"bamboo_hanging_sign": null,
+	"bamboo_mosaic": {},
+	"bamboo_mosaic_slab": {
+		"texture": "bamboo_mosaic"
+	},
+	"bamboo_mosaic_stairs": {
+		"texture": "bamboo_mosaic"
+	},
+	"bamboo_planks": {},
+	"bamboo_pressure_plate": {
+		"texture": "bamboo_planks"
+	},
 	"bamboo_sapling": null,
+	"bamboo_sign": {
+		"texture": "bamboo_planks"
+	},
+	"bamboo_slab": {
+		"texture": "bamboo_planks"
+	},
+	"bamboo_stairs": {
+		"texture": "bamboo_planks"
+	},
+	"bamboo_trapdoor": {},
+	"bamboo_wall_hanging_sign": null,
+	"bamboo_wall_sign": null,
 	"barrel": {
 		"texture": "barrel_top"
 	},
@@ -105,6 +144,7 @@
 	"birch_fence_gate": {
 		"texture": "birch_planks"
 	},
+	"birch_hanging_sign": null,
 	"birch_leaves": {
 		"birch": true
 	},
@@ -126,6 +166,7 @@
 		"texture": "birch_planks"
 	},
 	"birch_trapdoor": {},
+	"birch_wall_hanging_sign": null,
 	"birch_wall_sign": null,
 	"birch_wood": {
 		"texture": "birch_log"
@@ -246,6 +287,9 @@
 		"texture": "cake_top"
 	},
 	"calcite": {},
+	"calibrated_sculk_sensor": {
+		"texture": "calibrated_sculk_sensor_top"
+	},
 	"campfire": {
 		"texture": "campfire_log_lit"
 	},
@@ -272,12 +316,50 @@
 	"chain_command_block": {
 		"texture": "chain_command_block_side"
 	},
+	"cherry_button": null,
+	"cherry_door": {
+		"texture": "cherry_door_top"
+	},
+	"cherry_fence": {
+		"texture": "cherry_planks"
+	},
+	"cherry_fence_gate": {
+		"texture": "cherry_planks"
+	},
+	"cherry_hanging_sign": null,
+	"cherry_leaves": {},
+	"cherry_log": {
+		"texture": "cherry_log_top"
+	},
+	"cherry_planks": {},
+	"cherry_pressure_plate": {
+		"texture": "cherry_planks"
+	},
+	"cherry_sapling": null,
+	"cherry_sign": {
+		"texture": "cherry_planks"
+	},
+	"cherry_slab": {
+		"texture": "cherry_planks"
+	},
+	"cherry_stairs": {
+		"texture": "cherry_planks"
+	},
+	"cherry_trapdoor": {},
+	"cherry_wall_hanging_sign": null,
+	"cherry_wall_sign": null,
+	"cherry_wood": {
+		"texture": "cherry_log"
+	},
 	"chest": {
 		"texture": "oak_planks"
 	},
 	"chipped_anvil": {
 		"texture": "chipped_anvil_top"
 	},
+	"chiseled_bookshelf": {
+		"texture": "chiseled_bookshelf_top"
+	},
 	"chiseled_deepslate": {},
 	"chiseled_nether_bricks": {},
 	"chiseled_polished_blackstone": {},
@@ -351,6 +433,7 @@
 		"texture": "crimson_planks"
 	},
 	"crimson_fungus": null,
+	"crimson_hanging_sign": null,
 	"crimson_hyphae": {
 		"texture": "crimson_stem"
 	},
@@ -373,6 +456,7 @@
 		"texture": "crimson_stem_top"
 	},
 	"crimson_trapdoor": {},
+	"crimson_wall_hanging_sign": null,
 	"crimson_wall_sign": null,
 	"crying_obsidian": {},
 	"cut_copper": {},
@@ -428,6 +512,7 @@
 	"dark_oak_fence_gate": {
 		"texture": "dark_oak_planks"
 	},
+	"dark_oak_hanging_sign": null,
 	"dark_oak_leaves": {
 		"foliage": true
 	},
@@ -449,6 +534,7 @@
 		"texture": "dark_oak_planks"
 	},
 	"dark_oak_trapdoor": {},
+	"dark_oak_wall_hanging_sign": null,
 	"dark_oak_wall_sign": null,
 	"dark_oak_wood": {
 		"texture": "dark_oak_log"
@@ -484,6 +570,9 @@
 	"dead_tube_coral_block": {},
 	"dead_tube_coral_fan": null,
 	"dead_tube_coral_wall_fan": null,
+	"decorated_pot": {
+		"texture": "flower_pot"
+	},
 	"deepslate": {},
 	"deepslate_brick_slab": {
 		"texture": "deepslate_bricks"
@@ -743,6 +832,7 @@
 	"jungle_fence_gate": {
 		"texture": "jungle_planks"
 	},
+	"jungle_hanging_sign": null,
 	"jungle_leaves": {
 		"foliage": true
 	},
@@ -764,6 +854,7 @@
 		"texture": "jungle_planks"
 	},
 	"jungle_trapdoor": {},
+	"jungle_wall_hanging_sign": null,
 	"jungle_wall_sign": null,
 	"jungle_wood": {
 		"texture": "jungle_log"
@@ -900,6 +991,7 @@
 	"mangrove_fence_gate": {
 		"texture": "mangrove_planks"
 	},
+	"mangrove_hanging_sign": null,
 	"mangrove_leaves": {
 		"foliage": true
 	},
@@ -924,6 +1016,7 @@
 		"texture": "mangrove_planks"
 	},
 	"mangrove_trapdoor": {},
+	"mangrove_wall_hanging_sign": null,
 	"mangrove_wall_sign": null,
 	"mangrove_wood": {
 		"texture": "mangrove_log"
@@ -1012,6 +1105,7 @@
 	"oak_fence_gate": {
 		"texture": "oak_planks"
 	},
+	"oak_hanging_sign": null,
 	"oak_leaves": {
 		"foliage": true
 	},
@@ -1033,6 +1127,7 @@
 		"texture": "oak_planks"
 	},
 	"oak_trapdoor": {},
+	"oak_wall_hanging_sign": null,
 	"oak_wall_sign": null,
 	"oak_wood": {
 		"texture": "oak_log"
@@ -1085,6 +1180,8 @@
 	"petrified_oak_slab": {
 		"texture": "oak_planks"
 	},
+	"piglin_head": null,
+	"piglin_wall_head": null,
 	"pink_banner": null,
 	"pink_bed": null,
 	"pink_candle": null,
@@ -1097,6 +1194,7 @@
 	"pink_concrete": {},
 	"pink_concrete_powder": {},
 	"pink_glazed_terracotta": {},
+	"pink_petals": null,
 	"pink_shulker_box": {},
 	"pink_stained_glass": {},
 	"pink_stained_glass_pane": {
@@ -1112,6 +1210,12 @@
 	"piston_head": {
 		"texture": "piston_top"
 	},
+	"pitcher_crop": {
+		"texture": "pitcher_crop_top"
+	},
+	"pitcher_plant": {
+		"texture": "pitcher_crop_top_stage_4"
+	},
 	"player_head": null,
 	"player_wall_head": null,
 	"podzol": {
@@ -1209,6 +1313,9 @@
 	"potted_cactus": {
 		"texture": "cactus_top"
 	},
+	"potted_cherry_sapling": {
+		"texture": "cherry_sapling"
+	},
 	"potted_cornflower": {
 		"texture": "cornflower"
 	},
@@ -1267,6 +1374,9 @@
 	"potted_spruce_sapling": {
 		"texture": "spruce_sapling"
 	},
+	"potted_torchflower": {
+		"texture": "torchflower"
+	},
 	"potted_warped_fungus": {
 		"texture": "warped_fungus"
 	},
@@ -1496,6 +1606,9 @@
 	"smooth_stone_slab": {
 		"texture": "smooth_stone"
 	},
+	"sniffer_egg": {
+		"texture": "sniffer_egg_not_cracked_top"
+	},
 	"snow": {},
 	"snow_block": {
 		"texture": "snow"
@@ -1524,6 +1637,7 @@
 	"spruce_fence_gate": {
 		"texture": "spruce_planks"
 	},
+	"spruce_hanging_sign": null,
 	"spruce_leaves": {
 		"spruce": true
 	},
@@ -1545,6 +1659,7 @@
 		"texture": "spruce_planks"
 	},
 	"spruce_trapdoor": {},
+	"spruce_wall_hanging_sign": null,
 	"spruce_wall_sign": null,
 	"spruce_wood": {
 		"texture": "spruce_log"
@@ -1582,12 +1697,21 @@
 	"stripped_acacia_wood": {
 		"texture": "stripped_acacia_log"
 	},
+	"stripped_bamboo_block": {
+		"texture": "stripped_bamboo_block_top"
+	},
 	"stripped_birch_log": {
 		"texture": "stripped_birch_log_top"
 	},
 	"stripped_birch_wood": {
 		"texture": "stripped_birch_log"
 	},
+	"stripped_cherry_log": {
+		"texture": "stripped_cherry_log_top"
+	},
+	"stripped_cherry_wood": {
+		"texture": "stripped_cherry_log"
+	},
 	"stripped_crimson_hyphae": {
 		"texture": "stripped_crimson_stem"
 	},
@@ -1636,6 +1760,12 @@
 	"sunflower": {
 		"texture": "sunflower_front"
 	},
+	"suspicious_gravel": {
+		"texture": "suspicious_gravel_0"
+	},
+	"suspicious_sand": {
+		"texture": "suspicious_sand_0"
+	},
 	"sweet_berry_bush": {
 		"texture": "sweet_berry_bush_stage3"
 	},
@@ -1655,6 +1785,8 @@
 		"texture": "tnt_top"
 	},
 	"torch": null,
+	"torchflower": null,
+	"torchflower_crop": null,
 	"trapped_chest": {
 		"texture": "oak_planks"
 	},
@@ -1688,6 +1820,7 @@
 		"texture": "warped_planks"
 	},
 	"warped_fungus": null,
+	"warped_hanging_sign": null,
 	"warped_hyphae": {
 		"texture": "warped_stem"
 	},
@@ -1710,6 +1843,7 @@
 		"texture": "warped_stem_top"
 	},
 	"warped_trapdoor": {},
+	"warped_wall_hanging_sign": null,
 	"warped_wall_sign": null,
 	"warped_wart_block": {},
 	"water": {
diff --git a/src/resource/block_types.rs b/src/resource/block_types.rs
index 467cf7a..68a08c0 100644
--- a/src/resource/block_types.rs
+++ b/src/resource/block_types.rs
@@ -31,6 +31,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([168, 90, 50]),
 		},
 	),
+	(
+		"acacia_hanging_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
 	(
 		"acacia_leaves",
 		BlockType {
@@ -94,6 +101,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([156, 87, 51]),
 		},
 	),
+	(
+		"acacia_wall_hanging_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
 	(
 		"acacia_wall_sign",
 		BlockType {
@@ -227,6 +241,83 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([93, 144, 19]),
 		},
 	),
+	(
+		"bamboo_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([139, 141, 62]),
+		},
+	),
+	(
+		"bamboo_button",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
+	(
+		"bamboo_door",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([191, 171, 81]),
+		},
+	),
+	(
+		"bamboo_fence",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([193, 173, 80]),
+		},
+	),
+	(
+		"bamboo_fence_gate",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([193, 173, 80]),
+		},
+	),
+	(
+		"bamboo_hanging_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
+	(
+		"bamboo_mosaic",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([190, 170, 78]),
+		},
+	),
+	(
+		"bamboo_mosaic_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([190, 170, 78]),
+		},
+	),
+	(
+		"bamboo_mosaic_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([190, 170, 78]),
+		},
+	),
+	(
+		"bamboo_planks",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([193, 173, 80]),
+		},
+	),
+	(
+		"bamboo_pressure_plate",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([193, 173, 80]),
+		},
+	),
 	(
 		"bamboo_sapling",
 		BlockType {
@@ -234,6 +325,48 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([0, 0, 0]),
 		},
 	),
+	(
+		"bamboo_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([193, 173, 80]),
+		},
+	),
+	(
+		"bamboo_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([193, 173, 80]),
+		},
+	),
+	(
+		"bamboo_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([193, 173, 80]),
+		},
+	),
+	(
+		"bamboo_trapdoor",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([198, 179, 85]),
+		},
+	),
+	(
+		"bamboo_wall_hanging_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
+	(
+		"bamboo_wall_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
 	(
 		"barrel",
 		BlockType {
@@ -339,6 +472,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([192, 175, 121]),
 		},
 	),
+	(
+		"birch_hanging_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
 	(
 		"birch_leaves",
 		BlockType {
@@ -402,6 +542,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([207, 194, 157]),
 		},
 	),
+	(
+		"birch_wall_hanging_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
 	(
 		"birch_wall_sign",
 		BlockType {
@@ -913,6 +1060,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([223, 224, 220]),
 		},
 	),
+	(
+		"calibrated_sculk_sensor",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([27, 79, 100]),
+		},
+	),
 	(
 		"campfire",
 		BlockType {
@@ -997,6 +1151,125 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([131, 161, 147]),
 		},
 	),
+	(
+		"cherry_button",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
+	(
+		"cherry_door",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([223, 170, 164]),
+		},
+	),
+	(
+		"cherry_fence",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([226, 178, 172]),
+		},
+	),
+	(
+		"cherry_fence_gate",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([226, 178, 172]),
+		},
+	),
+	(
+		"cherry_hanging_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
+	(
+		"cherry_leaves",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([229, 172, 194]),
+		},
+	),
+	(
+		"cherry_log",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([185, 141, 137]),
+		},
+	),
+	(
+		"cherry_planks",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([226, 178, 172]),
+		},
+	),
+	(
+		"cherry_pressure_plate",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([226, 178, 172]),
+		},
+	),
+	(
+		"cherry_sapling",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
+	(
+		"cherry_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([226, 178, 172]),
+		},
+	),
+	(
+		"cherry_slab",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([226, 178, 172]),
+		},
+	),
+	(
+		"cherry_stairs",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([226, 178, 172]),
+		},
+	),
+	(
+		"cherry_trapdoor",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([226, 178, 172]),
+		},
+	),
+	(
+		"cherry_wall_hanging_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
+	(
+		"cherry_wall_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
+	(
+		"cherry_wood",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([54, 33, 44]),
+		},
+	),
 	(
 		"chest",
 		BlockType {
@@ -1011,6 +1284,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([72, 72, 72]),
 		},
 	),
+	(
+		"chiseled_bookshelf",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([178, 144, 88]),
+		},
+	),
 	(
 		"chiseled_deepslate",
 		BlockType {
@@ -1312,6 +1592,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([0, 0, 0]),
 		},
 	),
+	(
+		"crimson_hanging_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
 	(
 		"crimson_hyphae",
 		BlockType {
@@ -1382,6 +1669,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([103, 50, 72]),
 		},
 	),
+	(
+		"crimson_wall_hanging_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
 	(
 		"crimson_wall_sign",
 		BlockType {
@@ -1585,6 +1879,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([66, 43, 20]),
 		},
 	),
+	(
+		"dark_oak_hanging_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
 	(
 		"dark_oak_leaves",
 		BlockType {
@@ -1648,6 +1949,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([75, 49, 23]),
 		},
 	),
+	(
+		"dark_oak_wall_hanging_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
 	(
 		"dark_oak_wall_sign",
 		BlockType {
@@ -1837,6 +2145,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([0, 0, 0]),
 		},
 	),
+	(
+		"decorated_pot",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([124, 68, 53]),
+		},
+	),
 	(
 		"deepslate",
 		BlockType {
@@ -2817,6 +3132,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([160, 115, 80]),
 		},
 	),
+	(
+		"jungle_hanging_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
 	(
 		"jungle_leaves",
 		BlockType {
@@ -2880,6 +3202,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([152, 110, 77]),
 		},
 	),
+	(
+		"jungle_wall_hanging_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
 	(
 		"jungle_wall_sign",
 		BlockType {
@@ -3461,6 +3790,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([117, 54, 48]),
 		},
 	),
+	(
+		"mangrove_hanging_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
 	(
 		"mangrove_leaves",
 		BlockType {
@@ -3531,6 +3867,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([110, 46, 42]),
 		},
 	),
+	(
+		"mangrove_wall_hanging_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
 	(
 		"mangrove_wall_sign",
 		BlockType {
@@ -3825,6 +4168,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([162, 130, 78]),
 		},
 	),
+	(
+		"oak_hanging_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
 	(
 		"oak_leaves",
 		BlockType {
@@ -3888,6 +4238,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([124, 99, 56]),
 		},
 	),
+	(
+		"oak_wall_hanging_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
 	(
 		"oak_wall_sign",
 		BlockType {
@@ -4098,6 +4455,20 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([162, 130, 78]),
 		},
 	),
+	(
+		"piglin_head",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
+	(
+		"piglin_wall_head",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
 	(
 		"pink_banner",
 		BlockType {
@@ -4154,6 +4525,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([235, 154, 181]),
 		},
 	),
+	(
+		"pink_petals",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
 	(
 		"pink_shulker_box",
 		BlockType {
@@ -4217,6 +4595,20 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([153, 127, 85]),
 		},
 	),
+	(
+		"pitcher_crop",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([193, 165, 103]),
+		},
+	),
+	(
+		"pitcher_plant",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([122, 144, 189]),
+		},
+	),
 	(
 		"player_head",
 		BlockType {
@@ -4490,6 +4882,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([85, 127, 43]),
 		},
 	),
+	(
+		"potted_cherry_sapling",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([164, 117, 143]),
+		},
+	),
 	(
 		"potted_cornflower",
 		BlockType {
@@ -4623,6 +5022,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([44, 60, 36]),
 		},
 	),
+	(
+		"potted_torchflower",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([100, 101, 77]),
+		},
+	),
 	(
 		"potted_warped_fungus",
 		BlockType {
@@ -4788,7 +5194,7 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 		"purple_glazed_terracotta",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([109, 48, 152]),
+			color: Color([109, 47, 152]),
 		},
 	),
 	(
@@ -5229,7 +5635,7 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 		"scaffolding",
 		BlockType {
 			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([174, 134, 80]),
+			color: Color([170, 131, 73]),
 		},
 	),
 	(
@@ -5442,6 +5848,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([158, 158, 158]),
 		},
 	),
+	(
+		"sniffer_egg",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([135, 105, 67]),
+		},
+	),
 	(
 		"snow",
 		BlockType {
@@ -5554,6 +5967,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([114, 84, 48]),
 		},
 	),
+	(
+		"spruce_hanging_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
 	(
 		"spruce_leaves",
 		BlockType {
@@ -5617,6 +6037,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([103, 79, 47]),
 		},
 	),
+	(
+		"spruce_wall_hanging_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
 	(
 		"spruce_wall_sign",
 		BlockType {
@@ -5722,6 +6149,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([174, 92, 59]),
 		},
 	),
+	(
+		"stripped_bamboo_block",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([178, 158, 72]),
+		},
+	),
 	(
 		"stripped_birch_log",
 		BlockType {
@@ -5736,6 +6170,20 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([196, 176, 118]),
 		},
 	),
+	(
+		"stripped_cherry_log",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([221, 164, 157]),
+		},
+	),
+	(
+		"stripped_cherry_wood",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([215, 145, 148]),
+		},
+	),
 	(
 		"stripped_crimson_hyphae",
 		BlockType {
@@ -5862,6 +6310,20 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([246, 196, 54]),
 		},
 	),
+	(
+		"suspicious_gravel",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([129, 125, 124]),
+		},
+	),
+	(
+		"suspicious_sand",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{Opaque}),
+			color: Color([217, 204, 159]),
+		},
+	),
 	(
 		"sweet_berry_bush",
 		BlockType {
@@ -5918,6 +6380,20 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([0, 0, 0]),
 		},
 	),
+	(
+		"torchflower",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
+	(
+		"torchflower_crop",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
 	(
 		"trapped_chest",
 		BlockType {
@@ -6065,6 +6541,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([0, 0, 0]),
 		},
 	),
+	(
+		"warped_hanging_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
 	(
 		"warped_hyphae",
 		BlockType {
@@ -6135,6 +6618,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([47, 119, 111]),
 		},
 	),
+	(
+		"warped_wall_hanging_sign",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
 	(
 		"warped_wall_sign",
 		BlockType {

From 9ec1c03ce1ce15f8e0671d941725e84d29c2efb2 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 20 Aug 2023 14:15:29 +0200
Subject: [PATCH 238/460] Only name library crate rather than whole package
 "minedmap-core"

---
 Cargo.lock | 2 +-
 Cargo.toml | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 06f1283..0224949 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -553,7 +553,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "minedmap-core"
+name = "minedmap"
 version = "0.1.0"
 dependencies = [
  "anyhow",
diff --git a/Cargo.toml b/Cargo.toml
index 664b976..bbbc171 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,11 +1,12 @@
 [package]
-name = "minedmap-core"
+name = "minedmap"
 version = "0.1.0"
 edition = "2021"
 license = "MIT"
 default-run = "minedmap"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[lib]
+name = "minedmap_core"
 
 [dependencies]
 anyhow = "1.0.68"

From 09399f5ae951aa578375826930f7d600899797e6 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 20 Aug 2023 16:28:20 +0200
Subject: [PATCH 239/460] Update dependencies

---
 Cargo.lock | 68 +++++++++++++++++++++++++++---------------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0224949..17c6122 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -85,9 +85,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.72"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
+checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
 
 [[package]]
 name = "autocfg"
@@ -167,9 +167,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.3.21"
+version = "4.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd"
+checksum = "03aef18ddf7d879c15ce20f04826ef8418101c7e528014c3eeea13321047dca3"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -178,9 +178,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.3.21"
+version = "4.3.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa"
+checksum = "f8ce6fffb678c9b80a70b6b6de0aad31df727623a70fd9a842c30cd573e2fa98"
 dependencies = [
  "anstream",
  "anstyle",
@@ -356,9 +356,9 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.26"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
+checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
 dependencies = [
  "crc32fast",
  "libz-ng-sys",
@@ -687,9 +687,9 @@ checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
 [[package]]
 name = "png"
-version = "0.17.9"
+version = "0.17.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11"
+checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64"
 dependencies = [
  "bitflags 1.3.2",
  "crc32fast",
@@ -709,9 +709,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.32"
+version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
 dependencies = [
  "proc-macro2",
 ]
@@ -815,9 +815,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.104"
+version = "1.0.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
+checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
 dependencies = [
  "itoa",
  "ryu",
@@ -853,9 +853,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "syn"
-version = "2.0.28"
+version = "2.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
+checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -864,9 +864,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.31.0"
+version = "1.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40de3a2ba249dcb097e01be5e67a5ff53cf250397715a071a81543e8a832a920"
+checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
 dependencies = [
  "backtrace",
  "parking_lot",
@@ -902,9 +902,9 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.48.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
  "windows_aarch64_gnullvm",
  "windows_aarch64_msvc",
@@ -917,45 +917,45 @@ dependencies = [
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "zstd"

From 248a64103517bc1a43eb694cbf05a58aba99df88 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 20 Aug 2023 16:28:10 +0200
Subject: [PATCH 240/460] Restructure crates

Get rid of the arbitrary bin/lib split and instead move as much as
possible into the bin crate, which becomes the main crate again.

The types and NBT handling are moved into separate crates, so they can
be reused by nbtdump and regiondump.
---
 Cargo.lock                                    | 25 ++++++++++++++++---
 Cargo.toml                                    | 13 +++++-----
 crates/nbt/Cargo.toml                         | 17 +++++++++++++
 {src/io => crates/nbt/src}/data.rs            |  0
 crates/nbt/src/lib.rs                         |  7 ++++++
 {src/io => crates/nbt/src}/region.rs          |  2 +-
 crates/types/Cargo.toml                       | 10 ++++++++
 src/types.rs => crates/types/src/lib.rs       | 14 +++++++++++
 src/bin/nbtdump.rs                            |  2 +-
 src/bin/regiondump.rs                         |  2 +-
 src/{bin/minedmap => core}/common.rs          |  2 +-
 src/{bin/minedmap => core}/metadata_writer.rs |  7 ++----
 src/{bin/minedmap/main.rs => core/mod.rs}     | 10 +++-----
 src/{bin/minedmap => core}/region_group.rs    |  0
 .../minedmap => core}/region_processor.rs     | 19 ++++++--------
 src/{bin/minedmap => core}/tile_mipmapper.rs  |  6 ++---
 src/{bin/minedmap => core}/tile_renderer.rs   | 15 +++++------
 src/io/mod.rs                                 |  2 --
 src/lib.rs                                    | 10 --------
 src/main.rs                                   | 19 ++++++++++++++
 src/resource/mod.rs                           |  1 +
 21 files changed, 121 insertions(+), 62 deletions(-)
 create mode 100644 crates/nbt/Cargo.toml
 rename {src/io => crates/nbt/src}/data.rs (100%)
 create mode 100644 crates/nbt/src/lib.rs
 rename {src/io => crates/nbt/src}/region.rs (99%)
 create mode 100644 crates/types/Cargo.toml
 rename src/types.rs => crates/types/src/lib.rs (96%)
 rename src/{bin/minedmap => core}/common.rs (98%)
 rename src/{bin/minedmap => core}/metadata_writer.rs (94%)
 rename src/{bin/minedmap/main.rs => core/mod.rs} (87%)
 rename src/{bin/minedmap => core}/region_group.rs (100%)
 rename src/{bin/minedmap => core}/region_processor.rs (96%)
 rename src/{bin/minedmap => core}/tile_mipmapper.rs (98%)
 rename src/{bin/minedmap => core}/tile_renderer.rs (98%)
 delete mode 100644 src/lib.rs
 create mode 100644 src/main.rs

diff --git a/Cargo.lock b/Cargo.lock
index 17c6122..2b755fb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -558,17 +558,16 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "bincode",
- "bytemuck",
  "clap",
  "enumflags2",
  "fastnbt",
- "flate2",
  "futures-util",
  "glam",
  "image",
  "indexmap",
- "itertools",
  "lru",
+ "minedmap-nbt",
+ "minedmap-types",
  "num-integer",
  "num_cpus",
  "rayon",
@@ -579,6 +578,26 @@ dependencies = [
  "zstd",
 ]
 
+[[package]]
+name = "minedmap-nbt"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "bytemuck",
+ "fastnbt",
+ "flate2",
+ "minedmap-types",
+ "serde",
+]
+
+[[package]]
+name = "minedmap-types"
+version = "0.1.0"
+dependencies = [
+ "itertools",
+ "serde",
+]
+
 [[package]]
 name = "miniz_oxide"
 version = "0.7.1"
diff --git a/Cargo.toml b/Cargo.toml
index bbbc171..7c9ab32 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,3 +1,6 @@
+[workspace]
+members = ["crates/*"]
+
 [package]
 name = "minedmap"
 version = "0.1.0"
@@ -5,23 +8,19 @@ edition = "2021"
 license = "MIT"
 default-run = "minedmap"
 
-[lib]
-name = "minedmap_core"
-
 [dependencies]
 anyhow = "1.0.68"
 bincode = "1.3.3"
-bytemuck = "1.13.0"
 clap = { version = "4.1.4", features = ["derive"] }
 enumflags2 = { version = "0.7.5", features = ["serde"] }
 fastnbt = "2.3.2"
-flate2 = "1.0.25"
 futures-util = "0.3.28"
 glam = "0.24.0"
 image = { version = "0.24.5", default-features = false, features = ["png"] }
 indexmap = { version = "2.0.0", features = ["serde"] }
-itertools = "0.11.0"
 lru = "0.11.0"
+minedmap-nbt = { version = "0.1.0", path = "crates/nbt", default-features = false }
+minedmap-types = { version = "0.1.0", path = "crates/types" }
 num-integer = "0.1.45"
 num_cpus = "1.16.0"
 rayon = "1.7.0"
@@ -33,4 +32,4 @@ zstd = "0.12.3"
 
 [features]
 default = ["zlib-ng"]
-zlib-ng = ["flate2/zlib-ng"]
+zlib-ng = ["minedmap-nbt/zlib-ng"]
diff --git a/crates/nbt/Cargo.toml b/crates/nbt/Cargo.toml
new file mode 100644
index 0000000..ff1d7d2
--- /dev/null
+++ b/crates/nbt/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "minedmap-nbt"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+anyhow = "1.0.75"
+bytemuck = "1.13.1"
+fastnbt = "2.4.4"
+flate2 = "1.0.27"
+minedmap-types = { version = "0.1.0", path = "../types" }
+serde = "1.0.183"
+
+[features]
+zlib-ng = ["flate2/zlib-ng"]
diff --git a/src/io/data.rs b/crates/nbt/src/data.rs
similarity index 100%
rename from src/io/data.rs
rename to crates/nbt/src/data.rs
diff --git a/crates/nbt/src/lib.rs b/crates/nbt/src/lib.rs
new file mode 100644
index 0000000..0b817b1
--- /dev/null
+++ b/crates/nbt/src/lib.rs
@@ -0,0 +1,7 @@
+//! MinedMap's of Minecraft NBT data and region files
+
+#![warn(missing_docs)]
+#![warn(clippy::missing_docs_in_private_items)]
+
+pub mod data;
+pub mod region;
diff --git a/src/io/region.rs b/crates/nbt/src/region.rs
similarity index 99%
rename from src/io/region.rs
rename to crates/nbt/src/region.rs
index 82f5604..8a52b9d 100644
--- a/src/io/region.rs
+++ b/crates/nbt/src/region.rs
@@ -10,7 +10,7 @@ use anyhow::{bail, Context, Result};
 use flate2::read::ZlibDecoder;
 use serde::de::DeserializeOwned;
 
-use crate::types::*;
+use minedmap_types::*;
 
 /// Data block size of region data files
 ///
diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml
new file mode 100644
index 0000000..fae230b
--- /dev/null
+++ b/crates/types/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "minedmap-types"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+itertools = "0.11.0"
+serde = "1.0.183"
diff --git a/src/types.rs b/crates/types/src/lib.rs
similarity index 96%
rename from src/types.rs
rename to crates/types/src/lib.rs
index 045750b..2e4ea61 100644
--- a/src/types.rs
+++ b/crates/types/src/lib.rs
@@ -1,5 +1,8 @@
 //! Common types used by MinedMap
 
+#![warn(missing_docs)]
+#![warn(clippy::missing_docs_in_private_items)]
+
 use std::{
 	fmt::Debug,
 	iter::FusedIterator,
@@ -32,6 +35,7 @@ macro_rules! coord_type {
 			/// Constructs a new value
 			///
 			/// Will panic if the value is not in the valid range
+			#[inline]
 			pub fn new<T: TryInto<u8>>(value: T) -> Self {
 				Self(
 					value
@@ -43,6 +47,7 @@ macro_rules! coord_type {
 			}
 
 			/// Returns an iterator over all possible values of the type
+			#[inline]
 			pub fn iter() -> impl Iterator<Item = $t<AXIS>>
 			       + DoubleEndedIterator
 			       + ExactSizeIterator
@@ -95,6 +100,7 @@ impl LayerBlockCoords {
 	/// Many chunk data structures store block and biome data in the same
 	/// order. This method computes the offset at which the data for the
 	/// block at a given coordinate is stored.
+	#[inline]
 	pub fn offset(&self) -> usize {
 		use BLOCKS_PER_CHUNK as N;
 		let x = self.x.0 as usize;
@@ -112,12 +118,14 @@ pub struct LayerBlockArray<T>(pub [[T; BLOCKS_PER_CHUNK]; BLOCKS_PER_CHUNK]);
 impl<T> Index<LayerBlockCoords> for LayerBlockArray<T> {
 	type Output = T;
 
+	#[inline]
 	fn index(&self, index: LayerBlockCoords) -> &Self::Output {
 		&self.0[index.z.0 as usize][index.x.0 as usize]
 	}
 }
 
 impl<T> IndexMut<LayerBlockCoords> for LayerBlockArray<T> {
+	#[inline]
 	fn index_mut(&mut self, index: LayerBlockCoords) -> &mut Self::Output {
 		&mut self.0[index.z.0 as usize][index.x.0 as usize]
 	}
@@ -138,6 +146,7 @@ impl SectionBlockCoords {
 	/// Many chunk data structures store block and biome data in the same
 	/// order. This method computes the offset at which the data for the
 	/// block at a given coordinate is stored.
+	#[inline]
 	pub fn offset(&self) -> usize {
 		use BLOCKS_PER_CHUNK as N;
 		let y = self.y.0 as usize;
@@ -194,16 +203,19 @@ pub struct ChunkArray<T>(pub [[T; CHUNKS_PER_REGION]; CHUNKS_PER_REGION]);
 
 impl<T> ChunkArray<T> {
 	/// Iterates over all possible chunk coordinate pairs used as [ChunkArray] keys
+	#[inline]
 	pub fn keys() -> impl Iterator<Item = ChunkCoords> + Clone + Debug {
 		iproduct!(ChunkZ::iter(), ChunkX::iter()).map(|(z, x)| ChunkCoords { x, z })
 	}
 
 	/// Iterates over all values stored in the [ChunkArray]
+	#[inline]
 	pub fn values(&self) -> impl Iterator<Item = &T> + Clone + Debug {
 		Self::keys().map(|k| &self[k])
 	}
 
 	/// Iterates over pairs of chunk coordinate pairs and corresponding stored values
+	#[inline]
 	pub fn iter(&self) -> impl Iterator<Item = (ChunkCoords, &T)> + Clone + Debug {
 		Self::keys().map(|k| (k, &self[k]))
 	}
@@ -212,12 +224,14 @@ impl<T> ChunkArray<T> {
 impl<T> Index<ChunkCoords> for ChunkArray<T> {
 	type Output = T;
 
+	#[inline]
 	fn index(&self, index: ChunkCoords) -> &Self::Output {
 		&self.0[index.z.0 as usize][index.x.0 as usize]
 	}
 }
 
 impl<T> IndexMut<ChunkCoords> for ChunkArray<T> {
+	#[inline]
 	fn index_mut(&mut self, index: ChunkCoords) -> &mut Self::Output {
 		&mut self.0[index.z.0 as usize][index.x.0 as usize]
 	}
diff --git a/src/bin/nbtdump.rs b/src/bin/nbtdump.rs
index da5e502..a83a199 100644
--- a/src/bin/nbtdump.rs
+++ b/src/bin/nbtdump.rs
@@ -18,7 +18,7 @@ struct Args {
 fn main() -> Result<()> {
 	let args = Args::parse();
 
-	let value: fastnbt::Value = minedmap_core::io::data::from_file(args.file.as_path())?;
+	let value: fastnbt::Value = minedmap_nbt::data::from_file(args.file.as_path())?;
 	println!("{:#x?}", value);
 
 	Ok(())
diff --git a/src/bin/regiondump.rs b/src/bin/regiondump.rs
index 21351f7..c8e87b4 100644
--- a/src/bin/regiondump.rs
+++ b/src/bin/regiondump.rs
@@ -18,7 +18,7 @@ struct Args {
 fn main() -> Result<()> {
 	let args = Args::parse();
 
-	minedmap_core::io::region::from_file(args.file.as_path())?.foreach_chunk(
+	minedmap_nbt::region::from_file(args.file.as_path())?.foreach_chunk(
 		|coords, value: fastnbt::Value| {
 			println!("Chunk {:?}: {:#x?}", coords, value);
 			Ok(())
diff --git a/src/bin/minedmap/common.rs b/src/core/common.rs
similarity index 98%
rename from src/bin/minedmap/common.rs
rename to src/core/common.rs
index 4183b64..a6d9a44 100644
--- a/src/bin/minedmap/common.rs
+++ b/src/core/common.rs
@@ -9,7 +9,7 @@ use std::{
 use indexmap::IndexSet;
 use serde::{Deserialize, Serialize};
 
-use super::core::{io::fs::FileMetaVersion, resource::Biome, types::*, world::layer};
+use crate::{io::fs::FileMetaVersion, resource::Biome, types::*, world::layer};
 
 /// MinedMap data version number
 ///
diff --git a/src/bin/minedmap/metadata_writer.rs b/src/core/metadata_writer.rs
similarity index 94%
rename from src/bin/minedmap/metadata_writer.rs
rename to src/core/metadata_writer.rs
index 2ba6038..5783356 100644
--- a/src/bin/minedmap/metadata_writer.rs
+++ b/src/core/metadata_writer.rs
@@ -3,10 +3,7 @@
 use anyhow::{Context, Result};
 use serde::Serialize;
 
-use super::{
-	common::*,
-	core::{self, io::fs, world::de},
-};
+use crate::{core::common::*, io::fs, world::de};
 
 /// Minimum and maximum X and Z tile coordinates for a mipmap level
 #[derive(Debug, Serialize)]
@@ -101,7 +98,7 @@ impl<'a> MetadataWriter<'a> {
 
 	/// Reads and deserializes the `level.dat` of the Minecraft save data
 	fn read_level_dat(&self) -> Result<de::LevelDat> {
-		core::io::data::from_file(&self.config.level_dat_path).context("Failed to read level.dat")
+		crate::nbt::data::from_file(&self.config.level_dat_path).context("Failed to read level.dat")
 	}
 
 	/// Generates [Spawn] data from a [de::LevelDat]
diff --git a/src/bin/minedmap/main.rs b/src/core/mod.rs
similarity index 87%
rename from src/bin/minedmap/main.rs
rename to src/core/mod.rs
index 925a38b..a94cf2c 100644
--- a/src/bin/minedmap/main.rs
+++ b/src/core/mod.rs
@@ -1,7 +1,4 @@
-//! The minedmap generator renders map tile images from Minecraft save data
-
-#![warn(missing_docs)]
-#![warn(clippy::missing_docs_in_private_items)]
+//! Core functions of the MinedMap CLI
 
 mod common;
 mod metadata_writer;
@@ -10,8 +7,6 @@ mod region_processor;
 mod tile_mipmapper;
 mod tile_renderer;
 
-use minedmap_core as core;
-
 use std::path::PathBuf;
 
 use anyhow::{Context, Result};
@@ -46,7 +41,8 @@ fn setup_threads(num_threads: usize) -> Result<()> {
 		.context("Failed to configure thread pool")
 }
 
-fn main() -> Result<()> {
+/// MinedMap CLI main function
+pub fn cli() -> Result<()> {
 	let args = Args::parse();
 	let config = Config::new(&args);
 
diff --git a/src/bin/minedmap/region_group.rs b/src/core/region_group.rs
similarity index 100%
rename from src/bin/minedmap/region_group.rs
rename to src/core/region_group.rs
diff --git a/src/bin/minedmap/region_processor.rs b/src/core/region_processor.rs
similarity index 96%
rename from src/bin/minedmap/region_processor.rs
rename to src/core/region_processor.rs
index 7168ebd..6e32d94 100644
--- a/src/bin/minedmap/region_processor.rs
+++ b/src/core/region_processor.rs
@@ -6,17 +6,14 @@ use anyhow::{Context, Result};
 use indexmap::IndexSet;
 use rayon::prelude::*;
 
-use super::{
-	common::*,
-	core::{
+use super::common::*;
+use crate::{
+	io::{fs, storage},
+	resource::{self, Biome},
+	types::*,
+	world::{
 		self,
-		io::{fs, storage},
-		resource::{self, Biome},
-		types::*,
-		world::{
-			self,
-			layer::{self, LayerData},
-		},
+		layer::{self, LayerData},
 	},
 };
 
@@ -157,7 +154,7 @@ impl<'a> RegionProcessor<'a> {
 
 		println!("Processing region r.{}.{}.mca", coords.x, coords.z);
 
-		core::io::region::from_file(path)?.foreach_chunk(
+		crate::nbt::region::from_file(path)?.foreach_chunk(
 			|chunk_coords, data: world::de::Chunk| {
 				let Some(layer::LayerData {
 					blocks,
diff --git a/src/bin/minedmap/tile_mipmapper.rs b/src/core/tile_mipmapper.rs
similarity index 98%
rename from src/bin/minedmap/tile_mipmapper.rs
rename to src/core/tile_mipmapper.rs
index 59c2880..52fff09 100644
--- a/src/bin/minedmap/tile_mipmapper.rs
+++ b/src/core/tile_mipmapper.rs
@@ -3,10 +3,8 @@
 use anyhow::{Context, Result};
 use rayon::prelude::*;
 
-use super::{
-	common::*,
-	core::{io::fs, types::*},
-};
+use super::common::*;
+use crate::{io::fs, types::*};
 
 /// Generates mipmap tiles from full-resolution tile images
 pub struct TileMipmapper<'a> {
diff --git a/src/bin/minedmap/tile_renderer.rs b/src/core/tile_renderer.rs
similarity index 98%
rename from src/bin/minedmap/tile_renderer.rs
rename to src/core/tile_renderer.rs
index d5b7644..c26c559 100644
--- a/src/bin/minedmap/tile_renderer.rs
+++ b/src/core/tile_renderer.rs
@@ -13,15 +13,12 @@ use lru::LruCache;
 use rayon::prelude::*;
 use tokio::sync::OnceCell;
 
-use super::{
-	common::*,
-	core::{
-		io::{fs, storage},
-		resource::{block_color, needs_biome},
-		types::*,
-		util::coord_offset,
-	},
-	region_group::RegionGroup,
+use super::{common::*, region_group::RegionGroup};
+use crate::{
+	io::{fs, storage},
+	resource::{block_color, needs_biome},
+	types::*,
+	util::coord_offset,
 };
 
 /// Type for referencing loaded [ProcessedRegion] data
diff --git a/src/io/mod.rs b/src/io/mod.rs
index 590ca2a..bfe2a2c 100644
--- a/src/io/mod.rs
+++ b/src/io/mod.rs
@@ -1,6 +1,4 @@
 //! Input/output functions
 
-pub mod data;
 pub mod fs;
-pub mod region;
 pub mod storage;
diff --git a/src/lib.rs b/src/lib.rs
deleted file mode 100644
index 14d97f9..0000000
--- a/src/lib.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-//! Common library for MinedMap generator and dump utilities
-
-#![warn(missing_docs)]
-#![warn(clippy::missing_docs_in_private_items)]
-
-pub mod io;
-pub mod resource;
-pub mod types;
-pub mod util;
-pub mod world;
diff --git a/src/main.rs b/src/main.rs
new file mode 100644
index 0000000..9bbe0ab
--- /dev/null
+++ b/src/main.rs
@@ -0,0 +1,19 @@
+//! The minedmap generator renders map tile images from Minecraft save data
+
+#![warn(missing_docs)]
+#![warn(clippy::missing_docs_in_private_items)]
+
+mod core;
+mod io;
+mod resource;
+mod util;
+mod world;
+
+use minedmap_nbt as nbt;
+use minedmap_types as types;
+
+use anyhow::Result;
+
+fn main() -> Result<()> {
+	core::cli()
+}
diff --git a/src/resource/mod.rs b/src/resource/mod.rs
index 459e783..a0854c5 100644
--- a/src/resource/mod.rs
+++ b/src/resource/mod.rs
@@ -46,6 +46,7 @@ pub struct BlockType {
 
 impl BlockType {
 	/// Checks whether a block type has a given [BlockFlag] set
+	#[inline]
 	pub fn is(&self, flag: BlockFlag) -> bool {
 		self.flags.contains(flag)
 	}

From 228f31c568d447d7e214654948fb6c2dfd15eaee Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 20 Aug 2023 16:55:10 +0200
Subject: [PATCH 241/460] Move resource module to a separate crate

The resource module does not depend on any other part of MinedMap.
---
 Cargo.lock                                            | 11 ++++++++++-
 Cargo.toml                                            |  2 +-
 crates/resource/Cargo.toml                            | 11 +++++++++++
 {src/resource => crates/resource/src}/biomes.rs       |  0
 {src/resource => crates/resource/src}/block_color.rs  |  0
 {src/resource => crates/resource/src}/block_types.rs  |  0
 .../resource/src}/legacy_block_types.rs               |  0
 src/resource/mod.rs => crates/resource/src/lib.rs     |  0
 resource/README.md                                    |  4 ++--
 src/main.rs                                           |  2 +-
 10 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 crates/resource/Cargo.toml
 rename {src/resource => crates/resource/src}/biomes.rs (100%)
 rename {src/resource => crates/resource/src}/block_color.rs (100%)
 rename {src/resource => crates/resource/src}/block_types.rs (100%)
 rename {src/resource => crates/resource/src}/legacy_block_types.rs (100%)
 rename src/resource/mod.rs => crates/resource/src/lib.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index 2b755fb..21eee69 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -559,7 +559,6 @@ dependencies = [
  "anyhow",
  "bincode",
  "clap",
- "enumflags2",
  "fastnbt",
  "futures-util",
  "glam",
@@ -567,6 +566,7 @@ dependencies = [
  "indexmap",
  "lru",
  "minedmap-nbt",
+ "minedmap-resource",
  "minedmap-types",
  "num-integer",
  "num_cpus",
@@ -590,6 +590,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "minedmap-resource"
+version = "0.1.0"
+dependencies = [
+ "enumflags2",
+ "glam",
+ "serde",
+]
+
 [[package]]
 name = "minedmap-types"
 version = "0.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index 7c9ab32..df11d5e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,6 @@ default-run = "minedmap"
 anyhow = "1.0.68"
 bincode = "1.3.3"
 clap = { version = "4.1.4", features = ["derive"] }
-enumflags2 = { version = "0.7.5", features = ["serde"] }
 fastnbt = "2.3.2"
 futures-util = "0.3.28"
 glam = "0.24.0"
@@ -20,6 +19,7 @@ image = { version = "0.24.5", default-features = false, features = ["png"] }
 indexmap = { version = "2.0.0", features = ["serde"] }
 lru = "0.11.0"
 minedmap-nbt = { version = "0.1.0", path = "crates/nbt", default-features = false }
+minedmap-resource = { version = "0.1.0", path = "crates/resource" }
 minedmap-types = { version = "0.1.0", path = "crates/types" }
 num-integer = "0.1.45"
 num_cpus = "1.16.0"
diff --git a/crates/resource/Cargo.toml b/crates/resource/Cargo.toml
new file mode 100644
index 0000000..2436548
--- /dev/null
+++ b/crates/resource/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "minedmap-resource"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+enumflags2 = { version = "0.7.7", features = ["serde"] }
+glam = "0.24.1"
+serde = "1.0.183"
diff --git a/src/resource/biomes.rs b/crates/resource/src/biomes.rs
similarity index 100%
rename from src/resource/biomes.rs
rename to crates/resource/src/biomes.rs
diff --git a/src/resource/block_color.rs b/crates/resource/src/block_color.rs
similarity index 100%
rename from src/resource/block_color.rs
rename to crates/resource/src/block_color.rs
diff --git a/src/resource/block_types.rs b/crates/resource/src/block_types.rs
similarity index 100%
rename from src/resource/block_types.rs
rename to crates/resource/src/block_types.rs
diff --git a/src/resource/legacy_block_types.rs b/crates/resource/src/legacy_block_types.rs
similarity index 100%
rename from src/resource/legacy_block_types.rs
rename to crates/resource/src/legacy_block_types.rs
diff --git a/src/resource/mod.rs b/crates/resource/src/lib.rs
similarity index 100%
rename from src/resource/mod.rs
rename to crates/resource/src/lib.rs
diff --git a/resource/README.md b/resource/README.md
index 5211fd3..08857ad 100644
--- a/resource/README.md
+++ b/resource/README.md
@@ -63,8 +63,8 @@ with MinedMap's resource metadata.
 7. Update the source code with the new block colors:
 
      ```sh
-     ./generate.py colors.json ../src/resource/block_types.rs
-     cargo fmt
+     ./generate.py colors.json ../crates/resource/src/block_types.rs
+     cargo fmt --all
      ```
 
 After the update, the new version should be tested with old savegames (both
diff --git a/src/main.rs b/src/main.rs
index 9bbe0ab..4409dff 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -5,11 +5,11 @@
 
 mod core;
 mod io;
-mod resource;
 mod util;
 mod world;
 
 use minedmap_nbt as nbt;
+use minedmap_resource as resource;
 use minedmap_types as types;
 
 use anyhow::Result;

From 5fc296fc449f595cbdfde112845c6a75981142cc Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 20 Aug 2023 17:04:55 +0200
Subject: [PATCH 242/460] Fix binary usage comments

---
 src/bin/nbtdump.rs    | 2 +-
 src/bin/regiondump.rs | 2 +-
 src/core/mod.rs       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bin/nbtdump.rs b/src/bin/nbtdump.rs
index a83a199..3b29471 100644
--- a/src/bin/nbtdump.rs
+++ b/src/bin/nbtdump.rs
@@ -8,7 +8,7 @@ use std::path::PathBuf;
 use anyhow::Result;
 use clap::Parser;
 
-/// Command line arguments for nbtdump
+/// Dump a Minecraft NBT data file in a human-readable format
 #[derive(Debug, Parser)]
 struct Args {
 	/// Filename to dump
diff --git a/src/bin/regiondump.rs b/src/bin/regiondump.rs
index c8e87b4..094cc95 100644
--- a/src/bin/regiondump.rs
+++ b/src/bin/regiondump.rs
@@ -8,7 +8,7 @@ use std::path::PathBuf;
 use anyhow::Result;
 use clap::Parser;
 
-/// Command line arguments for regiondump
+/// Dump a Minecraft NBT region file in a human-readable format
 #[derive(Debug, Parser)]
 struct Args {
 	/// Filename to dump
diff --git a/src/core/mod.rs b/src/core/mod.rs
index a94cf2c..f714223 100644
--- a/src/core/mod.rs
+++ b/src/core/mod.rs
@@ -18,7 +18,7 @@ use region_processor::RegionProcessor;
 use tile_mipmapper::TileMipmapper;
 use tile_renderer::TileRenderer;
 
-/// Command line arguments for minedmap
+/// Generate map tiles from Minecraft save data
 #[derive(Debug, Parser)]
 pub struct Args {
 	/// Number of parallel threads to use for processing

From 0273e7bc088e0151a4ada0286a3c730100eaa153 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 20 Aug 2023 17:49:37 +0200
Subject: [PATCH 243/460] README.md: update for Rust rewrite

---
 README.md | 46 ++++++++++++++++++++--------------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index 708fe3d..48053cd 100644
--- a/README.md
+++ b/README.md
@@ -2,15 +2,16 @@
 
 * Render beautiful maps of your [Minecraft](https://minecraft.net/) worlds!
 * Put them on a webserver and view them in your browser!
-* Compatible with unmodified Minecraft Java Edition 1.8 up to 1.19 (no mod installation necessary!)
+* Compatible with unmodified Minecraft Java Edition 1.8 up to 1.20 (no mod installation necessary!)
 * Illumination layer: the world at night
-* Fast: create a full map for a huge 3GB savegame in less than 5 minutes
+* Fast: create a full map for a huge 3GB savegame in less than 5 minutes in single-threaded operation
+* Multi-threading support: pass `-j N` to the renderer to use `N` parallel threads for generation
 * Incremental updates: only recreate map tiles for regions that have changed
-* Very low memory usage: typically uses less than 5MB of RAM
+* Typically uses less than 100MB of RAM in single-threaded operation (may be higher when `-j` is passed)
+* Cross-platform: runs on Linux, Windows, and likely other systems like MacOS as well
 
 ![Screenshot](docs/images/MinedMap.png)
 
-
 ## How to use
 
 MinedMap consists of two components: a map renderer generating map tiles from
@@ -24,7 +25,7 @@ map, create this empty directory inside the viewer directory. Next, to generate
 map files run MinedMap passing the source and the destination paths on the command
 line:
 ```shell
-./MinedMap /path/to/save/game /path/to/viewer/data
+minedmap /path/to/save/game /path/to/viewer/data
 ```
 The save game is stored in `saves` inside your Minecraft main directory
 (`~/.minecraft` on Linux, `C:\Users\<username>\AppData\Roaming\.minecraft` on Windows)
@@ -45,27 +46,20 @@ This test server is very slow and cannot handle multiple requests concurrently,
 a proper webserver like [nginx](https://nginx.org/) or upload the viewer together with
 the generated map files to public webspace to make the map available to others.
 
+## Installation
 
-## Building MinedMap
-
-Precompiled MinedMap binaries for Windows (32bit and 64bit versions) are available under
-"Releases" on the Github page. On other platforms, MinedMap must be built from source.
-
-MinedMap has been tested to work on Windows and Linux. I assume it can also be
-built for MacOS and pretty much any POSIX-like system, but I didn't check. ¯\\\_(ツ)\_/¯
-
-To build from source, you need Git, CMake, the GCC toolchain and the development
-files for the libraries *zlib* and *libpng* (packages *git*, *cmake*, *build-essential*,
-*zlib1g-dev* and *libpng-dev* on Debian/Ubuntu).
-
-Use the following commands to build:
+Building the MinedMap map generator requires a recent Rust toolchain. There are no
+releases on crates.io or binary releases yet. For now, it can be installed using the
+following command:
 ```shell
-git clone https://github.com/NeoRaider/MinedMap.git # Or download a release ZIP and unpack it
-mkdir MinedMap-build
-cd MinedMap-build
-cmake ../MinedMap -DCMAKE_BUILD_TYPE=RELEASE
-make
+cargo install --git 'https://github.com/NeoRaider/MinedMap.git'
 ```
-After a successful build, the MinedMap renderer binary can be found in the *src*
-subdirectory of the build dir `MinedMap-build`. The viewer is located in the cloned
-Git repository `MinedMap`.
+
+In addition, CMake is needed to build the zlib-ng library. If you do not have
+CMake installed, you can disable the zlib-ng feature by passing `--no-default-features`
+to cargo. A pure-Rust zlib implementation will be used, which is more portable,
+but slower than zlib-ng.
+
+If you are looking for the older C++ implementation of the MinedMap tile renderer,
+see the (v1.19.1)[https://github.com/NeoRaider/MinedMap/tree/v1.19.1] tag.
+

From 42a800e08cf03e35ca09c4599c30c8d4d7c84637 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 20 Aug 2023 17:57:59 +0200
Subject: [PATCH 244/460] README.md: fix link syntax

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 48053cd..372d31d 100644
--- a/README.md
+++ b/README.md
@@ -61,5 +61,5 @@ to cargo. A pure-Rust zlib implementation will be used, which is more portable,
 but slower than zlib-ng.
 
 If you are looking for the older C++ implementation of the MinedMap tile renderer,
-see the (v1.19.1)[https://github.com/NeoRaider/MinedMap/tree/v1.19.1] tag.
+see the [v1.19.1](https://github.com/NeoRaider/MinedMap/tree/v1.19.1) tag.
 

From 003b48951b050afba28789651ac7151e80bfe300 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 20 Aug 2023 19:11:12 +0200
Subject: [PATCH 245/460] world: fix deserialize of unpopulated 1.18+ sections

---
 src/world/chunk.rs | 51 +++++++++++++++++++++++++++-------------------
 src/world/de.rs    | 28 ++++++++++++++++++-------
 2 files changed, 51 insertions(+), 28 deletions(-)

diff --git a/src/world/chunk.rs b/src/world/chunk.rs
index 53ee165..9285a16 100644
--- a/src/world/chunk.rs
+++ b/src/world/chunk.rs
@@ -112,27 +112,36 @@ impl<'a> Chunk<'a> {
 		let mut section_map = BTreeMap::new();
 
 		for section in sections {
-			section_map.insert(
-				SectionY(section.y),
-				(
-					SectionV1_13::new(
-						data_version,
-						section.block_states.data.as_deref(),
-						&section.block_states.palette,
-						block_types,
-					)
-					.with_context(|| format!("Failed to load section at Y={}", section.y))?,
-					BiomesV1_18::new(
-						section.biomes.data.as_deref(),
-						&section.biomes.palette,
-						biome_types,
-					)
-					.with_context(|| format!("Failed to load section biomes at Y={}", section.y))?,
-					BlockLight::new(section.block_light.as_deref()).with_context(|| {
-						format!("Failed to load section block light at Y={}", section.y)
-					})?,
-				),
-			);
+			match &section.section {
+				de::SectionV1_18Variants::V1_18 {
+					block_states,
+					biomes,
+					block_light,
+				} => {
+					section_map.insert(
+						SectionY(section.y),
+						(
+							SectionV1_13::new(
+								data_version,
+								block_states.data.as_deref(),
+								&block_states.palette,
+								block_types,
+							)
+							.with_context(|| {
+								format!("Failed to load section at Y={}", section.y)
+							})?,
+							BiomesV1_18::new(biomes.data.as_deref(), &biomes.palette, biome_types)
+								.with_context(|| {
+									format!("Failed to load section biomes at Y={}", section.y)
+								})?,
+							BlockLight::new(block_light.as_deref()).with_context(|| {
+								format!("Failed to load section block light at Y={}", section.y)
+							})?,
+						),
+					);
+				}
+				de::SectionV1_18Variants::Empty {} => {}
+			};
 		}
 
 		Ok(Chunk::V1_18 { section_map })
diff --git a/src/world/de.rs b/src/world/de.rs
index cbedf31..5c8f84f 100644
--- a/src/world/de.rs
+++ b/src/world/de.rs
@@ -28,19 +28,33 @@ pub struct BiomesV1_18 {
 	pub data: Option<fastnbt::LongArray>,
 }
 
+/// Variable part of a [SectionV1_18]
+#[derive(Debug, Deserialize)]
+#[serde(untagged)]
+pub enum SectionV1_18Variants {
+	/// Populated 1.18+ section
+	V1_18 {
+		/// Block type data
+		block_states: BlockStatesV1_18,
+		/// Biome data
+		biomes: BiomesV1_18,
+		/// Block light data
+		#[serde(rename = "BlockLight")]
+		block_light: Option<fastnbt::ByteArray>,
+	},
+	/// Empty section
+	Empty {},
+}
+
 /// Element of the 1.18+ `sections` list found in a [Chunk]
 #[derive(Debug, Deserialize)]
 pub struct SectionV1_18 {
 	/// Y coordinate
 	#[serde(rename = "Y")]
 	pub y: i32,
-	/// Block type data
-	pub block_states: BlockStatesV1_18,
-	/// Biome data
-	pub biomes: BiomesV1_18,
-	/// Block light data
-	#[serde(rename = "BlockLight")]
-	pub block_light: Option<fastnbt::ByteArray>,
+	/// Variable part of section
+	#[serde(flatten)]
+	pub section: SectionV1_18Variants,
 }
 
 /// Version-specific part of a pre-1.18 [Section](SectionV0)

From 1616f3b2e2bed619c1d8b1ab26e6f8df5a4d41c8 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 21 Aug 2023 13:19:00 +0200
Subject: [PATCH 246/460] Add --version command line argument

---
 src/bin/nbtdump.rs    | 1 +
 src/bin/regiondump.rs | 1 +
 src/core/mod.rs       | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/bin/nbtdump.rs b/src/bin/nbtdump.rs
index 3b29471..66aaa2a 100644
--- a/src/bin/nbtdump.rs
+++ b/src/bin/nbtdump.rs
@@ -10,6 +10,7 @@ use clap::Parser;
 
 /// Dump a Minecraft NBT data file in a human-readable format
 #[derive(Debug, Parser)]
+#[command(version)]
 struct Args {
 	/// Filename to dump
 	file: PathBuf,
diff --git a/src/bin/regiondump.rs b/src/bin/regiondump.rs
index 094cc95..9315022 100644
--- a/src/bin/regiondump.rs
+++ b/src/bin/regiondump.rs
@@ -10,6 +10,7 @@ use clap::Parser;
 
 /// Dump a Minecraft NBT region file in a human-readable format
 #[derive(Debug, Parser)]
+#[command(version)]
 struct Args {
 	/// Filename to dump
 	file: PathBuf,
diff --git a/src/core/mod.rs b/src/core/mod.rs
index f714223..9c000e9 100644
--- a/src/core/mod.rs
+++ b/src/core/mod.rs
@@ -20,6 +20,7 @@ use tile_renderer::TileRenderer;
 
 /// Generate map tiles from Minecraft save data
 #[derive(Debug, Parser)]
+#[command(version)]
 pub struct Args {
 	/// Number of parallel threads to use for processing
 	///

From 810a05ab36b75bbc3b481791b89f4fef27028bcf Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 21 Aug 2023 13:21:18 +0200
Subject: [PATCH 247/460] Move nbtdump and regiondump commands to examples

Do not install the development utilities with minedmap
---
 {src/bin => examples}/nbtdump.rs    | 0
 {src/bin => examples}/regiondump.rs | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename {src/bin => examples}/nbtdump.rs (100%)
 rename {src/bin => examples}/regiondump.rs (100%)

diff --git a/src/bin/nbtdump.rs b/examples/nbtdump.rs
similarity index 100%
rename from src/bin/nbtdump.rs
rename to examples/nbtdump.rs
diff --git a/src/bin/regiondump.rs b/examples/regiondump.rs
similarity index 100%
rename from src/bin/regiondump.rs
rename to examples/regiondump.rs

From 2544ee9e80bcd0629a2a411b4b4a9bea93e4aad5 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 21 Aug 2023 15:01:48 +0200
Subject: [PATCH 248/460] Move nbtdump and regiondump examples to minedmap-nbt
 crate

---
 Cargo.lock                                      | 1 +
 crates/nbt/Cargo.toml                           | 3 +++
 {examples => crates/nbt/examples}/nbtdump.rs    | 0
 {examples => crates/nbt/examples}/regiondump.rs | 0
 4 files changed, 4 insertions(+)
 rename {examples => crates/nbt/examples}/nbtdump.rs (100%)
 rename {examples => crates/nbt/examples}/regiondump.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index 21eee69..e97aec3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -584,6 +584,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "bytemuck",
+ "clap",
  "fastnbt",
  "flate2",
  "minedmap-types",
diff --git a/crates/nbt/Cargo.toml b/crates/nbt/Cargo.toml
index ff1d7d2..b144c39 100644
--- a/crates/nbt/Cargo.toml
+++ b/crates/nbt/Cargo.toml
@@ -15,3 +15,6 @@ serde = "1.0.183"
 
 [features]
 zlib-ng = ["flate2/zlib-ng"]
+
+[dev-dependencies]
+clap = { version = "4.3.23", features = ["derive"] }
diff --git a/examples/nbtdump.rs b/crates/nbt/examples/nbtdump.rs
similarity index 100%
rename from examples/nbtdump.rs
rename to crates/nbt/examples/nbtdump.rs
diff --git a/examples/regiondump.rs b/crates/nbt/examples/regiondump.rs
similarity index 100%
rename from examples/regiondump.rs
rename to crates/nbt/examples/regiondump.rs

From 43dfa6c5447b4b5742a584c4606aef8804791e05 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 21 Aug 2023 15:02:06 +0200
Subject: [PATCH 249/460] Update dependencies

---
 Cargo.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e97aec3..6c55934 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -145,9 +145,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
 name = "cc"
-version = "1.0.82"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
 dependencies = [
  "jobserver",
  "libc",
@@ -815,9 +815,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "serde"
-version = "1.0.183"
+version = "1.0.185"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c"
+checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31"
 dependencies = [
  "serde_derive",
 ]
@@ -833,9 +833,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.183"
+version = "1.0.185"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816"
+checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec"
 dependencies = [
  "proc-macro2",
  "quote",

From 4f3b43e4a44d881b0509f51a2ee60054c3a15b5f Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 21 Aug 2023 17:07:03 +0200
Subject: [PATCH 250/460] Add missing serde derive feature to Cargo.toml

---
 Cargo.toml                 | 2 +-
 crates/resource/Cargo.toml | 2 +-
 crates/types/Cargo.toml    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index df11d5e..b679609 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,7 +25,7 @@ num-integer = "0.1.45"
 num_cpus = "1.16.0"
 rayon = "1.7.0"
 rustc-hash = "1.1.0"
-serde = { version = "1.0.152", features = ["rc"] }
+serde = { version = "1.0.152", features = ["rc", "derive"] }
 serde_json = "1.0.99"
 tokio = { version = "1.31.0", features = ["rt", "parking_lot", "sync"] }
 zstd = "0.12.3"
diff --git a/crates/resource/Cargo.toml b/crates/resource/Cargo.toml
index 2436548..a0ba3ad 100644
--- a/crates/resource/Cargo.toml
+++ b/crates/resource/Cargo.toml
@@ -8,4 +8,4 @@ edition = "2021"
 [dependencies]
 enumflags2 = { version = "0.7.7", features = ["serde"] }
 glam = "0.24.1"
-serde = "1.0.183"
+serde = { version = "1.0.183", features = ["derive"] }
diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml
index fae230b..50a41fa 100644
--- a/crates/types/Cargo.toml
+++ b/crates/types/Cargo.toml
@@ -7,4 +7,4 @@ edition = "2021"
 
 [dependencies]
 itertools = "0.11.0"
-serde = "1.0.183"
+serde = { version = "1.0.183", features = ["derive"] }

From 8e369f33fda0d2077e7f65c8d47d483d369af74a Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 21 Aug 2023 19:10:54 +0200
Subject: [PATCH 251/460] Add license and repository info to all crates

---
 Cargo.toml                 | 10 ++++++++--
 crates/nbt/Cargo.toml      |  4 +++-
 crates/resource/Cargo.toml |  4 +++-
 crates/types/Cargo.toml    |  4 +++-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index b679609..a536520 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,11 +1,17 @@
 [workspace]
 members = ["crates/*"]
 
+[workspace.package]
+edition = "2021"
+license = "MIT"
+repository = "https://github.com/NeoRaider/MinedMap"
+
 [package]
 name = "minedmap"
 version = "0.1.0"
-edition = "2021"
-license = "MIT"
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
 default-run = "minedmap"
 
 [dependencies]
diff --git a/crates/nbt/Cargo.toml b/crates/nbt/Cargo.toml
index b144c39..e402a17 100644
--- a/crates/nbt/Cargo.toml
+++ b/crates/nbt/Cargo.toml
@@ -1,7 +1,9 @@
 [package]
 name = "minedmap-nbt"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/crates/resource/Cargo.toml b/crates/resource/Cargo.toml
index a0ba3ad..3321d28 100644
--- a/crates/resource/Cargo.toml
+++ b/crates/resource/Cargo.toml
@@ -1,7 +1,9 @@
 [package]
 name = "minedmap-resource"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml
index 50a41fa..4830080 100644
--- a/crates/types/Cargo.toml
+++ b/crates/types/Cargo.toml
@@ -1,7 +1,9 @@
 [package]
 name = "minedmap-types"
 version = "0.1.0"
-edition = "2021"
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

From c010ee9194608385ddf4f0fab54769698aa6ff38 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 21 Aug 2023 21:50:32 +0200
Subject: [PATCH 252/460] Prepare for crates.io release

---
 Cargo.toml                 | 2 ++
 README.md                  | 2 +-
 crates/nbt/Cargo.toml      | 4 ++--
 crates/nbt/src/lib.rs      | 3 +--
 crates/resource/Cargo.toml | 4 ++--
 crates/resource/src/lib.rs | 4 +++-
 crates/types/Cargo.toml    | 4 ++--
 crates/types/src/lib.rs    | 3 +--
 src/core/mod.rs            | 4 ++--
 src/main.rs                | 3 +--
 10 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index a536520..8bd65bd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,8 +9,10 @@ repository = "https://github.com/NeoRaider/MinedMap"
 [package]
 name = "minedmap"
 version = "0.1.0"
+description = "Generate browsable maps from Minecraft save data"
 edition.workspace = true
 license.workspace = true
+readme.workspace = true
 repository.workspace = true
 default-run = "minedmap"
 
diff --git a/README.md b/README.md
index 372d31d..3b133fe 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
 * Typically uses less than 100MB of RAM in single-threaded operation (may be higher when `-j` is passed)
 * Cross-platform: runs on Linux, Windows, and likely other systems like MacOS as well
 
-![Screenshot](docs/images/MinedMap.png)
+![Screenshot](https://raw.githubusercontent.com/NeoRaider/MinedMap/main/docs/images/MinedMap.png)
 
 ## How to use
 
diff --git a/crates/nbt/Cargo.toml b/crates/nbt/Cargo.toml
index e402a17..70802ec 100644
--- a/crates/nbt/Cargo.toml
+++ b/crates/nbt/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "minedmap-nbt"
 version = "0.1.0"
+description = "MinedMap's handling of Minecraft NBT data and region files"
 edition.workspace = true
 license.workspace = true
+readme.workspace = true
 repository.workspace = true
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 anyhow = "1.0.75"
 bytemuck = "1.13.1"
diff --git a/crates/nbt/src/lib.rs b/crates/nbt/src/lib.rs
index 0b817b1..98e6d1b 100644
--- a/crates/nbt/src/lib.rs
+++ b/crates/nbt/src/lib.rs
@@ -1,5 +1,4 @@
-//! MinedMap's of Minecraft NBT data and region files
-
+#![doc = env!("CARGO_PKG_DESCRIPTION")]
 #![warn(missing_docs)]
 #![warn(clippy::missing_docs_in_private_items)]
 
diff --git a/crates/resource/Cargo.toml b/crates/resource/Cargo.toml
index 3321d28..78917da 100644
--- a/crates/resource/Cargo.toml
+++ b/crates/resource/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "minedmap-resource"
 version = "0.1.0"
+description = "Data describing Minecraft biomes and block types"
 edition.workspace = true
 license.workspace = true
+readme.workspace = true
 repository.workspace = true
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 enumflags2 = { version = "0.7.7", features = ["serde"] }
 glam = "0.24.1"
diff --git a/crates/resource/src/lib.rs b/crates/resource/src/lib.rs
index a0854c5..5423bd7 100644
--- a/crates/resource/src/lib.rs
+++ b/crates/resource/src/lib.rs
@@ -1,4 +1,6 @@
-//! Data describing Minecraft biomes and block types
+#![doc = env!("CARGO_PKG_DESCRIPTION")]
+#![warn(missing_docs)]
+#![warn(clippy::missing_docs_in_private_items)]
 
 mod biomes;
 mod block_color;
diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml
index 4830080..4097eea 100644
--- a/crates/types/Cargo.toml
+++ b/crates/types/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "minedmap-types"
 version = "0.1.0"
+description = "Common types used by several MinedMap crates"
 edition.workspace = true
 license.workspace = true
+readme.workspace = true
 repository.workspace = true
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
 itertools = "0.11.0"
 serde = { version = "1.0.183", features = ["derive"] }
diff --git a/crates/types/src/lib.rs b/crates/types/src/lib.rs
index 2e4ea61..e219a97 100644
--- a/crates/types/src/lib.rs
+++ b/crates/types/src/lib.rs
@@ -1,5 +1,4 @@
-//! Common types used by MinedMap
-
+#![doc = env!("CARGO_PKG_DESCRIPTION")]
 #![warn(missing_docs)]
 #![warn(clippy::missing_docs_in_private_items)]
 
diff --git a/src/core/mod.rs b/src/core/mod.rs
index 9c000e9..9c775c7 100644
--- a/src/core/mod.rs
+++ b/src/core/mod.rs
@@ -18,9 +18,9 @@ use region_processor::RegionProcessor;
 use tile_mipmapper::TileMipmapper;
 use tile_renderer::TileRenderer;
 
-/// Generate map tiles from Minecraft save data
+/// Command line arguments for minedmap CLI
 #[derive(Debug, Parser)]
-#[command(version)]
+#[command(version, about)]
 pub struct Args {
 	/// Number of parallel threads to use for processing
 	///
diff --git a/src/main.rs b/src/main.rs
index 4409dff..31f2889 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,4 @@
-//! The minedmap generator renders map tile images from Minecraft save data
-
+#![doc = env!("CARGO_PKG_DESCRIPTION")]
 #![warn(missing_docs)]
 #![warn(clippy::missing_docs_in_private_items)]
 

From b0ad1d87657a6dd5a8f475e4ff8adfc41faf8134 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 21 Aug 2023 21:53:22 +0200
Subject: [PATCH 253/460] Cargo.toml: remove redundant default-run

---
 Cargo.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 8bd65bd..403ab49 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,7 +14,6 @@ edition.workspace = true
 license.workspace = true
 readme.workspace = true
 repository.workspace = true
-default-run = "minedmap"
 
 [dependencies]
 anyhow = "1.0.68"

From 14e57d2085aacf7402212d2f0034ebdf249cb8e8 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 21 Aug 2023 22:01:37 +0200
Subject: [PATCH 254/460] Cargo.toml: add excludes

---
 Cargo.toml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Cargo.toml b/Cargo.toml
index 403ab49..0d9ac3c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,6 +14,12 @@ edition.workspace = true
 license.workspace = true
 readme.workspace = true
 repository.workspace = true
+exclude = [
+  "/.github/",
+  "/docs/",
+  "/viewer/",
+  "/resource/",
+]
 
 [dependencies]
 anyhow = "1.0.68"

From d39e35508f4265005cc696c1dc3965f4adcd648f Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 22 Aug 2023 12:31:40 +0200
Subject: [PATCH 255/460] ci: add Rust CI

Check rustfmt/clippy/tests.
---
 .github/workflows/ci.yml | 81 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 .github/workflows/ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..9ee03af
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,81 @@
+# A lot of this has been copied from https://github.com/axodotdev/cargo-dist/blob/main/.github/workflows/ci.yml
+
+name: MinedMap Rust CI
+
+on:
+  pull_request:
+  push:
+
+env:
+  RUSTFLAGS: -Dwarnings
+  RUSTDOCFLAGS: -Dwarnings
+
+jobs:
+  fmt:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          # Use beta for now for let-else formatting
+          toolchain: beta
+          components: rustfmt
+      - run: cargo fmt --all -- --check
+
+  clippy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: stable
+          components: clippy
+      - uses: swatinem/rust-cache@v2
+      - uses: actions-rs/clippy-check@v1
+        env:
+          PWD: ${{ env.GITHUB_WORKSPACE }}
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: --workspace --tests --examples
+
+  docs:
+   runs-on: ubuntu-latest
+   env:
+     RUSTDOCFLAGS: -Dwarnings
+   steps:
+     - uses: actions/checkout@master
+     - uses: dtolnay/rust-toolchain@master
+       with:
+         toolchain: stable
+         components: rust-docs
+     - uses: swatinem/rust-cache@v2
+     - run: cargo doc --workspace --no-deps --document-private-items
+
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macOS-latest]
+        rust: [stable]
+    steps:
+      - uses: actions/checkout@master
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ matrix.rust }}
+      - uses: swatinem/rust-cache@v2
+      # Run the tests/doctests (default features)
+      - run: cargo test --workspace
+        env:
+          PWD: ${{ env.GITHUB_WORKSPACE }}
+      # Run the tests/doctests (no default features)
+      - run: cargo test --workspace --no-default-features
+        env:
+          PWD: ${{ env.GITHUB_WORKSPACE }}
+      # Test the examples (default features)
+      - run: cargo test --workspace --examples --bins
+        env:
+          PWD: ${{ env.GITHUB_WORKSPACE }}
+      # Test the examples (no default features)
+      - run: cargo test --workspace --no-default-features --examples --bins
+        env:
+          PWD: ${{ env.GITHUB_WORKSPACE }}

From 007c5f72fca6467357db3019dcd53a9ec9b619da Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 25 Aug 2023 21:43:31 +0200
Subject: [PATCH 256/460] Add Code of Conduct

Add the Contributor Covenant as a Code of Conduct.
---
 CODE_OF_CONDUCT.md | 128 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 128 insertions(+)
 create mode 100644 CODE_OF_CONDUCT.md

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000..7718011
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+mschiffer@universe-factory.net.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

From 4ef020080496c1e011510fc4cf42a73e5ea74895 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 27 Aug 2023 14:27:03 +0200
Subject: [PATCH 257/460] core: display version number based on git-describe

---
 Cargo.lock      | 48 ++++++++++++++++++++++++++++++++++++++++++++----
 Cargo.toml      |  1 +
 src/core/mod.rs |  9 ++++++++-
 3 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6c55934..1fcdc89 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -197,7 +197,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -303,7 +303,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -379,7 +379,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -408,6 +408,28 @@ version = "0.27.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
 
+[[package]]
+name = "git-version"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6b0decc02f4636b9ccad390dcbe77b722a77efedfa393caf8379a51d5c61899"
+dependencies = [
+ "git-version-macro",
+ "proc-macro-hack",
+]
+
+[[package]]
+name = "git-version-macro"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe69f1cbdb6e28af2bac214e943b99ce8a0a06b447d15d3e61161b0423139f3f"
+dependencies = [
+ "proc-macro-hack",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "glam"
 version = "0.24.1"
@@ -561,6 +583,7 @@ dependencies = [
  "clap",
  "fastnbt",
  "futures-util",
+ "git-version",
  "glam",
  "image",
  "indexmap",
@@ -727,6 +750,12 @@ dependencies = [
  "miniz_oxide",
 ]
 
+[[package]]
+name = "proc-macro-hack"
+version = "0.5.20+deprecated"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.66"
@@ -839,7 +868,7 @@ checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -880,6 +909,17 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
 [[package]]
 name = "syn"
 version = "2.0.29"
diff --git a/Cargo.toml b/Cargo.toml
index 0d9ac3c..5c5cecd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,6 +27,7 @@ bincode = "1.3.3"
 clap = { version = "4.1.4", features = ["derive"] }
 fastnbt = "2.3.2"
 futures-util = "0.3.28"
+git-version = "0.3.5"
 glam = "0.24.0"
 image = { version = "0.24.5", default-features = false, features = ["png"] }
 indexmap = { version = "2.0.0", features = ["serde"] }
diff --git a/src/core/mod.rs b/src/core/mod.rs
index 9c775c7..9cc9151 100644
--- a/src/core/mod.rs
+++ b/src/core/mod.rs
@@ -11,6 +11,7 @@ use std::path::PathBuf;
 
 use anyhow::{Context, Result};
 use clap::Parser;
+use git_version::git_version;
 
 use common::Config;
 use metadata_writer::MetadataWriter;
@@ -18,9 +19,15 @@ use region_processor::RegionProcessor;
 use tile_mipmapper::TileMipmapper;
 use tile_renderer::TileRenderer;
 
+/// MinedMap version number
+const VERSION: &str = git_version!(
+	args = ["--abbrev=7", "--match=v*", "--dirty=-modified"],
+	cargo_prefix = "v",
+);
+
 /// Command line arguments for minedmap CLI
 #[derive(Debug, Parser)]
-#[command(version, about)]
+#[command(about, version = VERSION.strip_prefix("v").unwrap())]
 pub struct Args {
 	/// Number of parallel threads to use for processing
 	///

From b5a5c72142d21a383124f53bae221a6e5e0e6042 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 17 Sep 2023 13:18:48 +0200
Subject: [PATCH 258/460] ci: update to actions/checkout@v4

---
 .github/workflows/MinedMap.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/MinedMap.yml b/.github/workflows/MinedMap.yml
index 66edb82..ff6b4a5 100644
--- a/.github/workflows/MinedMap.yml
+++ b/.github/workflows/MinedMap.yml
@@ -8,7 +8,7 @@ jobs:
 
     steps:
       - name: 'Checkout'
-        uses: 'actions/checkout@v3'
+        uses: 'actions/checkout@v4'
 
       - name: 'Get version'
         id: 'tag'

From 7cc6fca7fecd02b68478091d841f12ef23529398 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 17 Sep 2023 15:50:07 +0200
Subject: [PATCH 259/460] ci: merge ci.yml into MinedMap.yml, update actions

---
 .github/workflows/MinedMap.yml | 58 +++++++++++++++++++++++-
 .github/workflows/ci.yml       | 81 ----------------------------------
 2 files changed, 57 insertions(+), 82 deletions(-)
 delete mode 100644 .github/workflows/ci.yml

diff --git a/.github/workflows/MinedMap.yml b/.github/workflows/MinedMap.yml
index ff6b4a5..3f561d0 100644
--- a/.github/workflows/MinedMap.yml
+++ b/.github/workflows/MinedMap.yml
@@ -1,9 +1,12 @@
 name: 'MinedMap'
 on: ['push', 'pull_request', 'workflow_dispatch']
 
+env:
+  RUSTFLAGS: -Dwarnings
+  RUSTDOCFLAGS: -Dwarnings
+
 jobs:
   viewer:
-    name: 'Package viewer'
     runs-on: 'ubuntu-20.04'
 
     steps:
@@ -28,3 +31,56 @@ jobs:
         with:
           name: 'MinedMap-${{ steps.tag.outputs.tag }}-viewer'
           path: 'build/pkg'
+
+  fmt:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: stable
+          components: rustfmt
+      - run: cargo fmt --all -- --check
+
+  clippy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: stable
+          components: clippy
+      - uses: swatinem/rust-cache@v2
+      - uses: actions-rs/clippy-check@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: --workspace --tests --examples
+
+  docs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: stable
+          components: rust-docs
+      - uses: swatinem/rust-cache@v2
+      - run: cargo doc --workspace --no-deps --document-private-items
+
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macOS-latest]
+        rust: [stable]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{ matrix.rust }}
+      - uses: swatinem/rust-cache@v2
+      - run: cargo test --workspace
+      - run: cargo test --workspace --no-default-features
+      - run: cargo test --workspace --examples --bins
+      - run: cargo test --workspace --no-default-features --examples --bins
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
deleted file mode 100644
index 9ee03af..0000000
--- a/.github/workflows/ci.yml
+++ /dev/null
@@ -1,81 +0,0 @@
-# A lot of this has been copied from https://github.com/axodotdev/cargo-dist/blob/main/.github/workflows/ci.yml
-
-name: MinedMap Rust CI
-
-on:
-  pull_request:
-  push:
-
-env:
-  RUSTFLAGS: -Dwarnings
-  RUSTDOCFLAGS: -Dwarnings
-
-jobs:
-  fmt:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          # Use beta for now for let-else formatting
-          toolchain: beta
-          components: rustfmt
-      - run: cargo fmt --all -- --check
-
-  clippy:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: stable
-          components: clippy
-      - uses: swatinem/rust-cache@v2
-      - uses: actions-rs/clippy-check@v1
-        env:
-          PWD: ${{ env.GITHUB_WORKSPACE }}
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          args: --workspace --tests --examples
-
-  docs:
-   runs-on: ubuntu-latest
-   env:
-     RUSTDOCFLAGS: -Dwarnings
-   steps:
-     - uses: actions/checkout@master
-     - uses: dtolnay/rust-toolchain@master
-       with:
-         toolchain: stable
-         components: rust-docs
-     - uses: swatinem/rust-cache@v2
-     - run: cargo doc --workspace --no-deps --document-private-items
-
-  test:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
-        rust: [stable]
-    steps:
-      - uses: actions/checkout@master
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: ${{ matrix.rust }}
-      - uses: swatinem/rust-cache@v2
-      # Run the tests/doctests (default features)
-      - run: cargo test --workspace
-        env:
-          PWD: ${{ env.GITHUB_WORKSPACE }}
-      # Run the tests/doctests (no default features)
-      - run: cargo test --workspace --no-default-features
-        env:
-          PWD: ${{ env.GITHUB_WORKSPACE }}
-      # Test the examples (default features)
-      - run: cargo test --workspace --examples --bins
-        env:
-          PWD: ${{ env.GITHUB_WORKSPACE }}
-      # Test the examples (no default features)
-      - run: cargo test --workspace --no-default-features --examples --bins
-        env:
-          PWD: ${{ env.GITHUB_WORKSPACE }}

From 646534c75598faeeeecdfd31776e454a7e954d4f Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 17 Sep 2023 19:08:18 +0200
Subject: [PATCH 260/460] Cargo.toml: add workspace readme key

cargo-outdated requires the key to be set to allow inheriting it.
---
 Cargo.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Cargo.toml b/Cargo.toml
index 5c5cecd..4754eb6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,6 +4,7 @@ members = ["crates/*"]
 [workspace.package]
 edition = "2021"
 license = "MIT"
+readme = "README.md"
 repository = "https://github.com/NeoRaider/MinedMap"
 
 [package]

From a153889ce6df138b20920ddc909b7068580805a3 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 17 Sep 2023 19:09:18 +0200
Subject: [PATCH 261/460] Update dependencies

---
 Cargo.lock | 171 ++++++++++++++++++-----------------------------------
 1 file changed, 56 insertions(+), 115 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1fcdc89..8913b79 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "addr2line"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
 dependencies = [
  "gimli",
 ]
@@ -36,24 +36,23 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
 
 [[package]]
 name = "anstream"
-version = "0.3.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
+checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
 dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
  "anstyle-wincon",
  "colorchoice",
- "is-terminal",
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle"
-version = "1.0.1"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
+checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46"
 
 [[package]]
 name = "anstyle-parse"
@@ -75,9 +74,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle-wincon"
-version = "1.0.2"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c"
+checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
 dependencies = [
  "anstyle",
  "windows-sys",
@@ -97,9 +96,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "backtrace"
-version = "0.3.68"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
 dependencies = [
  "addr2line",
  "cc",
@@ -125,17 +124,11 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
-[[package]]
-name = "bitflags"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
-
 [[package]]
 name = "bytemuck"
-version = "1.13.1"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
+checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
 
 [[package]]
 name = "byteorder"
@@ -167,20 +160,19 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.3.23"
+version = "4.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03aef18ddf7d879c15ce20f04826ef8418101c7e528014c3eeea13321047dca3"
+checksum = "84ed82781cea27b43c9b106a979fe450a13a31aab0500595fb3fc06616de08e6"
 dependencies = [
  "clap_builder",
  "clap_derive",
- "once_cell",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.3.23"
+version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8ce6fffb678c9b80a70b6b6de0aad31df727623a70fd9a842c30cd573e2fa98"
+checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08"
 dependencies = [
  "anstream",
  "anstyle",
@@ -190,21 +182,21 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.3.12"
+version = "4.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050"
+checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.36",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
+checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961"
 
 [[package]]
 name = "cmake"
@@ -287,9 +279,9 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 
 [[package]]
 name = "enumflags2"
-version = "0.7.7"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2"
+checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939"
 dependencies = [
  "enumflags2_derive",
  "serde",
@@ -297,13 +289,13 @@ dependencies = [
 
 [[package]]
 name = "enumflags2_derive"
-version = "0.7.7"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
+checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.36",
 ]
 
 [[package]]
@@ -312,27 +304,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
-[[package]]
-name = "errno"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
- "libc",
-]
-
 [[package]]
 name = "fastnbt"
 version = "2.4.4"
@@ -379,7 +350,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.36",
 ]
 
 [[package]]
@@ -404,9 +375,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.27.3"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
+checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
 
 [[package]]
 name = "git-version"
@@ -483,17 +454,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "is-terminal"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
-dependencies = [
- "hermit-abi",
- "rustix",
- "windows-sys",
-]
-
 [[package]]
 name = "itertools"
 version = "0.11.0"
@@ -520,9 +480,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.147"
+version = "0.2.148"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
 
 [[package]]
 name = "libz-ng-sys"
@@ -534,12 +494,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
-
 [[package]]
 name = "lock_api"
 version = "0.4.10"
@@ -552,18 +506,18 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eedb2bdbad7e0634f83989bf596f497b070130daaa398ab22d84c39e266deec5"
+checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21"
 dependencies = [
  "hashbrown",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
 
 [[package]]
 name = "memoffset"
@@ -683,9 +637,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.31.1"
+version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
 dependencies = [
  "memchr",
 ]
@@ -721,9 +675,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.12"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
 
 [[package]]
 name = "pin-utils"
@@ -743,7 +697,7 @@ version = "0.17.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags",
  "crc32fast",
  "fdeflate",
  "flate2",
@@ -758,9 +712,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.66"
+version = "1.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
+checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
 dependencies = [
  "unicode-ident",
 ]
@@ -802,7 +756,7 @@ version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags",
 ]
 
 [[package]]
@@ -817,19 +771,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
-[[package]]
-name = "rustix"
-version = "0.38.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f"
-dependencies = [
- "bitflags 2.4.0",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys",
-]
-
 [[package]]
 name = "ryu"
 version = "1.0.15"
@@ -844,9 +785,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "serde"
-version = "1.0.185"
+version = "1.0.188"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be9b6f69f1dfd54c3b568ffa45c310d6973a5e5148fd40cf515acaf38cf5bc31"
+checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
 dependencies = [
  "serde_derive",
 ]
@@ -862,20 +803,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.185"
+version = "1.0.188"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc59dfdcbad1437773485e0367fea4b090a2e0a16d9ffc46af47764536a298ec"
+checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.29",
+ "syn 2.0.36",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.105"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
+checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
 dependencies = [
  "itoa",
  "ryu",
@@ -890,9 +831,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
 
 [[package]]
 name = "slab"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
 dependencies = [
  "autocfg",
 ]
@@ -922,9 +863,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.29"
+version = "2.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a"
+checksum = "91e02e55d62894af2a08aca894c6577281f76769ba47c94d5756bec8ac6e7373"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -944,9 +885,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "utf8parse"

From 63b9f085e1c6ff9b4e334aa26eb68f81149f412f Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 17 Sep 2023 18:52:18 +0200
Subject: [PATCH 262/460] ci: add Rust build

---
 .github/workflows/MinedMap.yml | 54 ++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/.github/workflows/MinedMap.yml b/.github/workflows/MinedMap.yml
index 3f561d0..3a6ea3c 100644
--- a/.github/workflows/MinedMap.yml
+++ b/.github/workflows/MinedMap.yml
@@ -84,3 +84,57 @@ jobs:
       - run: cargo test --workspace --no-default-features
       - run: cargo test --workspace --examples --bins
       - run: cargo test --workspace --no-default-features --examples --bins
+
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+        - os: 'macos-11'
+          target: 'aarch64-apple-darwin'
+        - os: 'macos-11'
+          target: 'x86_64-apple-darwin'
+        - os: 'windows-2019'
+          target: 'x86_64-pc-windows-msvc'
+          ext: '.exe'
+        - os: 'windows-2019'
+          target: 'i686-pc-windows-msvc'
+          ext: '.exe'
+        - os: 'ubuntu-20.04'
+          target: 'x86_64-unknown-linux-gnu'
+
+    env:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - name: 'Checkout'
+        uses: 'actions/checkout@v4'
+
+      - name: 'Get version'
+        id: 'tag'
+        shell: 'bash'
+        run: |
+          set -o pipefail
+          git fetch --prune --unshallow --tags -f
+          echo "tag=$(git describe --abbrev=7 --match='v*' | sed 's/^v//')" >> $GITHUB_OUTPUT
+
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: stable
+          targets: '${{ matrix.target }}'
+
+      - uses: swatinem/rust-cache@v2
+
+      - name: 'Build'
+        shell: 'bash'
+        run: |
+          pkgdir='target/pkg/MinedMap-${{ steps.tag.outputs.tag }}-${{ matrix.target }}'
+          mkdir -p "$pkgdir"
+          cargo build --release --target=${{ matrix.target }}
+          cp target/${{ matrix.target }}/release/minedmap${{ matrix.ext }} "$pkgdir"/
+
+      - name: 'Archive'
+        uses: 'actions/upload-artifact@v3'
+        with:
+          name: 'MinedMap-${{ steps.tag.outputs.tag }}-${{ matrix.target }}'
+          path: 'target/pkg'

From 92fb2a9ba5f4fdd8ffa2332359c61c86a4ebee77 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 17 Sep 2023 19:54:39 +0200
Subject: [PATCH 263/460] ci: remove unused env GH_TOKEN

---
 .github/workflows/MinedMap.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/MinedMap.yml b/.github/workflows/MinedMap.yml
index 3a6ea3c..98856ca 100644
--- a/.github/workflows/MinedMap.yml
+++ b/.github/workflows/MinedMap.yml
@@ -104,8 +104,6 @@ jobs:
         - os: 'ubuntu-20.04'
           target: 'x86_64-unknown-linux-gnu'
 
-    env:
-      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: 'Checkout'
         uses: 'actions/checkout@v4'

From f898116209a51e005a9722f7a3825452f6731a13 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 17 Sep 2023 20:01:25 +0200
Subject: [PATCH 264/460] ci: add shorter labels for target OS names again

---
 .github/workflows/MinedMap.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/MinedMap.yml b/.github/workflows/MinedMap.yml
index 98856ca..b577b5e 100644
--- a/.github/workflows/MinedMap.yml
+++ b/.github/workflows/MinedMap.yml
@@ -92,16 +92,21 @@ jobs:
       matrix:
         include:
         - os: 'macos-11'
+          label: 'MacOS-Intel'
           target: 'aarch64-apple-darwin'
         - os: 'macos-11'
+          label: 'MacOS-ARM'
           target: 'x86_64-apple-darwin'
         - os: 'windows-2019'
+          label: 'Win64'
           target: 'x86_64-pc-windows-msvc'
           ext: '.exe'
         - os: 'windows-2019'
+          label: 'Win32'
           target: 'i686-pc-windows-msvc'
           ext: '.exe'
         - os: 'ubuntu-20.04'
+          label: 'x86_64-unknown-linux-gnu'
           target: 'x86_64-unknown-linux-gnu'
 
     steps:
@@ -126,7 +131,7 @@ jobs:
       - name: 'Build'
         shell: 'bash'
         run: |
-          pkgdir='target/pkg/MinedMap-${{ steps.tag.outputs.tag }}-${{ matrix.target }}'
+          pkgdir='target/pkg/MinedMap-${{ steps.tag.outputs.tag }}-${{ matrix.label }}'
           mkdir -p "$pkgdir"
           cargo build --release --target=${{ matrix.target }}
           cp target/${{ matrix.target }}/release/minedmap${{ matrix.ext }} "$pkgdir"/
@@ -134,5 +139,5 @@ jobs:
       - name: 'Archive'
         uses: 'actions/upload-artifact@v3'
         with:
-          name: 'MinedMap-${{ steps.tag.outputs.tag }}-${{ matrix.target }}'
+          name: 'MinedMap-${{ steps.tag.outputs.tag }}-${{ matrix.label }}'
           path: 'target/pkg'

From fcd05b5e1c878c2a5d2b1cae0326336187b7f2cb Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 17 Sep 2023 21:45:36 +0200
Subject: [PATCH 265/460] Revert "ci: add shorter labels for target OS names
 again"

This reverts commit f898116209a51e005a9722f7a3825452f6731a13.

Let's keep the full target names to stay compatible with cargo-binstall
(and possibly cargo-dist in the future).
---
 .github/workflows/MinedMap.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/MinedMap.yml b/.github/workflows/MinedMap.yml
index b577b5e..98856ca 100644
--- a/.github/workflows/MinedMap.yml
+++ b/.github/workflows/MinedMap.yml
@@ -92,21 +92,16 @@ jobs:
       matrix:
         include:
         - os: 'macos-11'
-          label: 'MacOS-Intel'
           target: 'aarch64-apple-darwin'
         - os: 'macos-11'
-          label: 'MacOS-ARM'
           target: 'x86_64-apple-darwin'
         - os: 'windows-2019'
-          label: 'Win64'
           target: 'x86_64-pc-windows-msvc'
           ext: '.exe'
         - os: 'windows-2019'
-          label: 'Win32'
           target: 'i686-pc-windows-msvc'
           ext: '.exe'
         - os: 'ubuntu-20.04'
-          label: 'x86_64-unknown-linux-gnu'
           target: 'x86_64-unknown-linux-gnu'
 
     steps:
@@ -131,7 +126,7 @@ jobs:
       - name: 'Build'
         shell: 'bash'
         run: |
-          pkgdir='target/pkg/MinedMap-${{ steps.tag.outputs.tag }}-${{ matrix.label }}'
+          pkgdir='target/pkg/MinedMap-${{ steps.tag.outputs.tag }}-${{ matrix.target }}'
           mkdir -p "$pkgdir"
           cargo build --release --target=${{ matrix.target }}
           cp target/${{ matrix.target }}/release/minedmap${{ matrix.ext }} "$pkgdir"/
@@ -139,5 +134,5 @@ jobs:
       - name: 'Archive'
         uses: 'actions/upload-artifact@v3'
         with:
-          name: 'MinedMap-${{ steps.tag.outputs.tag }}-${{ matrix.label }}'
+          name: 'MinedMap-${{ steps.tag.outputs.tag }}-${{ matrix.target }}'
           path: 'target/pkg'

From e57ec81d96133d380fdacb964d5be39dd8ddbe08 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 17 Sep 2023 22:27:24 +0200
Subject: [PATCH 266/460] ci: strip release binaries

---
 .github/workflows/MinedMap.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/MinedMap.yml b/.github/workflows/MinedMap.yml
index 98856ca..b09d620 100644
--- a/.github/workflows/MinedMap.yml
+++ b/.github/workflows/MinedMap.yml
@@ -125,6 +125,8 @@ jobs:
 
       - name: 'Build'
         shell: 'bash'
+        env:
+          RUSTFLAGS: -Dwarnings -Cstrip=symbols
         run: |
           pkgdir='target/pkg/MinedMap-${{ steps.tag.outputs.tag }}-${{ matrix.target }}'
           mkdir -p "$pkgdir"

From a8eb2da95d7f075461ac04ba061252eebe992a63 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 19 Sep 2023 23:29:05 +0200
Subject: [PATCH 267/460] Use tracing for configurable logging

---
 Cargo.lock                   | 135 +++++++++++++++++++++++++++++++++++
 Cargo.toml                   |   2 +
 src/core/mod.rs              |  12 ++++
 src/core/region_processor.rs |   7 +-
 src/core/tile_mipmapper.rs   |   9 +--
 src/core/tile_renderer.rs    |   5 +-
 src/world/section.rs         |   5 +-
 7 files changed, 164 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8913b79..e6c40e4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -478,6 +478,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
 [[package]]
 name = "libc"
 version = "0.2.148"
@@ -504,6 +510,12 @@ dependencies = [
  "scopeguard",
 ]
 
+[[package]]
+name = "log"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+
 [[package]]
 name = "lru"
 version = "0.11.1"
@@ -552,6 +564,8 @@ dependencies = [
  "serde",
  "serde_json",
  "tokio",
+ "tracing",
+ "tracing-subscriber",
  "zstd",
 ]
 
@@ -595,6 +609,16 @@ dependencies = [
  "simd-adler32",
 ]
 
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
 [[package]]
 name = "num-integer"
 version = "0.1.45"
@@ -650,6 +674,12 @@ version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
 [[package]]
 name = "parking_lot"
 version = "0.12.1"
@@ -823,6 +853,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "sharded-slab"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+dependencies = [
+ "lazy_static",
+]
+
 [[package]]
 name = "simd-adler32"
 version = "0.3.7"
@@ -872,6 +911,16 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "thread_local"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
 [[package]]
 name = "tokio"
 version = "1.32.0"
@@ -883,6 +932,64 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "tracing"
+version = "0.1.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+dependencies = [
+ "cfg-if",
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.36",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
+dependencies = [
+ "once_cell",
+ "valuable",
+]
+
+[[package]]
+name = "tracing-log"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+dependencies = [
+ "lazy_static",
+ "log",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+dependencies = [
+ "nu-ansi-term",
+ "sharded-slab",
+ "smallvec",
+ "thread_local",
+ "tracing-core",
+ "tracing-log",
+]
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.12"
@@ -895,12 +1002,40 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
+[[package]]
+name = "valuable"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+
 [[package]]
 name = "version_check"
 version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
diff --git a/Cargo.toml b/Cargo.toml
index 4754eb6..c0fb86f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -43,6 +43,8 @@ rustc-hash = "1.1.0"
 serde = { version = "1.0.152", features = ["rc", "derive"] }
 serde_json = "1.0.99"
 tokio = { version = "1.31.0", features = ["rt", "parking_lot", "sync"] }
+tracing = "0.1.37"
+tracing-subscriber = "0.3.17"
 zstd = "0.12.3"
 
 [features]
diff --git a/src/core/mod.rs b/src/core/mod.rs
index 9cc9151..0e77768 100644
--- a/src/core/mod.rs
+++ b/src/core/mod.rs
@@ -35,6 +35,9 @@ pub struct Args {
 	/// use one thread per logical CPU core.
 	#[arg(short, long)]
 	pub jobs: Option<usize>,
+	/// Enable verbose messages
+	#[arg(short, long)]
+	pub verbose: bool,
 	/// Minecraft save directory
 	pub input_dir: PathBuf,
 	/// MinedMap data directory
@@ -54,6 +57,15 @@ pub fn cli() -> Result<()> {
 	let args = Args::parse();
 	let config = Config::new(&args);
 
+	tracing_subscriber::fmt()
+		.with_max_level(if args.verbose {
+			tracing::Level::DEBUG
+		} else {
+			tracing::Level::INFO
+		})
+		.with_target(false)
+		.init();
+
 	setup_threads(config.num_threads)?;
 
 	let rt = tokio::runtime::Builder::new_current_thread()
diff --git a/src/core/region_processor.rs b/src/core/region_processor.rs
index 6e32d94..6fb23c3 100644
--- a/src/core/region_processor.rs
+++ b/src/core/region_processor.rs
@@ -5,6 +5,7 @@ use std::{ffi::OsStr, path::Path, time::SystemTime};
 use anyhow::{Context, Result};
 use indexmap::IndexSet;
 use rayon::prelude::*;
+use tracing::{debug, error};
 
 use super::common::*;
 use crate::{
@@ -148,11 +149,11 @@ impl<'a> RegionProcessor<'a> {
 
 		if Some(input_timestamp) <= output_timestamp && Some(input_timestamp) <= lightmap_timestamp
 		{
-			println!("Skipping unchanged region r.{}.{}.mca", coords.x, coords.z);
+			debug!("Skipping unchanged region r.{}.{}.mca", coords.x, coords.z);
 			return Ok(());
 		}
 
-		println!("Processing region r.{}.{}.mca", coords.x, coords.z);
+		debug!("Processing region r.{}.{}.mca", coords.x, coords.z);
 
 		crate::nbt::region::from_file(path)?.foreach_chunk(
 			|chunk_coords, data: world::de::Chunk| {
@@ -204,7 +205,7 @@ impl<'a> RegionProcessor<'a> {
 
 		regions.par_iter().for_each(|&coords| {
 			if let Err(err) = self.process_region(coords) {
-				eprintln!("Failed to process region {:?}: {:?}", coords, err);
+				error!("Failed to process region {:?}: {:?}", coords, err);
 			}
 		});
 
diff --git a/src/core/tile_mipmapper.rs b/src/core/tile_mipmapper.rs
index 52fff09..e5d44fd 100644
--- a/src/core/tile_mipmapper.rs
+++ b/src/core/tile_mipmapper.rs
@@ -2,6 +2,7 @@
 
 use anyhow::{Context, Result};
 use rayon::prelude::*;
+use tracing::{debug, warn};
 
 use super::common::*;
 use crate::{io::fs, types::*};
@@ -83,7 +84,7 @@ impl<'a> TileMipmapper<'a> {
 				let timestamp = match fs::modified_timestamp(&source_path) {
 					Ok(timestamp) => timestamp,
 					Err(err) => {
-						eprintln!("{}", err);
+						warn!("{}", err);
 						return None;
 					}
 				};
@@ -96,7 +97,7 @@ impl<'a> TileMipmapper<'a> {
 		};
 
 		if Some(input_timestamp) <= output_timestamp {
-			println!(
+			debug!(
 				"Skipping unchanged mipmap tile {}",
 				output_path
 					.strip_prefix(&self.config.output_dir)
@@ -106,7 +107,7 @@ impl<'a> TileMipmapper<'a> {
 			return Ok(());
 		}
 
-		println!(
+		debug!(
 			"Rendering mipmap tile {}",
 			output_path
 				.strip_prefix(&self.config.output_dir)
@@ -121,7 +122,7 @@ impl<'a> TileMipmapper<'a> {
 			let source = match image::open(&source_path) {
 				Ok(source) => source,
 				Err(err) => {
-					eprintln!(
+					warn!(
 						"Failed to read source image {}: {}",
 						source_path.display(),
 						err,
diff --git a/src/core/tile_renderer.rs b/src/core/tile_renderer.rs
index c26c559..1386aa9 100644
--- a/src/core/tile_renderer.rs
+++ b/src/core/tile_renderer.rs
@@ -12,6 +12,7 @@ use glam::Vec3;
 use lru::LruCache;
 use rayon::prelude::*;
 use tokio::sync::OnceCell;
+use tracing::debug;
 
 use super::{common::*, region_group::RegionGroup};
 use crate::{
@@ -272,7 +273,7 @@ impl<'a> TileRenderer<'a> {
 		let output_timestamp = fs::read_timestamp(&output_path, FILE_META_VERSION);
 
 		if Some(processed_timestamp) <= output_timestamp {
-			println!(
+			debug!(
 				"Skipping unchanged tile {}",
 				output_path
 					.strip_prefix(&self.config.output_dir)
@@ -282,7 +283,7 @@ impl<'a> TileRenderer<'a> {
 			return Ok(());
 		}
 
-		println!(
+		debug!(
 			"Rendering tile {}",
 			output_path
 				.strip_prefix(&self.config.output_dir)
diff --git a/src/world/section.rs b/src/world/section.rs
index 8f47216..998d2f7 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -7,6 +7,7 @@ use std::fmt::Debug;
 
 use anyhow::{bail, Context, Result};
 use num_integer::div_rem;
+use tracing::warn;
 
 use super::de;
 use crate::{
@@ -94,7 +95,7 @@ impl<'a> SectionV1_13<'a> {
 			.map(|entry| {
 				let block_type = block_types.get(&entry.name);
 				if block_type.is_none() {
-					eprintln!("Unknown block type: {}", entry.name);
+					warn!("Unknown block type: {}", entry.name);
 				}
 				block_type
 			})
@@ -246,7 +247,7 @@ impl<'a> BiomesV1_18<'a> {
 			.map(|entry| {
 				let biome_type = biome_types.get(entry);
 				if biome_type.is_none() {
-					eprintln!("Unknown biome type: {}", entry);
+					warn!("Unknown biome type: {}", entry);
 				}
 				biome_type
 			})

From 7d37f6a5d018ca2e2ba1d67a5a3bc6f1b4716d9a Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 20 Sep 2023 00:38:19 +0200
Subject: [PATCH 268/460] Add summary messages

---
 src/core/region_processor.rs | 38 +++++++++++++++++------
 src/core/tile_mipmapper.rs   | 60 ++++++++++++++++++++++++++----------
 src/core/tile_renderer.rs    | 33 +++++++++++++++-----
 3 files changed, 97 insertions(+), 34 deletions(-)

diff --git a/src/core/region_processor.rs b/src/core/region_processor.rs
index 6fb23c3..ac6b42e 100644
--- a/src/core/region_processor.rs
+++ b/src/core/region_processor.rs
@@ -5,7 +5,7 @@ use std::{ffi::OsStr, path::Path, time::SystemTime};
 use anyhow::{Context, Result};
 use indexmap::IndexSet;
 use rayon::prelude::*;
-use tracing::{debug, error};
+use tracing::{debug, error, info};
 
 use super::common::*;
 use crate::{
@@ -132,7 +132,7 @@ impl<'a> RegionProcessor<'a> {
 	}
 
 	/// Processes a single region file
-	fn process_region(&self, coords: TileCoords) -> Result<()> {
+	fn process_region(&self, coords: TileCoords) -> Result<bool> {
 		/// Width/height of the region data
 		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
 
@@ -150,7 +150,7 @@ impl<'a> RegionProcessor<'a> {
 		if Some(input_timestamp) <= output_timestamp && Some(input_timestamp) <= lightmap_timestamp
 		{
 			debug!("Skipping unchanged region r.{}.{}.mca", coords.x, coords.z);
-			return Ok(());
+			return Ok(false);
 		}
 
 		debug!("Processing region r.{}.{}.mca", coords.x, coords.z);
@@ -188,7 +188,7 @@ impl<'a> RegionProcessor<'a> {
 			Self::save_lightmap(&lightmap_path, &lightmap, input_timestamp)?;
 		}
 
-		Ok(())
+		Ok(true)
 	}
 
 	/// Iterates over all region files of a Minecraft save directory
@@ -203,11 +203,31 @@ impl<'a> RegionProcessor<'a> {
 		fs::create_dir_all(&self.config.processed_dir)?;
 		fs::create_dir_all(&self.config.tile_dir(TileKind::Lightmap, 0))?;
 
-		regions.par_iter().for_each(|&coords| {
-			if let Err(err) = self.process_region(coords) {
-				error!("Failed to process region {:?}: {:?}", coords, err);
-			}
-		});
+		info!("Processing region files...");
+
+		let mut results = vec![];
+		regions
+			.par_iter()
+			.map(|&coords| {
+				let result = self.process_region(coords);
+				if let Err(err) = &result {
+					error!("Failed to process region {:?}: {:?}", coords, err);
+				}
+				result
+			})
+			.collect_into_vec(&mut results);
+
+		let processed = results
+			.iter()
+			.filter(|result| matches!(result, Ok(true)))
+			.count();
+		let errors = results.iter().filter(|result| result.is_err()).count();
+		info!(
+			"Processed region files ({} processed, {} unchanged, {} errors)",
+			processed,
+			results.len() - processed,
+			errors,
+		);
 
 		Ok(regions)
 	}
diff --git a/src/core/tile_mipmapper.rs b/src/core/tile_mipmapper.rs
index e5d44fd..d2b1ac5 100644
--- a/src/core/tile_mipmapper.rs
+++ b/src/core/tile_mipmapper.rs
@@ -2,7 +2,7 @@
 
 use anyhow::{Context, Result};
 use rayon::prelude::*;
-use tracing::{debug, warn};
+use tracing::{debug, info, warn};
 
 use super::common::*;
 use crate::{io::fs, types::*};
@@ -58,7 +58,7 @@ impl<'a> TileMipmapper<'a> {
 		level: usize,
 		coords: TileCoords,
 		prev: &TileCoordMap,
-	) -> Result<()>
+	) -> Result<(bool, bool)>
 	where
 		[P::Subpixel]: image::EncodableLayout,
 		image::ImageBuffer<P, Vec<P::Subpixel>>: Into<image::DynamicImage>,
@@ -93,7 +93,7 @@ impl<'a> TileMipmapper<'a> {
 			.collect();
 
 		let Some(input_timestamp) = sources.iter().map(|(_, _, ts)| *ts).max() else {
-			return Ok(());
+			return Ok((false, false));
 		};
 
 		if Some(input_timestamp) <= output_timestamp {
@@ -104,7 +104,7 @@ impl<'a> TileMipmapper<'a> {
 					.expect("tile path must be in output directory")
 					.display(),
 			);
-			return Ok(());
+			return Ok((true, false));
 		}
 
 		debug!(
@@ -143,7 +143,9 @@ impl<'a> TileMipmapper<'a> {
 			image
 				.write_to(file, image::ImageFormat::Png)
 				.context("Failed to save image")
-		})
+		})?;
+
+		Ok((true, true))
 	}
 
 	/// Runs the mipmap generation
@@ -165,24 +167,48 @@ impl<'a> TileMipmapper<'a> {
 				break;
 			}
 
+			info!("Generating level {} mipmaps...", level);
+
 			fs::create_dir_all(&self.config.tile_dir(TileKind::Map, level))?;
 			fs::create_dir_all(&self.config.tile_dir(TileKind::Lightmap, level))?;
 
 			let next = Self::map_coords(prev);
 
-			next.0.par_iter().try_for_each(|(&z, xs)| {
-				xs.par_iter().try_for_each(|&x| {
-					let coords = TileCoords { x, z };
-					self.render_mipmap::<image::Rgba<u8>>(TileKind::Map, level, coords, prev)?;
-					self.render_mipmap::<image::LumaA<u8>>(
-						TileKind::Lightmap,
-						level,
-						coords,
-						prev,
-					)?;
-					anyhow::Ok(())
+			let (total, processed) = next
+				.0
+				.par_iter()
+				.flat_map(|(&z, xs)| {
+					let mipmapper = &self;
+					xs.par_iter().map(move |&x| {
+						let coords = TileCoords { x, z };
+						let (found_map, processed_map) = mipmapper
+							.render_mipmap::<image::Rgba<u8>>(TileKind::Map, level, coords, prev)?;
+						let (found_light, processed_light) = mipmapper
+							.render_mipmap::<image::LumaA<u8>>(
+								TileKind::Lightmap,
+								level,
+								coords,
+								prev,
+							)?;
+						anyhow::Ok((
+							usize::from(found_map) + usize::from(found_light),
+							usize::from(processed_map) + usize::from(processed_light),
+						))
+					})
 				})
-			})?;
+				.try_reduce(
+					|| (0, 0),
+					|(found_a, processed_a), (found_b, processed_b)| {
+						Ok((found_a + found_b, processed_a + processed_b))
+					},
+				)?;
+
+			info!(
+				"Generated level {} mipmaps ({} processed, {} unchanged)",
+				level,
+				processed,
+				total - processed,
+			);
 
 			tile_stack.push(next);
 		}
diff --git a/src/core/tile_renderer.rs b/src/core/tile_renderer.rs
index 1386aa9..219e7c8 100644
--- a/src/core/tile_renderer.rs
+++ b/src/core/tile_renderer.rs
@@ -12,7 +12,7 @@ use glam::Vec3;
 use lru::LruCache;
 use rayon::prelude::*;
 use tokio::sync::OnceCell;
-use tracing::debug;
+use tracing::{debug, info};
 
 use super::{common::*, region_group::RegionGroup};
 use crate::{
@@ -263,7 +263,7 @@ impl<'a> TileRenderer<'a> {
 	}
 
 	/// Renders and saves a region tile image
-	fn render_tile(&self, coords: TileCoords) -> Result<()> {
+	fn render_tile(&self, coords: TileCoords) -> Result<bool> {
 		/// Width/height of a tile image
 		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
 
@@ -280,7 +280,7 @@ impl<'a> TileRenderer<'a> {
 					.expect("tile path must be in output directory")
 					.display(),
 			);
-			return Ok(());
+			return Ok(false);
 		}
 
 		debug!(
@@ -307,18 +307,35 @@ impl<'a> TileRenderer<'a> {
 					.write_to(file, image::ImageFormat::Png)
 					.context("Failed to save image")
 			},
-		)
+		)?;
+
+		Ok(true)
 	}
 
 	/// Runs the tile generation
 	pub fn run(self) -> Result<()> {
 		fs::create_dir_all(&self.config.tile_dir(TileKind::Map, 0))?;
 
+		info!("Rendering map tiles...");
+
 		// Use par_bridge to process items in order (for better use of region cache)
-		self.regions.iter().par_bridge().try_for_each(|&coords| {
-			self.render_tile(coords)
-				.with_context(|| format!("Failed to render tile {:?}", coords))
-		})?;
+		let processed = self
+			.regions
+			.iter()
+			.par_bridge()
+			.map(|&coords| {
+				anyhow::Ok(usize::from(
+					self.render_tile(coords)
+						.with_context(|| format!("Failed to render tile {:?}", coords))?,
+				))
+			})
+			.try_reduce(|| 0, |a, b| Ok(a + b))?;
+
+		info!(
+			"Rendered map tiles ({} processed, {} unchanged)",
+			processed,
+			self.regions.len() - processed,
+		);
 
 		Ok(())
 	}

From c7145c5c4ae4118f54734c1345c8eec1cd32fd14 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 29 Sep 2023 17:47:11 +0200
Subject: [PATCH 269/460] Cargo.toml: add cargo-release config

---
 Cargo.toml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Cargo.toml b/Cargo.toml
index c0fb86f..1f37f42 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,6 +7,9 @@ license = "MIT"
 readme = "README.md"
 repository = "https://github.com/NeoRaider/MinedMap"
 
+[workspace.metadata.release]
+consolidate-commits = false
+
 [package]
 name = "minedmap"
 version = "0.1.0"
@@ -22,6 +25,17 @@ exclude = [
   "/resource/",
 ]
 
+[package.metadata.release]
+pre-release-commit-message = "{{crate_name}} {{version}}"
+tag-message = "{{crate_name}} {{version}}"
+pre-release-replacements = [
+  {file="CHANGELOG.md", search="Unreleased", replace="{{version}}"},
+  {file="CHANGELOG.md", search="\\.\\.\\.HEAD", replace="...{{tag_name}}", exactly=1},
+  {file="CHANGELOG.md", search="ReleaseDate", replace="{{date}}"},
+  {file="CHANGELOG.md", search="<!-- next-header -->", replace="<!-- next-header -->\n\n## [Unreleased] - ReleaseDate", exactly=1},
+  {file="CHANGELOG.md", search="<!-- next-url -->", replace="<!-- next-url -->\n[Unreleased]: https://github.com/neocturne/MinedMap/compare/{{tag_name}}...HEAD", exactly=1},
+]
+
 [dependencies]
 anyhow = "1.0.68"
 bincode = "1.3.3"

From 8873ff74c4599a1dc9afcf86fc6434790c0917ff Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 30 Sep 2023 10:08:58 +0200
Subject: [PATCH 270/460] Update dependencies

---
 Cargo.lock | 82 +++++++++++++++++++++++-------------------------------
 1 file changed, 35 insertions(+), 47 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e6c40e4..ec8779a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -36,9 +36,9 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
 
 [[package]]
 name = "anstream"
-version = "0.5.0"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c"
+checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -50,15 +50,15 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46"
+checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
+checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140"
 dependencies = [
  "utf8parse",
 ]
@@ -74,9 +74,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle-wincon"
-version = "2.1.0"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd"
+checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
 dependencies = [
  "anstyle",
  "windows-sys",
@@ -160,9 +160,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.4.3"
+version = "4.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84ed82781cea27b43c9b106a979fe450a13a31aab0500595fb3fc06616de08e6"
+checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -170,9 +170,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.2"
+version = "4.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08"
+checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45"
 dependencies = [
  "anstream",
  "anstyle",
@@ -189,7 +189,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.36",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -228,16 +228,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-deque"
 version = "0.8.3"
@@ -295,7 +285,7 @@ checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.36",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -350,7 +340,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.36",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -403,15 +393,15 @@ dependencies = [
 
 [[package]]
 name = "glam"
-version = "0.24.1"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42218cb640844e3872cc3c153dc975229e080a6c4733b34709ef445610550226"
+checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -425,9 +415,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
+checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
 
 [[package]]
 name = "image"
@@ -445,9 +435,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.0.0"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -760,9 +750,9 @@ dependencies = [
 
 [[package]]
 name = "rayon"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
+checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
 dependencies = [
  "either",
  "rayon-core",
@@ -770,14 +760,12 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
+checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
 dependencies = [
- "crossbeam-channel",
  "crossbeam-deque",
  "crossbeam-utils",
- "num_cpus",
 ]
 
 [[package]]
@@ -839,7 +827,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.36",
+ "syn 2.0.37",
 ]
 
 [[package]]
@@ -855,9 +843,9 @@ dependencies = [
 
 [[package]]
 name = "sharded-slab"
-version = "0.1.4"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+checksum = "c1b21f559e07218024e7e9f90f96f601825397de0e25420135f7f952453fed0b"
 dependencies = [
  "lazy_static",
 ]
@@ -879,9 +867,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
+checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
 
 [[package]]
 name = "strsim"
@@ -902,9 +890,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.36"
+version = "2.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e02e55d62894af2a08aca894c6577281f76769ba47c94d5756bec8ac6e7373"
+checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -952,7 +940,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.36",
+ "syn 2.0.37",
 ]
 
 [[package]]

From d9d7cda5eeee6e989a2acc6696ca153b4543b726 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 30 Sep 2023 10:08:49 +0200
Subject: [PATCH 271/460] Add CHANGELOG.md

---
 CHANGELOG.md | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..9f500f1
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,41 @@
+<!-- next-header -->
+
+## [Unreleased] - ReleaseDate
+
+This is a complete rewrite of the map renderer in Rust, as the previous C++
+implementation was getting more and more difficult to maintain and keep current
+versions of Minecraft supported.
+
+The new implementation is generally faster than the old one (by using better
+data structures), but it also uses a bit more RAM and storage space for
+intermediate data.
+
+### Added
+
+- Added support for Minecraft 1.20 biomes and block types
+- Multithreading: Pass `-j N` to minedmap to use *N* CPU cores in parallel. Note
+  that this also multiplies the RAM requirements of MinedMap.
+- Extended OS support: MinedMap should now run on every system supported by Rust
+  as a target. As I don't have a way to test these builds, binary releases are
+  still limited to Windows and Linux for now; on other targets, MinedMap must
+  be built from source.
+
+### Changed
+
+- Biome smoothing uses a different filter kernel now, which might result in
+  nicer gradients?
+- Log messages have been reduced. Pass `-v` to get a message for each
+  processed file again.
+- The intermediate data directory `biome` in the output directory has been
+  replaced with a new `processed` directory. The `biome` directory can be
+  deleted when reusing the output directory of an older MinedMap version.
+
+### Fixed
+
+- Warnings about unknown biomes or block types have been reduced to once per
+  chunk/section, so rending is not slowed down by these message so much anymore.
+
+  Full support for custom biomes datapacks might be added in a future release.
+
+<!-- next-url -->
+[Unreleased]: https://github.com/NeoRaider/MinedMap/compare/v1.19.1...HEAD

From 1559486727ff8b27ebacf1ff7c736b67e2c0be3c Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 30 Sep 2023 16:17:49 +0200
Subject: [PATCH 272/460] README.md: update for release

---
 README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 3b133fe..4dcd106 100644
--- a/README.md
+++ b/README.md
@@ -48,9 +48,8 @@ the generated map files to public webspace to make the map available to others.
 
 ## Installation
 
-Building the MinedMap map generator requires a recent Rust toolchain. There are no
-releases on crates.io or binary releases yet. For now, it can be installed using the
-following command:
+Building the MinedMap map generator requires a recent Rust toolchain. The
+following command can be used to build the current development version from source:
 ```shell
 cargo install --git 'https://github.com/NeoRaider/MinedMap.git'
 ```

From ceb71f035caa5214e19dda49c63b6ea4b36c200b Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 30 Sep 2023 16:53:07 +0200
Subject: [PATCH 273/460] minedmap 2.0.0

---
 CHANGELOG.md | 5 ++++-
 Cargo.lock   | 2 +-
 Cargo.toml   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f500f1..5cafcf2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased] - ReleaseDate
 
+## [2.0.0] - 2023-09-30
+
 This is a complete rewrite of the map renderer in Rust, as the previous C++
 implementation was getting more and more difficult to maintain and keep current
 versions of Minecraft supported.
@@ -38,4 +40,5 @@ intermediate data.
   Full support for custom biomes datapacks might be added in a future release.
 
 <!-- next-url -->
-[Unreleased]: https://github.com/NeoRaider/MinedMap/compare/v1.19.1...HEAD
+[Unreleased]: https://github.com/neocturne/MinedMap/compare/v2.0.0...HEAD
+[2.0.0]: https://github.com/NeoRaider/MinedMap/compare/v1.19.1...v2.0.0
diff --git a/Cargo.lock b/Cargo.lock
index ec8779a..4687cf0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -532,7 +532,7 @@ dependencies = [
 
 [[package]]
 name = "minedmap"
-version = "0.1.0"
+version = "2.0.0"
 dependencies = [
  "anyhow",
  "bincode",
diff --git a/Cargo.toml b/Cargo.toml
index 1f37f42..fcef957 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@ consolidate-commits = false
 
 [package]
 name = "minedmap"
-version = "0.1.0"
+version = "2.0.0"
 description = "Generate browsable maps from Minecraft save data"
 edition.workspace = true
 license.workspace = true

From 30e5aee09e1e3387ae7c652039946832410021d9 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 12 Oct 2023 18:27:49 +0200
Subject: [PATCH 274/460] Update dependencies

---
 Cargo.lock | 64 ++++++++++++++++++++++++++----------------------------
 Cargo.toml |  4 ++--
 2 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4687cf0..5cdfec3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -132,9 +132,9 @@ checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
 
 [[package]]
 name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "cc"
@@ -189,7 +189,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -285,7 +285,7 @@ checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -340,7 +340,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -461,9 +461,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
 name = "jobserver"
-version = "0.1.26"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
+checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d"
 dependencies = [
  "libc",
 ]
@@ -476,9 +476,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.148"
+version = "0.2.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
+checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
 
 [[package]]
 name = "libz-ng-sys"
@@ -508,18 +508,18 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
 name = "lru"
-version = "0.11.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21"
+checksum = "1efa59af2ddfad1854ae27d75009d538d0998b4b2fd47083e743ac1a10e46c60"
 dependencies = [
  "hashbrown",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.6.3"
+version = "2.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
 
 [[package]]
 name = "memoffset"
@@ -632,9 +632,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
 dependencies = [
  "autocfg",
 ]
@@ -732,9 +732,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.67"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
 dependencies = [
  "unicode-ident",
 ]
@@ -827,7 +827,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -843,9 +843,9 @@ dependencies = [
 
 [[package]]
 name = "sharded-slab"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1b21f559e07218024e7e9f90f96f601825397de0e25420135f7f952453fed0b"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
 dependencies = [
  "lazy_static",
 ]
@@ -890,9 +890,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.37"
+version = "2.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -911,9 +911,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.32.0"
+version = "1.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
+checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
 dependencies = [
  "backtrace",
  "parking_lot",
@@ -940,7 +940,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -1092,30 +1092,28 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "zstd"
-version = "0.12.4"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c"
+checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110"
 dependencies = [
  "zstd-safe",
 ]
 
 [[package]]
 name = "zstd-safe"
-version = "6.0.6"
+version = "7.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581"
+checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e"
 dependencies = [
- "libc",
  "zstd-sys",
 ]
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.8+zstd.1.5.5"
+version = "2.0.9+zstd.1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c"
+checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656"
 dependencies = [
  "cc",
- "libc",
  "pkg-config",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index fcef957..f9b1f0b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -46,7 +46,7 @@ git-version = "0.3.5"
 glam = "0.24.0"
 image = { version = "0.24.5", default-features = false, features = ["png"] }
 indexmap = { version = "2.0.0", features = ["serde"] }
-lru = "0.11.0"
+lru = "0.12.0"
 minedmap-nbt = { version = "0.1.0", path = "crates/nbt", default-features = false }
 minedmap-resource = { version = "0.1.0", path = "crates/resource" }
 minedmap-types = { version = "0.1.0", path = "crates/types" }
@@ -59,7 +59,7 @@ serde_json = "1.0.99"
 tokio = { version = "1.31.0", features = ["rt", "parking_lot", "sync"] }
 tracing = "0.1.37"
 tracing-subscriber = "0.3.17"
-zstd = "0.12.3"
+zstd = "0.13.0"
 
 [features]
 default = ["zlib-ng"]

From 920547f64a57648aabef0b298ebc0ea3ada1bc2b Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 12 Oct 2023 19:14:13 +0200
Subject: [PATCH 275/460] core/tile_mipmapper: use mpsc channels for counters

Make the code a bit easier to understand.
---
 src/core/tile_mipmapper.rs | 73 ++++++++++++++++++++++----------------
 1 file changed, 42 insertions(+), 31 deletions(-)

diff --git a/src/core/tile_mipmapper.rs b/src/core/tile_mipmapper.rs
index d2b1ac5..cc1a8d4 100644
--- a/src/core/tile_mipmapper.rs
+++ b/src/core/tile_mipmapper.rs
@@ -1,5 +1,7 @@
 //! The [TileMipmapper]
 
+use std::sync::mpsc;
+
 use anyhow::{Context, Result};
 use rayon::prelude::*;
 use tracing::{debug, info, warn};
@@ -58,7 +60,9 @@ impl<'a> TileMipmapper<'a> {
 		level: usize,
 		coords: TileCoords,
 		prev: &TileCoordMap,
-	) -> Result<(bool, bool)>
+		count_total: &mpsc::Sender<()>,
+		count_processed: &mpsc::Sender<()>,
+	) -> Result<()>
 	where
 		[P::Subpixel]: image::EncodableLayout,
 		image::ImageBuffer<P, Vec<P::Subpixel>>: Into<image::DynamicImage>,
@@ -93,9 +97,11 @@ impl<'a> TileMipmapper<'a> {
 			.collect();
 
 		let Some(input_timestamp) = sources.iter().map(|(_, _, ts)| *ts).max() else {
-			return Ok((false, false));
+			return Ok(());
 		};
 
+		count_total.send(()).unwrap();
+
 		if Some(input_timestamp) <= output_timestamp {
 			debug!(
 				"Skipping unchanged mipmap tile {}",
@@ -104,7 +110,7 @@ impl<'a> TileMipmapper<'a> {
 					.expect("tile path must be in output directory")
 					.display(),
 			);
-			return Ok((true, false));
+			return Ok(());
 		}
 
 		debug!(
@@ -145,7 +151,8 @@ impl<'a> TileMipmapper<'a> {
 				.context("Failed to save image")
 		})?;
 
-		Ok((true, true))
+		count_processed.send(()).unwrap();
+		Ok(())
 	}
 
 	/// Runs the mipmap generation
@@ -174,34 +181,38 @@ impl<'a> TileMipmapper<'a> {
 
 			let next = Self::map_coords(prev);
 
-			let (total, processed) = next
-				.0
+			let (total_send, total_recv) = mpsc::channel();
+			let (processed_send, processed_recv) = mpsc::channel();
+
+			next.0
 				.par_iter()
-				.flat_map(|(&z, xs)| {
-					let mipmapper = &self;
-					xs.par_iter().map(move |&x| {
-						let coords = TileCoords { x, z };
-						let (found_map, processed_map) = mipmapper
-							.render_mipmap::<image::Rgba<u8>>(TileKind::Map, level, coords, prev)?;
-						let (found_light, processed_light) = mipmapper
-							.render_mipmap::<image::LumaA<u8>>(
-								TileKind::Lightmap,
-								level,
-								coords,
-								prev,
-							)?;
-						anyhow::Ok((
-							usize::from(found_map) + usize::from(found_light),
-							usize::from(processed_map) + usize::from(processed_light),
-						))
-					})
-				})
-				.try_reduce(
-					|| (0, 0),
-					|(found_a, processed_a), (found_b, processed_b)| {
-						Ok((found_a + found_b, processed_a + processed_b))
-					},
-				)?;
+				.flat_map(|(&z, xs)| xs.par_iter().map(move |&x| TileCoords { x, z }))
+				.try_for_each(|coords| {
+					self.render_mipmap::<image::Rgba<u8>>(
+						TileKind::Map,
+						level,
+						coords,
+						prev,
+						&total_send,
+						&processed_send,
+					)?;
+					self.render_mipmap::<image::LumaA<u8>>(
+						TileKind::Lightmap,
+						level,
+						coords,
+						prev,
+						&total_send,
+						&processed_send,
+					)?;
+
+					anyhow::Ok(())
+				})?;
+
+			drop(total_send);
+			let total = total_recv.into_iter().count();
+
+			drop(processed_send);
+			let processed = processed_recv.into_iter().count();
 
 			info!(
 				"Generated level {} mipmaps ({} processed, {} unchanged)",

From 38da1616d5af2edf4c16e204073a93bbd0d3ba73 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 12 Oct 2023 18:30:28 +0200
Subject: [PATCH 276/460] core/region_processor: rename path to input_path in
 process_region()

Make the variable names more consistent.
---
 src/core/region_processor.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/region_processor.rs b/src/core/region_processor.rs
index ac6b42e..55f7227 100644
--- a/src/core/region_processor.rs
+++ b/src/core/region_processor.rs
@@ -139,8 +139,8 @@ impl<'a> RegionProcessor<'a> {
 		let mut processed_region = ProcessedRegion::default();
 		let mut lightmap = image::GrayAlphaImage::new(N, N);
 
-		let path = self.config.region_path(coords);
-		let input_timestamp = fs::modified_timestamp(&path)?;
+		let input_path = self.config.region_path(coords);
+		let input_timestamp = fs::modified_timestamp(&input_path)?;
 
 		let output_path = self.config.processed_path(coords);
 		let output_timestamp = fs::read_timestamp(&output_path, FILE_META_VERSION);
@@ -155,7 +155,7 @@ impl<'a> RegionProcessor<'a> {
 
 		debug!("Processing region r.{}.{}.mca", coords.x, coords.z);
 
-		crate::nbt::region::from_file(path)?.foreach_chunk(
+		crate::nbt::region::from_file(input_path)?.foreach_chunk(
 			|chunk_coords, data: world::de::Chunk| {
 				let Some(layer::LayerData {
 					blocks,

From 46c04e632fb2e0e545cb1f8f47e21c5a7f7e8f44 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 12 Oct 2023 19:31:02 +0200
Subject: [PATCH 277/460] core/region_processor: temporarily disable stat
 output

---
 src/core/region_processor.rs | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/src/core/region_processor.rs b/src/core/region_processor.rs
index 55f7227..6e5adbe 100644
--- a/src/core/region_processor.rs
+++ b/src/core/region_processor.rs
@@ -205,29 +205,19 @@ impl<'a> RegionProcessor<'a> {
 
 		info!("Processing region files...");
 
-		let mut results = vec![];
-		regions
-			.par_iter()
-			.map(|&coords| {
-				let result = self.process_region(coords);
-				if let Err(err) = &result {
-					error!("Failed to process region {:?}: {:?}", coords, err);
-				}
-				result
-			})
-			.collect_into_vec(&mut results);
+		regions.par_iter().for_each(|&coords| {
+			let result = self.process_region(coords);
+			if let Err(err) = &result {
+				error!("Failed to process region {:?}: {:?}", coords, err);
+			}
+		});
 
-		let processed = results
-			.iter()
-			.filter(|result| matches!(result, Ok(true)))
-			.count();
-		let errors = results.iter().filter(|result| result.is_err()).count();
-		info!(
-			"Processed region files ({} processed, {} unchanged, {} errors)",
-			processed,
-			results.len() - processed,
-			errors,
-		);
+		// info!(
+		// 	"Processed region files ({} processed, {} unchanged, {} errors)",
+		// 	processed,
+		// 	results.len() - processed,
+		// 	errors,
+		// );
 
 		Ok(regions)
 	}

From 284892cea6a15cc16b68557a99d3c1f519d10abe Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 12 Oct 2023 19:36:18 +0200
Subject: [PATCH 278/460] core/region_processor: make all process_region()
 error fatal

Less severe errors will be changed not to be passed up to run().
---
 src/core/region_processor.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/core/region_processor.rs b/src/core/region_processor.rs
index 6e5adbe..db25fc2 100644
--- a/src/core/region_processor.rs
+++ b/src/core/region_processor.rs
@@ -5,7 +5,7 @@ use std::{ffi::OsStr, path::Path, time::SystemTime};
 use anyhow::{Context, Result};
 use indexmap::IndexSet;
 use rayon::prelude::*;
-use tracing::{debug, error, info};
+use tracing::{debug, info};
 
 use super::common::*;
 use crate::{
@@ -205,12 +205,12 @@ impl<'a> RegionProcessor<'a> {
 
 		info!("Processing region files...");
 
-		regions.par_iter().for_each(|&coords| {
-			let result = self.process_region(coords);
-			if let Err(err) = &result {
-				error!("Failed to process region {:?}: {:?}", coords, err);
-			}
-		});
+		regions.par_iter().try_for_each(|&coords| {
+			let _ = self
+				.process_region(coords)
+				.with_context(|| format!("Failed to process region {:?}", coords))?;
+			anyhow::Ok(())
+		})?;
 
 		// info!(
 		// 	"Processed region files ({} processed, {} unchanged, {} errors)",

From 09374d755e25a5dec400177ab7a58f40424e40c1 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 12 Oct 2023 19:44:14 +0200
Subject: [PATCH 279/460] core/region_processor: introduce
 RegionProcessorStatus enum

---
 src/core/region_processor.rs | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/core/region_processor.rs b/src/core/region_processor.rs
index db25fc2..fff0b25 100644
--- a/src/core/region_processor.rs
+++ b/src/core/region_processor.rs
@@ -31,6 +31,19 @@ fn parse_region_filename(file_name: &OsStr) -> Option<TileCoords> {
 	})
 }
 
+/// [RegionProcessor::process_region] return values
+#[derive(Debug, Clone, Copy)]
+enum RegionProcessorStatus {
+	/// Region was processed
+	Ok,
+	/// Region was unchanged and skipped
+	Skipped,
+	/// Reading the region failed, previous processed data is reused
+	ErrorOk,
+	/// Reading the region failed, no previous data available
+	ErrorMissing,
+}
+
 /// Type with methods for processing the regions of a Minecraft save directory
 ///
 /// The RegionProcessor builds lightmap tiles as well as processed region data
@@ -132,7 +145,7 @@ impl<'a> RegionProcessor<'a> {
 	}
 
 	/// Processes a single region file
-	fn process_region(&self, coords: TileCoords) -> Result<bool> {
+	fn process_region(&self, coords: TileCoords) -> Result<RegionProcessorStatus> {
 		/// Width/height of the region data
 		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
 
@@ -150,7 +163,7 @@ impl<'a> RegionProcessor<'a> {
 		if Some(input_timestamp) <= output_timestamp && Some(input_timestamp) <= lightmap_timestamp
 		{
 			debug!("Skipping unchanged region r.{}.{}.mca", coords.x, coords.z);
-			return Ok(false);
+			return Ok(RegionProcessorStatus::Skipped);
 		}
 
 		debug!("Processing region r.{}.{}.mca", coords.x, coords.z);
@@ -188,7 +201,7 @@ impl<'a> RegionProcessor<'a> {
 			Self::save_lightmap(&lightmap_path, &lightmap, input_timestamp)?;
 		}
 
-		Ok(true)
+		Ok(RegionProcessorStatus::Ok)
 	}
 
 	/// Iterates over all region files of a Minecraft save directory

From fd48f94f16b1028227bd26bee82d1597ae311352 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 12 Oct 2023 19:49:26 +0200
Subject: [PATCH 280/460] core/region_processor: make regular processing errors
 non-fatal again

Never fail because of invalid save files.
---
 src/core/region_processor.rs | 64 ++++++++++++++++++++++--------------
 1 file changed, 40 insertions(+), 24 deletions(-)

diff --git a/src/core/region_processor.rs b/src/core/region_processor.rs
index fff0b25..c1193b6 100644
--- a/src/core/region_processor.rs
+++ b/src/core/region_processor.rs
@@ -5,7 +5,7 @@ use std::{ffi::OsStr, path::Path, time::SystemTime};
 use anyhow::{Context, Result};
 use indexmap::IndexSet;
 use rayon::prelude::*;
-use tracing::{debug, info};
+use tracing::{debug, info, warn};
 
 use super::common::*;
 use crate::{
@@ -168,31 +168,47 @@ impl<'a> RegionProcessor<'a> {
 
 		debug!("Processing region r.{}.{}.mca", coords.x, coords.z);
 
-		crate::nbt::region::from_file(input_path)?.foreach_chunk(
-			|chunk_coords, data: world::de::Chunk| {
-				let Some(layer::LayerData {
-					blocks,
-					biomes,
-					block_light,
-					depths,
-				}) = self
-					.process_chunk(&mut processed_region.biome_list, data)
-					.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))?
-				else {
-					return Ok(());
-				};
-				processed_region.chunks[chunk_coords] = Some(Box::new(ProcessedChunk {
-					blocks,
-					biomes,
-					depths,
-				}));
+		if let Err(err) = (|| -> Result<()> {
+			crate::nbt::region::from_file(input_path)?.foreach_chunk(
+				|chunk_coords, data: world::de::Chunk| {
+					let Some(layer::LayerData {
+						blocks,
+						biomes,
+						block_light,
+						depths,
+					}) = self
+						.process_chunk(&mut processed_region.biome_list, data)
+						.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))?
+					else {
+						return Ok(());
+					};
+					processed_region.chunks[chunk_coords] = Some(Box::new(ProcessedChunk {
+						blocks,
+						biomes,
+						depths,
+					}));
 
-				let chunk_lightmap = Self::render_chunk_lightmap(block_light);
-				overlay_chunk(&mut lightmap, &chunk_lightmap, chunk_coords);
+					let chunk_lightmap = Self::render_chunk_lightmap(block_light);
+					overlay_chunk(&mut lightmap, &chunk_lightmap, chunk_coords);
 
-				Ok(())
-			},
-		)?;
+					Ok(())
+				},
+			)
+		})() {
+			if output_timestamp.is_some() && lightmap_timestamp.is_some() {
+				warn!(
+					"Failed to process region {:?}, using old data: {:?}",
+					coords, err
+				);
+				return Ok(RegionProcessorStatus::ErrorOk);
+			} else {
+				warn!(
+					"Failed to process region {:?}, no old data available: {:?}",
+					coords, err
+				);
+				return Ok(RegionProcessorStatus::ErrorMissing);
+			}
+		}
 
 		if Some(input_timestamp) > output_timestamp {
 			Self::save_region(&output_path, &processed_region, input_timestamp)?;

From 506631a18f9e20875e7bde703700851b61e15b24 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 12 Oct 2023 19:59:14 +0200
Subject: [PATCH 281/460] core/region_processor: only return available regions

Ignore regions that failed to process and have no old processed data.
---
 src/core/region_processor.rs | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/core/region_processor.rs b/src/core/region_processor.rs
index c1193b6..caaf8ec 100644
--- a/src/core/region_processor.rs
+++ b/src/core/region_processor.rs
@@ -1,6 +1,6 @@
 //! The [RegionProcessor] and related functions
 
-use std::{ffi::OsStr, path::Path, time::SystemTime};
+use std::{ffi::OsStr, path::Path, sync::mpsc, time::SystemTime};
 
 use anyhow::{Context, Result};
 use indexmap::IndexSet;
@@ -32,7 +32,7 @@ fn parse_region_filename(file_name: &OsStr) -> Option<TileCoords> {
 }
 
 /// [RegionProcessor::process_region] return values
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 enum RegionProcessorStatus {
 	/// Region was processed
 	Ok,
@@ -224,23 +224,28 @@ impl<'a> RegionProcessor<'a> {
 	///
 	/// Returns a list of the coordinates of all processed regions
 	pub fn run(self) -> Result<Vec<TileCoords>> {
-		let mut regions = self.collect_regions()?;
-
-		// Sort regions in a zig-zag pattern to optimize cache usage
-		regions.sort_unstable_by_key(|&TileCoords { x, z }| (x, if x % 2 == 0 { z } else { -z }));
-
 		fs::create_dir_all(&self.config.processed_dir)?;
 		fs::create_dir_all(&self.config.tile_dir(TileKind::Lightmap, 0))?;
 
 		info!("Processing region files...");
 
-		regions.par_iter().try_for_each(|&coords| {
-			let _ = self
+		let (region_send, region_recv) = mpsc::channel();
+
+		self.collect_regions()?.par_iter().try_for_each(|&coords| {
+			let ret = self
 				.process_region(coords)
 				.with_context(|| format!("Failed to process region {:?}", coords))?;
+
+			if ret != RegionProcessorStatus::ErrorMissing {
+				region_send.send(coords).unwrap();
+			}
+
 			anyhow::Ok(())
 		})?;
 
+		drop(region_send);
+		let mut regions: Vec<_> = region_recv.into_iter().collect();
+
 		// info!(
 		// 	"Processed region files ({} processed, {} unchanged, {} errors)",
 		// 	processed,
@@ -248,6 +253,9 @@ impl<'a> RegionProcessor<'a> {
 		// 	errors,
 		// );
 
+		// Sort regions in a zig-zag pattern to optimize cache usage
+		regions.sort_unstable_by_key(|&TileCoords { x, z }| (x, if x % 2 == 0 { z } else { -z }));
+
 		Ok(regions)
 	}
 }

From fba9b6cb553c2760d7399abca196f858f572f6a7 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 12 Oct 2023 20:08:02 +0200
Subject: [PATCH 282/460] core/region_processor: reenable stat output

---
 src/core/region_processor.rs | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/core/region_processor.rs b/src/core/region_processor.rs
index caaf8ec..6442da0 100644
--- a/src/core/region_processor.rs
+++ b/src/core/region_processor.rs
@@ -230,6 +230,8 @@ impl<'a> RegionProcessor<'a> {
 		info!("Processing region files...");
 
 		let (region_send, region_recv) = mpsc::channel();
+		let (processed_send, processed_recv) = mpsc::channel();
+		let (error_send, error_recv) = mpsc::channel();
 
 		self.collect_regions()?.par_iter().try_for_each(|&coords| {
 			let ret = self
@@ -240,18 +242,31 @@ impl<'a> RegionProcessor<'a> {
 				region_send.send(coords).unwrap();
 			}
 
+			match ret {
+				RegionProcessorStatus::Ok => processed_send.send(()).unwrap(),
+				RegionProcessorStatus::Skipped => {}
+				RegionProcessorStatus::ErrorOk | RegionProcessorStatus::ErrorMissing => {
+					error_send.send(()).unwrap()
+				}
+			}
+
 			anyhow::Ok(())
 		})?;
 
 		drop(region_send);
 		let mut regions: Vec<_> = region_recv.into_iter().collect();
 
-		// info!(
-		// 	"Processed region files ({} processed, {} unchanged, {} errors)",
-		// 	processed,
-		// 	results.len() - processed,
-		// 	errors,
-		// );
+		drop(processed_send);
+		let processed = processed_recv.into_iter().count();
+		drop(error_send);
+		let errors = error_recv.into_iter().count();
+
+		info!(
+			"Processed region files ({} processed, {} unchanged, {} errors)",
+			processed,
+			regions.len() - processed - errors,
+			errors,
+		);
 
 		// Sort regions in a zig-zag pattern to optimize cache usage
 		regions.sort_unstable_by_key(|&TileCoords { x, z }| (x, if x % 2 == 0 { z } else { -z }));

From 2c1c8c17ef7a7b156d8f4813289a8f5c0c5f515c Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 18 Nov 2023 18:49:25 +0100
Subject: [PATCH 283/460] Update dependencies

---
 Cargo.lock              | 179 ++++++++++++++++++++--------------------
 crates/types/Cargo.toml |   2 +-
 2 files changed, 91 insertions(+), 90 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5cdfec3..fc57421 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19,13 +19,14 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "ahash"
-version = "0.8.3"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
+checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
 dependencies = [
  "cfg-if",
  "once_cell",
  "version_check",
+ "zerocopy",
 ]
 
 [[package]]
@@ -160,9 +161,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.4.6"
+version = "4.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956"
+checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -170,9 +171,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.6"
+version = "4.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45"
+checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc"
 dependencies = [
  "anstream",
  "anstyle",
@@ -182,21 +183,21 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.4.2"
+version = "4.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873"
+checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.5.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961"
+checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
 
 [[package]]
 name = "cmake"
@@ -285,7 +286,7 @@ checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn",
 ]
 
 [[package]]
@@ -308,18 +309,18 @@ dependencies = [
 
 [[package]]
 name = "fdeflate"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10"
+checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868"
 dependencies = [
  "simd-adler32",
 ]
 
 [[package]]
 name = "flate2"
-version = "1.0.27"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
+checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
 dependencies = [
  "crc32fast",
  "libz-ng-sys",
@@ -328,32 +329,32 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
+checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn",
 ]
 
 [[package]]
 name = "futures-task"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
 
 [[package]]
 name = "futures-util"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
 dependencies = [
  "futures-core",
  "futures-macro",
@@ -371,24 +372,22 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
 
 [[package]]
 name = "git-version"
-version = "0.3.5"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6b0decc02f4636b9ccad390dcbe77b722a77efedfa393caf8379a51d5c61899"
+checksum = "13ad01ffa8221f7fe8b936d6ffb2a3e7ad428885a04fad51866a5f33eafda57c"
 dependencies = [
  "git-version-macro",
- "proc-macro-hack",
 ]
 
 [[package]]
 name = "git-version-macro"
-version = "0.3.5"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe69f1cbdb6e28af2bac214e943b99ce8a0a06b447d15d3e61161b0423139f3f"
+checksum = "84488ccbdb24ad6f56dc1863b4a8154a7856cd3c6c7610401634fab3cb588dae"
 dependencies = [
- "proc-macro-hack",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
@@ -399,9 +398,9 @@ checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.1"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -435,9 +434,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.0.2"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
+checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -446,9 +445,9 @@ dependencies = [
 
 [[package]]
 name = "itertools"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0"
 dependencies = [
  "either",
 ]
@@ -476,9 +475,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.149"
+version = "0.2.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
+checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
 
 [[package]]
 name = "libz-ng-sys"
@@ -492,9 +491,9 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -682,9 +681,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.8"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
+checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
 dependencies = [
  "cfg-if",
  "libc",
@@ -724,12 +723,6 @@ dependencies = [
  "miniz_oxide",
 ]
 
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.20+deprecated"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.69"
@@ -770,9 +763,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.3.5"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
 dependencies = [
  "bitflags",
 ]
@@ -803,9 +796,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "serde"
-version = "1.0.188"
+version = "1.0.192"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001"
 dependencies = [
  "serde_derive",
 ]
@@ -821,20 +814,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.188"
+version = "1.0.192"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.107"
+version = "1.0.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
+checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
 dependencies = [
  "itoa",
  "ryu",
@@ -867,9 +860,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
 
 [[package]]
 name = "strsim"
@@ -879,20 +872,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -911,9 +893,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.33.0"
+version = "1.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
+checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
 dependencies = [
  "backtrace",
  "parking_lot",
@@ -922,11 +904,10 @@ dependencies = [
 
 [[package]]
 name = "tracing"
-version = "0.1.37"
+version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
- "cfg-if",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
@@ -934,20 +915,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.26"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.38",
+ "syn",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.31"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 dependencies = [
  "once_cell",
  "valuable",
@@ -955,20 +936,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-log"
-version = "0.1.3"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
 dependencies = [
- "lazy_static",
  "log",
+ "once_cell",
  "tracing-core",
 ]
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
 dependencies = [
  "nu-ansi-term",
  "sharded-slab",
@@ -1090,6 +1071,26 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
+[[package]]
+name = "zerocopy"
+version = "0.7.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "zstd"
 version = "0.13.0"
diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml
index 4097eea..3e8f63d 100644
--- a/crates/types/Cargo.toml
+++ b/crates/types/Cargo.toml
@@ -8,5 +8,5 @@ readme.workspace = true
 repository.workspace = true
 
 [dependencies]
-itertools = "0.11.0"
+itertools = "0.12.0"
 serde = { version = "1.0.183", features = ["derive"] }

From 412568603e1c4b11dced9a2859f51152954fcd23 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 18 Nov 2023 18:51:11 +0100
Subject: [PATCH 284/460] README.md: minor updates

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 4dcd106..75877b4 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,8 @@
 MinedMap consists of two components: a map renderer generating map tiles from
 Minecraft save games, and a viewer for displaying and navigating maps in a browser
 based on [Leaflet](https://leafletjs.com/). The map renderer is heavily inspired by
-[MapRend](https://github.com/YSelfTool/MapRend), but it has been implemented in C++
-from scratch for highest performance.
+[MapRend](https://github.com/YSelfTool/MapRend), but has been reimplemented from scratch
+(first in C++, now in Rust) for highest performance.
 
 The viewer expects the the map data in a directory named `data`. To generate a new
 map, create this empty directory inside the viewer directory. Next, to generate the
@@ -48,8 +48,8 @@ the generated map files to public webspace to make the map available to others.
 
 ## Installation
 
-Building the MinedMap map generator requires a recent Rust toolchain. The
-following command can be used to build the current development version from source:
+Building the MinedMap map generator from source requires a recent Rust toolchain. The
+following command can be used to build the current development version:
 ```shell
 cargo install --git 'https://github.com/NeoRaider/MinedMap.git'
 ```

From 5f2dea6b4fac8d869057aac0dc9bbdb1721f433c Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 18 Nov 2023 18:58:53 +0100
Subject: [PATCH 285/460] minedmap-types 0.1.1

---
 crates/types/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml
index 3e8f63d..41e36cf 100644
--- a/crates/types/Cargo.toml
+++ b/crates/types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "minedmap-types"
-version = "0.1.0"
+version = "0.1.1"
 description = "Common types used by several MinedMap crates"
 edition.workspace = true
 license.workspace = true

From cc9d2c00b4d8cab4339b834d2cb539a50de4809e Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 18 Nov 2023 19:01:15 +0100
Subject: [PATCH 286/460] Cargo.lock: update

---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index fc57421..924b580 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -582,7 +582,7 @@ dependencies = [
 
 [[package]]
 name = "minedmap-types"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "itertools",
  "serde",

From ec4b1053c5c55c8a4c125ff1ec4424150cb72daf Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 18 Nov 2023 19:04:39 +0100
Subject: [PATCH 287/460] CHANGELOG.md: update for invalid region handling fix

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5cafcf2..e1e6c27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## [Unreleased] - ReleaseDate
 
+### Fixed
+
+- Proceed with missing tiles rather can failing completely when an invalid
+  region file is encountered and no processed data from a previous run exists
+
 ## [2.0.0] - 2023-09-30
 
 This is a complete rewrite of the map renderer in Rust, as the previous C++

From 196e21718fcbed7b0609664eb701788e78d44e75 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 18 Nov 2023 19:06:25 +0100
Subject: [PATCH 288/460] minedmap 2.0.1

---
 CHANGELOG.md | 5 ++++-
 Cargo.lock   | 2 +-
 Cargo.toml   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1e6c27..c638d6e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased] - ReleaseDate
 
+## [2.0.1] - 2023-11-18
+
 ### Fixed
 
 - Proceed with missing tiles rather can failing completely when an invalid
@@ -45,5 +47,6 @@ intermediate data.
   Full support for custom biomes datapacks might be added in a future release.
 
 <!-- next-url -->
-[Unreleased]: https://github.com/neocturne/MinedMap/compare/v2.0.0...HEAD
+[Unreleased]: https://github.com/neocturne/MinedMap/compare/v2.0.1...HEAD
+[2.0.1]: https://github.com/neocturne/MinedMap/compare/v2.0.0...v2.0.1
 [2.0.0]: https://github.com/NeoRaider/MinedMap/compare/v1.19.1...v2.0.0
diff --git a/Cargo.lock b/Cargo.lock
index 924b580..95ee246 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -531,7 +531,7 @@ dependencies = [
 
 [[package]]
 name = "minedmap"
-version = "2.0.0"
+version = "2.0.1"
 dependencies = [
  "anyhow",
  "bincode",
diff --git a/Cargo.toml b/Cargo.toml
index f9b1f0b..468f0f4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@ consolidate-commits = false
 
 [package]
 name = "minedmap"
-version = "2.0.0"
+version = "2.0.1"
 description = "Generate browsable maps from Minecraft save data"
 edition.workspace = true
 license.workspace = true

From b32bdb4d8e6a0588a467c92ef08d7161c9ca0fca Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 18 Nov 2023 21:15:04 +0100
Subject: [PATCH 289/460] README.md: mention minimum supported Rust version

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 75877b4..9a8755e 100644
--- a/README.md
+++ b/README.md
@@ -48,8 +48,8 @@ the generated map files to public webspace to make the map available to others.
 
 ## Installation
 
-Building the MinedMap map generator from source requires a recent Rust toolchain. The
-following command can be used to build the current development version:
+Building the MinedMap map generator from source requires a recent Rust toolchain (1.72.0
+or newer). The following command can be used to build the current development version:
 ```shell
 cargo install --git 'https://github.com/NeoRaider/MinedMap.git'
 ```

From 74a4fc93d011f30ab4bbd7974c669908128a4c83 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 25 Nov 2023 19:01:36 +0100
Subject: [PATCH 290/460] world/de: rename Variants enums to Variant

---
 src/world/chunk.rs | 14 +++++++-------
 src/world/de.rs    | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/world/chunk.rs b/src/world/chunk.rs
index 9285a16..77a543c 100644
--- a/src/world/chunk.rs
+++ b/src/world/chunk.rs
@@ -93,10 +93,10 @@ impl<'a> Chunk<'a> {
 		let data_version = data.data_version.unwrap_or_default();
 
 		match &data.chunk {
-			de::ChunkVariants::V1_18 { sections } => {
+			de::ChunkVariant::V1_18 { sections } => {
 				Self::new_v1_18(data_version, sections, block_types, biome_types)
 			}
-			de::ChunkVariants::V0 { level } => {
+			de::ChunkVariant::V0 { level } => {
 				Self::new_v0(data_version, level, block_types, biome_types)
 			}
 		}
@@ -113,7 +113,7 @@ impl<'a> Chunk<'a> {
 
 		for section in sections {
 			match &section.section {
-				de::SectionV1_18Variants::V1_18 {
+				de::SectionV1_18Variant::V1_18 {
 					block_states,
 					biomes,
 					block_light,
@@ -140,7 +140,7 @@ impl<'a> Chunk<'a> {
 						),
 					);
 				}
-				de::SectionV1_18Variants::Empty {} => {}
+				de::SectionV1_18Variant::Empty {} => {}
 			};
 		}
 
@@ -163,7 +163,7 @@ impl<'a> Chunk<'a> {
 					format!("Failed to load section block light at Y={}", section.y)
 				})?;
 			match &section.section {
-				de::SectionV0Variants::V1_13 {
+				de::SectionV0Variant::V1_13 {
 					block_states,
 					palette,
 				} => {
@@ -183,7 +183,7 @@ impl<'a> Chunk<'a> {
 						),
 					);
 				}
-				de::SectionV0Variants::V0 { blocks, data } => {
+				de::SectionV0Variant::V0 { blocks, data } => {
 					section_map_v0.insert(
 						SectionY(section.y.into()),
 						(
@@ -194,7 +194,7 @@ impl<'a> Chunk<'a> {
 						),
 					);
 				}
-				de::SectionV0Variants::Empty {} => {}
+				de::SectionV0Variant::Empty {} => {}
 			}
 		}
 
diff --git a/src/world/de.rs b/src/world/de.rs
index 5c8f84f..cf1b6b5 100644
--- a/src/world/de.rs
+++ b/src/world/de.rs
@@ -31,7 +31,7 @@ pub struct BiomesV1_18 {
 /// Variable part of a [SectionV1_18]
 #[derive(Debug, Deserialize)]
 #[serde(untagged)]
-pub enum SectionV1_18Variants {
+pub enum SectionV1_18Variant {
 	/// Populated 1.18+ section
 	V1_18 {
 		/// Block type data
@@ -54,13 +54,13 @@ pub struct SectionV1_18 {
 	pub y: i32,
 	/// Variable part of section
 	#[serde(flatten)]
-	pub section: SectionV1_18Variants,
+	pub section: SectionV1_18Variant,
 }
 
 /// Version-specific part of a pre-1.18 [Section](SectionV0)
 #[derive(Debug, Deserialize)]
 #[serde(untagged)]
-pub enum SectionV0Variants {
+pub enum SectionV0Variant {
 	/// v1.13+ data
 	#[serde(rename_all = "PascalCase")]
 	V1_13 {
@@ -91,7 +91,7 @@ pub struct SectionV0 {
 	pub block_light: Option<fastnbt::ByteArray>,
 	/// Version-specific data
 	#[serde(flatten)]
-	pub section: SectionV0Variants,
+	pub section: SectionV0Variant,
 }
 
 /// Pre-1.18 biome fields found in the [Level](LevelV0) compound
@@ -118,7 +118,7 @@ pub struct LevelV0 {
 /// Version-specific part of a [Chunk] compound
 #[derive(Debug, Deserialize)]
 #[serde(untagged)]
-pub enum ChunkVariants {
+pub enum ChunkVariant {
 	/// 1.18+ chunk data
 	V1_18 {
 		/// List of chunk sections
@@ -140,7 +140,7 @@ pub struct Chunk {
 	pub data_version: Option<u32>,
 	/// Version-specific chunk data
 	#[serde(flatten)]
-	pub chunk: ChunkVariants,
+	pub chunk: ChunkVariant,
 }
 
 /// `Data` compound element of level.dat

From 4574c06f5d14021e2315125f9fe3d3ccde737ced Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 25 Nov 2023 21:47:17 +0100
Subject: [PATCH 291/460] core/common: remove Clone from
 ProcessedChunk/ProcessedRegion

These can be rather large, and there is no reason to ever clone them.
---
 src/core/common.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/common.rs b/src/core/common.rs
index a6d9a44..471bef3 100644
--- a/src/core/common.rs
+++ b/src/core/common.rs
@@ -53,7 +53,7 @@ impl TileCoordMap {
 }
 
 /// Data structure for storing chunk data between processing and rendering steps
-#[derive(Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize)]
 pub struct ProcessedChunk {
 	/// Block type data
 	pub blocks: Box<layer::BlockArray>,
@@ -64,7 +64,7 @@ pub struct ProcessedChunk {
 }
 
 /// Data structure for storing region data between processing and rendering steps
-#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[derive(Debug, Default, Serialize, Deserialize)]
 pub struct ProcessedRegion {
 	/// List of biomes used in the region
 	///

From fa15a4e6e51b3a381b905ed5007121bcf981196b Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 25 Nov 2023 22:11:44 +0100
Subject: [PATCH 292/460] core/common: separate FileMetaVersion for different
 outputs

---
 src/core/common.rs           | 12 +++++++++---
 src/core/region_processor.rs |  8 ++++----
 src/core/tile_mipmapper.rs   |  8 ++++++--
 src/core/tile_renderer.rs    |  4 ++--
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/core/common.rs b/src/core/common.rs
index 471bef3..39c8e54 100644
--- a/src/core/common.rs
+++ b/src/core/common.rs
@@ -11,10 +11,16 @@ use serde::{Deserialize, Serialize};
 
 use crate::{io::fs::FileMetaVersion, resource::Biome, types::*, world::layer};
 
-/// MinedMap data version number
-///
 /// Increase to force regeneration of all output files
-pub const FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
+
+/// MinedMap processed region data version number
+pub const REGION_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
+
+/// MinedMap map tile data version number
+pub const MAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
+
+/// MinedMap lightmap data version number
+pub const LIGHTMAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
 
 /// Coordinate pair of a generated tile
 ///
diff --git a/src/core/region_processor.rs b/src/core/region_processor.rs
index 6442da0..830b0f2 100644
--- a/src/core/region_processor.rs
+++ b/src/core/region_processor.rs
@@ -126,7 +126,7 @@ impl<'a> RegionProcessor<'a> {
 		processed_region: &ProcessedRegion,
 		timestamp: SystemTime,
 	) -> Result<()> {
-		storage::write(path, processed_region, FILE_META_VERSION, timestamp)
+		storage::write(path, processed_region, REGION_FILE_META_VERSION, timestamp)
 	}
 
 	/// Saves a lightmap tile
@@ -137,7 +137,7 @@ impl<'a> RegionProcessor<'a> {
 		lightmap: &image::GrayAlphaImage,
 		timestamp: SystemTime,
 	) -> Result<()> {
-		fs::create_with_timestamp(path, FILE_META_VERSION, timestamp, |file| {
+		fs::create_with_timestamp(path, LIGHTMAP_FILE_META_VERSION, timestamp, |file| {
 			lightmap
 				.write_to(file, image::ImageFormat::Png)
 				.context("Failed to save image")
@@ -156,9 +156,9 @@ impl<'a> RegionProcessor<'a> {
 		let input_timestamp = fs::modified_timestamp(&input_path)?;
 
 		let output_path = self.config.processed_path(coords);
-		let output_timestamp = fs::read_timestamp(&output_path, FILE_META_VERSION);
+		let output_timestamp = fs::read_timestamp(&output_path, REGION_FILE_META_VERSION);
 		let lightmap_path = self.config.tile_path(TileKind::Lightmap, 0, coords);
-		let lightmap_timestamp = fs::read_timestamp(&lightmap_path, FILE_META_VERSION);
+		let lightmap_timestamp = fs::read_timestamp(&lightmap_path, LIGHTMAP_FILE_META_VERSION);
 
 		if Some(input_timestamp) <= output_timestamp && Some(input_timestamp) <= lightmap_timestamp
 		{
diff --git a/src/core/tile_mipmapper.rs b/src/core/tile_mipmapper.rs
index cc1a8d4..355bd23 100644
--- a/src/core/tile_mipmapper.rs
+++ b/src/core/tile_mipmapper.rs
@@ -70,8 +70,12 @@ impl<'a> TileMipmapper<'a> {
 		/// Tile width/height
 		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
 
+		let version = match kind {
+			TileKind::Map => REGION_FILE_META_VERSION,
+			TileKind::Lightmap => LIGHTMAP_FILE_META_VERSION,
+		};
 		let output_path = self.config.tile_path(kind, level, coords);
-		let output_timestamp = fs::read_timestamp(&output_path, FILE_META_VERSION);
+		let output_timestamp = fs::read_timestamp(&output_path, version);
 
 		let sources: Vec<_> = [(0, 0), (0, 1), (1, 0), (1, 1)]
 			.into_iter()
@@ -145,7 +149,7 @@ impl<'a> TileMipmapper<'a> {
 			);
 		}
 
-		fs::create_with_timestamp(&output_path, FILE_META_VERSION, input_timestamp, |file| {
+		fs::create_with_timestamp(&output_path, version, input_timestamp, |file| {
 			image
 				.write_to(file, image::ImageFormat::Png)
 				.context("Failed to save image")
diff --git a/src/core/tile_renderer.rs b/src/core/tile_renderer.rs
index 219e7c8..34f0310 100644
--- a/src/core/tile_renderer.rs
+++ b/src/core/tile_renderer.rs
@@ -270,7 +270,7 @@ impl<'a> TileRenderer<'a> {
 		let (processed_paths, processed_timestamp) = self.processed_sources(coords)?;
 
 		let output_path = self.config.tile_path(TileKind::Map, 0, coords);
-		let output_timestamp = fs::read_timestamp(&output_path, FILE_META_VERSION);
+		let output_timestamp = fs::read_timestamp(&output_path, MAP_FILE_META_VERSION);
 
 		if Some(processed_timestamp) <= output_timestamp {
 			debug!(
@@ -300,7 +300,7 @@ impl<'a> TileRenderer<'a> {
 
 		fs::create_with_timestamp(
 			&output_path,
-			FILE_META_VERSION,
+			MAP_FILE_META_VERSION,
 			processed_timestamp,
 			|file| {
 				image

From a5ad057e0cb4dc742c0603b1f025bf79e4c9bac1 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 25 Nov 2023 22:54:08 +0100
Subject: [PATCH 293/460] core/region_processor: refactor
 RegionProcessor::process_region()

---
 src/core/region_processor.rs | 317 ++++++++++++++++++++---------------
 1 file changed, 185 insertions(+), 132 deletions(-)

diff --git a/src/core/region_processor.rs b/src/core/region_processor.rs
index 830b0f2..712436f 100644
--- a/src/core/region_processor.rs
+++ b/src/core/region_processor.rs
@@ -1,21 +1,22 @@
 //! The [RegionProcessor] and related functions
 
-use std::{ffi::OsStr, path::Path, sync::mpsc, time::SystemTime};
+use std::{
+	ffi::OsStr,
+	path::{Path, PathBuf},
+	sync::mpsc,
+	time::SystemTime,
+};
 
 use anyhow::{Context, Result};
-use indexmap::IndexSet;
 use rayon::prelude::*;
 use tracing::{debug, info, warn};
 
 use super::common::*;
 use crate::{
 	io::{fs, storage},
-	resource::{self, Biome},
+	resource,
 	types::*,
-	world::{
-		self,
-		layer::{self, LayerData},
-	},
+	world::{self, layer},
 };
 
 /// Parses a filename in the format r.X.Z.mca into the contained X and Z values
@@ -44,6 +45,182 @@ enum RegionProcessorStatus {
 	ErrorMissing,
 }
 
+/// Handles processing for a single region
+struct SingleRegionProcessor<'a> {
+	/// Registry of known block types
+	block_types: &'a resource::BlockTypes,
+	/// Registry of known biome types
+	biome_types: &'a resource::BiomeTypes,
+	/// Coordinates of the region this instance is processing
+	coords: TileCoords,
+	/// Input region filename
+	input_path: PathBuf,
+	/// Processed region data output filename
+	output_path: PathBuf,
+	/// Lightmap output filename
+	lightmap_path: PathBuf,
+	/// Timestamp of last modification of input file
+	input_timestamp: SystemTime,
+	/// Timestamp of last modification of processed region output file (if valid)
+	output_timestamp: Option<SystemTime>,
+	/// Timestamp of last modification of lightmap output file (if valid)
+	lightmap_timestamp: Option<SystemTime>,
+	/// Processed region intermediate data
+	processed_region: ProcessedRegion,
+	/// Lightmap intermediate data
+	lightmap: image::GrayAlphaImage,
+}
+
+impl<'a> SingleRegionProcessor<'a> {
+	/// Initializes a [SingleRegionProcessor]
+	fn new(processor: &'a RegionProcessor<'a>, coords: TileCoords) -> Result<Self> {
+		/// Width/height of the region data
+		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
+
+		let input_path = processor.config.region_path(coords);
+		let input_timestamp = fs::modified_timestamp(&input_path)?;
+
+		let output_path = processor.config.processed_path(coords);
+		let output_timestamp = fs::read_timestamp(&output_path, REGION_FILE_META_VERSION);
+		let lightmap_path = processor.config.tile_path(TileKind::Lightmap, 0, coords);
+		let lightmap_timestamp = fs::read_timestamp(&lightmap_path, LIGHTMAP_FILE_META_VERSION);
+
+		let processed_region = ProcessedRegion::default();
+		let lightmap = image::GrayAlphaImage::new(N, N);
+
+		Ok(SingleRegionProcessor {
+			block_types: &processor.block_types,
+			biome_types: &processor.biome_types,
+			coords,
+			input_path,
+			output_path,
+			lightmap_path,
+			input_timestamp,
+			output_timestamp,
+			lightmap_timestamp,
+			processed_region,
+			lightmap,
+		})
+	}
+
+	/// Renders a lightmap subtile from chunk block light data
+	fn render_chunk_lightmap(
+		block_light: Box<world::layer::BlockLightArray>,
+	) -> image::GrayAlphaImage {
+		/// Width/height of generated chunk lightmap
+		const N: u32 = BLOCKS_PER_CHUNK as u32;
+
+		image::GrayAlphaImage::from_fn(N, N, |x, z| {
+			let v: f32 = block_light[LayerBlockCoords {
+				x: BlockX::new(x),
+				z: BlockZ::new(z),
+			}]
+			.into();
+			image::LumaA([0, (192.0 * (1.0 - v / 15.0)) as u8])
+		})
+	}
+
+	/// Saves processed region data
+	///
+	/// The timestamp is the time of the last modification of the input region data.
+	fn save_region(
+		path: &Path,
+		processed_region: &ProcessedRegion,
+		timestamp: SystemTime,
+	) -> Result<()> {
+		storage::write(path, processed_region, REGION_FILE_META_VERSION, timestamp)
+	}
+
+	/// Saves a lightmap tile
+	///
+	/// The timestamp is the time of the last modification of the input region data.
+	fn save_lightmap(
+		path: &Path,
+		lightmap: &image::GrayAlphaImage,
+		timestamp: SystemTime,
+	) -> Result<()> {
+		fs::create_with_timestamp(path, LIGHTMAP_FILE_META_VERSION, timestamp, |file| {
+			lightmap
+				.write_to(file, image::ImageFormat::Png)
+				.context("Failed to save image")
+		})
+	}
+
+	/// Processes the region
+	fn run(mut self) -> Result<RegionProcessorStatus> {
+		if Some(self.input_timestamp) <= self.output_timestamp
+			&& Some(self.input_timestamp) <= self.lightmap_timestamp
+		{
+			debug!(
+				"Skipping unchanged region r.{}.{}.mca",
+				self.coords.x, self.coords.z
+			);
+			return Ok(RegionProcessorStatus::Skipped);
+		}
+
+		debug!(
+			"Processing region r.{}.{}.mca",
+			self.coords.x, self.coords.z
+		);
+
+		if let Err(err) = (|| -> Result<()> {
+			crate::nbt::region::from_file(&self.input_path)?.foreach_chunk(
+				|chunk_coords, data: world::de::Chunk| {
+					let chunk = world::chunk::Chunk::new(&data, self.block_types, self.biome_types)
+						.with_context(|| format!("Failed to decode chunk {:?}", chunk_coords))?;
+					let Some(layer::LayerData {
+						blocks,
+						biomes,
+						block_light,
+						depths,
+					}) = world::layer::top_layer(&mut self.processed_region.biome_list, &chunk)
+						.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))?
+					else {
+						return Ok(());
+					};
+					self.processed_region.chunks[chunk_coords] = Some(Box::new(ProcessedChunk {
+						blocks,
+						biomes,
+						depths,
+					}));
+
+					let chunk_lightmap = Self::render_chunk_lightmap(block_light);
+					overlay_chunk(&mut self.lightmap, &chunk_lightmap, chunk_coords);
+
+					Ok(())
+				},
+			)
+		})() {
+			if self.output_timestamp.is_some() && self.lightmap_timestamp.is_some() {
+				warn!(
+					"Failed to process region {:?}, using old data: {:?}",
+					self.coords, err
+				);
+				return Ok(RegionProcessorStatus::ErrorOk);
+			} else {
+				warn!(
+					"Failed to process region {:?}, no old data available: {:?}",
+					self.coords, err
+				);
+				return Ok(RegionProcessorStatus::ErrorMissing);
+			}
+		}
+
+		if Some(self.input_timestamp) > self.output_timestamp {
+			Self::save_region(
+				&self.output_path,
+				&self.processed_region,
+				self.input_timestamp,
+			)?;
+		}
+		if Some(self.input_timestamp) > self.lightmap_timestamp {
+			Self::save_lightmap(&self.lightmap_path, &self.lightmap, self.input_timestamp)?;
+		}
+
+		Ok(RegionProcessorStatus::Ok)
+	}
+}
+
 /// Type with methods for processing the regions of a Minecraft save directory
 ///
 /// The RegionProcessor builds lightmap tiles as well as processed region data
@@ -91,133 +268,9 @@ impl<'a> RegionProcessor<'a> {
 			.collect())
 	}
 
-	/// Processes a single chunk
-	fn process_chunk(
-		&self,
-		biome_list: &mut IndexSet<Biome>,
-		data: world::de::Chunk,
-	) -> Result<Option<LayerData>> {
-		let chunk = world::chunk::Chunk::new(&data, &self.block_types, &self.biome_types)?;
-		world::layer::top_layer(biome_list, &chunk)
-	}
-
-	/// Renders a lightmap subtile from chunk block light data
-	fn render_chunk_lightmap(
-		block_light: Box<world::layer::BlockLightArray>,
-	) -> image::GrayAlphaImage {
-		/// Width/height of generated chunk lightmap
-		const N: u32 = BLOCKS_PER_CHUNK as u32;
-
-		image::GrayAlphaImage::from_fn(N, N, |x, z| {
-			let v: f32 = block_light[LayerBlockCoords {
-				x: BlockX::new(x),
-				z: BlockZ::new(z),
-			}]
-			.into();
-			image::LumaA([0, (192.0 * (1.0 - v / 15.0)) as u8])
-		})
-	}
-
-	/// Saves processed region data
-	///
-	/// The timestamp is the time of the last modification of the input region data.
-	fn save_region(
-		path: &Path,
-		processed_region: &ProcessedRegion,
-		timestamp: SystemTime,
-	) -> Result<()> {
-		storage::write(path, processed_region, REGION_FILE_META_VERSION, timestamp)
-	}
-
-	/// Saves a lightmap tile
-	///
-	/// The timestamp is the time of the last modification of the input region data.
-	fn save_lightmap(
-		path: &Path,
-		lightmap: &image::GrayAlphaImage,
-		timestamp: SystemTime,
-	) -> Result<()> {
-		fs::create_with_timestamp(path, LIGHTMAP_FILE_META_VERSION, timestamp, |file| {
-			lightmap
-				.write_to(file, image::ImageFormat::Png)
-				.context("Failed to save image")
-		})
-	}
-
 	/// Processes a single region file
 	fn process_region(&self, coords: TileCoords) -> Result<RegionProcessorStatus> {
-		/// Width/height of the region data
-		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
-
-		let mut processed_region = ProcessedRegion::default();
-		let mut lightmap = image::GrayAlphaImage::new(N, N);
-
-		let input_path = self.config.region_path(coords);
-		let input_timestamp = fs::modified_timestamp(&input_path)?;
-
-		let output_path = self.config.processed_path(coords);
-		let output_timestamp = fs::read_timestamp(&output_path, REGION_FILE_META_VERSION);
-		let lightmap_path = self.config.tile_path(TileKind::Lightmap, 0, coords);
-		let lightmap_timestamp = fs::read_timestamp(&lightmap_path, LIGHTMAP_FILE_META_VERSION);
-
-		if Some(input_timestamp) <= output_timestamp && Some(input_timestamp) <= lightmap_timestamp
-		{
-			debug!("Skipping unchanged region r.{}.{}.mca", coords.x, coords.z);
-			return Ok(RegionProcessorStatus::Skipped);
-		}
-
-		debug!("Processing region r.{}.{}.mca", coords.x, coords.z);
-
-		if let Err(err) = (|| -> Result<()> {
-			crate::nbt::region::from_file(input_path)?.foreach_chunk(
-				|chunk_coords, data: world::de::Chunk| {
-					let Some(layer::LayerData {
-						blocks,
-						biomes,
-						block_light,
-						depths,
-					}) = self
-						.process_chunk(&mut processed_region.biome_list, data)
-						.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))?
-					else {
-						return Ok(());
-					};
-					processed_region.chunks[chunk_coords] = Some(Box::new(ProcessedChunk {
-						blocks,
-						biomes,
-						depths,
-					}));
-
-					let chunk_lightmap = Self::render_chunk_lightmap(block_light);
-					overlay_chunk(&mut lightmap, &chunk_lightmap, chunk_coords);
-
-					Ok(())
-				},
-			)
-		})() {
-			if output_timestamp.is_some() && lightmap_timestamp.is_some() {
-				warn!(
-					"Failed to process region {:?}, using old data: {:?}",
-					coords, err
-				);
-				return Ok(RegionProcessorStatus::ErrorOk);
-			} else {
-				warn!(
-					"Failed to process region {:?}, no old data available: {:?}",
-					coords, err
-				);
-				return Ok(RegionProcessorStatus::ErrorMissing);
-			}
-		}
-
-		if Some(input_timestamp) > output_timestamp {
-			Self::save_region(&output_path, &processed_region, input_timestamp)?;
-		}
-		if Some(input_timestamp) > lightmap_timestamp {
-			Self::save_lightmap(&lightmap_path, &lightmap, input_timestamp)?;
-		}
-
-		Ok(RegionProcessorStatus::Ok)
+		SingleRegionProcessor::new(self, coords)?.run()
 	}
 
 	/// Iterates over all region files of a Minecraft save directory

From 25f675bd3b3e62b917175beb9eea55bb12ff7932 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 25 Nov 2023 22:16:56 +0100
Subject: [PATCH 294/460] core/region_processor: make logic for skipping
 updates more fine-grained

Allow skipping parts of the processing separately for processed region
and lightmap files.
---
 src/core/region_processor.rs | 37 ++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/core/region_processor.rs b/src/core/region_processor.rs
index 712436f..52b9e7d 100644
--- a/src/core/region_processor.rs
+++ b/src/core/region_processor.rs
@@ -65,6 +65,10 @@ struct SingleRegionProcessor<'a> {
 	output_timestamp: Option<SystemTime>,
 	/// Timestamp of last modification of lightmap output file (if valid)
 	lightmap_timestamp: Option<SystemTime>,
+	/// True if processed region output file needs to be updated
+	output_needed: bool,
+	/// True if lightmap output file needs to be updated
+	lightmap_needed: bool,
 	/// Processed region intermediate data
 	processed_region: ProcessedRegion,
 	/// Lightmap intermediate data
@@ -85,6 +89,9 @@ impl<'a> SingleRegionProcessor<'a> {
 		let lightmap_path = processor.config.tile_path(TileKind::Lightmap, 0, coords);
 		let lightmap_timestamp = fs::read_timestamp(&lightmap_path, LIGHTMAP_FILE_META_VERSION);
 
+		let output_needed = Some(input_timestamp) > output_timestamp;
+		let lightmap_needed = Some(input_timestamp) > lightmap_timestamp;
+
 		let processed_region = ProcessedRegion::default();
 		let lightmap = image::GrayAlphaImage::new(N, N);
 
@@ -98,6 +105,8 @@ impl<'a> SingleRegionProcessor<'a> {
 			input_timestamp,
 			output_timestamp,
 			lightmap_timestamp,
+			output_needed,
+			lightmap_needed,
 			processed_region,
 			lightmap,
 		})
@@ -148,9 +157,7 @@ impl<'a> SingleRegionProcessor<'a> {
 
 	/// Processes the region
 	fn run(mut self) -> Result<RegionProcessorStatus> {
-		if Some(self.input_timestamp) <= self.output_timestamp
-			&& Some(self.input_timestamp) <= self.lightmap_timestamp
-		{
+		if !self.output_needed && !self.lightmap_needed {
 			debug!(
 				"Skipping unchanged region r.{}.{}.mca",
 				self.coords.x, self.coords.z
@@ -178,14 +185,20 @@ impl<'a> SingleRegionProcessor<'a> {
 					else {
 						return Ok(());
 					};
-					self.processed_region.chunks[chunk_coords] = Some(Box::new(ProcessedChunk {
-						blocks,
-						biomes,
-						depths,
-					}));
 
-					let chunk_lightmap = Self::render_chunk_lightmap(block_light);
-					overlay_chunk(&mut self.lightmap, &chunk_lightmap, chunk_coords);
+					if self.output_needed {
+						self.processed_region.chunks[chunk_coords] =
+							Some(Box::new(ProcessedChunk {
+								blocks,
+								biomes,
+								depths,
+							}));
+					}
+
+					if self.lightmap_needed {
+						let chunk_lightmap = Self::render_chunk_lightmap(block_light);
+						overlay_chunk(&mut self.lightmap, &chunk_lightmap, chunk_coords);
+					}
 
 					Ok(())
 				},
@@ -206,14 +219,14 @@ impl<'a> SingleRegionProcessor<'a> {
 			}
 		}
 
-		if Some(self.input_timestamp) > self.output_timestamp {
+		if self.output_needed {
 			Self::save_region(
 				&self.output_path,
 				&self.processed_region,
 				self.input_timestamp,
 			)?;
 		}
-		if Some(self.input_timestamp) > self.lightmap_timestamp {
+		if self.lightmap_needed {
 			Self::save_lightmap(&self.lightmap_path, &self.lightmap, self.input_timestamp)?;
 		}
 

From 93c1ce943714cad655cc324a4723e323010b2090 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 25 Nov 2023 23:03:13 +0100
Subject: [PATCH 295/460] core/region_processor: further split up
 SingleRegionProcessor::run()

---
 src/core/region_processor.rs | 133 ++++++++++++++++++-----------------
 1 file changed, 67 insertions(+), 66 deletions(-)

diff --git a/src/core/region_processor.rs b/src/core/region_processor.rs
index 52b9e7d..9e1bb65 100644
--- a/src/core/region_processor.rs
+++ b/src/core/region_processor.rs
@@ -1,11 +1,6 @@
 //! The [RegionProcessor] and related functions
 
-use std::{
-	ffi::OsStr,
-	path::{Path, PathBuf},
-	sync::mpsc,
-	time::SystemTime,
-};
+use std::{ffi::OsStr, path::PathBuf, sync::mpsc, time::SystemTime};
 
 use anyhow::{Context, Result};
 use rayon::prelude::*;
@@ -132,27 +127,74 @@ impl<'a> SingleRegionProcessor<'a> {
 	/// Saves processed region data
 	///
 	/// The timestamp is the time of the last modification of the input region data.
-	fn save_region(
-		path: &Path,
-		processed_region: &ProcessedRegion,
-		timestamp: SystemTime,
-	) -> Result<()> {
-		storage::write(path, processed_region, REGION_FILE_META_VERSION, timestamp)
+	fn save_region(&self) -> Result<()> {
+		if !self.output_needed {
+			return Ok(());
+		}
+
+		storage::write(
+			&self.output_path,
+			&self.processed_region,
+			REGION_FILE_META_VERSION,
+			self.input_timestamp,
+		)
 	}
 
 	/// Saves a lightmap tile
 	///
 	/// The timestamp is the time of the last modification of the input region data.
-	fn save_lightmap(
-		path: &Path,
-		lightmap: &image::GrayAlphaImage,
-		timestamp: SystemTime,
-	) -> Result<()> {
-		fs::create_with_timestamp(path, LIGHTMAP_FILE_META_VERSION, timestamp, |file| {
-			lightmap
-				.write_to(file, image::ImageFormat::Png)
-				.context("Failed to save image")
-		})
+	fn save_lightmap(&self) -> Result<()> {
+		if !self.lightmap_needed {
+			return Ok(());
+		}
+
+		fs::create_with_timestamp(
+			&self.lightmap_path,
+			LIGHTMAP_FILE_META_VERSION,
+			self.input_timestamp,
+			|file| {
+				self.lightmap
+					.write_to(file, image::ImageFormat::Png)
+					.context("Failed to save image")
+			},
+		)
+	}
+
+	/// Processes a single chunk
+	fn process_chunk(&mut self, chunk_coords: ChunkCoords, data: world::de::Chunk) -> Result<()> {
+		let chunk = world::chunk::Chunk::new(&data, self.block_types, self.biome_types)
+			.with_context(|| format!("Failed to decode chunk {:?}", chunk_coords))?;
+		let Some(layer::LayerData {
+			blocks,
+			biomes,
+			block_light,
+			depths,
+		}) = world::layer::top_layer(&mut self.processed_region.biome_list, &chunk)
+			.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))?
+		else {
+			return Ok(());
+		};
+
+		if self.output_needed {
+			self.processed_region.chunks[chunk_coords] = Some(Box::new(ProcessedChunk {
+				blocks,
+				biomes,
+				depths,
+			}));
+		}
+
+		if self.lightmap_needed {
+			let chunk_lightmap = Self::render_chunk_lightmap(block_light);
+			overlay_chunk(&mut self.lightmap, &chunk_lightmap, chunk_coords);
+		}
+
+		Ok(())
+	}
+
+	/// Processes the chunks of the region
+	fn process_chunks(&mut self) -> Result<()> {
+		crate::nbt::region::from_file(&self.input_path)?
+			.foreach_chunk(|chunk_coords, data| self.process_chunk(chunk_coords, data))
 	}
 
 	/// Processes the region
@@ -170,40 +212,7 @@ impl<'a> SingleRegionProcessor<'a> {
 			self.coords.x, self.coords.z
 		);
 
-		if let Err(err) = (|| -> Result<()> {
-			crate::nbt::region::from_file(&self.input_path)?.foreach_chunk(
-				|chunk_coords, data: world::de::Chunk| {
-					let chunk = world::chunk::Chunk::new(&data, self.block_types, self.biome_types)
-						.with_context(|| format!("Failed to decode chunk {:?}", chunk_coords))?;
-					let Some(layer::LayerData {
-						blocks,
-						biomes,
-						block_light,
-						depths,
-					}) = world::layer::top_layer(&mut self.processed_region.biome_list, &chunk)
-						.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))?
-					else {
-						return Ok(());
-					};
-
-					if self.output_needed {
-						self.processed_region.chunks[chunk_coords] =
-							Some(Box::new(ProcessedChunk {
-								blocks,
-								biomes,
-								depths,
-							}));
-					}
-
-					if self.lightmap_needed {
-						let chunk_lightmap = Self::render_chunk_lightmap(block_light);
-						overlay_chunk(&mut self.lightmap, &chunk_lightmap, chunk_coords);
-					}
-
-					Ok(())
-				},
-			)
-		})() {
+		if let Err(err) = self.process_chunks() {
 			if self.output_timestamp.is_some() && self.lightmap_timestamp.is_some() {
 				warn!(
 					"Failed to process region {:?}, using old data: {:?}",
@@ -219,16 +228,8 @@ impl<'a> SingleRegionProcessor<'a> {
 			}
 		}
 
-		if self.output_needed {
-			Self::save_region(
-				&self.output_path,
-				&self.processed_region,
-				self.input_timestamp,
-			)?;
-		}
-		if self.lightmap_needed {
-			Self::save_lightmap(&self.lightmap_path, &self.lightmap, self.input_timestamp)?;
-		}
+		self.save_region()?;
+		self.save_lightmap()?;
 
 		Ok(RegionProcessorStatus::Ok)
 	}

From 1432df7c936927b051ab40f2630ab372fa659115 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 29 Dec 2023 20:06:52 +0100
Subject: [PATCH 296/460] Update dependencies

---
 Cargo.lock                 | 236 ++++++++++++++++++++++---------------
 Cargo.toml                 |   2 +-
 crates/resource/Cargo.toml |   2 +-
 3 files changed, 143 insertions(+), 97 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 95ee246..b76fb71 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -37,9 +37,9 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
 
 [[package]]
 name = "anstream"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
+checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -57,27 +57,27 @@ checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140"
+checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
 dependencies = [
  "windows-sys",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.1"
+version = "3.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
+checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
 dependencies = [
  "anstyle",
  "windows-sys",
@@ -85,9 +85,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.75"
+version = "1.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
+checksum = "c9d19de80eff169429ac1e9f48fffb163916b448a44e8e046186232046d9e1f9"
 
 [[package]]
 name = "autocfg"
@@ -161,9 +161,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.4.8"
+version = "4.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64"
+checksum = "dcfab8ba68f3668e89f6ff60f5b205cea56aa7b769451a59f34b8682f51c056d"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -171,9 +171,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.8"
+version = "4.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc"
+checksum = "fb7fb5e4e979aec3be7791562fcba452f94ad85e954da024396433e0e25a79e9"
 dependencies = [
  "anstream",
  "anstyle",
@@ -231,9 +231,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
+checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751"
 dependencies = [
  "cfg-if",
  "crossbeam-epoch",
@@ -242,22 +242,20 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.15"
+version = "0.9.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
+checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d"
 dependencies = [
  "autocfg",
  "cfg-if",
  "crossbeam-utils",
- "memoffset",
- "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.16"
+version = "0.8.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
+checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c"
 dependencies = [
  "cfg-if",
 ]
@@ -309,9 +307,9 @@ dependencies = [
 
 [[package]]
 name = "fdeflate"
-version = "0.3.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868"
+checksum = "209098dd6dfc4445aa6111f0e98653ac323eaa4dfd212c9ca3931bf9955c31bd"
 dependencies = [
  "simd-adler32",
 ]
@@ -329,15 +327,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -346,15 +344,15 @@ dependencies = [
 
 [[package]]
 name = "futures-task"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-util"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
  "futures-core",
  "futures-macro",
@@ -366,24 +364,24 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.28.0"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
 [[package]]
 name = "git-version"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13ad01ffa8221f7fe8b936d6ffb2a3e7ad428885a04fad51866a5f33eafda57c"
+checksum = "1ad568aa3db0fcbc81f2f116137f263d7304f512a1209b35b85150d3ef88ad19"
 dependencies = [
  "git-version-macro",
 ]
 
 [[package]]
 name = "git-version-macro"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84488ccbdb24ad6f56dc1863b4a8154a7856cd3c6c7610401634fab3cb588dae"
+checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -392,15 +390,15 @@ dependencies = [
 
 [[package]]
 name = "glam"
-version = "0.24.2"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945"
+checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.2"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -454,9 +452,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.9"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
 
 [[package]]
 name = "jobserver"
@@ -475,9 +473,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.150"
+version = "0.2.151"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
+checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
 
 [[package]]
 name = "libz-ng-sys"
@@ -507,27 +505,18 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
 name = "lru"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1efa59af2ddfad1854ae27d75009d538d0998b4b2fd47083e743ac1a10e46c60"
+checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7"
 dependencies = [
  "hashbrown",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.6.4"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
-
-[[package]]
-name = "memoffset"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
-dependencies = [
- "autocfg",
-]
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
 
 [[package]]
 name = "minedmap"
@@ -650,18 +639,18 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.1"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "overload"
@@ -689,7 +678,7 @@ dependencies = [
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -706,9 +695,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.27"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
+checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a"
 
 [[package]]
 name = "png"
@@ -725,9 +714,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8"
 dependencies = [
  "unicode-ident",
 ]
@@ -784,9 +773,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "ryu"
-version = "1.0.15"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
 
 [[package]]
 name = "scopeguard"
@@ -796,27 +785,27 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "serde"
-version = "1.0.192"
+version = "1.0.193"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001"
+checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_bytes"
-version = "0.11.12"
+version = "0.11.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff"
+checksum = "8bb1879ea93538b78549031e2d54da3e901fd7e75f2e4dc758d760937b123d10"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.192"
+version = "1.0.193"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1"
+checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -872,9 +861,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "syn"
-version = "2.0.39"
+version = "2.0.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
+checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -893,9 +882,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.34.0"
+version = "1.35.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
+checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
 dependencies = [
  "backtrace",
  "parking_lot",
@@ -1007,11 +996,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows-sys"
-version = "0.48.0"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.52.0",
 ]
 
 [[package]]
@@ -1020,13 +1009,28 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.0",
+ "windows_aarch64_msvc 0.52.0",
+ "windows_i686_gnu 0.52.0",
+ "windows_i686_msvc 0.52.0",
+ "windows_x86_64_gnu 0.52.0",
+ "windows_x86_64_gnullvm 0.52.0",
+ "windows_x86_64_msvc 0.52.0",
 ]
 
 [[package]]
@@ -1035,36 +1039,72 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
@@ -1072,19 +1112,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
-name = "zerocopy"
-version = "0.7.26"
+name = "windows_x86_64_msvc"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+
+[[package]]
+name = "zerocopy"
+version = "0.7.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.26"
+version = "0.7.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index 468f0f4..a1d5daf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -43,7 +43,7 @@ clap = { version = "4.1.4", features = ["derive"] }
 fastnbt = "2.3.2"
 futures-util = "0.3.28"
 git-version = "0.3.5"
-glam = "0.24.0"
+glam = "0.25.0"
 image = { version = "0.24.5", default-features = false, features = ["png"] }
 indexmap = { version = "2.0.0", features = ["serde"] }
 lru = "0.12.0"
diff --git a/crates/resource/Cargo.toml b/crates/resource/Cargo.toml
index 78917da..b1bc005 100644
--- a/crates/resource/Cargo.toml
+++ b/crates/resource/Cargo.toml
@@ -9,5 +9,5 @@ repository.workspace = true
 
 [dependencies]
 enumflags2 = { version = "0.7.7", features = ["serde"] }
-glam = "0.24.1"
+glam = "0.25.0"
 serde = { version = "1.0.183", features = ["derive"] }

From 1812e5c6d636474a5891ce3ac632443e70cb654c Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 29 Dec 2023 20:13:03 +0100
Subject: [PATCH 297/460] Add type alias for f32 colors to minedmap-resource

Allow removing the dependency on a specific glam version from the main
crate.
---
 Cargo.lock                         |  1 -
 Cargo.toml                         |  1 -
 crates/resource/src/block_color.rs | 52 ++++++++++++++----------------
 crates/resource/src/lib.rs         |  5 ++-
 src/core/tile_renderer.rs          |  7 ++--
 5 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index b76fb71..f681a43 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -528,7 +528,6 @@ dependencies = [
  "fastnbt",
  "futures-util",
  "git-version",
- "glam",
  "image",
  "indexmap",
  "lru",
diff --git a/Cargo.toml b/Cargo.toml
index a1d5daf..47c13c7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -43,7 +43,6 @@ clap = { version = "4.1.4", features = ["derive"] }
 fastnbt = "2.3.2"
 futures-util = "0.3.28"
 git-version = "0.3.5"
-glam = "0.25.0"
 image = { version = "0.24.5", default-features = false, features = ["png"] }
 indexmap = { version = "2.0.0", features = ["serde"] }
 lru = "0.12.0"
diff --git a/crates/resource/src/block_color.rs b/crates/resource/src/block_color.rs
index 3df9a54..cffebeb 100644
--- a/crates/resource/src/block_color.rs
+++ b/crates/resource/src/block_color.rs
@@ -1,16 +1,14 @@
 //! Functions for computations of block colors
 
-use super::{Biome, BlockType, Color};
-
-use glam::Vec3;
+use super::{Biome, BlockType, Color, Colorf};
 
 /// Converts an u8 RGB color to a float vector
-fn color_vec_unscaled(color: Color) -> Vec3 {
-	Vec3::from_array(color.0.map(f32::from))
+fn color_vec_unscaled(color: Color) -> Colorf {
+	Colorf::from_array(color.0.map(f32::from))
 }
 
 /// Converts an u8 RGB color to a float vector, scaling the components to 0.0..1.0
-fn color_vec(color: Color) -> Vec3 {
+fn color_vec(color: Color) -> Colorf {
 	color_vec_unscaled(color) / 255.0
 }
 
@@ -18,7 +16,7 @@ fn color_vec(color: Color) -> Vec3 {
 ///
 /// Biome temperature and downfall are modified based on the depth value
 /// before using them to compute the final color
-fn color_from_params(colors: &[Vec3; 3], biome: &Biome, depth: f32) -> Vec3 {
+fn color_from_params(colors: &[Colorf; 3], biome: &Biome, depth: f32) -> Colorf {
 	let temp = (biome.temp() - f32::max((depth - 64.0) / 600.0, 0.0)).clamp(0.0, 1.0);
 	let downfall = biome.downfall().clamp(0.0, 1.0) * temp;
 
@@ -28,27 +26,27 @@ fn color_from_params(colors: &[Vec3; 3], biome: &Biome, depth: f32) -> Vec3 {
 /// Extension trait with helpers for computing biome-specific block colors
 trait BiomeExt {
 	/// Returns the grass color of the biome at a given depth
-	fn grass_color(&self, depth: f32) -> Vec3;
+	fn grass_color(&self, depth: f32) -> Colorf;
 	/// Returns the foliage color of the biome at a given depth
-	fn foliage_color(&self, depth: f32) -> Vec3;
+	fn foliage_color(&self, depth: f32) -> Colorf;
 	/// Returns the water color of the biome
-	fn water_color(&self) -> Vec3;
+	fn water_color(&self) -> Colorf;
 }
 
 impl BiomeExt for Biome {
-	fn grass_color(&self, depth: f32) -> Vec3 {
+	fn grass_color(&self, depth: f32) -> Colorf {
 		use super::BiomeGrassColorModifier::*;
 
 		/// Color matrix extracted from grass color texture
-		const GRASS_COLORS: [Vec3; 3] = [
-			Vec3::new(0.502, 0.706, 0.592),   // lower right
-			Vec3::new(0.247, 0.012, -0.259),  // lower left - lower right
-			Vec3::new(-0.471, 0.086, -0.133), // upper left - lower left
+		const GRASS_COLORS: [Colorf; 3] = [
+			Colorf::new(0.502, 0.706, 0.592),   // lower right
+			Colorf::new(0.247, 0.012, -0.259),  // lower left - lower right
+			Colorf::new(-0.471, 0.086, -0.133), // upper left - lower left
 		];
 		/// Used for dark forst grass color modifier
-		const DARK_FOREST_GRASS_COLOR: Vec3 = Vec3::new(0.157, 0.204, 0.039); // == color_vec(Color([40, 52, 10]))
+		const DARK_FOREST_GRASS_COLOR: Colorf = Colorf::new(0.157, 0.204, 0.039); // == color_vec(Color([40, 52, 10]))
 		/// Grass color in swamp biomes
-		const SWAMP_GRASS_COLOR: Vec3 = Vec3::new(0.416, 0.439, 0.224); // == color_vec(Color([106, 112, 57]))
+		const SWAMP_GRASS_COLOR: Colorf = Colorf::new(0.416, 0.439, 0.224); // == color_vec(Color([106, 112, 57]))
 
 		let regular_color = || {
 			self.grass_color
@@ -63,12 +61,12 @@ impl BiomeExt for Biome {
 		}
 	}
 
-	fn foliage_color(&self, depth: f32) -> Vec3 {
+	fn foliage_color(&self, depth: f32) -> Colorf {
 		/// Color matrix extracted from foliage color texture
-		const FOLIAGE_COLORS: [Vec3; 3] = [
-			Vec3::new(0.376, 0.631, 0.482),   // lower right
-			Vec3::new(0.306, 0.012, -0.317),  // lower left - lower right
-			Vec3::new(-0.580, 0.106, -0.165), // upper left - lower left
+		const FOLIAGE_COLORS: [Colorf; 3] = [
+			Colorf::new(0.376, 0.631, 0.482),   // lower right
+			Colorf::new(0.306, 0.012, -0.317),  // lower left - lower right
+			Colorf::new(-0.580, 0.106, -0.165), // upper left - lower left
 		];
 
 		self.foliage_color
@@ -76,11 +74,11 @@ impl BiomeExt for Biome {
 			.unwrap_or_else(|| color_from_params(&FOLIAGE_COLORS, self, depth))
 	}
 
-	fn water_color(&self) -> Vec3 {
+	fn water_color(&self) -> Colorf {
 		/// Default biome water color
 		///
 		/// Used for biomes that don't explicitly set a water color
-		const DEFAULT_WATER_COLOR: Vec3 = Vec3::new(0.247, 0.463, 0.894); // == color_vec(Color([63, 118, 228]))
+		const DEFAULT_WATER_COLOR: Colorf = Colorf::new(0.247, 0.463, 0.894); // == color_vec(Color([63, 118, 228]))
 
 		self.water_color
 			.map(color_vec)
@@ -89,9 +87,9 @@ impl BiomeExt for Biome {
 }
 
 /// Color multiplier for birch leaves
-const BIRCH_COLOR: Vec3 = Vec3::new(0.502, 0.655, 0.333); // == color_vec(Color([128, 167, 85]))
+const BIRCH_COLOR: Colorf = Colorf::new(0.502, 0.655, 0.333); // == color_vec(Color([128, 167, 85]))
 /// Color multiplier for spruce leaves
-const EVERGREEN_COLOR: Vec3 = Vec3::new(0.380, 0.600, 0.380); // == color_vec(Color([97, 153, 97]))
+const EVERGREEN_COLOR: Colorf = Colorf::new(0.380, 0.600, 0.380); // == color_vec(Color([97, 153, 97]))
 
 /// Determined if calling [block_color] for a given [BlockType] needs biome information
 pub fn needs_biome(block: BlockType) -> bool {
@@ -104,7 +102,7 @@ pub fn needs_biome(block: BlockType) -> bool {
 ///
 /// [needs_biome] must be used to determine whether passing a [Biome] is necessary.
 /// Will panic if a [Biome] is necessary, but none is passed.
-pub fn block_color(block: BlockType, biome: Option<&Biome>, depth: f32) -> Vec3 {
+pub fn block_color(block: BlockType, biome: Option<&Biome>, depth: f32) -> Colorf {
 	use super::BlockFlag::*;
 
 	let get_biome = || biome.expect("needs biome to determine block color");
diff --git a/crates/resource/src/lib.rs b/crates/resource/src/lib.rs
index 5423bd7..a832a58 100644
--- a/crates/resource/src/lib.rs
+++ b/crates/resource/src/lib.rs
@@ -33,10 +33,13 @@ pub enum BlockFlag {
 	Water,
 }
 
-/// An RGB color
+/// An RGB color with u8 components
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct Color(pub [u8; 3]);
 
+/// An RGB color with f32 components
+pub type Colorf = glam::Vec3;
+
 /// A block type specification
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 pub struct BlockType {
diff --git a/src/core/tile_renderer.rs b/src/core/tile_renderer.rs
index 34f0310..b341076 100644
--- a/src/core/tile_renderer.rs
+++ b/src/core/tile_renderer.rs
@@ -8,7 +8,6 @@ use std::{
 };
 
 use anyhow::{Context, Result};
-use glam::Vec3;
 use lru::LruCache;
 use rayon::prelude::*;
 use tokio::sync::OnceCell;
@@ -17,7 +16,7 @@ use tracing::{debug, info};
 use super::{common::*, region_group::RegionGroup};
 use crate::{
 	io::{fs, storage},
-	resource::{block_color, needs_biome},
+	resource::{block_color, needs_biome, Colorf},
 	types::*,
 	util::coord_offset,
 };
@@ -128,7 +127,7 @@ impl<'a> TileRenderer<'a> {
 		chunk: &ProcessedChunk,
 		chunk_coords: ChunkCoords,
 		block_coords: LayerBlockCoords,
-	) -> Option<Vec3> {
+	) -> Option<Colorf> {
 		/// Helper for keys in the weight table
 		///
 		/// Hashing the value as a single u32 is more efficient than hashing
@@ -182,7 +181,7 @@ impl<'a> TileRenderer<'a> {
 			return None;
 		}
 
-		let mut color = Vec3::ZERO;
+		let mut color = Colorf::ZERO;
 		let mut total = 0.0;
 
 		for ((region_x, region_z, index), w) in weights.into_values() {

From fdf44ebc8039b1471ccf004119c62cd4b9fa2153 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 3 Jan 2024 02:18:33 +0100
Subject: [PATCH 298/460] viewer: update to use "modern" ECMAScript features

---
 viewer/MinedMap.js | 63 +++++++++++++++++++++++-----------------------
 1 file changed, 31 insertions(+), 32 deletions(-)

diff --git a/viewer/MinedMap.js b/viewer/MinedMap.js
index 0ced720..94e5ff8 100644
--- a/viewer/MinedMap.js
+++ b/viewer/MinedMap.js
@@ -1,10 +1,10 @@
 // bsearch-based array element check
 function contains(array, elem) {
-	var min = 0, max = array.length, i, cur;
+	let min = 0, max = array.length;
 
 	while (min < max) {
-		i = min + Math.floor((max-min)/2);
-		cur = array[i];
+		const i = min + Math.floor((max-min)/2);
+		const cur = array[i];
 
 		if (cur === elem)
 			return true;
@@ -17,7 +17,7 @@ function contains(array, elem) {
 	return false;
 }
 
-var MinedMapLayer = L.GridLayer.extend({
+const MinedMapLayer = L.GridLayer.extend({
 	initialize: function (mipmaps, layer) {
 		this.mipmaps = mipmaps;
 		this.layer = layer;
@@ -37,7 +37,7 @@ var MinedMapLayer = L.GridLayer.extend({
 	},
 
 	createTile: function (coords, done) {
-		var tile = document.createElement('img');
+		const tile = document.createElement('img');
 
 		tile.onload = L.bind(this._tileOnLoad, this, done, tile);
 		tile.onerror = L.bind(this._tileOnError, this, done, tile);
@@ -54,11 +54,11 @@ var MinedMapLayer = L.GridLayer.extend({
 		*/
 		tile.setAttribute('role', 'presentation');
 
-		var z = -(coords.z + this.zoomOffset);
+		let z = -(coords.z + this.zoomOffset);
 		if (z < 0)
 			z = 0;
 
-		var mipmap = this.mipmaps[z];
+		const mipmap = this.mipmaps[z];
 
 		if (coords.x >= mipmap.bounds.minX && coords.x <= mipmap.bounds.maxX &&
 		    coords.y >= mipmap.bounds.minZ && coords.y <= mipmap.bounds.maxZ &&
@@ -87,10 +87,9 @@ var MinedMapLayer = L.GridLayer.extend({
 	},
 
 	_abortLoading: function () {
-		var i, tile;
-		for (i in this._tiles) {
+		for (const i in this._tiles) {
 			if (this._tiles[i].coords.z !== this._tileZoom) {
-				tile = this._tiles[i].el;
+				const tile = this._tiles[i].el;
 
 				tile.onload = L.Util.falseFn;
 				tile.onerror = L.Util.falseFn;
@@ -104,7 +103,7 @@ var MinedMapLayer = L.GridLayer.extend({
 	},
 
 	_removeTile: function (key) {
-		var tile = this._tiles[key];
+		const tile = this._tiles[key];
 		if (!tile) { return; }
 
 		// Cancels any pending http requests associated with the tile
@@ -119,7 +118,7 @@ var MinedMapLayer = L.GridLayer.extend({
 });
 
 
-var CoordControl = L.Control.extend({
+const CoordControl = L.Control.extend({
 	initialize: function () {
 		this.options.position = 'bottomleft';
 	},
@@ -138,15 +137,15 @@ var CoordControl = L.Control.extend({
 });
 
 
-var parseHash = function () {
-	var args = {};
+const parseHash = function () {
+	const args = {};
 
 	if (window.location.hash) {
-		var parts = window.location.hash.substr(1).split('&');
+		const parts = window.location.hash.substring(1).split('&');
 
-		for (var i = 0; i < parts.length; i++) {
-			var key_value = parts[i].split('=');
-			var key = key_value[0], value = key_value.slice(1).join('=');
+		for (const part of parts) {
+			const key_value = part.split('=');
+			const key = key_value[0], value = key_value.slice(1).join('=');
 
 			args[key] = value;
 		}
@@ -157,16 +156,16 @@ var parseHash = function () {
 
 
 window.createMap = function () {
-	var xhr = new XMLHttpRequest();
+	const xhr = new XMLHttpRequest();
 	xhr.onload = function () {
-		var res = JSON.parse(this.responseText),
+		const res = JSON.parse(this.responseText),
 		    mipmaps = res.mipmaps,
 		    spawn = res.spawn;
 
-		var x, z, zoom, light;
+		let x, z, zoom, light;
 
-		var updateParams = function () {
-			var args = parseHash();
+		const updateParams = function () {
+			const args = parseHash();
 
 			zoom = parseInt(args['zoom']);
 			x = parseFloat(args['x']);
@@ -183,7 +182,7 @@ window.createMap = function () {
 
 		updateParams();
 
-		var map = L.map('map', {
+		const map = L.map('map', {
 			center: [-z, x],
 			zoom: zoom,
 			minZoom: -(mipmaps.length-1),
@@ -195,29 +194,29 @@ window.createMap = function () {
 			],
 		});
 
-		var mapLayer = new MinedMapLayer(mipmaps, 'map');
-		var lightLayer = new MinedMapLayer(mipmaps, 'light');
+		const mapLayer = new MinedMapLayer(mipmaps, 'map');
+		const lightLayer = new MinedMapLayer(mipmaps, 'light');
 
 		mapLayer.addTo(map);
 
 		if (light)
 			map.addLayer(lightLayer);
 
-		var overlayMaps = {
+		const overlayMaps = {
 			"Illumination": lightLayer,
 		};
 
 		L.control.layers({}, overlayMaps).addTo(map);
 
-		var coordControl = new CoordControl();
+		const coordControl = new CoordControl();
 		coordControl.addTo(map);
 
 		map.on('mousemove', function(e) {
 			coordControl.update(Math.round(e.latlng.lng), Math.round(-e.latlng.lat));
 		});
 
-		var makeHash = function () {
-			var ret = '#x='+x+'&z='+z;
+		const makeHash = function () {
+			let ret = '#x='+x+'&z='+z;
 
 			if (zoom != 0)
 				ret += '&zoom='+zoom;
@@ -228,11 +227,11 @@ window.createMap = function () {
 			return ret;
 		};
 
-		var updateHash = function () {
+		const updateHash = function () {
 			window.location.hash = makeHash();
 		};
 
-		var refreshHash = function () {
+		const refreshHash = function () {
 			zoom = map.getZoom();
 			center = map.getCenter();
 			x = Math.round(center.lng);

From a8e0af287b099e15affa90caa923b6e526968f2e Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 3 Jan 2024 02:22:54 +0100
Subject: [PATCH 299/460] viewer: update attribution link

---
 viewer/MinedMap.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/viewer/MinedMap.js b/viewer/MinedMap.js
index 94e5ff8..8cd4d67 100644
--- a/viewer/MinedMap.js
+++ b/viewer/MinedMap.js
@@ -25,7 +25,7 @@ const MinedMapLayer = L.GridLayer.extend({
 		this.zoomOffset = L.Browser.retina ? 1 : 0;
 
 		this.options.tileSize = L.Browser.retina ? 256 : 512;
-		this.options.attribution = 'Generated by <a href="https://github.com/NeoRaider/MinedMap">MinedMap</a>';
+		this.options.attribution = 'Generated by <a href="https://github.com/neocturne/MinedMap">MinedMap</a>';
 
 		this.options.minZoom = -(mipmaps.length-1 + this.zoomOffset);
 		this.options.maxNativeZoom = -this.zoomOffset;

From cb7f428974ed75e5f9bcc2088a9d7335a2a4a3d3 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 3 Jan 2024 04:05:41 +0100
Subject: [PATCH 300/460] viewer: update to leaflet 1.9.4

---
 viewer/MinedMap.js                            | 106 ++++-------------
 viewer/index.html                             |   4 +-
 viewer/leaflet-1.6.0/leaflet.js               |   5 -
 viewer/leaflet-1.6.0/leaflet.js.map           |   1 -
 .../images/layers-2x.png                      | Bin
 .../images/layers.png                         | Bin
 .../images/marker-icon-2x.png                 | Bin
 .../images/marker-icon.png                    | Bin
 .../images/marker-shadow.png                  | Bin
 .../leaflet.css                               | 107 +++++++++++-------
 viewer/leaflet-1.9.4/leaflet.js               |   6 +
 viewer/leaflet-1.9.4/leaflet.js.map           |   1 +
 12 files changed, 98 insertions(+), 132 deletions(-)
 delete mode 100644 viewer/leaflet-1.6.0/leaflet.js
 delete mode 100644 viewer/leaflet-1.6.0/leaflet.js.map
 rename viewer/{leaflet-1.6.0 => leaflet-1.9.4}/images/layers-2x.png (100%)
 rename viewer/{leaflet-1.6.0 => leaflet-1.9.4}/images/layers.png (100%)
 rename viewer/{leaflet-1.6.0 => leaflet-1.9.4}/images/marker-icon-2x.png (100%)
 rename viewer/{leaflet-1.6.0 => leaflet-1.9.4}/images/marker-icon.png (100%)
 rename viewer/{leaflet-1.6.0 => leaflet-1.9.4}/images/marker-shadow.png (100%)
 rename viewer/{leaflet-1.6.0 => leaflet-1.9.4}/leaflet.css (84%)
 create mode 100644 viewer/leaflet-1.9.4/leaflet.js
 create mode 100644 viewer/leaflet-1.9.4/leaflet.js.map

diff --git a/viewer/MinedMap.js b/viewer/MinedMap.js
index 8cd4d67..1288dc9 100644
--- a/viewer/MinedMap.js
+++ b/viewer/MinedMap.js
@@ -17,103 +17,47 @@ function contains(array, elem) {
 	return false;
 }
 
-const MinedMapLayer = L.GridLayer.extend({
+const MinedMapLayer = L.TileLayer.extend({
 	initialize: function (mipmaps, layer) {
+		L.TileLayer.prototype.initialize.call(this, '', {
+			detectRetina: true,
+			tileSize: 512,
+			zoomReverse: true,
+			minZoom: -(mipmaps.length-1),
+			maxZoom: 0,
+			attribution: 'Generated by <a href="https://github.com/neocturne/MinedMap">MinedMap</a>',
+		});
+
+		this.options.maxNativeZoom = this.options.maxZoom;
+		this.options.maxZoom = undefined;
+
 		this.mipmaps = mipmaps;
 		this.layer = layer;
-
-		this.zoomOffset = L.Browser.retina ? 1 : 0;
-
-		this.options.tileSize = L.Browser.retina ? 256 : 512;
-		this.options.attribution = 'Generated by <a href="https://github.com/neocturne/MinedMap">MinedMap</a>';
-
-		this.options.minZoom = -(mipmaps.length-1 + this.zoomOffset);
-		this.options.maxNativeZoom = -this.zoomOffset;
-
-		// for https://github.com/Leaflet/Leaflet/issues/137
-		if (!L.Browser.android) {
-			this.on('tileunload', this._onTileRemove);
-		}
 	},
 
 	createTile: function (coords, done) {
-		const tile = document.createElement('img');
+		const tile = L.TileLayer.prototype.createTile.call(this, coords, done);
 
-		tile.onload = L.bind(this._tileOnLoad, this, done, tile);
-		tile.onerror = L.bind(this._tileOnError, this, done, tile);
-
-		/*
-		 Alt tag is set to empty string to keep screen readers from reading URL and for compliance reasons
-		 http://www.w3.org/TR/WCAG20-TECHS/H67
-		*/
-		tile.alt = '';
-
-		/*
-		 Set role="presentation" to force screen readers to ignore this
-		 https://www.w3.org/TR/wai-aria/roles#textalternativecomputation
-		*/
-		tile.setAttribute('role', 'presentation');
-
-		let z = -(coords.z + this.zoomOffset);
-		if (z < 0)
-			z = 0;
-
-		const mipmap = this.mipmaps[z];
-
-		if (coords.x >= mipmap.bounds.minX && coords.x <= mipmap.bounds.maxX &&
-		    coords.y >= mipmap.bounds.minZ && coords.y <= mipmap.bounds.maxZ &&
-		    contains(mipmap.regions[coords.y] || [], coords.x))
-			tile.src = 'data/'+this.layer+'/'+z+'/r.'+coords.x+'.'+coords.y+'.png';
-
-		if (z === 0)
+		if (coords.z - this.options.zoomOffset >= 0)
 			L.DomUtil.addClass(tile, 'overzoomed');
 
 		return tile;
 	},
 
-	_tileOnLoad: function (done, tile) {
-		if (L.Browser.ielt9)
-			setTimeout(Util.bind(done, this, null, tile), 0);
-		else
-			done(null, tile);
-	},
+	getTileUrl: function (coords) {
+		let z = -coords.z + this.options.zoomOffset;
+		if (z < 0)
+			z = 0;
 
-	_tileOnError: function (done, tile, e) {
-		done(e, tile);
-	},
+		const mipmap = this.mipmaps[z];
 
-	_onTileRemove: function (e) {
-		e.tile.onload = null;
-	},
+		if (coords.x < mipmap.bounds.minX || coords.x > mipmap.bounds.maxX ||
+		    coords.y < mipmap.bounds.minZ || coords.y > mipmap.bounds.maxZ ||
+		    !contains(mipmap.regions[coords.y] || [], coords.x))
+			return L.Util.emptyImageUrl;
 
-	_abortLoading: function () {
-		for (const i in this._tiles) {
-			if (this._tiles[i].coords.z !== this._tileZoom) {
-				const tile = this._tiles[i].el;
 
-				tile.onload = L.Util.falseFn;
-				tile.onerror = L.Util.falseFn;
-
-				if (!tile.complete) {
-					tile.src = L.Util.emptyImageUrl;
-					L.DomUtil.remove(tile);
-				}
-			}
-		}
-	},
-
-	_removeTile: function (key) {
-		const tile = this._tiles[key];
-		if (!tile) { return; }
-
-		// Cancels any pending http requests associated with the tile
-		// unless we're on Android's stock browser,
-		// see https://github.com/Leaflet/Leaflet/issues/137
-		if (!L.Browser.androidStock) {
-			tile.el.setAttribute('src', L.Util.emptyImageUrl);
-		}
-
-		return L.GridLayer.prototype._removeTile.call(this, key);
+		return 'data/'+this.layer+'/'+z+'/r.'+coords.x+'.'+coords.y+'.png';
 	},
 });
 
diff --git a/viewer/index.html b/viewer/index.html
index 20b71b1..df57cb6 100644
--- a/viewer/index.html
+++ b/viewer/index.html
@@ -4,8 +4,8 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
     <title>MinedMap</title>
-    <link rel="stylesheet" href="leaflet-1.6.0/leaflet.css" />
-    <script src="leaflet-1.6.0/leaflet.js"></script>
+    <link rel="stylesheet" href="leaflet-1.9.4/leaflet.css" />
+    <script src="leaflet-1.9.4/leaflet.js"></script>
     <script src="MinedMap.js"></script>
 
     <style type="text/css">
diff --git a/viewer/leaflet-1.6.0/leaflet.js b/viewer/leaflet-1.6.0/leaflet.js
deleted file mode 100644
index bc9ef0f..0000000
--- a/viewer/leaflet-1.6.0/leaflet.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/* @preserve
- * Leaflet 1.6.0+Detached: 0c81bdf904d864fd12a286e3d1979f47aba17991.0c81bdf, a JS library for interactive maps. http://leafletjs.com
- * (c) 2010-2019 Vladimir Agafonkin, (c) 2010-2011 CloudMade
- */
-!function(t,i){"object"==typeof exports&&"undefined"!=typeof module?i(exports):"function"==typeof define&&define.amd?define(["exports"],i):i(t.L={})}(this,function(t){"use strict";var i=Object.freeze;function h(t){var i,e,n,o;for(e=1,n=arguments.length;e<n;e++)for(i in o=arguments[e])t[i]=o[i];return t}Object.freeze=function(t){return t};var s=Object.create||function(t){return e.prototype=t,new e};function e(){}function a(t,i){var e=Array.prototype.slice;if(t.bind)return t.bind.apply(t,e.call(arguments,1));var n=e.call(arguments,2);return function(){return t.apply(i,n.length?n.concat(e.call(arguments)):arguments)}}var n=0;function u(t){return t._leaflet_id=t._leaflet_id||++n,t._leaflet_id}function o(t,i,e){var n,o,s,r;return r=function(){n=!1,o&&(s.apply(e,o),o=!1)},s=function(){n?o=arguments:(t.apply(e,arguments),setTimeout(r,i),n=!0)}}function r(t,i,e){var n=i[1],o=i[0],s=n-o;return t===n&&e?t:((t-o)%s+s)%s+o}function l(){return!1}function c(t,i){var e=Math.pow(10,void 0===i?6:i);return Math.round(t*e)/e}function _(t){return t.trim?t.trim():t.replace(/^\s+|\s+$/g,"")}function d(t){return _(t).split(/\s+/)}function p(t,i){for(var e in t.hasOwnProperty("options")||(t.options=t.options?s(t.options):{}),i)t.options[e]=i[e];return t.options}function m(t,i,e){var n=[];for(var o in t)n.push(encodeURIComponent(e?o.toUpperCase():o)+"="+encodeURIComponent(t[o]));return(i&&-1!==i.indexOf("?")?"&":"?")+n.join("&")}var f=/\{ *([\w_-]+) *\}/g;function g(t,n){return t.replace(f,function(t,i){var e=n[i];if(void 0===e)throw new Error("No value provided for variable "+t);return"function"==typeof e&&(e=e(n)),e})}var v=Array.isArray||function(t){return"[object Array]"===Object.prototype.toString.call(t)};function y(t,i){for(var e=0;e<t.length;e++)if(t[e]===i)return e;return-1}var x="data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs=";function w(t){return window["webkit"+t]||window["moz"+t]||window["ms"+t]}var P=0;function b(t){var i=+new Date,e=Math.max(0,16-(i-P));return P=i+e,window.setTimeout(t,e)}var T=window.requestAnimationFrame||w("RequestAnimationFrame")||b,z=window.cancelAnimationFrame||w("CancelAnimationFrame")||w("CancelRequestAnimationFrame")||function(t){window.clearTimeout(t)};function M(t,i,e){if(!e||T!==b)return T.call(window,a(t,i));t.call(i)}function C(t){t&&z.call(window,t)}var E=(Object.freeze||Object)({freeze:i,extend:h,create:s,bind:a,lastId:n,stamp:u,throttle:o,wrapNum:r,falseFn:l,formatNum:c,trim:_,splitWords:d,setOptions:p,getParamString:m,template:g,isArray:v,indexOf:y,emptyImageUrl:x,requestFn:T,cancelFn:z,requestAnimFrame:M,cancelAnimFrame:C});function S(){}S.extend=function(t){function i(){this.initialize&&this.initialize.apply(this,arguments),this.callInitHooks()}var e=i.__super__=this.prototype,n=s(e);for(var o in(n.constructor=i).prototype=n,this)this.hasOwnProperty(o)&&"prototype"!==o&&"__super__"!==o&&(i[o]=this[o]);return t.statics&&(h(i,t.statics),delete t.statics),t.includes&&(function(t){if("undefined"==typeof L||!L||!L.Mixin)return;t=v(t)?t:[t];for(var i=0;i<t.length;i++)t[i]===L.Mixin.Events&&console.warn("Deprecated include of L.Mixin.Events: this property will be removed in future releases, please inherit from L.Evented instead.",(new Error).stack)}(t.includes),h.apply(null,[n].concat(t.includes)),delete t.includes),n.options&&(t.options=h(s(n.options),t.options)),h(n,t),n._initHooks=[],n.callInitHooks=function(){if(!this._initHooksCalled){e.callInitHooks&&e.callInitHooks.call(this),this._initHooksCalled=!0;for(var t=0,i=n._initHooks.length;t<i;t++)n._initHooks[t].call(this)}},i},S.include=function(t){return h(this.prototype,t),this},S.mergeOptions=function(t){return h(this.prototype.options,t),this},S.addInitHook=function(t){var i=Array.prototype.slice.call(arguments,1),e="function"==typeof t?t:function(){this[t].apply(this,i)};return this.prototype._initHooks=this.prototype._initHooks||[],this.prototype._initHooks.push(e),this};var Z={on:function(t,i,e){if("object"==typeof t)for(var n in t)this._on(n,t[n],i);else for(var o=0,s=(t=d(t)).length;o<s;o++)this._on(t[o],i,e);return this},off:function(t,i,e){if(t)if("object"==typeof t)for(var n in t)this._off(n,t[n],i);else for(var o=0,s=(t=d(t)).length;o<s;o++)this._off(t[o],i,e);else delete this._events;return this},_on:function(t,i,e){this._events=this._events||{};var n=this._events[t];n||(n=[],this._events[t]=n),e===this&&(e=void 0);for(var o={fn:i,ctx:e},s=n,r=0,a=s.length;r<a;r++)if(s[r].fn===i&&s[r].ctx===e)return;s.push(o)},_off:function(t,i,e){var n,o,s;if(this._events&&(n=this._events[t]))if(i){if(e===this&&(e=void 0),n)for(o=0,s=n.length;o<s;o++){var r=n[o];if(r.ctx===e&&r.fn===i)return r.fn=l,this._firingCount&&(this._events[t]=n=n.slice()),void n.splice(o,1)}}else{for(o=0,s=n.length;o<s;o++)n[o].fn=l;delete this._events[t]}},fire:function(t,i,e){if(!this.listens(t,e))return this;var n=h({},i,{type:t,target:this,sourceTarget:i&&i.sourceTarget||this});if(this._events){var o=this._events[t];if(o){this._firingCount=this._firingCount+1||1;for(var s=0,r=o.length;s<r;s++){var a=o[s];a.fn.call(a.ctx||this,n)}this._firingCount--}}return e&&this._propagateEvent(n),this},listens:function(t,i){var e=this._events&&this._events[t];if(e&&e.length)return!0;if(i)for(var n in this._eventParents)if(this._eventParents[n].listens(t,i))return!0;return!1},once:function(t,i,e){if("object"==typeof t){for(var n in t)this.once(n,t[n],i);return this}var o=a(function(){this.off(t,i,e).off(t,o,e)},this);return this.on(t,i,e).on(t,o,e)},addEventParent:function(t){return this._eventParents=this._eventParents||{},this._eventParents[u(t)]=t,this},removeEventParent:function(t){return this._eventParents&&delete this._eventParents[u(t)],this},_propagateEvent:function(t){for(var i in this._eventParents)this._eventParents[i].fire(t.type,h({layer:t.target,propagatedFrom:t.target},t),!0)}};Z.addEventListener=Z.on,Z.removeEventListener=Z.clearAllEventListeners=Z.off,Z.addOneTimeEventListener=Z.once,Z.fireEvent=Z.fire,Z.hasEventListeners=Z.listens;var k=S.extend(Z);function B(t,i,e){this.x=e?Math.round(t):t,this.y=e?Math.round(i):i}var A=Math.trunc||function(t){return 0<t?Math.floor(t):Math.ceil(t)};function I(t,i,e){return t instanceof B?t:v(t)?new B(t[0],t[1]):null==t?t:"object"==typeof t&&"x"in t&&"y"in t?new B(t.x,t.y):new B(t,i,e)}function O(t,i){if(t)for(var e=i?[t,i]:t,n=0,o=e.length;n<o;n++)this.extend(e[n])}function R(t,i){return!t||t instanceof O?t:new O(t,i)}function N(t,i){if(t)for(var e=i?[t,i]:t,n=0,o=e.length;n<o;n++)this.extend(e[n])}function D(t,i){return t instanceof N?t:new N(t,i)}function j(t,i,e){if(isNaN(t)||isNaN(i))throw new Error("Invalid LatLng object: ("+t+", "+i+")");this.lat=+t,this.lng=+i,void 0!==e&&(this.alt=+e)}function W(t,i,e){return t instanceof j?t:v(t)&&"object"!=typeof t[0]?3===t.length?new j(t[0],t[1],t[2]):2===t.length?new j(t[0],t[1]):null:null==t?t:"object"==typeof t&&"lat"in t?new j(t.lat,"lng"in t?t.lng:t.lon,t.alt):void 0===i?null:new j(t,i,e)}B.prototype={clone:function(){return new B(this.x,this.y)},add:function(t){return this.clone()._add(I(t))},_add:function(t){return this.x+=t.x,this.y+=t.y,this},subtract:function(t){return this.clone()._subtract(I(t))},_subtract:function(t){return this.x-=t.x,this.y-=t.y,this},divideBy:function(t){return this.clone()._divideBy(t)},_divideBy:function(t){return this.x/=t,this.y/=t,this},multiplyBy:function(t){return this.clone()._multiplyBy(t)},_multiplyBy:function(t){return this.x*=t,this.y*=t,this},scaleBy:function(t){return new B(this.x*t.x,this.y*t.y)},unscaleBy:function(t){return new B(this.x/t.x,this.y/t.y)},round:function(){return this.clone()._round()},_round:function(){return this.x=Math.round(this.x),this.y=Math.round(this.y),this},floor:function(){return this.clone()._floor()},_floor:function(){return this.x=Math.floor(this.x),this.y=Math.floor(this.y),this},ceil:function(){return this.clone()._ceil()},_ceil:function(){return this.x=Math.ceil(this.x),this.y=Math.ceil(this.y),this},trunc:function(){return this.clone()._trunc()},_trunc:function(){return this.x=A(this.x),this.y=A(this.y),this},distanceTo:function(t){var i=(t=I(t)).x-this.x,e=t.y-this.y;return Math.sqrt(i*i+e*e)},equals:function(t){return(t=I(t)).x===this.x&&t.y===this.y},contains:function(t){return t=I(t),Math.abs(t.x)<=Math.abs(this.x)&&Math.abs(t.y)<=Math.abs(this.y)},toString:function(){return"Point("+c(this.x)+", "+c(this.y)+")"}},O.prototype={extend:function(t){return t=I(t),this.min||this.max?(this.min.x=Math.min(t.x,this.min.x),this.max.x=Math.max(t.x,this.max.x),this.min.y=Math.min(t.y,this.min.y),this.max.y=Math.max(t.y,this.max.y)):(this.min=t.clone(),this.max=t.clone()),this},getCenter:function(t){return new B((this.min.x+this.max.x)/2,(this.min.y+this.max.y)/2,t)},getBottomLeft:function(){return new B(this.min.x,this.max.y)},getTopRight:function(){return new B(this.max.x,this.min.y)},getTopLeft:function(){return this.min},getBottomRight:function(){return this.max},getSize:function(){return this.max.subtract(this.min)},contains:function(t){var i,e;return(t="number"==typeof t[0]||t instanceof B?I(t):R(t))instanceof O?(i=t.min,e=t.max):i=e=t,i.x>=this.min.x&&e.x<=this.max.x&&i.y>=this.min.y&&e.y<=this.max.y},intersects:function(t){t=R(t);var i=this.min,e=this.max,n=t.min,o=t.max,s=o.x>=i.x&&n.x<=e.x,r=o.y>=i.y&&n.y<=e.y;return s&&r},overlaps:function(t){t=R(t);var i=this.min,e=this.max,n=t.min,o=t.max,s=o.x>i.x&&n.x<e.x,r=o.y>i.y&&n.y<e.y;return s&&r},isValid:function(){return!(!this.min||!this.max)}},N.prototype={extend:function(t){var i,e,n=this._southWest,o=this._northEast;if(t instanceof j)e=i=t;else{if(!(t instanceof N))return t?this.extend(W(t)||D(t)):this;if(i=t._southWest,e=t._northEast,!i||!e)return this}return n||o?(n.lat=Math.min(i.lat,n.lat),n.lng=Math.min(i.lng,n.lng),o.lat=Math.max(e.lat,o.lat),o.lng=Math.max(e.lng,o.lng)):(this._southWest=new j(i.lat,i.lng),this._northEast=new j(e.lat,e.lng)),this},pad:function(t){var i=this._southWest,e=this._northEast,n=Math.abs(i.lat-e.lat)*t,o=Math.abs(i.lng-e.lng)*t;return new N(new j(i.lat-n,i.lng-o),new j(e.lat+n,e.lng+o))},getCenter:function(){return new j((this._southWest.lat+this._northEast.lat)/2,(this._southWest.lng+this._northEast.lng)/2)},getSouthWest:function(){return this._southWest},getNorthEast:function(){return this._northEast},getNorthWest:function(){return new j(this.getNorth(),this.getWest())},getSouthEast:function(){return new j(this.getSouth(),this.getEast())},getWest:function(){return this._southWest.lng},getSouth:function(){return this._southWest.lat},getEast:function(){return this._northEast.lng},getNorth:function(){return this._northEast.lat},contains:function(t){t="number"==typeof t[0]||t instanceof j||"lat"in t?W(t):D(t);var i,e,n=this._southWest,o=this._northEast;return t instanceof N?(i=t.getSouthWest(),e=t.getNorthEast()):i=e=t,i.lat>=n.lat&&e.lat<=o.lat&&i.lng>=n.lng&&e.lng<=o.lng},intersects:function(t){t=D(t);var i=this._southWest,e=this._northEast,n=t.getSouthWest(),o=t.getNorthEast(),s=o.lat>=i.lat&&n.lat<=e.lat,r=o.lng>=i.lng&&n.lng<=e.lng;return s&&r},overlaps:function(t){t=D(t);var i=this._southWest,e=this._northEast,n=t.getSouthWest(),o=t.getNorthEast(),s=o.lat>i.lat&&n.lat<e.lat,r=o.lng>i.lng&&n.lng<e.lng;return s&&r},toBBoxString:function(){return[this.getWest(),this.getSouth(),this.getEast(),this.getNorth()].join(",")},equals:function(t,i){return!!t&&(t=D(t),this._southWest.equals(t.getSouthWest(),i)&&this._northEast.equals(t.getNorthEast(),i))},isValid:function(){return!(!this._southWest||!this._northEast)}};var H,F={latLngToPoint:function(t,i){var e=this.projection.project(t),n=this.scale(i);return this.transformation._transform(e,n)},pointToLatLng:function(t,i){var e=this.scale(i),n=this.transformation.untransform(t,e);return this.projection.unproject(n)},project:function(t){return this.projection.project(t)},unproject:function(t){return this.projection.unproject(t)},scale:function(t){return 256*Math.pow(2,t)},zoom:function(t){return Math.log(t/256)/Math.LN2},getProjectedBounds:function(t){if(this.infinite)return null;var i=this.projection.bounds,e=this.scale(t);return new O(this.transformation.transform(i.min,e),this.transformation.transform(i.max,e))},infinite:!(j.prototype={equals:function(t,i){return!!t&&(t=W(t),Math.max(Math.abs(this.lat-t.lat),Math.abs(this.lng-t.lng))<=(void 0===i?1e-9:i))},toString:function(t){return"LatLng("+c(this.lat,t)+", "+c(this.lng,t)+")"},distanceTo:function(t){return U.distance(this,W(t))},wrap:function(){return U.wrapLatLng(this)},toBounds:function(t){var i=180*t/40075017,e=i/Math.cos(Math.PI/180*this.lat);return D([this.lat-i,this.lng-e],[this.lat+i,this.lng+e])},clone:function(){return new j(this.lat,this.lng,this.alt)}}),wrapLatLng:function(t){var i=this.wrapLng?r(t.lng,this.wrapLng,!0):t.lng;return new j(this.wrapLat?r(t.lat,this.wrapLat,!0):t.lat,i,t.alt)},wrapLatLngBounds:function(t){var i=t.getCenter(),e=this.wrapLatLng(i),n=i.lat-e.lat,o=i.lng-e.lng;if(0==n&&0==o)return t;var s=t.getSouthWest(),r=t.getNorthEast();return new N(new j(s.lat-n,s.lng-o),new j(r.lat-n,r.lng-o))}},U=h({},F,{wrapLng:[-180,180],R:6371e3,distance:function(t,i){var e=Math.PI/180,n=t.lat*e,o=i.lat*e,s=Math.sin((i.lat-t.lat)*e/2),r=Math.sin((i.lng-t.lng)*e/2),a=s*s+Math.cos(n)*Math.cos(o)*r*r,h=2*Math.atan2(Math.sqrt(a),Math.sqrt(1-a));return this.R*h}}),V=6378137,q={R:V,MAX_LATITUDE:85.0511287798,project:function(t){var i=Math.PI/180,e=this.MAX_LATITUDE,n=Math.max(Math.min(e,t.lat),-e),o=Math.sin(n*i);return new B(this.R*t.lng*i,this.R*Math.log((1+o)/(1-o))/2)},unproject:function(t){var i=180/Math.PI;return new j((2*Math.atan(Math.exp(t.y/this.R))-Math.PI/2)*i,t.x*i/this.R)},bounds:(H=V*Math.PI,new O([-H,-H],[H,H]))};function G(t,i,e,n){if(v(t))return this._a=t[0],this._b=t[1],this._c=t[2],void(this._d=t[3]);this._a=t,this._b=i,this._c=e,this._d=n}function K(t,i,e,n){return new G(t,i,e,n)}G.prototype={transform:function(t,i){return this._transform(t.clone(),i)},_transform:function(t,i){return i=i||1,t.x=i*(this._a*t.x+this._b),t.y=i*(this._c*t.y+this._d),t},untransform:function(t,i){return i=i||1,new B((t.x/i-this._b)/this._a,(t.y/i-this._d)/this._c)}};var Y,X=h({},U,{code:"EPSG:3857",projection:q,transformation:(Y=.5/(Math.PI*q.R),K(Y,.5,-Y,.5))}),J=h({},X,{code:"EPSG:900913"});function $(t){return document.createElementNS("http://www.w3.org/2000/svg",t)}function Q(t,i){var e,n,o,s,r,a,h="";for(e=0,o=t.length;e<o;e++){for(n=0,s=(r=t[e]).length;n<s;n++)h+=(n?"L":"M")+(a=r[n]).x+" "+a.y;h+=i?Zt?"z":"x":""}return h||"M0 0"}var tt=document.documentElement.style,it="ActiveXObject"in window,et=it&&!document.addEventListener,nt="msLaunchUri"in navigator&&!("documentMode"in document),ot=Bt("webkit"),st=Bt("android"),rt=Bt("android 2")||Bt("android 3"),at=parseInt(/WebKit\/([0-9]+)|$/.exec(navigator.userAgent)[1],10),ht=st&&Bt("Google")&&at<537&&!("AudioNode"in window),ut=!!window.opera,lt=Bt("chrome"),ct=Bt("gecko")&&!ot&&!ut&&!it,_t=!lt&&Bt("safari"),dt=Bt("phantom"),pt="OTransition"in tt,mt=0===navigator.platform.indexOf("Win"),ft=it&&"transition"in tt,gt="WebKitCSSMatrix"in window&&"m11"in new window.WebKitCSSMatrix&&!rt,vt="MozPerspective"in tt,yt=!window.L_DISABLE_3D&&(ft||gt||vt)&&!pt&&!dt,xt="undefined"!=typeof orientation||Bt("mobile"),wt=xt&&ot,Pt=xt&&gt,Lt=!window.PointerEvent&&window.MSPointerEvent,bt=!(ot||!window.PointerEvent&&!Lt),Tt=!window.L_NO_TOUCH&&(bt||"ontouchstart"in window||window.DocumentTouch&&document instanceof window.DocumentTouch),zt=xt&&ut,Mt=xt&&ct,Ct=1<(window.devicePixelRatio||window.screen.deviceXDPI/window.screen.logicalXDPI),Et=function(){var t=!1;try{var i=Object.defineProperty({},"passive",{get:function(){t=!0}});window.addEventListener("testPassiveEventSupport",l,i),window.removeEventListener("testPassiveEventSupport",l,i)}catch(t){}return t},St=!!document.createElement("canvas").getContext,Zt=!(!document.createElementNS||!$("svg").createSVGRect),kt=!Zt&&function(){try{var t=document.createElement("div");t.innerHTML='<v:shape adj="1"/>';var i=t.firstChild;return i.style.behavior="url(#default#VML)",i&&"object"==typeof i.adj}catch(t){return!1}}();function Bt(t){return 0<=navigator.userAgent.toLowerCase().indexOf(t)}var At=(Object.freeze||Object)({ie:it,ielt9:et,edge:nt,webkit:ot,android:st,android23:rt,androidStock:ht,opera:ut,chrome:lt,gecko:ct,safari:_t,phantom:dt,opera12:pt,win:mt,ie3d:ft,webkit3d:gt,gecko3d:vt,any3d:yt,mobile:xt,mobileWebkit:wt,mobileWebkit3d:Pt,msPointer:Lt,pointer:bt,touch:Tt,mobileOpera:zt,mobileGecko:Mt,retina:Ct,passiveEvents:Et,canvas:St,svg:Zt,vml:kt}),It=Lt?"MSPointerDown":"pointerdown",Ot=Lt?"MSPointerMove":"pointermove",Rt=Lt?"MSPointerUp":"pointerup",Nt=Lt?"MSPointerCancel":"pointercancel",Dt=["INPUT","SELECT","OPTION"],jt={},Wt=!1,Ht=0;function Ft(t,i,e,n){return"touchstart"===i?function(t,i,e){var n=a(function(t){if("mouse"!==t.pointerType&&t.MSPOINTER_TYPE_MOUSE&&t.pointerType!==t.MSPOINTER_TYPE_MOUSE){if(!(Dt.indexOf(t.target.tagName)<0))return;ji(t)}Gt(t,i)});t["_leaflet_touchstart"+e]=n,t.addEventListener(It,n,!1),Wt||(document.documentElement.addEventListener(It,Ut,!0),document.documentElement.addEventListener(Ot,Vt,!0),document.documentElement.addEventListener(Rt,qt,!0),document.documentElement.addEventListener(Nt,qt,!0),Wt=!0)}(t,e,n):"touchmove"===i?function(t,i,e){function n(t){(t.pointerType!==t.MSPOINTER_TYPE_MOUSE&&"mouse"!==t.pointerType||0!==t.buttons)&&Gt(t,i)}t["_leaflet_touchmove"+e]=n,t.addEventListener(Ot,n,!1)}(t,e,n):"touchend"===i&&function(t,i,e){function n(t){Gt(t,i)}t["_leaflet_touchend"+e]=n,t.addEventListener(Rt,n,!1),t.addEventListener(Nt,n,!1)}(t,e,n),this}function Ut(t){jt[t.pointerId]=t,Ht++}function Vt(t){jt[t.pointerId]&&(jt[t.pointerId]=t)}function qt(t){delete jt[t.pointerId],Ht--}function Gt(t,i){for(var e in t.touches=[],jt)t.touches.push(jt[e]);t.changedTouches=[t],i(t)}var Kt=Lt?"MSPointerDown":bt?"pointerdown":"touchstart",Yt=Lt?"MSPointerUp":bt?"pointerup":"touchend",Xt="_leaflet_";function Jt(t,o,i){var s,r,a=!1;function e(t){var i;if(bt){if(!nt||"mouse"===t.pointerType)return;i=Ht}else i=t.touches.length;if(!(1<i)){var e=Date.now(),n=e-(s||e);r=t.touches?t.touches[0]:t,a=0<n&&n<=250,s=e}}function n(t){if(a&&!r.cancelBubble){if(bt){if(!nt||"mouse"===t.pointerType)return;var i,e,n={};for(e in r)i=r[e],n[e]=i&&i.bind?i.bind(r):i;r=n}r.type="dblclick",r.button=0,o(r),s=null}}return t[Xt+Kt+i]=e,t[Xt+Yt+i]=n,t[Xt+"dblclick"+i]=o,t.addEventListener(Kt,e,!!Et&&{passive:!1}),t.addEventListener(Yt,n,!!Et&&{passive:!1}),t.addEventListener("dblclick",o,!1),this}function $t(t,i){var e=t[Xt+Kt+i],n=t[Xt+Yt+i],o=t[Xt+"dblclick"+i];return t.removeEventListener(Kt,e,!!Et&&{passive:!1}),t.removeEventListener(Yt,n,!!Et&&{passive:!1}),nt||t.removeEventListener("dblclick",o,!1),this}var Qt,ti,ii,ei,ni,oi=xi(["transform","webkitTransform","OTransform","MozTransform","msTransform"]),si=xi(["webkitTransition","transition","OTransition","MozTransition","msTransition"]),ri="webkitTransition"===si||"OTransition"===si?si+"End":"transitionend";function ai(t){return"string"==typeof t?document.getElementById(t):t}function hi(t,i){var e=t.style[i]||t.currentStyle&&t.currentStyle[i];if((!e||"auto"===e)&&document.defaultView){var n=document.defaultView.getComputedStyle(t,null);e=n?n[i]:null}return"auto"===e?null:e}function ui(t,i,e){var n=document.createElement(t);return n.className=i||"",e&&e.appendChild(n),n}function li(t){var i=t.parentNode;i&&i.removeChild(t)}function ci(t){for(;t.firstChild;)t.removeChild(t.firstChild)}function _i(t){var i=t.parentNode;i&&i.lastChild!==t&&i.appendChild(t)}function di(t){var i=t.parentNode;i&&i.firstChild!==t&&i.insertBefore(t,i.firstChild)}function pi(t,i){if(void 0!==t.classList)return t.classList.contains(i);var e=vi(t);return 0<e.length&&new RegExp("(^|\\s)"+i+"(\\s|$)").test(e)}function mi(t,i){if(void 0!==t.classList)for(var e=d(i),n=0,o=e.length;n<o;n++)t.classList.add(e[n]);else if(!pi(t,i)){var s=vi(t);gi(t,(s?s+" ":"")+i)}}function fi(t,i){void 0!==t.classList?t.classList.remove(i):gi(t,_((" "+vi(t)+" ").replace(" "+i+" "," ")))}function gi(t,i){void 0===t.className.baseVal?t.className=i:t.className.baseVal=i}function vi(t){return t.correspondingElement&&(t=t.correspondingElement),void 0===t.className.baseVal?t.className:t.className.baseVal}function yi(t,i){"opacity"in t.style?t.style.opacity=i:"filter"in t.style&&function(t,i){var e=!1,n="DXImageTransform.Microsoft.Alpha";try{e=t.filters.item(n)}catch(t){if(1===i)return}i=Math.round(100*i),e?(e.Enabled=100!==i,e.Opacity=i):t.style.filter+=" progid:"+n+"(opacity="+i+")"}(t,i)}function xi(t){for(var i=document.documentElement.style,e=0;e<t.length;e++)if(t[e]in i)return t[e];return!1}function wi(t,i,e){var n=i||new B(0,0);t.style[oi]=(ft?"translate("+n.x+"px,"+n.y+"px)":"translate3d("+n.x+"px,"+n.y+"px,0)")+(e?" scale("+e+")":"")}function Pi(t,i){t._leaflet_pos=i,yt?wi(t,i):(t.style.left=i.x+"px",t.style.top=i.y+"px")}function Li(t){return t._leaflet_pos||new B(0,0)}if("onselectstart"in document)Qt=function(){ki(window,"selectstart",ji)},ti=function(){Ai(window,"selectstart",ji)};else{var bi=xi(["userSelect","WebkitUserSelect","OUserSelect","MozUserSelect","msUserSelect"]);Qt=function(){if(bi){var t=document.documentElement.style;ii=t[bi],t[bi]="none"}},ti=function(){bi&&(document.documentElement.style[bi]=ii,ii=void 0)}}function Ti(){ki(window,"dragstart",ji)}function zi(){Ai(window,"dragstart",ji)}function Mi(t){for(;-1===t.tabIndex;)t=t.parentNode;t.style&&(Ci(),ni=(ei=t).style.outline,t.style.outline="none",ki(window,"keydown",Ci))}function Ci(){ei&&(ei.style.outline=ni,ni=ei=void 0,Ai(window,"keydown",Ci))}function Ei(t){for(;!((t=t.parentNode).offsetWidth&&t.offsetHeight||t===document.body););return t}function Si(t){var i=t.getBoundingClientRect();return{x:i.width/t.offsetWidth||1,y:i.height/t.offsetHeight||1,boundingClientRect:i}}var Zi=(Object.freeze||Object)({TRANSFORM:oi,TRANSITION:si,TRANSITION_END:ri,get:ai,getStyle:hi,create:ui,remove:li,empty:ci,toFront:_i,toBack:di,hasClass:pi,addClass:mi,removeClass:fi,setClass:gi,getClass:vi,setOpacity:yi,testProp:xi,setTransform:wi,setPosition:Pi,getPosition:Li,disableTextSelection:Qt,enableTextSelection:ti,disableImageDrag:Ti,enableImageDrag:zi,preventOutline:Mi,restoreOutline:Ci,getSizedParentNode:Ei,getScale:Si});function ki(t,i,e,n){if("object"==typeof i)for(var o in i)Ii(t,o,i[o],e);else for(var s=0,r=(i=d(i)).length;s<r;s++)Ii(t,i[s],e,n);return this}var Bi="_leaflet_events";function Ai(t,i,e,n){if("object"==typeof i)for(var o in i)Oi(t,o,i[o],e);else if(i)for(var s=0,r=(i=d(i)).length;s<r;s++)Oi(t,i[s],e,n);else{for(var a in t[Bi])Oi(t,a,t[Bi][a]);delete t[Bi]}return this}function Ii(i,t,e,n){var o=t+u(e)+(n?"_"+u(n):"");if(i[Bi]&&i[Bi][o])return this;var s=function(t){return e.call(n||i,t||window.event)},r=s;bt&&0===t.indexOf("touch")?Ft(i,t,s,o):!Tt||"dblclick"!==t||bt&&lt?"addEventListener"in i?"mousewheel"===t?i.addEventListener("onwheel"in i?"wheel":"mousewheel",s,!!Et&&{passive:!1}):"mouseenter"===t||"mouseleave"===t?(s=function(t){t=t||window.event,Yi(i,t)&&r(t)},i.addEventListener("mouseenter"===t?"mouseover":"mouseout",s,!1)):("click"===t&&st&&(s=function(t){!function(t,i){var e=t.timeStamp||t.originalEvent&&t.originalEvent.timeStamp,n=Vi&&e-Vi;if(n&&100<n&&n<500||t.target._simulatedClick&&!t._simulated)return Wi(t);Vi=e,i(t)}(t,r)}),i.addEventListener(t,s,!1)):"attachEvent"in i&&i.attachEvent("on"+t,s):Jt(i,s,o),i[Bi]=i[Bi]||{},i[Bi][o]=s}function Oi(t,i,e,n){var o=i+u(e)+(n?"_"+u(n):""),s=t[Bi]&&t[Bi][o];if(!s)return this;bt&&0===i.indexOf("touch")?function(t,i,e){var n=t["_leaflet_"+i+e];"touchstart"===i?t.removeEventListener(It,n,!1):"touchmove"===i?t.removeEventListener(Ot,n,!1):"touchend"===i&&(t.removeEventListener(Rt,n,!1),t.removeEventListener(Nt,n,!1))}(t,i,o):!Tt||"dblclick"!==i||bt&&lt?"removeEventListener"in t?"mousewheel"===i?t.removeEventListener("onwheel"in t?"wheel":"mousewheel",s,!!Et&&{passive:!1}):t.removeEventListener("mouseenter"===i?"mouseover":"mouseleave"===i?"mouseout":i,s,!1):"detachEvent"in t&&t.detachEvent("on"+i,s):$t(t,o),t[Bi][o]=null}function Ri(t){return t.stopPropagation?t.stopPropagation():t.originalEvent?t.originalEvent._stopped=!0:t.cancelBubble=!0,Ki(t),this}function Ni(t){return Ii(t,"mousewheel",Ri),this}function Di(t){return ki(t,"mousedown touchstart dblclick",Ri),Ii(t,"click",Gi),this}function ji(t){return t.preventDefault?t.preventDefault():t.returnValue=!1,this}function Wi(t){return ji(t),Ri(t),this}function Hi(t,i){if(!i)return new B(t.clientX,t.clientY);var e=Si(i),n=e.boundingClientRect;return new B((t.clientX-n.left)/e.x-i.clientLeft,(t.clientY-n.top)/e.y-i.clientTop)}var Fi=mt&&lt?2*window.devicePixelRatio:ct?window.devicePixelRatio:1;function Ui(t){return nt?t.wheelDeltaY/2:t.deltaY&&0===t.deltaMode?-t.deltaY/Fi:t.deltaY&&1===t.deltaMode?20*-t.deltaY:t.deltaY&&2===t.deltaMode?60*-t.deltaY:t.deltaX||t.deltaZ?0:t.wheelDelta?(t.wheelDeltaY||t.wheelDelta)/2:t.detail&&Math.abs(t.detail)<32765?20*-t.detail:t.detail?t.detail/-32765*60:0}var Vi,qi={};function Gi(t){qi[t.type]=!0}function Ki(t){var i=qi[t.type];return qi[t.type]=!1,i}function Yi(t,i){var e=i.relatedTarget;if(!e)return!0;try{for(;e&&e!==t;)e=e.parentNode}catch(t){return!1}return e!==t}var Xi=(Object.freeze||Object)({on:ki,off:Ai,stopPropagation:Ri,disableScrollPropagation:Ni,disableClickPropagation:Di,preventDefault:ji,stop:Wi,getMousePosition:Hi,getWheelDelta:Ui,fakeStop:Gi,skipped:Ki,isExternalTarget:Yi,addListener:ki,removeListener:Ai}),Ji=k.extend({run:function(t,i,e,n){this.stop(),this._el=t,this._inProgress=!0,this._duration=e||.25,this._easeOutPower=1/Math.max(n||.5,.2),this._startPos=Li(t),this._offset=i.subtract(this._startPos),this._startTime=+new Date,this.fire("start"),this._animate()},stop:function(){this._inProgress&&(this._step(!0),this._complete())},_animate:function(){this._animId=M(this._animate,this),this._step()},_step:function(t){var i=+new Date-this._startTime,e=1e3*this._duration;i<e?this._runFrame(this._easeOut(i/e),t):(this._runFrame(1),this._complete())},_runFrame:function(t,i){var e=this._startPos.add(this._offset.multiplyBy(t));i&&e._round(),Pi(this._el,e),this.fire("step")},_complete:function(){C(this._animId),this._inProgress=!1,this.fire("end")},_easeOut:function(t){return 1-Math.pow(1-t,this._easeOutPower)}}),$i=k.extend({options:{crs:X,center:void 0,zoom:void 0,minZoom:void 0,maxZoom:void 0,layers:[],maxBounds:void 0,renderer:void 0,zoomAnimation:!0,zoomAnimationThreshold:4,fadeAnimation:!0,markerZoomAnimation:!0,transform3DLimit:8388608,zoomSnap:1,zoomDelta:1,trackResize:!0},initialize:function(t,i){i=p(this,i),this._handlers=[],this._layers={},this._zoomBoundLayers={},this._sizeChanged=!0,this._initContainer(t),this._initLayout(),this._onResize=a(this._onResize,this),this._initEvents(),i.maxBounds&&this.setMaxBounds(i.maxBounds),void 0!==i.zoom&&(this._zoom=this._limitZoom(i.zoom)),i.center&&void 0!==i.zoom&&this.setView(W(i.center),i.zoom,{reset:!0}),this.callInitHooks(),this._zoomAnimated=si&&yt&&!zt&&this.options.zoomAnimation,this._zoomAnimated&&(this._createAnimProxy(),ki(this._proxy,ri,this._catchTransitionEnd,this)),this._addLayers(this.options.layers)},setView:function(t,i,e){if((i=void 0===i?this._zoom:this._limitZoom(i),t=this._limitCenter(W(t),i,this.options.maxBounds),e=e||{},this._stop(),this._loaded&&!e.reset&&!0!==e)&&(void 0!==e.animate&&(e.zoom=h({animate:e.animate},e.zoom),e.pan=h({animate:e.animate,duration:e.duration},e.pan)),this._zoom!==i?this._tryAnimatedZoom&&this._tryAnimatedZoom(t,i,e.zoom):this._tryAnimatedPan(t,e.pan)))return clearTimeout(this._sizeTimer),this;return this._resetView(t,i),this},setZoom:function(t,i){return this._loaded?this.setView(this.getCenter(),t,{zoom:i}):(this._zoom=t,this)},zoomIn:function(t,i){return t=t||(yt?this.options.zoomDelta:1),this.setZoom(this._zoom+t,i)},zoomOut:function(t,i){return t=t||(yt?this.options.zoomDelta:1),this.setZoom(this._zoom-t,i)},setZoomAround:function(t,i,e){var n=this.getZoomScale(i),o=this.getSize().divideBy(2),s=(t instanceof B?t:this.latLngToContainerPoint(t)).subtract(o).multiplyBy(1-1/n),r=this.containerPointToLatLng(o.add(s));return this.setView(r,i,{zoom:e})},_getBoundsCenterZoom:function(t,i){i=i||{},t=t.getBounds?t.getBounds():D(t);var e=I(i.paddingTopLeft||i.padding||[0,0]),n=I(i.paddingBottomRight||i.padding||[0,0]),o=this.getBoundsZoom(t,!1,e.add(n));if((o="number"==typeof i.maxZoom?Math.min(i.maxZoom,o):o)===1/0)return{center:t.getCenter(),zoom:o};var s=n.subtract(e).divideBy(2),r=this.project(t.getSouthWest(),o),a=this.project(t.getNorthEast(),o);return{center:this.unproject(r.add(a).divideBy(2).add(s),o),zoom:o}},fitBounds:function(t,i){if(!(t=D(t)).isValid())throw new Error("Bounds are not valid.");var e=this._getBoundsCenterZoom(t,i);return this.setView(e.center,e.zoom,i)},fitWorld:function(t){return this.fitBounds([[-90,-180],[90,180]],t)},panTo:function(t,i){return this.setView(t,this._zoom,{pan:i})},panBy:function(t,i){if(i=i||{},!(t=I(t).round()).x&&!t.y)return this.fire("moveend");if(!0!==i.animate&&!this.getSize().contains(t))return this._resetView(this.unproject(this.project(this.getCenter()).add(t)),this.getZoom()),this;if(this._panAnim||(this._panAnim=new Ji,this._panAnim.on({step:this._onPanTransitionStep,end:this._onPanTransitionEnd},this)),i.noMoveStart||this.fire("movestart"),!1!==i.animate){mi(this._mapPane,"leaflet-pan-anim");var e=this._getMapPanePos().subtract(t).round();this._panAnim.run(this._mapPane,e,i.duration||.25,i.easeLinearity)}else this._rawPanBy(t),this.fire("move").fire("moveend");return this},flyTo:function(n,o,t){if(!1===(t=t||{}).animate||!yt)return this.setView(n,o,t);this._stop();var s=this.project(this.getCenter()),r=this.project(n),i=this.getSize(),a=this._zoom;n=W(n),o=void 0===o?a:o;var h=Math.max(i.x,i.y),u=h*this.getZoomScale(a,o),l=r.distanceTo(s)||1,c=1.42,_=c*c;function e(t){var i=(u*u-h*h+(t?-1:1)*_*_*l*l)/(2*(t?u:h)*_*l),e=Math.sqrt(i*i+1)-i;return e<1e-9?-18:Math.log(e)}function d(t){return(Math.exp(t)-Math.exp(-t))/2}function p(t){return(Math.exp(t)+Math.exp(-t))/2}var m=e(0);function f(t){return h*(p(m)*function(t){return d(t)/p(t)}(m+c*t)-d(m))/_}var g=Date.now(),v=(e(1)-m)/c,y=t.duration?1e3*t.duration:1e3*v*.8;return this._moveStart(!0,t.noMoveStart),function t(){var i=(Date.now()-g)/y,e=function(t){return 1-Math.pow(1-t,1.5)}(i)*v;i<=1?(this._flyToFrame=M(t,this),this._move(this.unproject(s.add(r.subtract(s).multiplyBy(f(e)/l)),a),this.getScaleZoom(h/function(t){return h*(p(m)/p(m+c*t))}(e),a),{flyTo:!0})):this._move(n,o)._moveEnd(!0)}.call(this),this},flyToBounds:function(t,i){var e=this._getBoundsCenterZoom(t,i);return this.flyTo(e.center,e.zoom,i)},setMaxBounds:function(t){return(t=D(t)).isValid()?(this.options.maxBounds&&this.off("moveend",this._panInsideMaxBounds),this.options.maxBounds=t,this._loaded&&this._panInsideMaxBounds(),this.on("moveend",this._panInsideMaxBounds)):(this.options.maxBounds=null,this.off("moveend",this._panInsideMaxBounds))},setMinZoom:function(t){var i=this.options.minZoom;return this.options.minZoom=t,this._loaded&&i!==t&&(this.fire("zoomlevelschange"),this.getZoom()<this.options.minZoom)?this.setZoom(t):this},setMaxZoom:function(t){var i=this.options.maxZoom;return this.options.maxZoom=t,this._loaded&&i!==t&&(this.fire("zoomlevelschange"),this.getZoom()>this.options.maxZoom)?this.setZoom(t):this},panInsideBounds:function(t,i){this._enforcingBounds=!0;var e=this.getCenter(),n=this._limitCenter(e,this._zoom,D(t));return e.equals(n)||this.panTo(n,i),this._enforcingBounds=!1,this},panInside:function(t,i){var e=I((i=i||{}).paddingTopLeft||i.padding||[0,0]),n=I(i.paddingBottomRight||i.padding||[0,0]),o=this.getCenter(),s=this.project(o),r=this.project(t),a=this.getPixelBounds(),h=a.getSize().divideBy(2),u=R([a.min.add(e),a.max.subtract(n)]);if(!u.contains(r)){this._enforcingBounds=!0;var l=s.subtract(r),c=I(r.x+l.x,r.y+l.y);(r.x<u.min.x||r.x>u.max.x)&&(c.x=s.x-l.x,0<l.x?c.x+=h.x-e.x:c.x-=h.x-n.x),(r.y<u.min.y||r.y>u.max.y)&&(c.y=s.y-l.y,0<l.y?c.y+=h.y-e.y:c.y-=h.y-n.y),this.panTo(this.unproject(c),i),this._enforcingBounds=!1}return this},invalidateSize:function(t){if(!this._loaded)return this;t=h({animate:!1,pan:!0},!0===t?{animate:!0}:t);var i=this.getSize();this._sizeChanged=!0,this._lastCenter=null;var e=this.getSize(),n=i.divideBy(2).round(),o=e.divideBy(2).round(),s=n.subtract(o);return s.x||s.y?(t.animate&&t.pan?this.panBy(s):(t.pan&&this._rawPanBy(s),this.fire("move"),t.debounceMoveend?(clearTimeout(this._sizeTimer),this._sizeTimer=setTimeout(a(this.fire,this,"moveend"),200)):this.fire("moveend")),this.fire("resize",{oldSize:i,newSize:e})):this},stop:function(){return this.setZoom(this._limitZoom(this._zoom)),this.options.zoomSnap||this.fire("viewreset"),this._stop()},locate:function(t){if(t=this._locateOptions=h({timeout:1e4,watch:!1},t),!("geolocation"in navigator))return this._handleGeolocationError({code:0,message:"Geolocation not supported."}),this;var i=a(this._handleGeolocationResponse,this),e=a(this._handleGeolocationError,this);return t.watch?this._locationWatchId=navigator.geolocation.watchPosition(i,e,t):navigator.geolocation.getCurrentPosition(i,e,t),this},stopLocate:function(){return navigator.geolocation&&navigator.geolocation.clearWatch&&navigator.geolocation.clearWatch(this._locationWatchId),this._locateOptions&&(this._locateOptions.setView=!1),this},_handleGeolocationError:function(t){var i=t.code,e=t.message||(1===i?"permission denied":2===i?"position unavailable":"timeout");this._locateOptions.setView&&!this._loaded&&this.fitWorld(),this.fire("locationerror",{code:i,message:"Geolocation error: "+e+"."})},_handleGeolocationResponse:function(t){var i=new j(t.coords.latitude,t.coords.longitude),e=i.toBounds(2*t.coords.accuracy),n=this._locateOptions;if(n.setView){var o=this.getBoundsZoom(e);this.setView(i,n.maxZoom?Math.min(o,n.maxZoom):o)}var s={latlng:i,bounds:e,timestamp:t.timestamp};for(var r in t.coords)"number"==typeof t.coords[r]&&(s[r]=t.coords[r]);this.fire("locationfound",s)},addHandler:function(t,i){if(!i)return this;var e=this[t]=new i(this);return this._handlers.push(e),this.options[t]&&e.enable(),this},remove:function(){if(this._initEvents(!0),this._containerId!==this._container._leaflet_id)throw new Error("Map container is being reused by another instance");try{delete this._container._leaflet_id,delete this._containerId}catch(t){this._container._leaflet_id=void 0,this._containerId=void 0}var t;for(t in void 0!==this._locationWatchId&&this.stopLocate(),this._stop(),li(this._mapPane),this._clearControlPos&&this._clearControlPos(),this._resizeRequest&&(C(this._resizeRequest),this._resizeRequest=null),this._clearHandlers(),this._loaded&&this.fire("unload"),this._layers)this._layers[t].remove();for(t in this._panes)li(this._panes[t]);return this._layers=[],this._panes=[],delete this._mapPane,delete this._renderer,this},createPane:function(t,i){var e=ui("div","leaflet-pane"+(t?" leaflet-"+t.replace("Pane","")+"-pane":""),i||this._mapPane);return t&&(this._panes[t]=e),e},getCenter:function(){return this._checkIfLoaded(),this._lastCenter&&!this._moved()?this._lastCenter:this.layerPointToLatLng(this._getCenterLayerPoint())},getZoom:function(){return this._zoom},getBounds:function(){var t=this.getPixelBounds();return new N(this.unproject(t.getBottomLeft()),this.unproject(t.getTopRight()))},getMinZoom:function(){return void 0===this.options.minZoom?this._layersMinZoom||0:this.options.minZoom},getMaxZoom:function(){return void 0===this.options.maxZoom?void 0===this._layersMaxZoom?1/0:this._layersMaxZoom:this.options.maxZoom},getBoundsZoom:function(t,i,e){t=D(t),e=I(e||[0,0]);var n=this.getZoom()||0,o=this.getMinZoom(),s=this.getMaxZoom(),r=t.getNorthWest(),a=t.getSouthEast(),h=this.getSize().subtract(e),u=R(this.project(a,n),this.project(r,n)).getSize(),l=yt?this.options.zoomSnap:1,c=h.x/u.x,_=h.y/u.y,d=i?Math.max(c,_):Math.min(c,_);return n=this.getScaleZoom(d,n),l&&(n=Math.round(n/(l/100))*(l/100),n=i?Math.ceil(n/l)*l:Math.floor(n/l)*l),Math.max(o,Math.min(s,n))},getSize:function(){return this._size&&!this._sizeChanged||(this._size=new B(this._container.clientWidth||0,this._container.clientHeight||0),this._sizeChanged=!1),this._size.clone()},getPixelBounds:function(t,i){var e=this._getTopLeftPoint(t,i);return new O(e,e.add(this.getSize()))},getPixelOrigin:function(){return this._checkIfLoaded(),this._pixelOrigin},getPixelWorldBounds:function(t){return this.options.crs.getProjectedBounds(void 0===t?this.getZoom():t)},getPane:function(t){return"string"==typeof t?this._panes[t]:t},getPanes:function(){return this._panes},getContainer:function(){return this._container},getZoomScale:function(t,i){var e=this.options.crs;return i=void 0===i?this._zoom:i,e.scale(t)/e.scale(i)},getScaleZoom:function(t,i){var e=this.options.crs;i=void 0===i?this._zoom:i;var n=e.zoom(t*e.scale(i));return isNaN(n)?1/0:n},project:function(t,i){return i=void 0===i?this._zoom:i,this.options.crs.latLngToPoint(W(t),i)},unproject:function(t,i){return i=void 0===i?this._zoom:i,this.options.crs.pointToLatLng(I(t),i)},layerPointToLatLng:function(t){var i=I(t).add(this.getPixelOrigin());return this.unproject(i)},latLngToLayerPoint:function(t){return this.project(W(t))._round()._subtract(this.getPixelOrigin())},wrapLatLng:function(t){return this.options.crs.wrapLatLng(W(t))},wrapLatLngBounds:function(t){return this.options.crs.wrapLatLngBounds(D(t))},distance:function(t,i){return this.options.crs.distance(W(t),W(i))},containerPointToLayerPoint:function(t){return I(t).subtract(this._getMapPanePos())},layerPointToContainerPoint:function(t){return I(t).add(this._getMapPanePos())},containerPointToLatLng:function(t){var i=this.containerPointToLayerPoint(I(t));return this.layerPointToLatLng(i)},latLngToContainerPoint:function(t){return this.layerPointToContainerPoint(this.latLngToLayerPoint(W(t)))},mouseEventToContainerPoint:function(t){return Hi(t,this._container)},mouseEventToLayerPoint:function(t){return this.containerPointToLayerPoint(this.mouseEventToContainerPoint(t))},mouseEventToLatLng:function(t){return this.layerPointToLatLng(this.mouseEventToLayerPoint(t))},_initContainer:function(t){var i=this._container=ai(t);if(!i)throw new Error("Map container not found.");if(i._leaflet_id)throw new Error("Map container is already initialized.");ki(i,"scroll",this._onScroll,this),this._containerId=u(i)},_initLayout:function(){var t=this._container;this._fadeAnimated=this.options.fadeAnimation&&yt,mi(t,"leaflet-container"+(Tt?" leaflet-touch":"")+(Ct?" leaflet-retina":"")+(et?" leaflet-oldie":"")+(_t?" leaflet-safari":"")+(this._fadeAnimated?" leaflet-fade-anim":""));var i=hi(t,"position");"absolute"!==i&&"relative"!==i&&"fixed"!==i&&(t.style.position="relative"),this._initPanes(),this._initControlPos&&this._initControlPos()},_initPanes:function(){var t=this._panes={};this._paneRenderers={},this._mapPane=this.createPane("mapPane",this._container),Pi(this._mapPane,new B(0,0)),this.createPane("tilePane"),this.createPane("shadowPane"),this.createPane("overlayPane"),this.createPane("markerPane"),this.createPane("tooltipPane"),this.createPane("popupPane"),this.options.markerZoomAnimation||(mi(t.markerPane,"leaflet-zoom-hide"),mi(t.shadowPane,"leaflet-zoom-hide"))},_resetView:function(t,i){Pi(this._mapPane,new B(0,0));var e=!this._loaded;this._loaded=!0,i=this._limitZoom(i),this.fire("viewprereset");var n=this._zoom!==i;this._moveStart(n,!1)._move(t,i)._moveEnd(n),this.fire("viewreset"),e&&this.fire("load")},_moveStart:function(t,i){return t&&this.fire("zoomstart"),i||this.fire("movestart"),this},_move:function(t,i,e){void 0===i&&(i=this._zoom);var n=this._zoom!==i;return this._zoom=i,this._lastCenter=t,this._pixelOrigin=this._getNewPixelOrigin(t),(n||e&&e.pinch)&&this.fire("zoom",e),this.fire("move",e)},_moveEnd:function(t){return t&&this.fire("zoomend"),this.fire("moveend")},_stop:function(){return C(this._flyToFrame),this._panAnim&&this._panAnim.stop(),this},_rawPanBy:function(t){Pi(this._mapPane,this._getMapPanePos().subtract(t))},_getZoomSpan:function(){return this.getMaxZoom()-this.getMinZoom()},_panInsideMaxBounds:function(){this._enforcingBounds||this.panInsideBounds(this.options.maxBounds)},_checkIfLoaded:function(){if(!this._loaded)throw new Error("Set map center and zoom first.")},_initEvents:function(t){this._targets={};var i=t?Ai:ki;i((this._targets[u(this._container)]=this)._container,"click dblclick mousedown mouseup mouseover mouseout mousemove contextmenu keypress keydown keyup",this._handleDOMEvent,this),this.options.trackResize&&i(window,"resize",this._onResize,this),yt&&this.options.transform3DLimit&&(t?this.off:this.on).call(this,"moveend",this._onMoveEnd)},_onResize:function(){C(this._resizeRequest),this._resizeRequest=M(function(){this.invalidateSize({debounceMoveend:!0})},this)},_onScroll:function(){this._container.scrollTop=0,this._container.scrollLeft=0},_onMoveEnd:function(){var t=this._getMapPanePos();Math.max(Math.abs(t.x),Math.abs(t.y))>=this.options.transform3DLimit&&this._resetView(this.getCenter(),this.getZoom())},_findEventTargets:function(t,i){for(var e,n=[],o="mouseout"===i||"mouseover"===i,s=t.target||t.srcElement,r=!1;s;){if((e=this._targets[u(s)])&&("click"===i||"preclick"===i)&&!t._simulated&&this._draggableMoved(e)){r=!0;break}if(e&&e.listens(i,!0)){if(o&&!Yi(s,t))break;if(n.push(e),o)break}if(s===this._container)break;s=s.parentNode}return n.length||r||o||!Yi(s,t)||(n=[this]),n},_handleDOMEvent:function(t){if(this._loaded&&!Ki(t)){var i=t.type;"mousedown"!==i&&"keypress"!==i&&"keyup"!==i&&"keydown"!==i||Mi(t.target||t.srcElement),this._fireDOMEvent(t,i)}},_mouseEvents:["click","dblclick","mouseover","mouseout","contextmenu"],_fireDOMEvent:function(t,i,e){if("click"===t.type){var n=h({},t);n.type="preclick",this._fireDOMEvent(n,n.type,e)}if(!t._stopped&&(e=(e||[]).concat(this._findEventTargets(t,i))).length){var o=e[0];"contextmenu"===i&&o.listens(i,!0)&&ji(t);var s={originalEvent:t};if("keypress"!==t.type&&"keydown"!==t.type&&"keyup"!==t.type){var r=o.getLatLng&&(!o._radius||o._radius<=10);s.containerPoint=r?this.latLngToContainerPoint(o.getLatLng()):this.mouseEventToContainerPoint(t),s.layerPoint=this.containerPointToLayerPoint(s.containerPoint),s.latlng=r?o.getLatLng():this.layerPointToLatLng(s.layerPoint)}for(var a=0;a<e.length;a++)if(e[a].fire(i,s,!0),s.originalEvent._stopped||!1===e[a].options.bubblingMouseEvents&&-1!==y(this._mouseEvents,i))return}},_draggableMoved:function(t){return(t=t.dragging&&t.dragging.enabled()?t:this).dragging&&t.dragging.moved()||this.boxZoom&&this.boxZoom.moved()},_clearHandlers:function(){for(var t=0,i=this._handlers.length;t<i;t++)this._handlers[t].disable()},whenReady:function(t,i){return this._loaded?t.call(i||this,{target:this}):this.on("load",t,i),this},_getMapPanePos:function(){return Li(this._mapPane)||new B(0,0)},_moved:function(){var t=this._getMapPanePos();return t&&!t.equals([0,0])},_getTopLeftPoint:function(t,i){return(t&&void 0!==i?this._getNewPixelOrigin(t,i):this.getPixelOrigin()).subtract(this._getMapPanePos())},_getNewPixelOrigin:function(t,i){var e=this.getSize()._divideBy(2);return this.project(t,i)._subtract(e)._add(this._getMapPanePos())._round()},_latLngToNewLayerPoint:function(t,i,e){var n=this._getNewPixelOrigin(e,i);return this.project(t,i)._subtract(n)},_latLngBoundsToNewLayerBounds:function(t,i,e){var n=this._getNewPixelOrigin(e,i);return R([this.project(t.getSouthWest(),i)._subtract(n),this.project(t.getNorthWest(),i)._subtract(n),this.project(t.getSouthEast(),i)._subtract(n),this.project(t.getNorthEast(),i)._subtract(n)])},_getCenterLayerPoint:function(){return this.containerPointToLayerPoint(this.getSize()._divideBy(2))},_getCenterOffset:function(t){return this.latLngToLayerPoint(t).subtract(this._getCenterLayerPoint())},_limitCenter:function(t,i,e){if(!e)return t;var n=this.project(t,i),o=this.getSize().divideBy(2),s=new O(n.subtract(o),n.add(o)),r=this._getBoundsOffset(s,e,i);return r.round().equals([0,0])?t:this.unproject(n.add(r),i)},_limitOffset:function(t,i){if(!i)return t;var e=this.getPixelBounds(),n=new O(e.min.add(t),e.max.add(t));return t.add(this._getBoundsOffset(n,i))},_getBoundsOffset:function(t,i,e){var n=R(this.project(i.getNorthEast(),e),this.project(i.getSouthWest(),e)),o=n.min.subtract(t.min),s=n.max.subtract(t.max);return new B(this._rebound(o.x,-s.x),this._rebound(o.y,-s.y))},_rebound:function(t,i){return 0<t+i?Math.round(t-i)/2:Math.max(0,Math.ceil(t))-Math.max(0,Math.floor(i))},_limitZoom:function(t){var i=this.getMinZoom(),e=this.getMaxZoom(),n=yt?this.options.zoomSnap:1;return n&&(t=Math.round(t/n)*n),Math.max(i,Math.min(e,t))},_onPanTransitionStep:function(){this.fire("move")},_onPanTransitionEnd:function(){fi(this._mapPane,"leaflet-pan-anim"),this.fire("moveend")},_tryAnimatedPan:function(t,i){var e=this._getCenterOffset(t)._trunc();return!(!0!==(i&&i.animate)&&!this.getSize().contains(e))&&(this.panBy(e,i),!0)},_createAnimProxy:function(){var t=this._proxy=ui("div","leaflet-proxy leaflet-zoom-animated");this._panes.mapPane.appendChild(t),this.on("zoomanim",function(t){var i=oi,e=this._proxy.style[i];wi(this._proxy,this.project(t.center,t.zoom),this.getZoomScale(t.zoom,1)),e===this._proxy.style[i]&&this._animatingZoom&&this._onZoomTransitionEnd()},this),this.on("load moveend",this._animMoveEnd,this),this._on("unload",this._destroyAnimProxy,this)},_destroyAnimProxy:function(){li(this._proxy),this.off("load moveend",this._animMoveEnd,this),delete this._proxy},_animMoveEnd:function(){var t=this.getCenter(),i=this.getZoom();wi(this._proxy,this.project(t,i),this.getZoomScale(i,1))},_catchTransitionEnd:function(t){this._animatingZoom&&0<=t.propertyName.indexOf("transform")&&this._onZoomTransitionEnd()},_nothingToAnimate:function(){return!this._container.getElementsByClassName("leaflet-zoom-animated").length},_tryAnimatedZoom:function(t,i,e){if(this._animatingZoom)return!0;if(e=e||{},!this._zoomAnimated||!1===e.animate||this._nothingToAnimate()||Math.abs(i-this._zoom)>this.options.zoomAnimationThreshold)return!1;var n=this.getZoomScale(i),o=this._getCenterOffset(t)._divideBy(1-1/n);return!(!0!==e.animate&&!this.getSize().contains(o))&&(M(function(){this._moveStart(!0,!1)._animateZoom(t,i,!0)},this),!0)},_animateZoom:function(t,i,e,n){this._mapPane&&(e&&(this._animatingZoom=!0,this._animateToCenter=t,this._animateToZoom=i,mi(this._mapPane,"leaflet-zoom-anim")),this.fire("zoomanim",{center:t,zoom:i,noUpdate:n}),setTimeout(a(this._onZoomTransitionEnd,this),250))},_onZoomTransitionEnd:function(){this._animatingZoom&&(this._mapPane&&fi(this._mapPane,"leaflet-zoom-anim"),this._animatingZoom=!1,this._move(this._animateToCenter,this._animateToZoom),M(function(){this._moveEnd(!0)},this))}});function Qi(t){return new te(t)}var te=S.extend({options:{position:"topright"},initialize:function(t){p(this,t)},getPosition:function(){return this.options.position},setPosition:function(t){var i=this._map;return i&&i.removeControl(this),this.options.position=t,i&&i.addControl(this),this},getContainer:function(){return this._container},addTo:function(t){this.remove(),this._map=t;var i=this._container=this.onAdd(t),e=this.getPosition(),n=t._controlCorners[e];return mi(i,"leaflet-control"),-1!==e.indexOf("bottom")?n.insertBefore(i,n.firstChild):n.appendChild(i),this._map.on("unload",this.remove,this),this},remove:function(){return this._map&&(li(this._container),this.onRemove&&this.onRemove(this._map),this._map.off("unload",this.remove,this),this._map=null),this},_refocusOnMap:function(t){this._map&&t&&0<t.screenX&&0<t.screenY&&this._map.getContainer().focus()}});$i.include({addControl:function(t){return t.addTo(this),this},removeControl:function(t){return t.remove(),this},_initControlPos:function(){var n=this._controlCorners={},o="leaflet-",s=this._controlContainer=ui("div",o+"control-container",this._container);function t(t,i){var e=o+t+" "+o+i;n[t+i]=ui("div",e,s)}t("top","left"),t("top","right"),t("bottom","left"),t("bottom","right")},_clearControlPos:function(){for(var t in this._controlCorners)li(this._controlCorners[t]);li(this._controlContainer),delete this._controlCorners,delete this._controlContainer}});var ie=te.extend({options:{collapsed:!0,position:"topright",autoZIndex:!0,hideSingleBase:!1,sortLayers:!1,sortFunction:function(t,i,e,n){return e<n?-1:n<e?1:0}},initialize:function(t,i,e){for(var n in p(this,e),this._layerControlInputs=[],this._layers=[],this._lastZIndex=0,this._handlingClick=!1,t)this._addLayer(t[n],n);for(n in i)this._addLayer(i[n],n,!0)},onAdd:function(t){this._initLayout(),this._update(),(this._map=t).on("zoomend",this._checkDisabledLayers,this);for(var i=0;i<this._layers.length;i++)this._layers[i].layer.on("add remove",this._onLayerChange,this);return this._container},addTo:function(t){return te.prototype.addTo.call(this,t),this._expandIfNotCollapsed()},onRemove:function(){this._map.off("zoomend",this._checkDisabledLayers,this);for(var t=0;t<this._layers.length;t++)this._layers[t].layer.off("add remove",this._onLayerChange,this)},addBaseLayer:function(t,i){return this._addLayer(t,i),this._map?this._update():this},addOverlay:function(t,i){return this._addLayer(t,i,!0),this._map?this._update():this},removeLayer:function(t){t.off("add remove",this._onLayerChange,this);var i=this._getLayer(u(t));return i&&this._layers.splice(this._layers.indexOf(i),1),this._map?this._update():this},expand:function(){mi(this._container,"leaflet-control-layers-expanded"),this._section.style.height=null;var t=this._map.getSize().y-(this._container.offsetTop+50);return t<this._section.clientHeight?(mi(this._section,"leaflet-control-layers-scrollbar"),this._section.style.height=t+"px"):fi(this._section,"leaflet-control-layers-scrollbar"),this._checkDisabledLayers(),this},collapse:function(){return fi(this._container,"leaflet-control-layers-expanded"),this},_initLayout:function(){var t="leaflet-control-layers",i=this._container=ui("div",t),e=this.options.collapsed;i.setAttribute("aria-haspopup",!0),Di(i),Ni(i);var n=this._section=ui("section",t+"-list");e&&(this._map.on("click",this.collapse,this),st||ki(i,{mouseenter:this.expand,mouseleave:this.collapse},this));var o=this._layersLink=ui("a",t+"-toggle",i);o.href="#",o.title="Layers",Tt?(ki(o,"click",Wi),ki(o,"click",this.expand,this)):ki(o,"focus",this.expand,this),e||this.expand(),this._baseLayersList=ui("div",t+"-base",n),this._separator=ui("div",t+"-separator",n),this._overlaysList=ui("div",t+"-overlays",n),i.appendChild(n)},_getLayer:function(t){for(var i=0;i<this._layers.length;i++)if(this._layers[i]&&u(this._layers[i].layer)===t)return this._layers[i]},_addLayer:function(t,i,e){this._map&&t.on("add remove",this._onLayerChange,this),this._layers.push({layer:t,name:i,overlay:e}),this.options.sortLayers&&this._layers.sort(a(function(t,i){return this.options.sortFunction(t.layer,i.layer,t.name,i.name)},this)),this.options.autoZIndex&&t.setZIndex&&(this._lastZIndex++,t.setZIndex(this._lastZIndex)),this._expandIfNotCollapsed()},_update:function(){if(!this._container)return this;ci(this._baseLayersList),ci(this._overlaysList),this._layerControlInputs=[];var t,i,e,n,o=0;for(e=0;e<this._layers.length;e++)n=this._layers[e],this._addItem(n),i=i||n.overlay,t=t||!n.overlay,o+=n.overlay?0:1;return this.options.hideSingleBase&&(t=t&&1<o,this._baseLayersList.style.display=t?"":"none"),this._separator.style.display=i&&t?"":"none",this},_onLayerChange:function(t){this._handlingClick||this._update();var i=this._getLayer(u(t.target)),e=i.overlay?"add"===t.type?"overlayadd":"overlayremove":"add"===t.type?"baselayerchange":null;e&&this._map.fire(e,i)},_createRadioElement:function(t,i){var e='<input type="radio" class="leaflet-control-layers-selector" name="'+t+'"'+(i?' checked="checked"':"")+"/>",n=document.createElement("div");return n.innerHTML=e,n.firstChild},_addItem:function(t){var i,e=document.createElement("label"),n=this._map.hasLayer(t.layer);t.overlay?((i=document.createElement("input")).type="checkbox",i.className="leaflet-control-layers-selector",i.defaultChecked=n):i=this._createRadioElement("leaflet-base-layers_"+u(this),n),this._layerControlInputs.push(i),i.layerId=u(t.layer),ki(i,"click",this._onInputClick,this);var o=document.createElement("span");o.innerHTML=" "+t.name;var s=document.createElement("div");return e.appendChild(s),s.appendChild(i),s.appendChild(o),(t.overlay?this._overlaysList:this._baseLayersList).appendChild(e),this._checkDisabledLayers(),e},_onInputClick:function(){var t,i,e=this._layerControlInputs,n=[],o=[];this._handlingClick=!0;for(var s=e.length-1;0<=s;s--)t=e[s],i=this._getLayer(t.layerId).layer,t.checked?n.push(i):t.checked||o.push(i);for(s=0;s<o.length;s++)this._map.hasLayer(o[s])&&this._map.removeLayer(o[s]);for(s=0;s<n.length;s++)this._map.hasLayer(n[s])||this._map.addLayer(n[s]);this._handlingClick=!1,this._refocusOnMap()},_checkDisabledLayers:function(){for(var t,i,e=this._layerControlInputs,n=this._map.getZoom(),o=e.length-1;0<=o;o--)t=e[o],i=this._getLayer(t.layerId).layer,t.disabled=void 0!==i.options.minZoom&&n<i.options.minZoom||void 0!==i.options.maxZoom&&n>i.options.maxZoom},_expandIfNotCollapsed:function(){return this._map&&!this.options.collapsed&&this.expand(),this},_expand:function(){return this.expand()},_collapse:function(){return this.collapse()}}),ee=te.extend({options:{position:"topleft",zoomInText:"+",zoomInTitle:"Zoom in",zoomOutText:"&#x2212;",zoomOutTitle:"Zoom out"},onAdd:function(t){var i="leaflet-control-zoom",e=ui("div",i+" leaflet-bar"),n=this.options;return this._zoomInButton=this._createButton(n.zoomInText,n.zoomInTitle,i+"-in",e,this._zoomIn),this._zoomOutButton=this._createButton(n.zoomOutText,n.zoomOutTitle,i+"-out",e,this._zoomOut),this._updateDisabled(),t.on("zoomend zoomlevelschange",this._updateDisabled,this),e},onRemove:function(t){t.off("zoomend zoomlevelschange",this._updateDisabled,this)},disable:function(){return this._disabled=!0,this._updateDisabled(),this},enable:function(){return this._disabled=!1,this._updateDisabled(),this},_zoomIn:function(t){!this._disabled&&this._map._zoom<this._map.getMaxZoom()&&this._map.zoomIn(this._map.options.zoomDelta*(t.shiftKey?3:1))},_zoomOut:function(t){!this._disabled&&this._map._zoom>this._map.getMinZoom()&&this._map.zoomOut(this._map.options.zoomDelta*(t.shiftKey?3:1))},_createButton:function(t,i,e,n,o){var s=ui("a",e,n);return s.innerHTML=t,s.href="#",s.title=i,s.setAttribute("role","button"),s.setAttribute("aria-label",i),Di(s),ki(s,"click",Wi),ki(s,"click",o,this),ki(s,"click",this._refocusOnMap,this),s},_updateDisabled:function(){var t=this._map,i="leaflet-disabled";fi(this._zoomInButton,i),fi(this._zoomOutButton,i),!this._disabled&&t._zoom!==t.getMinZoom()||mi(this._zoomOutButton,i),!this._disabled&&t._zoom!==t.getMaxZoom()||mi(this._zoomInButton,i)}});$i.mergeOptions({zoomControl:!0}),$i.addInitHook(function(){this.options.zoomControl&&(this.zoomControl=new ee,this.addControl(this.zoomControl))});var ne=te.extend({options:{position:"bottomleft",maxWidth:100,metric:!0,imperial:!0},onAdd:function(t){var i="leaflet-control-scale",e=ui("div",i),n=this.options;return this._addScales(n,i+"-line",e),t.on(n.updateWhenIdle?"moveend":"move",this._update,this),t.whenReady(this._update,this),e},onRemove:function(t){t.off(this.options.updateWhenIdle?"moveend":"move",this._update,this)},_addScales:function(t,i,e){t.metric&&(this._mScale=ui("div",i,e)),t.imperial&&(this._iScale=ui("div",i,e))},_update:function(){var t=this._map,i=t.getSize().y/2,e=t.distance(t.containerPointToLatLng([0,i]),t.containerPointToLatLng([this.options.maxWidth,i]));this._updateScales(e)},_updateScales:function(t){this.options.metric&&t&&this._updateMetric(t),this.options.imperial&&t&&this._updateImperial(t)},_updateMetric:function(t){var i=this._getRoundNum(t),e=i<1e3?i+" m":i/1e3+" km";this._updateScale(this._mScale,e,i/t)},_updateImperial:function(t){var i,e,n,o=3.2808399*t;5280<o?(i=o/5280,e=this._getRoundNum(i),this._updateScale(this._iScale,e+" mi",e/i)):(n=this._getRoundNum(o),this._updateScale(this._iScale,n+" ft",n/o))},_updateScale:function(t,i,e){t.style.width=Math.round(this.options.maxWidth*e)+"px",t.innerHTML=i},_getRoundNum:function(t){var i=Math.pow(10,(Math.floor(t)+"").length-1),e=t/i;return i*(e=10<=e?10:5<=e?5:3<=e?3:2<=e?2:1)}}),oe=te.extend({options:{position:"bottomright",prefix:'<a href="https://leafletjs.com" title="A JS library for interactive maps">Leaflet</a>'},initialize:function(t){p(this,t),this._attributions={}},onAdd:function(t){for(var i in(t.attributionControl=this)._container=ui("div","leaflet-control-attribution"),Di(this._container),t._layers)t._layers[i].getAttribution&&this.addAttribution(t._layers[i].getAttribution());return this._update(),this._container},setPrefix:function(t){return this.options.prefix=t,this._update(),this},addAttribution:function(t){return t&&(this._attributions[t]||(this._attributions[t]=0),this._attributions[t]++,this._update()),this},removeAttribution:function(t){return t&&this._attributions[t]&&(this._attributions[t]--,this._update()),this},_update:function(){if(this._map){var t=[];for(var i in this._attributions)this._attributions[i]&&t.push(i);var e=[];this.options.prefix&&e.push(this.options.prefix),t.length&&e.push(t.join(", ")),this._container.innerHTML=e.join(" | ")}}});$i.mergeOptions({attributionControl:!0}),$i.addInitHook(function(){this.options.attributionControl&&(new oe).addTo(this)});te.Layers=ie,te.Zoom=ee,te.Scale=ne,te.Attribution=oe,Qi.layers=function(t,i,e){return new ie(t,i,e)},Qi.zoom=function(t){return new ee(t)},Qi.scale=function(t){return new ne(t)},Qi.attribution=function(t){return new oe(t)};var se=S.extend({initialize:function(t){this._map=t},enable:function(){return this._enabled||(this._enabled=!0,this.addHooks()),this},disable:function(){return this._enabled&&(this._enabled=!1,this.removeHooks()),this},enabled:function(){return!!this._enabled}});se.addTo=function(t,i){return t.addHandler(i,this),this};var re,ae={Events:Z},he=Tt?"touchstart mousedown":"mousedown",ue={mousedown:"mouseup",touchstart:"touchend",pointerdown:"touchend",MSPointerDown:"touchend"},le={mousedown:"mousemove",touchstart:"touchmove",pointerdown:"touchmove",MSPointerDown:"touchmove"},ce=k.extend({options:{clickTolerance:3},initialize:function(t,i,e,n){p(this,n),this._element=t,this._dragStartTarget=i||t,this._preventOutline=e},enable:function(){this._enabled||(ki(this._dragStartTarget,he,this._onDown,this),this._enabled=!0)},disable:function(){this._enabled&&(ce._dragging===this&&this.finishDrag(),Ai(this._dragStartTarget,he,this._onDown,this),this._enabled=!1,this._moved=!1)},_onDown:function(t){if(!t._simulated&&this._enabled&&(this._moved=!1,!pi(this._element,"leaflet-zoom-anim")&&!(ce._dragging||t.shiftKey||1!==t.which&&1!==t.button&&!t.touches||((ce._dragging=this)._preventOutline&&Mi(this._element),Ti(),Qt(),this._moving)))){this.fire("down");var i=t.touches?t.touches[0]:t,e=Ei(this._element);this._startPoint=new B(i.clientX,i.clientY),this._parentScale=Si(e),ki(document,le[t.type],this._onMove,this),ki(document,ue[t.type],this._onUp,this)}},_onMove:function(t){if(!t._simulated&&this._enabled)if(t.touches&&1<t.touches.length)this._moved=!0;else{var i=t.touches&&1===t.touches.length?t.touches[0]:t,e=new B(i.clientX,i.clientY)._subtract(this._startPoint);(e.x||e.y)&&(Math.abs(e.x)+Math.abs(e.y)<this.options.clickTolerance||(e.x/=this._parentScale.x,e.y/=this._parentScale.y,ji(t),this._moved||(this.fire("dragstart"),this._moved=!0,this._startPos=Li(this._element).subtract(e),mi(document.body,"leaflet-dragging"),this._lastTarget=t.target||t.srcElement,window.SVGElementInstance&&this._lastTarget instanceof SVGElementInstance&&(this._lastTarget=this._lastTarget.correspondingUseElement),mi(this._lastTarget,"leaflet-drag-target")),this._newPos=this._startPos.add(e),this._moving=!0,C(this._animRequest),this._lastEvent=t,this._animRequest=M(this._updatePosition,this,!0)))}},_updatePosition:function(){var t={originalEvent:this._lastEvent};this.fire("predrag",t),Pi(this._element,this._newPos),this.fire("drag",t)},_onUp:function(t){!t._simulated&&this._enabled&&this.finishDrag()},finishDrag:function(){for(var t in fi(document.body,"leaflet-dragging"),this._lastTarget&&(fi(this._lastTarget,"leaflet-drag-target"),this._lastTarget=null),le)Ai(document,le[t],this._onMove,this),Ai(document,ue[t],this._onUp,this);zi(),ti(),this._moved&&this._moving&&(C(this._animRequest),this.fire("dragend",{distance:this._newPos.distanceTo(this._startPos)})),this._moving=!1,ce._dragging=!1}});function _e(t,i){if(!i||!t.length)return t.slice();var e=i*i;return t=function(t,i){var e=t.length,n=new(typeof Uint8Array!=void 0+""?Uint8Array:Array)(e);n[0]=n[e-1]=1,function t(i,e,n,o,s){var r,a,h,u=0;for(a=o+1;a<=s-1;a++)h=ge(i[a],i[o],i[s],!0),u<h&&(r=a,u=h);n<u&&(e[r]=1,t(i,e,n,o,r),t(i,e,n,r,s))}(t,n,i,0,e-1);var o,s=[];for(o=0;o<e;o++)n[o]&&s.push(t[o]);return s}(t=function(t,i){for(var e=[t[0]],n=1,o=0,s=t.length;n<s;n++)r=t[n],a=t[o],void 0,h=a.x-r.x,u=a.y-r.y,i<h*h+u*u&&(e.push(t[n]),o=n);var r,a,h,u;o<s-1&&e.push(t[s-1]);return e}(t,e),e)}function de(t,i,e){return Math.sqrt(ge(t,i,e,!0))}function pe(t,i,e,n,o){var s,r,a,h=n?re:fe(t,e),u=fe(i,e);for(re=u;;){if(!(h|u))return[t,i];if(h&u)return!1;a=fe(r=me(t,i,s=h||u,e,o),e),s===h?(t=r,h=a):(i=r,u=a)}}function me(t,i,e,n,o){var s,r,a=i.x-t.x,h=i.y-t.y,u=n.min,l=n.max;return 8&e?(s=t.x+a*(l.y-t.y)/h,r=l.y):4&e?(s=t.x+a*(u.y-t.y)/h,r=u.y):2&e?(s=l.x,r=t.y+h*(l.x-t.x)/a):1&e&&(s=u.x,r=t.y+h*(u.x-t.x)/a),new B(s,r,o)}function fe(t,i){var e=0;return t.x<i.min.x?e|=1:t.x>i.max.x&&(e|=2),t.y<i.min.y?e|=4:t.y>i.max.y&&(e|=8),e}function ge(t,i,e,n){var o,s=i.x,r=i.y,a=e.x-s,h=e.y-r,u=a*a+h*h;return 0<u&&(1<(o=((t.x-s)*a+(t.y-r)*h)/u)?(s=e.x,r=e.y):0<o&&(s+=a*o,r+=h*o)),a=t.x-s,h=t.y-r,n?a*a+h*h:new B(s,r)}function ve(t){return!v(t[0])||"object"!=typeof t[0][0]&&void 0!==t[0][0]}function ye(t){return console.warn("Deprecated use of _flat, please use L.LineUtil.isFlat instead."),ve(t)}var xe=(Object.freeze||Object)({simplify:_e,pointToSegmentDistance:de,closestPointOnSegment:function(t,i,e){return ge(t,i,e)},clipSegment:pe,_getEdgeIntersection:me,_getBitCode:fe,_sqClosestPointOnSegment:ge,isFlat:ve,_flat:ye});function we(t,i,e){var n,o,s,r,a,h,u,l,c,_=[1,4,2,8];for(o=0,u=t.length;o<u;o++)t[o]._code=fe(t[o],i);for(r=0;r<4;r++){for(l=_[r],n=[],o=0,s=(u=t.length)-1;o<u;s=o++)a=t[o],h=t[s],a._code&l?h._code&l||((c=me(h,a,l,i,e))._code=fe(c,i),n.push(c)):(h._code&l&&((c=me(h,a,l,i,e))._code=fe(c,i),n.push(c)),n.push(a));t=n}return t}var Pe,Le=(Object.freeze||Object)({clipPolygon:we}),be={project:function(t){return new B(t.lng,t.lat)},unproject:function(t){return new j(t.y,t.x)},bounds:new O([-180,-90],[180,90])},Te={R:6378137,R_MINOR:6356752.314245179,bounds:new O([-20037508.34279,-15496570.73972],[20037508.34279,18764656.23138]),project:function(t){var i=Math.PI/180,e=this.R,n=t.lat*i,o=this.R_MINOR/e,s=Math.sqrt(1-o*o),r=s*Math.sin(n),a=Math.tan(Math.PI/4-n/2)/Math.pow((1-r)/(1+r),s/2);return n=-e*Math.log(Math.max(a,1e-10)),new B(t.lng*i*e,n)},unproject:function(t){for(var i,e=180/Math.PI,n=this.R,o=this.R_MINOR/n,s=Math.sqrt(1-o*o),r=Math.exp(-t.y/n),a=Math.PI/2-2*Math.atan(r),h=0,u=.1;h<15&&1e-7<Math.abs(u);h++)i=s*Math.sin(a),i=Math.pow((1-i)/(1+i),s/2),a+=u=Math.PI/2-2*Math.atan(r*i)-a;return new j(a*e,t.x*e/n)}},ze=(Object.freeze||Object)({LonLat:be,Mercator:Te,SphericalMercator:q}),Me=h({},U,{code:"EPSG:3395",projection:Te,transformation:(Pe=.5/(Math.PI*Te.R),K(Pe,.5,-Pe,.5))}),Ce=h({},U,{code:"EPSG:4326",projection:be,transformation:K(1/180,1,-1/180,.5)}),Ee=h({},F,{projection:be,transformation:K(1,0,-1,0),scale:function(t){return Math.pow(2,t)},zoom:function(t){return Math.log(t)/Math.LN2},distance:function(t,i){var e=i.lng-t.lng,n=i.lat-t.lat;return Math.sqrt(e*e+n*n)},infinite:!0});F.Earth=U,F.EPSG3395=Me,F.EPSG3857=X,F.EPSG900913=J,F.EPSG4326=Ce,F.Simple=Ee;var Se=k.extend({options:{pane:"overlayPane",attribution:null,bubblingMouseEvents:!0},addTo:function(t){return t.addLayer(this),this},remove:function(){return this.removeFrom(this._map||this._mapToAdd)},removeFrom:function(t){return t&&t.removeLayer(this),this},getPane:function(t){return this._map.getPane(t?this.options[t]||t:this.options.pane)},addInteractiveTarget:function(t){return this._map._targets[u(t)]=this},removeInteractiveTarget:function(t){return delete this._map._targets[u(t)],this},getAttribution:function(){return this.options.attribution},_layerAdd:function(t){var i=t.target;if(i.hasLayer(this)){if(this._map=i,this._zoomAnimated=i._zoomAnimated,this.getEvents){var e=this.getEvents();i.on(e,this),this.once("remove",function(){i.off(e,this)},this)}this.onAdd(i),this.getAttribution&&i.attributionControl&&i.attributionControl.addAttribution(this.getAttribution()),this.fire("add"),i.fire("layeradd",{layer:this})}}});$i.include({addLayer:function(t){if(!t._layerAdd)throw new Error("The provided object is not a Layer.");var i=u(t);return this._layers[i]||((this._layers[i]=t)._mapToAdd=this,t.beforeAdd&&t.beforeAdd(this),this.whenReady(t._layerAdd,t)),this},removeLayer:function(t){var i=u(t);return this._layers[i]&&(this._loaded&&t.onRemove(this),t.getAttribution&&this.attributionControl&&this.attributionControl.removeAttribution(t.getAttribution()),delete this._layers[i],this._loaded&&(this.fire("layerremove",{layer:t}),t.fire("remove")),t._map=t._mapToAdd=null),this},hasLayer:function(t){return!!t&&u(t)in this._layers},eachLayer:function(t,i){for(var e in this._layers)t.call(i,this._layers[e]);return this},_addLayers:function(t){for(var i=0,e=(t=t?v(t)?t:[t]:[]).length;i<e;i++)this.addLayer(t[i])},_addZoomLimit:function(t){!isNaN(t.options.maxZoom)&&isNaN(t.options.minZoom)||(this._zoomBoundLayers[u(t)]=t,this._updateZoomLevels())},_removeZoomLimit:function(t){var i=u(t);this._zoomBoundLayers[i]&&(delete this._zoomBoundLayers[i],this._updateZoomLevels())},_updateZoomLevels:function(){var t=1/0,i=-1/0,e=this._getZoomSpan();for(var n in this._zoomBoundLayers){var o=this._zoomBoundLayers[n].options;t=void 0===o.minZoom?t:Math.min(t,o.minZoom),i=void 0===o.maxZoom?i:Math.max(i,o.maxZoom)}this._layersMaxZoom=i===-1/0?void 0:i,this._layersMinZoom=t===1/0?void 0:t,e!==this._getZoomSpan()&&this.fire("zoomlevelschange"),void 0===this.options.maxZoom&&this._layersMaxZoom&&this.getZoom()>this._layersMaxZoom&&this.setZoom(this._layersMaxZoom),void 0===this.options.minZoom&&this._layersMinZoom&&this.getZoom()<this._layersMinZoom&&this.setZoom(this._layersMinZoom)}});var Ze=Se.extend({initialize:function(t,i){var e,n;if(p(this,i),this._layers={},t)for(e=0,n=t.length;e<n;e++)this.addLayer(t[e])},addLayer:function(t){var i=this.getLayerId(t);return this._layers[i]=t,this._map&&this._map.addLayer(t),this},removeLayer:function(t){var i=t in this._layers?t:this.getLayerId(t);return this._map&&this._layers[i]&&this._map.removeLayer(this._layers[i]),delete this._layers[i],this},hasLayer:function(t){return!!t&&(t in this._layers||this.getLayerId(t)in this._layers)},clearLayers:function(){return this.eachLayer(this.removeLayer,this)},invoke:function(t){var i,e,n=Array.prototype.slice.call(arguments,1);for(i in this._layers)(e=this._layers[i])[t]&&e[t].apply(e,n);return this},onAdd:function(t){this.eachLayer(t.addLayer,t)},onRemove:function(t){this.eachLayer(t.removeLayer,t)},eachLayer:function(t,i){for(var e in this._layers)t.call(i,this._layers[e]);return this},getLayer:function(t){return this._layers[t]},getLayers:function(){var t=[];return this.eachLayer(t.push,t),t},setZIndex:function(t){return this.invoke("setZIndex",t)},getLayerId:function(t){return u(t)}}),ke=Ze.extend({addLayer:function(t){return this.hasLayer(t)?this:(t.addEventParent(this),Ze.prototype.addLayer.call(this,t),this.fire("layeradd",{layer:t}))},removeLayer:function(t){return this.hasLayer(t)?(t in this._layers&&(t=this._layers[t]),t.removeEventParent(this),Ze.prototype.removeLayer.call(this,t),this.fire("layerremove",{layer:t})):this},setStyle:function(t){return this.invoke("setStyle",t)},bringToFront:function(){return this.invoke("bringToFront")},bringToBack:function(){return this.invoke("bringToBack")},getBounds:function(){var t=new N;for(var i in this._layers){var e=this._layers[i];t.extend(e.getBounds?e.getBounds():e.getLatLng())}return t}}),Be=S.extend({options:{popupAnchor:[0,0],tooltipAnchor:[0,0]},initialize:function(t){p(this,t)},createIcon:function(t){return this._createIcon("icon",t)},createShadow:function(t){return this._createIcon("shadow",t)},_createIcon:function(t,i){var e=this._getIconUrl(t);if(!e){if("icon"===t)throw new Error("iconUrl not set in Icon options (see the docs).");return null}var n=this._createImg(e,i&&"IMG"===i.tagName?i:null);return this._setIconStyles(n,t),n},_setIconStyles:function(t,i){var e=this.options,n=e[i+"Size"];"number"==typeof n&&(n=[n,n]);var o=I(n),s=I("shadow"===i&&e.shadowAnchor||e.iconAnchor||o&&o.divideBy(2,!0));t.className="leaflet-marker-"+i+" "+(e.className||""),s&&(t.style.marginLeft=-s.x+"px",t.style.marginTop=-s.y+"px"),o&&(t.style.width=o.x+"px",t.style.height=o.y+"px")},_createImg:function(t,i){return(i=i||document.createElement("img")).src=t,i},_getIconUrl:function(t){return Ct&&this.options[t+"RetinaUrl"]||this.options[t+"Url"]}});var Ae=Be.extend({options:{iconUrl:"marker-icon.png",iconRetinaUrl:"marker-icon-2x.png",shadowUrl:"marker-shadow.png",iconSize:[25,41],iconAnchor:[12,41],popupAnchor:[1,-34],tooltipAnchor:[16,-28],shadowSize:[41,41]},_getIconUrl:function(t){return Ae.imagePath||(Ae.imagePath=this._detectIconPath()),(this.options.imagePath||Ae.imagePath)+Be.prototype._getIconUrl.call(this,t)},_detectIconPath:function(){var t=ui("div","leaflet-default-icon-path",document.body),i=hi(t,"background-image")||hi(t,"backgroundImage");return document.body.removeChild(t),i=null===i||0!==i.indexOf("url")?"":i.replace(/^url\(["']?/,"").replace(/marker-icon\.png["']?\)$/,"")}}),Ie=se.extend({initialize:function(t){this._marker=t},addHooks:function(){var t=this._marker._icon;this._draggable||(this._draggable=new ce(t,t,!0)),this._draggable.on({dragstart:this._onDragStart,predrag:this._onPreDrag,drag:this._onDrag,dragend:this._onDragEnd},this).enable(),mi(t,"leaflet-marker-draggable")},removeHooks:function(){this._draggable.off({dragstart:this._onDragStart,predrag:this._onPreDrag,drag:this._onDrag,dragend:this._onDragEnd},this).disable(),this._marker._icon&&fi(this._marker._icon,"leaflet-marker-draggable")},moved:function(){return this._draggable&&this._draggable._moved},_adjustPan:function(t){var i=this._marker,e=i._map,n=this._marker.options.autoPanSpeed,o=this._marker.options.autoPanPadding,s=Li(i._icon),r=e.getPixelBounds(),a=e.getPixelOrigin(),h=R(r.min._subtract(a).add(o),r.max._subtract(a).subtract(o));if(!h.contains(s)){var u=I((Math.max(h.max.x,s.x)-h.max.x)/(r.max.x-h.max.x)-(Math.min(h.min.x,s.x)-h.min.x)/(r.min.x-h.min.x),(Math.max(h.max.y,s.y)-h.max.y)/(r.max.y-h.max.y)-(Math.min(h.min.y,s.y)-h.min.y)/(r.min.y-h.min.y)).multiplyBy(n);e.panBy(u,{animate:!1}),this._draggable._newPos._add(u),this._draggable._startPos._add(u),Pi(i._icon,this._draggable._newPos),this._onDrag(t),this._panRequest=M(this._adjustPan.bind(this,t))}},_onDragStart:function(){this._oldLatLng=this._marker.getLatLng(),this._marker.closePopup().fire("movestart").fire("dragstart")},_onPreDrag:function(t){this._marker.options.autoPan&&(C(this._panRequest),this._panRequest=M(this._adjustPan.bind(this,t)))},_onDrag:function(t){var i=this._marker,e=i._shadow,n=Li(i._icon),o=i._map.layerPointToLatLng(n);e&&Pi(e,n),i._latlng=o,t.latlng=o,t.oldLatLng=this._oldLatLng,i.fire("move",t).fire("drag",t)},_onDragEnd:function(t){C(this._panRequest),delete this._oldLatLng,this._marker.fire("moveend").fire("dragend",t)}}),Oe=Se.extend({options:{icon:new Ae,interactive:!0,keyboard:!0,title:"",alt:"",zIndexOffset:0,opacity:1,riseOnHover:!1,riseOffset:250,pane:"markerPane",shadowPane:"shadowPane",bubblingMouseEvents:!1,draggable:!1,autoPan:!1,autoPanPadding:[50,50],autoPanSpeed:10},initialize:function(t,i){p(this,i),this._latlng=W(t)},onAdd:function(t){this._zoomAnimated=this._zoomAnimated&&t.options.markerZoomAnimation,this._zoomAnimated&&t.on("zoomanim",this._animateZoom,this),this._initIcon(),this.update()},onRemove:function(t){this.dragging&&this.dragging.enabled()&&(this.options.draggable=!0,this.dragging.removeHooks()),delete this.dragging,this._zoomAnimated&&t.off("zoomanim",this._animateZoom,this),this._removeIcon(),this._removeShadow()},getEvents:function(){return{zoom:this.update,viewreset:this.update}},getLatLng:function(){return this._latlng},setLatLng:function(t){var i=this._latlng;return this._latlng=W(t),this.update(),this.fire("move",{oldLatLng:i,latlng:this._latlng})},setZIndexOffset:function(t){return this.options.zIndexOffset=t,this.update()},getIcon:function(){return this.options.icon},setIcon:function(t){return this.options.icon=t,this._map&&(this._initIcon(),this.update()),this._popup&&this.bindPopup(this._popup,this._popup.options),this},getElement:function(){return this._icon},update:function(){if(this._icon&&this._map){var t=this._map.latLngToLayerPoint(this._latlng).round();this._setPos(t)}return this},_initIcon:function(){var t=this.options,i="leaflet-zoom-"+(this._zoomAnimated?"animated":"hide"),e=t.icon.createIcon(this._icon),n=!1;e!==this._icon&&(this._icon&&this._removeIcon(),n=!0,t.title&&(e.title=t.title),"IMG"===e.tagName&&(e.alt=t.alt||"")),mi(e,i),t.keyboard&&(e.tabIndex="0"),this._icon=e,t.riseOnHover&&this.on({mouseover:this._bringToFront,mouseout:this._resetZIndex});var o=t.icon.createShadow(this._shadow),s=!1;o!==this._shadow&&(this._removeShadow(),s=!0),o&&(mi(o,i),o.alt=""),this._shadow=o,t.opacity<1&&this._updateOpacity(),n&&this.getPane().appendChild(this._icon),this._initInteraction(),o&&s&&this.getPane(t.shadowPane).appendChild(this._shadow)},_removeIcon:function(){this.options.riseOnHover&&this.off({mouseover:this._bringToFront,mouseout:this._resetZIndex}),li(this._icon),this.removeInteractiveTarget(this._icon),this._icon=null},_removeShadow:function(){this._shadow&&li(this._shadow),this._shadow=null},_setPos:function(t){this._icon&&Pi(this._icon,t),this._shadow&&Pi(this._shadow,t),this._zIndex=t.y+this.options.zIndexOffset,this._resetZIndex()},_updateZIndex:function(t){this._icon&&(this._icon.style.zIndex=this._zIndex+t)},_animateZoom:function(t){var i=this._map._latLngToNewLayerPoint(this._latlng,t.zoom,t.center).round();this._setPos(i)},_initInteraction:function(){if(this.options.interactive&&(mi(this._icon,"leaflet-interactive"),this.addInteractiveTarget(this._icon),Ie)){var t=this.options.draggable;this.dragging&&(t=this.dragging.enabled(),this.dragging.disable()),this.dragging=new Ie(this),t&&this.dragging.enable()}},setOpacity:function(t){return this.options.opacity=t,this._map&&this._updateOpacity(),this},_updateOpacity:function(){var t=this.options.opacity;this._icon&&yi(this._icon,t),this._shadow&&yi(this._shadow,t)},_bringToFront:function(){this._updateZIndex(this.options.riseOffset)},_resetZIndex:function(){this._updateZIndex(0)},_getPopupAnchor:function(){return this.options.icon.options.popupAnchor},_getTooltipAnchor:function(){return this.options.icon.options.tooltipAnchor}});var Re=Se.extend({options:{stroke:!0,color:"#3388ff",weight:3,opacity:1,lineCap:"round",lineJoin:"round",dashArray:null,dashOffset:null,fill:!1,fillColor:null,fillOpacity:.2,fillRule:"evenodd",interactive:!0,bubblingMouseEvents:!0},beforeAdd:function(t){this._renderer=t.getRenderer(this)},onAdd:function(){this._renderer._initPath(this),this._reset(),this._renderer._addPath(this)},onRemove:function(){this._renderer._removePath(this)},redraw:function(){return this._map&&this._renderer._updatePath(this),this},setStyle:function(t){return p(this,t),this._renderer&&(this._renderer._updateStyle(this),this.options.stroke&&t&&t.hasOwnProperty("weight")&&this._updateBounds()),this},bringToFront:function(){return this._renderer&&this._renderer._bringToFront(this),this},bringToBack:function(){return this._renderer&&this._renderer._bringToBack(this),this},getElement:function(){return this._path},_reset:function(){this._project(),this._update()},_clickTolerance:function(){return(this.options.stroke?this.options.weight/2:0)+this._renderer.options.tolerance}}),Ne=Re.extend({options:{fill:!0,radius:10},initialize:function(t,i){p(this,i),this._latlng=W(t),this._radius=this.options.radius},setLatLng:function(t){var i=this._latlng;return this._latlng=W(t),this.redraw(),this.fire("move",{oldLatLng:i,latlng:this._latlng})},getLatLng:function(){return this._latlng},setRadius:function(t){return this.options.radius=this._radius=t,this.redraw()},getRadius:function(){return this._radius},setStyle:function(t){var i=t&&t.radius||this._radius;return Re.prototype.setStyle.call(this,t),this.setRadius(i),this},_project:function(){this._point=this._map.latLngToLayerPoint(this._latlng),this._updateBounds()},_updateBounds:function(){var t=this._radius,i=this._radiusY||t,e=this._clickTolerance(),n=[t+e,i+e];this._pxBounds=new O(this._point.subtract(n),this._point.add(n))},_update:function(){this._map&&this._updatePath()},_updatePath:function(){this._renderer._updateCircle(this)},_empty:function(){return this._radius&&!this._renderer._bounds.intersects(this._pxBounds)},_containsPoint:function(t){return t.distanceTo(this._point)<=this._radius+this._clickTolerance()}});var De=Ne.extend({initialize:function(t,i,e){if("number"==typeof i&&(i=h({},e,{radius:i})),p(this,i),this._latlng=W(t),isNaN(this.options.radius))throw new Error("Circle radius cannot be NaN");this._mRadius=this.options.radius},setRadius:function(t){return this._mRadius=t,this.redraw()},getRadius:function(){return this._mRadius},getBounds:function(){var t=[this._radius,this._radiusY||this._radius];return new N(this._map.layerPointToLatLng(this._point.subtract(t)),this._map.layerPointToLatLng(this._point.add(t)))},setStyle:Re.prototype.setStyle,_project:function(){var t=this._latlng.lng,i=this._latlng.lat,e=this._map,n=e.options.crs;if(n.distance===U.distance){var o=Math.PI/180,s=this._mRadius/U.R/o,r=e.project([i+s,t]),a=e.project([i-s,t]),h=r.add(a).divideBy(2),u=e.unproject(h).lat,l=Math.acos((Math.cos(s*o)-Math.sin(i*o)*Math.sin(u*o))/(Math.cos(i*o)*Math.cos(u*o)))/o;!isNaN(l)&&0!==l||(l=s/Math.cos(Math.PI/180*i)),this._point=h.subtract(e.getPixelOrigin()),this._radius=isNaN(l)?0:h.x-e.project([u,t-l]).x,this._radiusY=h.y-r.y}else{var c=n.unproject(n.project(this._latlng).subtract([this._mRadius,0]));this._point=e.latLngToLayerPoint(this._latlng),this._radius=this._point.x-e.latLngToLayerPoint(c).x}this._updateBounds()}});var je=Re.extend({options:{smoothFactor:1,noClip:!1},initialize:function(t,i){p(this,i),this._setLatLngs(t)},getLatLngs:function(){return this._latlngs},setLatLngs:function(t){return this._setLatLngs(t),this.redraw()},isEmpty:function(){return!this._latlngs.length},closestLayerPoint:function(t){for(var i,e,n=1/0,o=null,s=ge,r=0,a=this._parts.length;r<a;r++)for(var h=this._parts[r],u=1,l=h.length;u<l;u++){var c=s(t,i=h[u-1],e=h[u],!0);c<n&&(n=c,o=s(t,i,e))}return o&&(o.distance=Math.sqrt(n)),o},getCenter:function(){if(!this._map)throw new Error("Must add layer to map before using getCenter()");var t,i,e,n,o,s,r,a=this._rings[0],h=a.length;if(!h)return null;for(i=t=0;t<h-1;t++)i+=a[t].distanceTo(a[t+1])/2;if(0===i)return this._map.layerPointToLatLng(a[0]);for(n=t=0;t<h-1;t++)if(o=a[t],s=a[t+1],i<(n+=e=o.distanceTo(s)))return r=(n-i)/e,this._map.layerPointToLatLng([s.x-r*(s.x-o.x),s.y-r*(s.y-o.y)])},getBounds:function(){return this._bounds},addLatLng:function(t,i){return i=i||this._defaultShape(),t=W(t),i.push(t),this._bounds.extend(t),this.redraw()},_setLatLngs:function(t){this._bounds=new N,this._latlngs=this._convertLatLngs(t)},_defaultShape:function(){return ve(this._latlngs)?this._latlngs:this._latlngs[0]},_convertLatLngs:function(t){for(var i=[],e=ve(t),n=0,o=t.length;n<o;n++)e?(i[n]=W(t[n]),this._bounds.extend(i[n])):i[n]=this._convertLatLngs(t[n]);return i},_project:function(){var t=new O;this._rings=[],this._projectLatlngs(this._latlngs,this._rings,t),this._bounds.isValid()&&t.isValid()&&(this._rawPxBounds=t,this._updateBounds())},_updateBounds:function(){var t=this._clickTolerance(),i=new B(t,t);this._pxBounds=new O([this._rawPxBounds.min.subtract(i),this._rawPxBounds.max.add(i)])},_projectLatlngs:function(t,i,e){var n,o,s=t[0]instanceof j,r=t.length;if(s){for(o=[],n=0;n<r;n++)o[n]=this._map.latLngToLayerPoint(t[n]),e.extend(o[n]);i.push(o)}else for(n=0;n<r;n++)this._projectLatlngs(t[n],i,e)},_clipPoints:function(){var t=this._renderer._bounds;if(this._parts=[],this._pxBounds&&this._pxBounds.intersects(t))if(this.options.noClip)this._parts=this._rings;else{var i,e,n,o,s,r,a,h=this._parts;for(n=i=0,o=this._rings.length;i<o;i++)for(e=0,s=(a=this._rings[i]).length;e<s-1;e++)(r=pe(a[e],a[e+1],t,e,!0))&&(h[n]=h[n]||[],h[n].push(r[0]),r[1]===a[e+1]&&e!==s-2||(h[n].push(r[1]),n++))}},_simplifyPoints:function(){for(var t=this._parts,i=this.options.smoothFactor,e=0,n=t.length;e<n;e++)t[e]=_e(t[e],i)},_update:function(){this._map&&(this._clipPoints(),this._simplifyPoints(),this._updatePath())},_updatePath:function(){this._renderer._updatePoly(this)},_containsPoint:function(t,i){var e,n,o,s,r,a,h=this._clickTolerance();if(!this._pxBounds||!this._pxBounds.contains(t))return!1;for(e=0,s=this._parts.length;e<s;e++)for(n=0,o=(r=(a=this._parts[e]).length)-1;n<r;o=n++)if((i||0!==n)&&de(t,a[o],a[n])<=h)return!0;return!1}});je._flat=ye;var We=je.extend({options:{fill:!0},isEmpty:function(){return!this._latlngs.length||!this._latlngs[0].length},getCenter:function(){if(!this._map)throw new Error("Must add layer to map before using getCenter()");var t,i,e,n,o,s,r,a,h,u=this._rings[0],l=u.length;if(!l)return null;for(s=r=a=0,t=0,i=l-1;t<l;i=t++)e=u[t],n=u[i],o=e.y*n.x-n.y*e.x,r+=(e.x+n.x)*o,a+=(e.y+n.y)*o,s+=3*o;return h=0===s?u[0]:[r/s,a/s],this._map.layerPointToLatLng(h)},_convertLatLngs:function(t){var i=je.prototype._convertLatLngs.call(this,t),e=i.length;return 2<=e&&i[0]instanceof j&&i[0].equals(i[e-1])&&i.pop(),i},_setLatLngs:function(t){je.prototype._setLatLngs.call(this,t),ve(this._latlngs)&&(this._latlngs=[this._latlngs])},_defaultShape:function(){return ve(this._latlngs[0])?this._latlngs[0]:this._latlngs[0][0]},_clipPoints:function(){var t=this._renderer._bounds,i=this.options.weight,e=new B(i,i);if(t=new O(t.min.subtract(e),t.max.add(e)),this._parts=[],this._pxBounds&&this._pxBounds.intersects(t))if(this.options.noClip)this._parts=this._rings;else for(var n,o=0,s=this._rings.length;o<s;o++)(n=we(this._rings[o],t,!0)).length&&this._parts.push(n)},_updatePath:function(){this._renderer._updatePoly(this,!0)},_containsPoint:function(t){var i,e,n,o,s,r,a,h,u=!1;if(!this._pxBounds||!this._pxBounds.contains(t))return!1;for(o=0,a=this._parts.length;o<a;o++)for(s=0,r=(h=(i=this._parts[o]).length)-1;s<h;r=s++)e=i[s],n=i[r],e.y>t.y!=n.y>t.y&&t.x<(n.x-e.x)*(t.y-e.y)/(n.y-e.y)+e.x&&(u=!u);return u||je.prototype._containsPoint.call(this,t,!0)}});var He=ke.extend({initialize:function(t,i){p(this,i),this._layers={},t&&this.addData(t)},addData:function(t){var i,e,n,o=v(t)?t:t.features;if(o){for(i=0,e=o.length;i<e;i++)((n=o[i]).geometries||n.geometry||n.features||n.coordinates)&&this.addData(n);return this}var s=this.options;if(s.filter&&!s.filter(t))return this;var r=Fe(t,s);return r?(r.feature=Xe(t),r.defaultOptions=r.options,this.resetStyle(r),s.onEachFeature&&s.onEachFeature(t,r),this.addLayer(r)):this},resetStyle:function(t){return void 0===t?this.eachLayer(this.resetStyle,this):(t.options=h({},t.defaultOptions),this._setLayerStyle(t,this.options.style),this)},setStyle:function(i){return this.eachLayer(function(t){this._setLayerStyle(t,i)},this)},_setLayerStyle:function(t,i){t.setStyle&&("function"==typeof i&&(i=i(t.feature)),t.setStyle(i))}});function Fe(t,i){var e,n,o,s,r="Feature"===t.type?t.geometry:t,a=r?r.coordinates:null,h=[],u=i&&i.pointToLayer,l=i&&i.coordsToLatLng||Ve;if(!a&&!r)return null;switch(r.type){case"Point":return Ue(u,t,e=l(a),i);case"MultiPoint":for(o=0,s=a.length;o<s;o++)e=l(a[o]),h.push(Ue(u,t,e,i));return new ke(h);case"LineString":case"MultiLineString":return n=qe(a,"LineString"===r.type?0:1,l),new je(n,i);case"Polygon":case"MultiPolygon":return n=qe(a,"Polygon"===r.type?1:2,l),new We(n,i);case"GeometryCollection":for(o=0,s=r.geometries.length;o<s;o++){var c=Fe({geometry:r.geometries[o],type:"Feature",properties:t.properties},i);c&&h.push(c)}return new ke(h);default:throw new Error("Invalid GeoJSON object.")}}function Ue(t,i,e,n){return t?t(i,e):new Oe(e,n&&n.markersInheritOptions&&n)}function Ve(t){return new j(t[1],t[0],t[2])}function qe(t,i,e){for(var n,o=[],s=0,r=t.length;s<r;s++)n=i?qe(t[s],i-1,e):(e||Ve)(t[s]),o.push(n);return o}function Ge(t,i){return i="number"==typeof i?i:6,void 0!==t.alt?[c(t.lng,i),c(t.lat,i),c(t.alt,i)]:[c(t.lng,i),c(t.lat,i)]}function Ke(t,i,e,n){for(var o=[],s=0,r=t.length;s<r;s++)o.push(i?Ke(t[s],i-1,e,n):Ge(t[s],n));return!i&&e&&o.push(o[0]),o}function Ye(t,i){return t.feature?h({},t.feature,{geometry:i}):Xe(i)}function Xe(t){return"Feature"===t.type||"FeatureCollection"===t.type?t:{type:"Feature",properties:{},geometry:t}}var Je={toGeoJSON:function(t){return Ye(this,{type:"Point",coordinates:Ge(this.getLatLng(),t)})}};function $e(t,i){return new He(t,i)}Oe.include(Je),De.include(Je),Ne.include(Je),je.include({toGeoJSON:function(t){var i=!ve(this._latlngs);return Ye(this,{type:(i?"Multi":"")+"LineString",coordinates:Ke(this._latlngs,i?1:0,!1,t)})}}),We.include({toGeoJSON:function(t){var i=!ve(this._latlngs),e=i&&!ve(this._latlngs[0]),n=Ke(this._latlngs,e?2:i?1:0,!0,t);return i||(n=[n]),Ye(this,{type:(e?"Multi":"")+"Polygon",coordinates:n})}}),Ze.include({toMultiPoint:function(i){var e=[];return this.eachLayer(function(t){e.push(t.toGeoJSON(i).geometry.coordinates)}),Ye(this,{type:"MultiPoint",coordinates:e})},toGeoJSON:function(n){var t=this.feature&&this.feature.geometry&&this.feature.geometry.type;if("MultiPoint"===t)return this.toMultiPoint(n);var o="GeometryCollection"===t,s=[];return this.eachLayer(function(t){if(t.toGeoJSON){var i=t.toGeoJSON(n);if(o)s.push(i.geometry);else{var e=Xe(i);"FeatureCollection"===e.type?s.push.apply(s,e.features):s.push(e)}}}),o?Ye(this,{geometries:s,type:"GeometryCollection"}):{type:"FeatureCollection",features:s}}});var Qe=$e,tn=Se.extend({options:{opacity:1,alt:"",interactive:!1,crossOrigin:!1,errorOverlayUrl:"",zIndex:1,className:""},initialize:function(t,i,e){this._url=t,this._bounds=D(i),p(this,e)},onAdd:function(){this._image||(this._initImage(),this.options.opacity<1&&this._updateOpacity()),this.options.interactive&&(mi(this._image,"leaflet-interactive"),this.addInteractiveTarget(this._image)),this.getPane().appendChild(this._image),this._reset()},onRemove:function(){li(this._image),this.options.interactive&&this.removeInteractiveTarget(this._image)},setOpacity:function(t){return this.options.opacity=t,this._image&&this._updateOpacity(),this},setStyle:function(t){return t.opacity&&this.setOpacity(t.opacity),this},bringToFront:function(){return this._map&&_i(this._image),this},bringToBack:function(){return this._map&&di(this._image),this},setUrl:function(t){return this._url=t,this._image&&(this._image.src=t),this},setBounds:function(t){return this._bounds=D(t),this._map&&this._reset(),this},getEvents:function(){var t={zoom:this._reset,viewreset:this._reset};return this._zoomAnimated&&(t.zoomanim=this._animateZoom),t},setZIndex:function(t){return this.options.zIndex=t,this._updateZIndex(),this},getBounds:function(){return this._bounds},getElement:function(){return this._image},_initImage:function(){var t="IMG"===this._url.tagName,i=this._image=t?this._url:ui("img");mi(i,"leaflet-image-layer"),this._zoomAnimated&&mi(i,"leaflet-zoom-animated"),this.options.className&&mi(i,this.options.className),i.onselectstart=l,i.onmousemove=l,i.onload=a(this.fire,this,"load"),i.onerror=a(this._overlayOnError,this,"error"),!this.options.crossOrigin&&""!==this.options.crossOrigin||(i.crossOrigin=!0===this.options.crossOrigin?"":this.options.crossOrigin),this.options.zIndex&&this._updateZIndex(),t?this._url=i.src:(i.src=this._url,i.alt=this.options.alt)},_animateZoom:function(t){var i=this._map.getZoomScale(t.zoom),e=this._map._latLngBoundsToNewLayerBounds(this._bounds,t.zoom,t.center).min;wi(this._image,e,i)},_reset:function(){var t=this._image,i=new O(this._map.latLngToLayerPoint(this._bounds.getNorthWest()),this._map.latLngToLayerPoint(this._bounds.getSouthEast())),e=i.getSize();Pi(t,i.min),t.style.width=e.x+"px",t.style.height=e.y+"px"},_updateOpacity:function(){yi(this._image,this.options.opacity)},_updateZIndex:function(){this._image&&void 0!==this.options.zIndex&&null!==this.options.zIndex&&(this._image.style.zIndex=this.options.zIndex)},_overlayOnError:function(){this.fire("error");var t=this.options.errorOverlayUrl;t&&this._url!==t&&(this._url=t,this._image.src=t)}}),en=tn.extend({options:{autoplay:!0,loop:!0,keepAspectRatio:!0},_initImage:function(){var t="VIDEO"===this._url.tagName,i=this._image=t?this._url:ui("video");if(mi(i,"leaflet-image-layer"),this._zoomAnimated&&mi(i,"leaflet-zoom-animated"),this.options.className&&mi(i,this.options.className),i.onselectstart=l,i.onmousemove=l,i.onloadeddata=a(this.fire,this,"load"),t){for(var e=i.getElementsByTagName("source"),n=[],o=0;o<e.length;o++)n.push(e[o].src);this._url=0<e.length?n:[i.src]}else{v(this._url)||(this._url=[this._url]),!this.options.keepAspectRatio&&i.style.hasOwnProperty("objectFit")&&(i.style.objectFit="fill"),i.autoplay=!!this.options.autoplay,i.loop=!!this.options.loop;for(var s=0;s<this._url.length;s++){var r=ui("source");r.src=this._url[s],i.appendChild(r)}}}});var nn=tn.extend({_initImage:function(){var t=this._image=this._url;mi(t,"leaflet-image-layer"),this._zoomAnimated&&mi(t,"leaflet-zoom-animated"),this.options.className&&mi(t,this.options.className),t.onselectstart=l,t.onmousemove=l}});var on=Se.extend({options:{offset:[0,7],className:"",pane:"popupPane"},initialize:function(t,i){p(this,t),this._source=i},onAdd:function(t){this._zoomAnimated=t._zoomAnimated,this._container||this._initLayout(),t._fadeAnimated&&yi(this._container,0),clearTimeout(this._removeTimeout),this.getPane().appendChild(this._container),this.update(),t._fadeAnimated&&yi(this._container,1),this.bringToFront()},onRemove:function(t){t._fadeAnimated?(yi(this._container,0),this._removeTimeout=setTimeout(a(li,void 0,this._container),200)):li(this._container)},getLatLng:function(){return this._latlng},setLatLng:function(t){return this._latlng=W(t),this._map&&(this._updatePosition(),this._adjustPan()),this},getContent:function(){return this._content},setContent:function(t){return this._content=t,this.update(),this},getElement:function(){return this._container},update:function(){this._map&&(this._container.style.visibility="hidden",this._updateContent(),this._updateLayout(),this._updatePosition(),this._container.style.visibility="",this._adjustPan())},getEvents:function(){var t={zoom:this._updatePosition,viewreset:this._updatePosition};return this._zoomAnimated&&(t.zoomanim=this._animateZoom),t},isOpen:function(){return!!this._map&&this._map.hasLayer(this)},bringToFront:function(){return this._map&&_i(this._container),this},bringToBack:function(){return this._map&&di(this._container),this},_prepareOpen:function(t,i,e){if(i instanceof Se||(e=i,i=t),i instanceof ke)for(var n in t._layers){i=t._layers[n];break}if(!e)if(i.getCenter)e=i.getCenter();else{if(!i.getLatLng)throw new Error("Unable to get source layer LatLng.");e=i.getLatLng()}return this._source=i,this.update(),e},_updateContent:function(){if(this._content){var t=this._contentNode,i="function"==typeof this._content?this._content(this._source||this):this._content;if("string"==typeof i)t.innerHTML=i;else{for(;t.hasChildNodes();)t.removeChild(t.firstChild);t.appendChild(i)}this.fire("contentupdate")}},_updatePosition:function(){if(this._map){var t=this._map.latLngToLayerPoint(this._latlng),i=I(this.options.offset),e=this._getAnchor();this._zoomAnimated?Pi(this._container,t.add(e)):i=i.add(t).add(e);var n=this._containerBottom=-i.y,o=this._containerLeft=-Math.round(this._containerWidth/2)+i.x;this._container.style.bottom=n+"px",this._container.style.left=o+"px"}},_getAnchor:function(){return[0,0]}}),sn=on.extend({options:{maxWidth:300,minWidth:50,maxHeight:null,autoPan:!0,autoPanPaddingTopLeft:null,autoPanPaddingBottomRight:null,autoPanPadding:[5,5],keepInView:!1,closeButton:!0,autoClose:!0,closeOnEscapeKey:!0,className:""},openOn:function(t){return t.openPopup(this),this},onAdd:function(t){on.prototype.onAdd.call(this,t),t.fire("popupopen",{popup:this}),this._source&&(this._source.fire("popupopen",{popup:this},!0),this._source instanceof Re||this._source.on("preclick",Ri))},onRemove:function(t){on.prototype.onRemove.call(this,t),t.fire("popupclose",{popup:this}),this._source&&(this._source.fire("popupclose",{popup:this},!0),this._source instanceof Re||this._source.off("preclick",Ri))},getEvents:function(){var t=on.prototype.getEvents.call(this);return(void 0!==this.options.closeOnClick?this.options.closeOnClick:this._map.options.closePopupOnClick)&&(t.preclick=this._close),this.options.keepInView&&(t.moveend=this._adjustPan),t},_close:function(){this._map&&this._map.closePopup(this)},_initLayout:function(){var t="leaflet-popup",i=this._container=ui("div",t+" "+(this.options.className||"")+" leaflet-zoom-animated"),e=this._wrapper=ui("div",t+"-content-wrapper",i);if(this._contentNode=ui("div",t+"-content",e),Di(e),Ni(this._contentNode),ki(e,"contextmenu",Ri),this._tipContainer=ui("div",t+"-tip-container",i),this._tip=ui("div",t+"-tip",this._tipContainer),this.options.closeButton){var n=this._closeButton=ui("a",t+"-close-button",i);n.href="#close",n.innerHTML="&#215;",ki(n,"click",this._onCloseButtonClick,this)}},_updateLayout:function(){var t=this._contentNode,i=t.style;i.width="",i.whiteSpace="nowrap";var e=t.offsetWidth;e=Math.min(e,this.options.maxWidth),e=Math.max(e,this.options.minWidth),i.width=e+1+"px",i.whiteSpace="",i.height="";var n=t.offsetHeight,o=this.options.maxHeight,s="leaflet-popup-scrolled";o&&o<n?(i.height=o+"px",mi(t,s)):fi(t,s),this._containerWidth=this._container.offsetWidth},_animateZoom:function(t){var i=this._map._latLngToNewLayerPoint(this._latlng,t.zoom,t.center),e=this._getAnchor();Pi(this._container,i.add(e))},_adjustPan:function(){if(this.options.autoPan){this._map._panAnim&&this._map._panAnim.stop();var t=this._map,i=parseInt(hi(this._container,"marginBottom"),10)||0,e=this._container.offsetHeight+i,n=this._containerWidth,o=new B(this._containerLeft,-e-this._containerBottom);o._add(Li(this._container));var s=t.layerPointToContainerPoint(o),r=I(this.options.autoPanPadding),a=I(this.options.autoPanPaddingTopLeft||r),h=I(this.options.autoPanPaddingBottomRight||r),u=t.getSize(),l=0,c=0;s.x+n+h.x>u.x&&(l=s.x+n-u.x+h.x),s.x-l-a.x<0&&(l=s.x-a.x),s.y+e+h.y>u.y&&(c=s.y+e-u.y+h.y),s.y-c-a.y<0&&(c=s.y-a.y),(l||c)&&t.fire("autopanstart").panBy([l,c])}},_onCloseButtonClick:function(t){this._close(),Wi(t)},_getAnchor:function(){return I(this._source&&this._source._getPopupAnchor?this._source._getPopupAnchor():[0,0])}});$i.mergeOptions({closePopupOnClick:!0}),$i.include({openPopup:function(t,i,e){return t instanceof sn||(t=new sn(e).setContent(t)),i&&t.setLatLng(i),this.hasLayer(t)?this:(this._popup&&this._popup.options.autoClose&&this.closePopup(),this._popup=t,this.addLayer(t))},closePopup:function(t){return t&&t!==this._popup||(t=this._popup,this._popup=null),t&&this.removeLayer(t),this}}),Se.include({bindPopup:function(t,i){return t instanceof sn?(p(t,i),(this._popup=t)._source=this):(this._popup&&!i||(this._popup=new sn(i,this)),this._popup.setContent(t)),this._popupHandlersAdded||(this.on({click:this._openPopup,keypress:this._onKeyPress,remove:this.closePopup,move:this._movePopup}),this._popupHandlersAdded=!0),this},unbindPopup:function(){return this._popup&&(this.off({click:this._openPopup,keypress:this._onKeyPress,remove:this.closePopup,move:this._movePopup}),this._popupHandlersAdded=!1,this._popup=null),this},openPopup:function(t,i){return this._popup&&this._map&&(i=this._popup._prepareOpen(this,t,i),this._map.openPopup(this._popup,i)),this},closePopup:function(){return this._popup&&this._popup._close(),this},togglePopup:function(t){return this._popup&&(this._popup._map?this.closePopup():this.openPopup(t)),this},isPopupOpen:function(){return!!this._popup&&this._popup.isOpen()},setPopupContent:function(t){return this._popup&&this._popup.setContent(t),this},getPopup:function(){return this._popup},_openPopup:function(t){var i=t.layer||t.target;this._popup&&this._map&&(Wi(t),i instanceof Re?this.openPopup(t.layer||t.target,t.latlng):this._map.hasLayer(this._popup)&&this._popup._source===i?this.closePopup():this.openPopup(i,t.latlng))},_movePopup:function(t){this._popup.setLatLng(t.latlng)},_onKeyPress:function(t){13===t.originalEvent.keyCode&&this._openPopup(t)}});var rn=on.extend({options:{pane:"tooltipPane",offset:[0,0],direction:"auto",permanent:!1,sticky:!1,interactive:!1,opacity:.9},onAdd:function(t){on.prototype.onAdd.call(this,t),this.setOpacity(this.options.opacity),t.fire("tooltipopen",{tooltip:this}),this._source&&this._source.fire("tooltipopen",{tooltip:this},!0)},onRemove:function(t){on.prototype.onRemove.call(this,t),t.fire("tooltipclose",{tooltip:this}),this._source&&this._source.fire("tooltipclose",{tooltip:this},!0)},getEvents:function(){var t=on.prototype.getEvents.call(this);return Tt&&!this.options.permanent&&(t.preclick=this._close),t},_close:function(){this._map&&this._map.closeTooltip(this)},_initLayout:function(){var t="leaflet-tooltip "+(this.options.className||"")+" leaflet-zoom-"+(this._zoomAnimated?"animated":"hide");this._contentNode=this._container=ui("div",t)},_updateLayout:function(){},_adjustPan:function(){},_setPosition:function(t){var i=this._map,e=this._container,n=i.latLngToContainerPoint(i.getCenter()),o=i.layerPointToContainerPoint(t),s=this.options.direction,r=e.offsetWidth,a=e.offsetHeight,h=I(this.options.offset),u=this._getAnchor();t="top"===s?t.add(I(-r/2+h.x,-a+h.y+u.y,!0)):"bottom"===s?t.subtract(I(r/2-h.x,-h.y,!0)):"center"===s?t.subtract(I(r/2+h.x,a/2-u.y+h.y,!0)):"right"===s||"auto"===s&&o.x<n.x?(s="right",t.add(I(h.x+u.x,u.y-a/2+h.y,!0))):(s="left",t.subtract(I(r+u.x-h.x,a/2-u.y-h.y,!0))),fi(e,"leaflet-tooltip-right"),fi(e,"leaflet-tooltip-left"),fi(e,"leaflet-tooltip-top"),fi(e,"leaflet-tooltip-bottom"),mi(e,"leaflet-tooltip-"+s),Pi(e,t)},_updatePosition:function(){var t=this._map.latLngToLayerPoint(this._latlng);this._setPosition(t)},setOpacity:function(t){this.options.opacity=t,this._container&&yi(this._container,t)},_animateZoom:function(t){var i=this._map._latLngToNewLayerPoint(this._latlng,t.zoom,t.center);this._setPosition(i)},_getAnchor:function(){return I(this._source&&this._source._getTooltipAnchor&&!this.options.sticky?this._source._getTooltipAnchor():[0,0])}});$i.include({openTooltip:function(t,i,e){return t instanceof rn||(t=new rn(e).setContent(t)),i&&t.setLatLng(i),this.hasLayer(t)?this:this.addLayer(t)},closeTooltip:function(t){return t&&this.removeLayer(t),this}}),Se.include({bindTooltip:function(t,i){return t instanceof rn?(p(t,i),(this._tooltip=t)._source=this):(this._tooltip&&!i||(this._tooltip=new rn(i,this)),this._tooltip.setContent(t)),this._initTooltipInteractions(),this._tooltip.options.permanent&&this._map&&this._map.hasLayer(this)&&this.openTooltip(),this},unbindTooltip:function(){return this._tooltip&&(this._initTooltipInteractions(!0),this.closeTooltip(),this._tooltip=null),this},_initTooltipInteractions:function(t){if(t||!this._tooltipHandlersAdded){var i=t?"off":"on",e={remove:this.closeTooltip,move:this._moveTooltip};this._tooltip.options.permanent?e.add=this._openTooltip:(e.mouseover=this._openTooltip,e.mouseout=this.closeTooltip,this._tooltip.options.sticky&&(e.mousemove=this._moveTooltip),Tt&&(e.click=this._openTooltip)),this[i](e),this._tooltipHandlersAdded=!t}},openTooltip:function(t,i){return this._tooltip&&this._map&&(i=this._tooltip._prepareOpen(this,t,i),this._map.openTooltip(this._tooltip,i),this._tooltip.options.interactive&&this._tooltip._container&&(mi(this._tooltip._container,"leaflet-clickable"),this.addInteractiveTarget(this._tooltip._container))),this},closeTooltip:function(){return this._tooltip&&(this._tooltip._close(),this._tooltip.options.interactive&&this._tooltip._container&&(fi(this._tooltip._container,"leaflet-clickable"),this.removeInteractiveTarget(this._tooltip._container))),this},toggleTooltip:function(t){return this._tooltip&&(this._tooltip._map?this.closeTooltip():this.openTooltip(t)),this},isTooltipOpen:function(){return this._tooltip.isOpen()},setTooltipContent:function(t){return this._tooltip&&this._tooltip.setContent(t),this},getTooltip:function(){return this._tooltip},_openTooltip:function(t){var i=t.layer||t.target;this._tooltip&&this._map&&this.openTooltip(i,this._tooltip.options.sticky?t.latlng:void 0)},_moveTooltip:function(t){var i,e,n=t.latlng;this._tooltip.options.sticky&&t.originalEvent&&(i=this._map.mouseEventToContainerPoint(t.originalEvent),e=this._map.containerPointToLayerPoint(i),n=this._map.layerPointToLatLng(e)),this._tooltip.setLatLng(n)}});var an=Be.extend({options:{iconSize:[12,12],html:!1,bgPos:null,className:"leaflet-div-icon"},createIcon:function(t){var i=t&&"DIV"===t.tagName?t:document.createElement("div"),e=this.options;if(e.html instanceof Element?(ci(i),i.appendChild(e.html)):i.innerHTML=!1!==e.html?e.html:"",e.bgPos){var n=I(e.bgPos);i.style.backgroundPosition=-n.x+"px "+-n.y+"px"}return this._setIconStyles(i,"icon"),i},createShadow:function(){return null}});Be.Default=Ae;var hn=Se.extend({options:{tileSize:256,opacity:1,updateWhenIdle:xt,updateWhenZooming:!0,updateInterval:200,zIndex:1,bounds:null,minZoom:0,maxZoom:void 0,maxNativeZoom:void 0,minNativeZoom:void 0,noWrap:!1,pane:"tilePane",className:"",keepBuffer:2},initialize:function(t){p(this,t)},onAdd:function(){this._initContainer(),this._levels={},this._tiles={},this._resetView(),this._update()},beforeAdd:function(t){t._addZoomLimit(this)},onRemove:function(t){this._removeAllTiles(),li(this._container),t._removeZoomLimit(this),this._container=null,this._tileZoom=void 0},bringToFront:function(){return this._map&&(_i(this._container),this._setAutoZIndex(Math.max)),this},bringToBack:function(){return this._map&&(di(this._container),this._setAutoZIndex(Math.min)),this},getContainer:function(){return this._container},setOpacity:function(t){return this.options.opacity=t,this._updateOpacity(),this},setZIndex:function(t){return this.options.zIndex=t,this._updateZIndex(),this},isLoading:function(){return this._loading},redraw:function(){return this._map&&(this._removeAllTiles(),this._update()),this},getEvents:function(){var t={viewprereset:this._invalidateAll,viewreset:this._resetView,zoom:this._resetView,moveend:this._onMoveEnd};return this.options.updateWhenIdle||(this._onMove||(this._onMove=o(this._onMoveEnd,this.options.updateInterval,this)),t.move=this._onMove),this._zoomAnimated&&(t.zoomanim=this._animateZoom),t},createTile:function(){return document.createElement("div")},getTileSize:function(){var t=this.options.tileSize;return t instanceof B?t:new B(t,t)},_updateZIndex:function(){this._container&&void 0!==this.options.zIndex&&null!==this.options.zIndex&&(this._container.style.zIndex=this.options.zIndex)},_setAutoZIndex:function(t){for(var i,e=this.getPane().children,n=-t(-1/0,1/0),o=0,s=e.length;o<s;o++)i=e[o].style.zIndex,e[o]!==this._container&&i&&(n=t(n,+i));isFinite(n)&&(this.options.zIndex=n+t(-1,1),this._updateZIndex())},_updateOpacity:function(){if(this._map&&!et){yi(this._container,this.options.opacity);var t=+new Date,i=!1,e=!1;for(var n in this._tiles){var o=this._tiles[n];if(o.current&&o.loaded){var s=Math.min(1,(t-o.loaded)/200);yi(o.el,s),s<1?i=!0:(o.active?e=!0:this._onOpaqueTile(o),o.active=!0)}}e&&!this._noPrune&&this._pruneTiles(),i&&(C(this._fadeFrame),this._fadeFrame=M(this._updateOpacity,this))}},_onOpaqueTile:l,_initContainer:function(){this._container||(this._container=ui("div","leaflet-layer "+(this.options.className||"")),this._updateZIndex(),this.options.opacity<1&&this._updateOpacity(),this.getPane().appendChild(this._container))},_updateLevels:function(){var t=this._tileZoom,i=this.options.maxZoom;if(void 0!==t){for(var e in this._levels)this._levels[e].el.children.length||e===t?(this._levels[e].el.style.zIndex=i-Math.abs(t-e),this._onUpdateLevel(e)):(li(this._levels[e].el),this._removeTilesAtZoom(e),this._onRemoveLevel(e),delete this._levels[e]);var n=this._levels[t],o=this._map;return n||((n=this._levels[t]={}).el=ui("div","leaflet-tile-container leaflet-zoom-animated",this._container),n.el.style.zIndex=i,n.origin=o.project(o.unproject(o.getPixelOrigin()),t).round(),n.zoom=t,this._setZoomTransform(n,o.getCenter(),o.getZoom()),n.el.offsetWidth,this._onCreateLevel(n)),this._level=n}},_onUpdateLevel:l,_onRemoveLevel:l,_onCreateLevel:l,_pruneTiles:function(){if(this._map){var t,i,e=this._map.getZoom();if(e>this.options.maxZoom||e<this.options.minZoom)this._removeAllTiles();else{for(t in this._tiles)(i=this._tiles[t]).retain=i.current;for(t in this._tiles)if((i=this._tiles[t]).current&&!i.active){var n=i.coords;this._retainParent(n.x,n.y,n.z,n.z-5)||this._retainChildren(n.x,n.y,n.z,n.z+2)}for(t in this._tiles)this._tiles[t].retain||this._removeTile(t)}}},_removeTilesAtZoom:function(t){for(var i in this._tiles)this._tiles[i].coords.z===t&&this._removeTile(i)},_removeAllTiles:function(){for(var t in this._tiles)this._removeTile(t)},_invalidateAll:function(){for(var t in this._levels)li(this._levels[t].el),this._onRemoveLevel(t),delete this._levels[t];this._removeAllTiles(),this._tileZoom=void 0},_retainParent:function(t,i,e,n){var o=Math.floor(t/2),s=Math.floor(i/2),r=e-1,a=new B(+o,+s);a.z=+r;var h=this._tileCoordsToKey(a),u=this._tiles[h];return u&&u.active?u.retain=!0:(u&&u.loaded&&(u.retain=!0),n<r&&this._retainParent(o,s,r,n))},_retainChildren:function(t,i,e,n){for(var o=2*t;o<2*t+2;o++)for(var s=2*i;s<2*i+2;s++){var r=new B(o,s);r.z=e+1;var a=this._tileCoordsToKey(r),h=this._tiles[a];h&&h.active?h.retain=!0:(h&&h.loaded&&(h.retain=!0),e+1<n&&this._retainChildren(o,s,e+1,n))}},_resetView:function(t){var i=t&&(t.pinch||t.flyTo);this._setView(this._map.getCenter(),this._map.getZoom(),i,i)},_animateZoom:function(t){this._setView(t.center,t.zoom,!0,t.noUpdate)},_clampZoom:function(t){var i=this.options;return void 0!==i.minNativeZoom&&t<i.minNativeZoom?i.minNativeZoom:void 0!==i.maxNativeZoom&&i.maxNativeZoom<t?i.maxNativeZoom:t},_setView:function(t,i,e,n){var o=this._clampZoom(Math.round(i));(void 0!==this.options.maxZoom&&o>this.options.maxZoom||void 0!==this.options.minZoom&&o<this.options.minZoom)&&(o=void 0);var s=this.options.updateWhenZooming&&o!==this._tileZoom;n&&!s||(this._tileZoom=o,this._abortLoading&&this._abortLoading(),this._updateLevels(),this._resetGrid(),void 0!==o&&this._update(t),e||this._pruneTiles(),this._noPrune=!!e),this._setZoomTransforms(t,i)},_setZoomTransforms:function(t,i){for(var e in this._levels)this._setZoomTransform(this._levels[e],t,i)},_setZoomTransform:function(t,i,e){var n=this._map.getZoomScale(e,t.zoom),o=t.origin.multiplyBy(n).subtract(this._map._getNewPixelOrigin(i,e)).round();yt?wi(t.el,o,n):Pi(t.el,o)},_resetGrid:function(){var t=this._map,i=t.options.crs,e=this._tileSize=this.getTileSize(),n=this._tileZoom,o=this._map.getPixelWorldBounds(this._tileZoom);o&&(this._globalTileRange=this._pxBoundsToTileRange(o)),this._wrapX=i.wrapLng&&!this.options.noWrap&&[Math.floor(t.project([0,i.wrapLng[0]],n).x/e.x),Math.ceil(t.project([0,i.wrapLng[1]],n).x/e.y)],this._wrapY=i.wrapLat&&!this.options.noWrap&&[Math.floor(t.project([i.wrapLat[0],0],n).y/e.x),Math.ceil(t.project([i.wrapLat[1],0],n).y/e.y)]},_onMoveEnd:function(){this._map&&!this._map._animatingZoom&&this._update()},_getTiledPixelBounds:function(t){var i=this._map,e=i._animatingZoom?Math.max(i._animateToZoom,i.getZoom()):i.getZoom(),n=i.getZoomScale(e,this._tileZoom),o=i.project(t,this._tileZoom).floor(),s=i.getSize().divideBy(2*n);return new O(o.subtract(s),o.add(s))},_update:function(t){var i=this._map;if(i){var e=this._clampZoom(i.getZoom());if(void 0===t&&(t=i.getCenter()),void 0!==this._tileZoom){var n=this._getTiledPixelBounds(t),o=this._pxBoundsToTileRange(n),s=o.getCenter(),r=[],a=this.options.keepBuffer,h=new O(o.getBottomLeft().subtract([a,-a]),o.getTopRight().add([a,-a]));if(!(isFinite(o.min.x)&&isFinite(o.min.y)&&isFinite(o.max.x)&&isFinite(o.max.y)))throw new Error("Attempted to load an infinite number of tiles");for(var u in this._tiles){var l=this._tiles[u].coords;l.z===this._tileZoom&&h.contains(new B(l.x,l.y))||(this._tiles[u].current=!1)}if(1<Math.abs(e-this._tileZoom))this._setView(t,e);else{for(var c=o.min.y;c<=o.max.y;c++)for(var _=o.min.x;_<=o.max.x;_++){var d=new B(_,c);if(d.z=this._tileZoom,this._isValidTile(d)){var p=this._tiles[this._tileCoordsToKey(d)];p?p.current=!0:r.push(d)}}if(r.sort(function(t,i){return t.distanceTo(s)-i.distanceTo(s)}),0!==r.length){this._loading||(this._loading=!0,this.fire("loading"));var m=document.createDocumentFragment();for(_=0;_<r.length;_++)this._addTile(r[_],m);this._level.el.appendChild(m)}}}}},_isValidTile:function(t){var i=this._map.options.crs;if(!i.infinite){var e=this._globalTileRange;if(!i.wrapLng&&(t.x<e.min.x||t.x>e.max.x)||!i.wrapLat&&(t.y<e.min.y||t.y>e.max.y))return!1}if(!this.options.bounds)return!0;var n=this._tileCoordsToBounds(t);return D(this.options.bounds).overlaps(n)},_keyToBounds:function(t){return this._tileCoordsToBounds(this._keyToTileCoords(t))},_tileCoordsToNwSe:function(t){var i=this._map,e=this.getTileSize(),n=t.scaleBy(e),o=n.add(e);return[i.unproject(n,t.z),i.unproject(o,t.z)]},_tileCoordsToBounds:function(t){var i=this._tileCoordsToNwSe(t),e=new N(i[0],i[1]);return this.options.noWrap||(e=this._map.wrapLatLngBounds(e)),e},_tileCoordsToKey:function(t){return t.x+":"+t.y+":"+t.z},_keyToTileCoords:function(t){var i=t.split(":"),e=new B(+i[0],+i[1]);return e.z=+i[2],e},_removeTile:function(t){var i=this._tiles[t];i&&(li(i.el),delete this._tiles[t],this.fire("tileunload",{tile:i.el,coords:this._keyToTileCoords(t)}))},_initTile:function(t){mi(t,"leaflet-tile");var i=this.getTileSize();t.style.width=i.x+"px",t.style.height=i.y+"px",t.onselectstart=l,t.onmousemove=l,et&&this.options.opacity<1&&yi(t,this.options.opacity),st&&!rt&&(t.style.WebkitBackfaceVisibility="hidden")},_addTile:function(t,i){var e=this._getTilePos(t),n=this._tileCoordsToKey(t),o=this.createTile(this._wrapCoords(t),a(this._tileReady,this,t));this._initTile(o),this.createTile.length<2&&M(a(this._tileReady,this,t,null,o)),Pi(o,e),this._tiles[n]={el:o,coords:t,current:!0},i.appendChild(o),this.fire("tileloadstart",{tile:o,coords:t})},_tileReady:function(t,i,e){i&&this.fire("tileerror",{error:i,tile:e,coords:t});var n=this._tileCoordsToKey(t);(e=this._tiles[n])&&(e.loaded=+new Date,this._map._fadeAnimated?(yi(e.el,0),C(this._fadeFrame),this._fadeFrame=M(this._updateOpacity,this)):(e.active=!0,this._pruneTiles()),i||(mi(e.el,"leaflet-tile-loaded"),this.fire("tileload",{tile:e.el,coords:t})),this._noTilesToLoad()&&(this._loading=!1,this.fire("load"),et||!this._map._fadeAnimated?M(this._pruneTiles,this):setTimeout(a(this._pruneTiles,this),250)))},_getTilePos:function(t){return t.scaleBy(this.getTileSize()).subtract(this._level.origin)},_wrapCoords:function(t){var i=new B(this._wrapX?r(t.x,this._wrapX):t.x,this._wrapY?r(t.y,this._wrapY):t.y);return i.z=t.z,i},_pxBoundsToTileRange:function(t){var i=this.getTileSize();return new O(t.min.unscaleBy(i).floor(),t.max.unscaleBy(i).ceil().subtract([1,1]))},_noTilesToLoad:function(){for(var t in this._tiles)if(!this._tiles[t].loaded)return!1;return!0}});var un=hn.extend({options:{minZoom:0,maxZoom:18,subdomains:"abc",errorTileUrl:"",zoomOffset:0,tms:!1,zoomReverse:!1,detectRetina:!1,crossOrigin:!1},initialize:function(t,i){this._url=t,(i=p(this,i)).detectRetina&&Ct&&0<i.maxZoom&&(i.tileSize=Math.floor(i.tileSize/2),i.zoomReverse?(i.zoomOffset--,i.minZoom++):(i.zoomOffset++,i.maxZoom--),i.minZoom=Math.max(0,i.minZoom)),"string"==typeof i.subdomains&&(i.subdomains=i.subdomains.split("")),st||this.on("tileunload",this._onTileRemove)},setUrl:function(t,i){return this._url===t&&void 0===i&&(i=!0),this._url=t,i||this.redraw(),this},createTile:function(t,i){var e=document.createElement("img");return ki(e,"load",a(this._tileOnLoad,this,i,e)),ki(e,"error",a(this._tileOnError,this,i,e)),!this.options.crossOrigin&&""!==this.options.crossOrigin||(e.crossOrigin=!0===this.options.crossOrigin?"":this.options.crossOrigin),e.alt="",e.setAttribute("role","presentation"),e.src=this.getTileUrl(t),e},getTileUrl:function(t){var i={r:Ct?"@2x":"",s:this._getSubdomain(t),x:t.x,y:t.y,z:this._getZoomForUrl()};if(this._map&&!this._map.options.crs.infinite){var e=this._globalTileRange.max.y-t.y;this.options.tms&&(i.y=e),i["-y"]=e}return g(this._url,h(i,this.options))},_tileOnLoad:function(t,i){et?setTimeout(a(t,this,null,i),0):t(null,i)},_tileOnError:function(t,i,e){var n=this.options.errorTileUrl;n&&i.getAttribute("src")!==n&&(i.src=n),t(e,i)},_onTileRemove:function(t){t.tile.onload=null},_getZoomForUrl:function(){var t=this._tileZoom,i=this.options.maxZoom;return this.options.zoomReverse&&(t=i-t),t+this.options.zoomOffset},_getSubdomain:function(t){var i=Math.abs(t.x+t.y)%this.options.subdomains.length;return this.options.subdomains[i]},_abortLoading:function(){var t,i;for(t in this._tiles)this._tiles[t].coords.z!==this._tileZoom&&((i=this._tiles[t].el).onload=l,i.onerror=l,i.complete||(i.src=x,li(i),delete this._tiles[t]))},_removeTile:function(t){var i=this._tiles[t];if(i)return ht||i.el.setAttribute("src",x),hn.prototype._removeTile.call(this,t)},_tileReady:function(t,i,e){if(this._map&&(!e||e.getAttribute("src")!==x))return hn.prototype._tileReady.call(this,t,i,e)}});function ln(t,i){return new un(t,i)}var cn=un.extend({defaultWmsParams:{service:"WMS",request:"GetMap",layers:"",styles:"",format:"image/jpeg",transparent:!1,version:"1.1.1"},options:{crs:null,uppercase:!1},initialize:function(t,i){this._url=t;var e=h({},this.defaultWmsParams);for(var n in i)n in this.options||(e[n]=i[n]);var o=(i=p(this,i)).detectRetina&&Ct?2:1,s=this.getTileSize();e.width=s.x*o,e.height=s.y*o,this.wmsParams=e},onAdd:function(t){this._crs=this.options.crs||t.options.crs,this._wmsVersion=parseFloat(this.wmsParams.version);var i=1.3<=this._wmsVersion?"crs":"srs";this.wmsParams[i]=this._crs.code,un.prototype.onAdd.call(this,t)},getTileUrl:function(t){var i=this._tileCoordsToNwSe(t),e=this._crs,n=R(e.project(i[0]),e.project(i[1])),o=n.min,s=n.max,r=(1.3<=this._wmsVersion&&this._crs===Ce?[o.y,o.x,s.y,s.x]:[o.x,o.y,s.x,s.y]).join(","),a=un.prototype.getTileUrl.call(this,t);return a+m(this.wmsParams,a,this.options.uppercase)+(this.options.uppercase?"&BBOX=":"&bbox=")+r},setParams:function(t,i){return h(this.wmsParams,t),i||this.redraw(),this}});un.WMS=cn,ln.wms=function(t,i){return new cn(t,i)};var _n=Se.extend({options:{padding:.1,tolerance:0},initialize:function(t){p(this,t),u(this),this._layers=this._layers||{}},onAdd:function(){this._container||(this._initContainer(),this._zoomAnimated&&mi(this._container,"leaflet-zoom-animated")),this.getPane().appendChild(this._container),this._update(),this.on("update",this._updatePaths,this)},onRemove:function(){this.off("update",this._updatePaths,this),this._destroyContainer()},getEvents:function(){var t={viewreset:this._reset,zoom:this._onZoom,moveend:this._update,zoomend:this._onZoomEnd};return this._zoomAnimated&&(t.zoomanim=this._onAnimZoom),t},_onAnimZoom:function(t){this._updateTransform(t.center,t.zoom)},_onZoom:function(){this._updateTransform(this._map.getCenter(),this._map.getZoom())},_updateTransform:function(t,i){var e=this._map.getZoomScale(i,this._zoom),n=Li(this._container),o=this._map.getSize().multiplyBy(.5+this.options.padding),s=this._map.project(this._center,i),r=this._map.project(t,i).subtract(s),a=o.multiplyBy(-e).add(n).add(o).subtract(r);yt?wi(this._container,a,e):Pi(this._container,a)},_reset:function(){for(var t in this._update(),this._updateTransform(this._center,this._zoom),this._layers)this._layers[t]._reset()},_onZoomEnd:function(){for(var t in this._layers)this._layers[t]._project()},_updatePaths:function(){for(var t in this._layers)this._layers[t]._update()},_update:function(){var t=this.options.padding,i=this._map.getSize(),e=this._map.containerPointToLayerPoint(i.multiplyBy(-t)).round();this._bounds=new O(e,e.add(i.multiplyBy(1+2*t)).round()),this._center=this._map.getCenter(),this._zoom=this._map.getZoom()}}),dn=_n.extend({getEvents:function(){var t=_n.prototype.getEvents.call(this);return t.viewprereset=this._onViewPreReset,t},_onViewPreReset:function(){this._postponeUpdatePaths=!0},onAdd:function(){_n.prototype.onAdd.call(this),this._draw()},_initContainer:function(){var t=this._container=document.createElement("canvas");ki(t,"mousemove",this._onMouseMove,this),ki(t,"click dblclick mousedown mouseup contextmenu",this._onClick,this),ki(t,"mouseout",this._handleMouseOut,this),this._ctx=t.getContext("2d")},_destroyContainer:function(){C(this._redrawRequest),delete this._ctx,li(this._container),Ai(this._container),delete this._container},_updatePaths:function(){if(!this._postponeUpdatePaths){for(var t in this._redrawBounds=null,this._layers)this._layers[t]._update();this._redraw()}},_update:function(){if(!this._map._animatingZoom||!this._bounds){_n.prototype._update.call(this);var t=this._bounds,i=this._container,e=t.getSize(),n=Ct?2:1;Pi(i,t.min),i.width=n*e.x,i.height=n*e.y,i.style.width=e.x+"px",i.style.height=e.y+"px",Ct&&this._ctx.scale(2,2),this._ctx.translate(-t.min.x,-t.min.y),this.fire("update")}},_reset:function(){_n.prototype._reset.call(this),this._postponeUpdatePaths&&(this._postponeUpdatePaths=!1,this._updatePaths())},_initPath:function(t){this._updateDashArray(t);var i=(this._layers[u(t)]=t)._order={layer:t,prev:this._drawLast,next:null};this._drawLast&&(this._drawLast.next=i),this._drawLast=i,this._drawFirst=this._drawFirst||this._drawLast},_addPath:function(t){this._requestRedraw(t)},_removePath:function(t){var i=t._order,e=i.next,n=i.prev;e?e.prev=n:this._drawLast=n,n?n.next=e:this._drawFirst=e,delete t._order,delete this._layers[u(t)],this._requestRedraw(t)},_updatePath:function(t){this._extendRedrawBounds(t),t._project(),t._update(),this._requestRedraw(t)},_updateStyle:function(t){this._updateDashArray(t),this._requestRedraw(t)},_updateDashArray:function(t){if("string"==typeof t.options.dashArray){var i,e,n=t.options.dashArray.split(/[, ]+/),o=[];for(e=0;e<n.length;e++){if(i=Number(n[e]),isNaN(i))return;o.push(i)}t.options._dashArray=o}else t.options._dashArray=t.options.dashArray},_requestRedraw:function(t){this._map&&(this._extendRedrawBounds(t),this._redrawRequest=this._redrawRequest||M(this._redraw,this))},_extendRedrawBounds:function(t){if(t._pxBounds){var i=(t.options.weight||0)+1;this._redrawBounds=this._redrawBounds||new O,this._redrawBounds.extend(t._pxBounds.min.subtract([i,i])),this._redrawBounds.extend(t._pxBounds.max.add([i,i]))}},_redraw:function(){this._redrawRequest=null,this._redrawBounds&&(this._redrawBounds.min._floor(),this._redrawBounds.max._ceil()),this._clear(),this._draw(),this._redrawBounds=null},_clear:function(){var t=this._redrawBounds;if(t){var i=t.getSize();this._ctx.clearRect(t.min.x,t.min.y,i.x,i.y)}else this._ctx.clearRect(0,0,this._container.width,this._container.height)},_draw:function(){var t,i=this._redrawBounds;if(this._ctx.save(),i){var e=i.getSize();this._ctx.beginPath(),this._ctx.rect(i.min.x,i.min.y,e.x,e.y),this._ctx.clip()}this._drawing=!0;for(var n=this._drawFirst;n;n=n.next)t=n.layer,(!i||t._pxBounds&&t._pxBounds.intersects(i))&&t._updatePath();this._drawing=!1,this._ctx.restore()},_updatePoly:function(t,i){if(this._drawing){var e,n,o,s,r=t._parts,a=r.length,h=this._ctx;if(a){for(h.beginPath(),e=0;e<a;e++){for(n=0,o=r[e].length;n<o;n++)s=r[e][n],h[n?"lineTo":"moveTo"](s.x,s.y);i&&h.closePath()}this._fillStroke(h,t)}}},_updateCircle:function(t){if(this._drawing&&!t._empty()){var i=t._point,e=this._ctx,n=Math.max(Math.round(t._radius),1),o=(Math.max(Math.round(t._radiusY),1)||n)/n;1!=o&&(e.save(),e.scale(1,o)),e.beginPath(),e.arc(i.x,i.y/o,n,0,2*Math.PI,!1),1!=o&&e.restore(),this._fillStroke(e,t)}},_fillStroke:function(t,i){var e=i.options;e.fill&&(t.globalAlpha=e.fillOpacity,t.fillStyle=e.fillColor||e.color,t.fill(e.fillRule||"evenodd")),e.stroke&&0!==e.weight&&(t.setLineDash&&t.setLineDash(i.options&&i.options._dashArray||[]),t.globalAlpha=e.opacity,t.lineWidth=e.weight,t.strokeStyle=e.color,t.lineCap=e.lineCap,t.lineJoin=e.lineJoin,t.stroke())},_onClick:function(t){for(var i,e,n=this._map.mouseEventToLayerPoint(t),o=this._drawFirst;o;o=o.next)(i=o.layer).options.interactive&&i._containsPoint(n)&&!this._map._draggableMoved(i)&&(e=i);e&&(Gi(t),this._fireEvent([e],t))},_onMouseMove:function(t){if(this._map&&!this._map.dragging.moving()&&!this._map._animatingZoom){var i=this._map.mouseEventToLayerPoint(t);this._handleMouseHover(t,i)}},_handleMouseOut:function(t){var i=this._hoveredLayer;i&&(fi(this._container,"leaflet-interactive"),this._fireEvent([i],t,"mouseout"),this._hoveredLayer=null,this._mouseHoverThrottled=!1)},_handleMouseHover:function(t,i){if(!this._mouseHoverThrottled){for(var e,n,o=this._drawFirst;o;o=o.next)(e=o.layer).options.interactive&&e._containsPoint(i)&&(n=e);n!==this._hoveredLayer&&(this._handleMouseOut(t),n&&(mi(this._container,"leaflet-interactive"),this._fireEvent([n],t,"mouseover"),this._hoveredLayer=n)),this._hoveredLayer&&this._fireEvent([this._hoveredLayer],t),this._mouseHoverThrottled=!0,setTimeout(L.bind(function(){this._mouseHoverThrottled=!1},this),32)}},_fireEvent:function(t,i,e){this._map._fireDOMEvent(i,e||i.type,t)},_bringToFront:function(t){var i=t._order;if(i){var e=i.next,n=i.prev;e&&((e.prev=n)?n.next=e:e&&(this._drawFirst=e),i.prev=this._drawLast,(this._drawLast.next=i).next=null,this._drawLast=i,this._requestRedraw(t))}},_bringToBack:function(t){var i=t._order;if(i){var e=i.next,n=i.prev;n&&((n.next=e)?e.prev=n:n&&(this._drawLast=n),i.prev=null,i.next=this._drawFirst,this._drawFirst.prev=i,this._drawFirst=i,this._requestRedraw(t))}}});function pn(t){return St?new dn(t):null}var mn=function(){try{return document.namespaces.add("lvml","urn:schemas-microsoft-com:vml"),function(t){return document.createElement("<lvml:"+t+' class="lvml">')}}catch(t){return function(t){return document.createElement("<"+t+' xmlns="urn:schemas-microsoft.com:vml" class="lvml">')}}}(),fn={_initContainer:function(){this._container=ui("div","leaflet-vml-container")},_update:function(){this._map._animatingZoom||(_n.prototype._update.call(this),this.fire("update"))},_initPath:function(t){var i=t._container=mn("shape");mi(i,"leaflet-vml-shape "+(this.options.className||"")),i.coordsize="1 1",t._path=mn("path"),i.appendChild(t._path),this._updateStyle(t),this._layers[u(t)]=t},_addPath:function(t){var i=t._container;this._container.appendChild(i),t.options.interactive&&t.addInteractiveTarget(i)},_removePath:function(t){var i=t._container;li(i),t.removeInteractiveTarget(i),delete this._layers[u(t)]},_updateStyle:function(t){var i=t._stroke,e=t._fill,n=t.options,o=t._container;o.stroked=!!n.stroke,o.filled=!!n.fill,n.stroke?(i||(i=t._stroke=mn("stroke")),o.appendChild(i),i.weight=n.weight+"px",i.color=n.color,i.opacity=n.opacity,n.dashArray?i.dashStyle=v(n.dashArray)?n.dashArray.join(" "):n.dashArray.replace(/( *, *)/g," "):i.dashStyle="",i.endcap=n.lineCap.replace("butt","flat"),i.joinstyle=n.lineJoin):i&&(o.removeChild(i),t._stroke=null),n.fill?(e||(e=t._fill=mn("fill")),o.appendChild(e),e.color=n.fillColor||n.color,e.opacity=n.fillOpacity):e&&(o.removeChild(e),t._fill=null)},_updateCircle:function(t){var i=t._point.round(),e=Math.round(t._radius),n=Math.round(t._radiusY||e);this._setPath(t,t._empty()?"M0 0":"AL "+i.x+","+i.y+" "+e+","+n+" 0,23592600")},_setPath:function(t,i){t._path.v=i},_bringToFront:function(t){_i(t._container)},_bringToBack:function(t){di(t._container)}},gn=kt?mn:$,vn=_n.extend({getEvents:function(){var t=_n.prototype.getEvents.call(this);return t.zoomstart=this._onZoomStart,t},_initContainer:function(){this._container=gn("svg"),this._container.setAttribute("pointer-events","none"),this._rootGroup=gn("g"),this._container.appendChild(this._rootGroup)},_destroyContainer:function(){li(this._container),Ai(this._container),delete this._container,delete this._rootGroup,delete this._svgSize},_onZoomStart:function(){this._update()},_update:function(){if(!this._map._animatingZoom||!this._bounds){_n.prototype._update.call(this);var t=this._bounds,i=t.getSize(),e=this._container;this._svgSize&&this._svgSize.equals(i)||(this._svgSize=i,e.setAttribute("width",i.x),e.setAttribute("height",i.y)),Pi(e,t.min),e.setAttribute("viewBox",[t.min.x,t.min.y,i.x,i.y].join(" ")),this.fire("update")}},_initPath:function(t){var i=t._path=gn("path");t.options.className&&mi(i,t.options.className),t.options.interactive&&mi(i,"leaflet-interactive"),this._updateStyle(t),this._layers[u(t)]=t},_addPath:function(t){this._rootGroup||this._initContainer(),this._rootGroup.appendChild(t._path),t.addInteractiveTarget(t._path)},_removePath:function(t){li(t._path),t.removeInteractiveTarget(t._path),delete this._layers[u(t)]},_updatePath:function(t){t._project(),t._update()},_updateStyle:function(t){var i=t._path,e=t.options;i&&(e.stroke?(i.setAttribute("stroke",e.color),i.setAttribute("stroke-opacity",e.opacity),i.setAttribute("stroke-width",e.weight),i.setAttribute("stroke-linecap",e.lineCap),i.setAttribute("stroke-linejoin",e.lineJoin),e.dashArray?i.setAttribute("stroke-dasharray",e.dashArray):i.removeAttribute("stroke-dasharray"),e.dashOffset?i.setAttribute("stroke-dashoffset",e.dashOffset):i.removeAttribute("stroke-dashoffset")):i.setAttribute("stroke","none"),e.fill?(i.setAttribute("fill",e.fillColor||e.color),i.setAttribute("fill-opacity",e.fillOpacity),i.setAttribute("fill-rule",e.fillRule||"evenodd")):i.setAttribute("fill","none"))},_updatePoly:function(t,i){this._setPath(t,Q(t._parts,i))},_updateCircle:function(t){var i=t._point,e=Math.max(Math.round(t._radius),1),n="a"+e+","+(Math.max(Math.round(t._radiusY),1)||e)+" 0 1,0 ",o=t._empty()?"M0 0":"M"+(i.x-e)+","+i.y+n+2*e+",0 "+n+2*-e+",0 ";this._setPath(t,o)},_setPath:function(t,i){t._path.setAttribute("d",i)},_bringToFront:function(t){_i(t._path)},_bringToBack:function(t){di(t._path)}});function yn(t){return Zt||kt?new vn(t):null}kt&&vn.include(fn),$i.include({getRenderer:function(t){var i=t.options.renderer||this._getPaneRenderer(t.options.pane)||this.options.renderer||this._renderer;return i||(i=this._renderer=this._createRenderer()),this.hasLayer(i)||this.addLayer(i),i},_getPaneRenderer:function(t){if("overlayPane"===t||void 0===t)return!1;var i=this._paneRenderers[t];return void 0===i&&(i=this._createRenderer({pane:t}),this._paneRenderers[t]=i),i},_createRenderer:function(t){return this.options.preferCanvas&&pn(t)||yn(t)}});var xn=We.extend({initialize:function(t,i){We.prototype.initialize.call(this,this._boundsToLatLngs(t),i)},setBounds:function(t){return this.setLatLngs(this._boundsToLatLngs(t))},_boundsToLatLngs:function(t){return[(t=D(t)).getSouthWest(),t.getNorthWest(),t.getNorthEast(),t.getSouthEast()]}});vn.create=gn,vn.pointsToPath=Q,He.geometryToLayer=Fe,He.coordsToLatLng=Ve,He.coordsToLatLngs=qe,He.latLngToCoords=Ge,He.latLngsToCoords=Ke,He.getFeature=Ye,He.asFeature=Xe,$i.mergeOptions({boxZoom:!0});var wn=se.extend({initialize:function(t){this._map=t,this._container=t._container,this._pane=t._panes.overlayPane,this._resetStateTimeout=0,t.on("unload",this._destroy,this)},addHooks:function(){ki(this._container,"mousedown",this._onMouseDown,this)},removeHooks:function(){Ai(this._container,"mousedown",this._onMouseDown,this)},moved:function(){return this._moved},_destroy:function(){li(this._pane),delete this._pane},_resetState:function(){this._resetStateTimeout=0,this._moved=!1},_clearDeferredResetState:function(){0!==this._resetStateTimeout&&(clearTimeout(this._resetStateTimeout),this._resetStateTimeout=0)},_onMouseDown:function(t){if(!t.shiftKey||1!==t.which&&1!==t.button)return!1;this._clearDeferredResetState(),this._resetState(),Qt(),Ti(),this._startPoint=this._map.mouseEventToContainerPoint(t),ki(document,{contextmenu:Wi,mousemove:this._onMouseMove,mouseup:this._onMouseUp,keydown:this._onKeyDown},this)},_onMouseMove:function(t){this._moved||(this._moved=!0,this._box=ui("div","leaflet-zoom-box",this._container),mi(this._container,"leaflet-crosshair"),this._map.fire("boxzoomstart")),this._point=this._map.mouseEventToContainerPoint(t);var i=new O(this._point,this._startPoint),e=i.getSize();Pi(this._box,i.min),this._box.style.width=e.x+"px",this._box.style.height=e.y+"px"},_finish:function(){this._moved&&(li(this._box),fi(this._container,"leaflet-crosshair")),ti(),zi(),Ai(document,{contextmenu:Wi,mousemove:this._onMouseMove,mouseup:this._onMouseUp,keydown:this._onKeyDown},this)},_onMouseUp:function(t){if((1===t.which||1===t.button)&&(this._finish(),this._moved)){this._clearDeferredResetState(),this._resetStateTimeout=setTimeout(a(this._resetState,this),0);var i=new N(this._map.containerPointToLatLng(this._startPoint),this._map.containerPointToLatLng(this._point));this._map.fitBounds(i).fire("boxzoomend",{boxZoomBounds:i})}},_onKeyDown:function(t){27===t.keyCode&&this._finish()}});$i.addInitHook("addHandler","boxZoom",wn),$i.mergeOptions({doubleClickZoom:!0});var Pn=se.extend({addHooks:function(){this._map.on("dblclick",this._onDoubleClick,this)},removeHooks:function(){this._map.off("dblclick",this._onDoubleClick,this)},_onDoubleClick:function(t){var i=this._map,e=i.getZoom(),n=i.options.zoomDelta,o=t.originalEvent.shiftKey?e-n:e+n;"center"===i.options.doubleClickZoom?i.setZoom(o):i.setZoomAround(t.containerPoint,o)}});$i.addInitHook("addHandler","doubleClickZoom",Pn),$i.mergeOptions({dragging:!0,inertia:!rt,inertiaDeceleration:3400,inertiaMaxSpeed:1/0,easeLinearity:.2,worldCopyJump:!1,maxBoundsViscosity:0});var Ln=se.extend({addHooks:function(){if(!this._draggable){var t=this._map;this._draggable=new ce(t._mapPane,t._container),this._draggable.on({dragstart:this._onDragStart,drag:this._onDrag,dragend:this._onDragEnd},this),this._draggable.on("predrag",this._onPreDragLimit,this),t.options.worldCopyJump&&(this._draggable.on("predrag",this._onPreDragWrap,this),t.on("zoomend",this._onZoomEnd,this),t.whenReady(this._onZoomEnd,this))}mi(this._map._container,"leaflet-grab leaflet-touch-drag"),this._draggable.enable(),this._positions=[],this._times=[]},removeHooks:function(){fi(this._map._container,"leaflet-grab"),fi(this._map._container,"leaflet-touch-drag"),this._draggable.disable()},moved:function(){return this._draggable&&this._draggable._moved},moving:function(){return this._draggable&&this._draggable._moving},_onDragStart:function(){var t=this._map;if(t._stop(),this._map.options.maxBounds&&this._map.options.maxBoundsViscosity){var i=D(this._map.options.maxBounds);this._offsetLimit=R(this._map.latLngToContainerPoint(i.getNorthWest()).multiplyBy(-1),this._map.latLngToContainerPoint(i.getSouthEast()).multiplyBy(-1).add(this._map.getSize())),this._viscosity=Math.min(1,Math.max(0,this._map.options.maxBoundsViscosity))}else this._offsetLimit=null;t.fire("movestart").fire("dragstart"),t.options.inertia&&(this._positions=[],this._times=[])},_onDrag:function(t){if(this._map.options.inertia){var i=this._lastTime=+new Date,e=this._lastPos=this._draggable._absPos||this._draggable._newPos;this._positions.push(e),this._times.push(i),this._prunePositions(i)}this._map.fire("move",t).fire("drag",t)},_prunePositions:function(t){for(;1<this._positions.length&&50<t-this._times[0];)this._positions.shift(),this._times.shift()},_onZoomEnd:function(){var t=this._map.getSize().divideBy(2),i=this._map.latLngToLayerPoint([0,0]);this._initialWorldOffset=i.subtract(t).x,this._worldWidth=this._map.getPixelWorldBounds().getSize().x},_viscousLimit:function(t,i){return t-(t-i)*this._viscosity},_onPreDragLimit:function(){if(this._viscosity&&this._offsetLimit){var t=this._draggable._newPos.subtract(this._draggable._startPos),i=this._offsetLimit;t.x<i.min.x&&(t.x=this._viscousLimit(t.x,i.min.x)),t.y<i.min.y&&(t.y=this._viscousLimit(t.y,i.min.y)),t.x>i.max.x&&(t.x=this._viscousLimit(t.x,i.max.x)),t.y>i.max.y&&(t.y=this._viscousLimit(t.y,i.max.y)),this._draggable._newPos=this._draggable._startPos.add(t)}},_onPreDragWrap:function(){var t=this._worldWidth,i=Math.round(t/2),e=this._initialWorldOffset,n=this._draggable._newPos.x,o=(n-i+e)%t+i-e,s=(n+i+e)%t-i-e,r=Math.abs(o+e)<Math.abs(s+e)?o:s;this._draggable._absPos=this._draggable._newPos.clone(),this._draggable._newPos.x=r},_onDragEnd:function(t){var i=this._map,e=i.options,n=!e.inertia||this._times.length<2;if(i.fire("dragend",t),n)i.fire("moveend");else{this._prunePositions(+new Date);var o=this._lastPos.subtract(this._positions[0]),s=(this._lastTime-this._times[0])/1e3,r=e.easeLinearity,a=o.multiplyBy(r/s),h=a.distanceTo([0,0]),u=Math.min(e.inertiaMaxSpeed,h),l=a.multiplyBy(u/h),c=u/(e.inertiaDeceleration*r),_=l.multiplyBy(-c/2).round();_.x||_.y?(_=i._limitOffset(_,i.options.maxBounds),M(function(){i.panBy(_,{duration:c,easeLinearity:r,noMoveStart:!0,animate:!0})})):i.fire("moveend")}}});$i.addInitHook("addHandler","dragging",Ln),$i.mergeOptions({keyboard:!0,keyboardPanDelta:80});var bn=se.extend({keyCodes:{left:[37],right:[39],down:[40],up:[38],zoomIn:[187,107,61,171],zoomOut:[189,109,54,173]},initialize:function(t){this._map=t,this._setPanDelta(t.options.keyboardPanDelta),this._setZoomDelta(t.options.zoomDelta)},addHooks:function(){var t=this._map._container;t.tabIndex<=0&&(t.tabIndex="0"),ki(t,{focus:this._onFocus,blur:this._onBlur,mousedown:this._onMouseDown},this),this._map.on({focus:this._addHooks,blur:this._removeHooks},this)},removeHooks:function(){this._removeHooks(),Ai(this._map._container,{focus:this._onFocus,blur:this._onBlur,mousedown:this._onMouseDown},this),this._map.off({focus:this._addHooks,blur:this._removeHooks},this)},_onMouseDown:function(){if(!this._focused){var t=document.body,i=document.documentElement,e=t.scrollTop||i.scrollTop,n=t.scrollLeft||i.scrollLeft;this._map._container.focus(),window.scrollTo(n,e)}},_onFocus:function(){this._focused=!0,this._map.fire("focus")},_onBlur:function(){this._focused=!1,this._map.fire("blur")},_setPanDelta:function(t){var i,e,n=this._panKeys={},o=this.keyCodes;for(i=0,e=o.left.length;i<e;i++)n[o.left[i]]=[-1*t,0];for(i=0,e=o.right.length;i<e;i++)n[o.right[i]]=[t,0];for(i=0,e=o.down.length;i<e;i++)n[o.down[i]]=[0,t];for(i=0,e=o.up.length;i<e;i++)n[o.up[i]]=[0,-1*t]},_setZoomDelta:function(t){var i,e,n=this._zoomKeys={},o=this.keyCodes;for(i=0,e=o.zoomIn.length;i<e;i++)n[o.zoomIn[i]]=t;for(i=0,e=o.zoomOut.length;i<e;i++)n[o.zoomOut[i]]=-t},_addHooks:function(){ki(document,"keydown",this._onKeyDown,this)},_removeHooks:function(){Ai(document,"keydown",this._onKeyDown,this)},_onKeyDown:function(t){if(!(t.altKey||t.ctrlKey||t.metaKey)){var i,e=t.keyCode,n=this._map;if(e in this._panKeys)n._panAnim&&n._panAnim._inProgress||(i=this._panKeys[e],t.shiftKey&&(i=I(i).multiplyBy(3)),n.panBy(i),n.options.maxBounds&&n.panInsideBounds(n.options.maxBounds));else if(e in this._zoomKeys)n.setZoom(n.getZoom()+(t.shiftKey?3:1)*this._zoomKeys[e]);else{if(27!==e||!n._popup||!n._popup.options.closeOnEscapeKey)return;n.closePopup()}Wi(t)}}});$i.addInitHook("addHandler","keyboard",bn),$i.mergeOptions({scrollWheelZoom:!0,wheelDebounceTime:40,wheelPxPerZoomLevel:60});var Tn=se.extend({addHooks:function(){ki(this._map._container,"mousewheel",this._onWheelScroll,this),this._delta=0},removeHooks:function(){Ai(this._map._container,"mousewheel",this._onWheelScroll,this)},_onWheelScroll:function(t){var i=Ui(t),e=this._map.options.wheelDebounceTime;this._delta+=i,this._lastMousePos=this._map.mouseEventToContainerPoint(t),this._startTime||(this._startTime=+new Date);var n=Math.max(e-(+new Date-this._startTime),0);clearTimeout(this._timer),this._timer=setTimeout(a(this._performZoom,this),n),Wi(t)},_performZoom:function(){var t=this._map,i=t.getZoom(),e=this._map.options.zoomSnap||0;t._stop();var n=this._delta/(4*this._map.options.wheelPxPerZoomLevel),o=4*Math.log(2/(1+Math.exp(-Math.abs(n))))/Math.LN2,s=e?Math.ceil(o/e)*e:o,r=t._limitZoom(i+(0<this._delta?s:-s))-i;this._delta=0,this._startTime=null,r&&("center"===t.options.scrollWheelZoom?t.setZoom(i+r):t.setZoomAround(this._lastMousePos,i+r))}});$i.addInitHook("addHandler","scrollWheelZoom",Tn),$i.mergeOptions({tap:!0,tapTolerance:15});var zn=se.extend({addHooks:function(){ki(this._map._container,"touchstart",this._onDown,this)},removeHooks:function(){Ai(this._map._container,"touchstart",this._onDown,this)},_onDown:function(t){if(t.touches){if(ji(t),this._fireClick=!0,1<t.touches.length)return this._fireClick=!1,void clearTimeout(this._holdTimeout);var i=t.touches[0],e=i.target;this._startPos=this._newPos=new B(i.clientX,i.clientY),e.tagName&&"a"===e.tagName.toLowerCase()&&mi(e,"leaflet-active"),this._holdTimeout=setTimeout(a(function(){this._isTapValid()&&(this._fireClick=!1,this._onUp(),this._simulateEvent("contextmenu",i))},this),1e3),this._simulateEvent("mousedown",i),ki(document,{touchmove:this._onMove,touchend:this._onUp},this)}},_onUp:function(t){if(clearTimeout(this._holdTimeout),Ai(document,{touchmove:this._onMove,touchend:this._onUp},this),this._fireClick&&t&&t.changedTouches){var i=t.changedTouches[0],e=i.target;e&&e.tagName&&"a"===e.tagName.toLowerCase()&&fi(e,"leaflet-active"),this._simulateEvent("mouseup",i),this._isTapValid()&&this._simulateEvent("click",i)}},_isTapValid:function(){return this._newPos.distanceTo(this._startPos)<=this._map.options.tapTolerance},_onMove:function(t){var i=t.touches[0];this._newPos=new B(i.clientX,i.clientY),this._simulateEvent("mousemove",i)},_simulateEvent:function(t,i){var e=document.createEvent("MouseEvents");e._simulated=!0,i.target._simulatedClick=!0,e.initMouseEvent(t,!0,!0,window,1,i.screenX,i.screenY,i.clientX,i.clientY,!1,!1,!1,!1,0,null),i.target.dispatchEvent(e)}});Tt&&!bt&&$i.addInitHook("addHandler","tap",zn),$i.mergeOptions({touchZoom:Tt&&!rt,bounceAtZoomLimits:!0});var Mn=se.extend({addHooks:function(){mi(this._map._container,"leaflet-touch-zoom"),ki(this._map._container,"touchstart",this._onTouchStart,this)},removeHooks:function(){fi(this._map._container,"leaflet-touch-zoom"),Ai(this._map._container,"touchstart",this._onTouchStart,this)},_onTouchStart:function(t){var i=this._map;if(t.touches&&2===t.touches.length&&!i._animatingZoom&&!this._zooming){var e=i.mouseEventToContainerPoint(t.touches[0]),n=i.mouseEventToContainerPoint(t.touches[1]);this._centerPoint=i.getSize()._divideBy(2),this._startLatLng=i.containerPointToLatLng(this._centerPoint),"center"!==i.options.touchZoom&&(this._pinchStartLatLng=i.containerPointToLatLng(e.add(n)._divideBy(2))),this._startDist=e.distanceTo(n),this._startZoom=i.getZoom(),this._moved=!1,this._zooming=!0,i._stop(),ki(document,"touchmove",this._onTouchMove,this),ki(document,"touchend",this._onTouchEnd,this),ji(t)}},_onTouchMove:function(t){if(t.touches&&2===t.touches.length&&this._zooming){var i=this._map,e=i.mouseEventToContainerPoint(t.touches[0]),n=i.mouseEventToContainerPoint(t.touches[1]),o=e.distanceTo(n)/this._startDist;if(this._zoom=i.getScaleZoom(o,this._startZoom),!i.options.bounceAtZoomLimits&&(this._zoom<i.getMinZoom()&&o<1||this._zoom>i.getMaxZoom()&&1<o)&&(this._zoom=i._limitZoom(this._zoom)),"center"===i.options.touchZoom){if(this._center=this._startLatLng,1==o)return}else{var s=e._add(n)._divideBy(2)._subtract(this._centerPoint);if(1==o&&0===s.x&&0===s.y)return;this._center=i.unproject(i.project(this._pinchStartLatLng,this._zoom).subtract(s),this._zoom)}this._moved||(i._moveStart(!0,!1),this._moved=!0),C(this._animRequest);var r=a(i._move,i,this._center,this._zoom,{pinch:!0,round:!1});this._animRequest=M(r,this,!0),ji(t)}},_onTouchEnd:function(){this._moved&&this._zooming?(this._zooming=!1,C(this._animRequest),Ai(document,"touchmove",this._onTouchMove),Ai(document,"touchend",this._onTouchEnd),this._map.options.zoomAnimation?this._map._animateZoom(this._center,this._map._limitZoom(this._zoom),!0,this._map.options.zoomSnap):this._map._resetView(this._center,this._map._limitZoom(this._zoom))):this._zooming=!1}});$i.addInitHook("addHandler","touchZoom",Mn),$i.BoxZoom=wn,$i.DoubleClickZoom=Pn,$i.Drag=Ln,$i.Keyboard=bn,$i.ScrollWheelZoom=Tn,$i.Tap=zn,$i.TouchZoom=Mn,Object.freeze=i,t.version="1.6.0+HEAD.0c81bdf",t.Control=te,t.control=Qi,t.Browser=At,t.Evented=k,t.Mixin=ae,t.Util=E,t.Class=S,t.Handler=se,t.extend=h,t.bind=a,t.stamp=u,t.setOptions=p,t.DomEvent=Xi,t.DomUtil=Zi,t.PosAnimation=Ji,t.Draggable=ce,t.LineUtil=xe,t.PolyUtil=Le,t.Point=B,t.point=I,t.Bounds=O,t.bounds=R,t.Transformation=G,t.transformation=K,t.Projection=ze,t.LatLng=j,t.latLng=W,t.LatLngBounds=N,t.latLngBounds=D,t.CRS=F,t.GeoJSON=He,t.geoJSON=$e,t.geoJson=Qe,t.Layer=Se,t.LayerGroup=Ze,t.layerGroup=function(t,i){return new Ze(t,i)},t.FeatureGroup=ke,t.featureGroup=function(t){return new ke(t)},t.ImageOverlay=tn,t.imageOverlay=function(t,i,e){return new tn(t,i,e)},t.VideoOverlay=en,t.videoOverlay=function(t,i,e){return new en(t,i,e)},t.SVGOverlay=nn,t.svgOverlay=function(t,i,e){return new nn(t,i,e)},t.DivOverlay=on,t.Popup=sn,t.popup=function(t,i){return new sn(t,i)},t.Tooltip=rn,t.tooltip=function(t,i){return new rn(t,i)},t.Icon=Be,t.icon=function(t){return new Be(t)},t.DivIcon=an,t.divIcon=function(t){return new an(t)},t.Marker=Oe,t.marker=function(t,i){return new Oe(t,i)},t.TileLayer=un,t.tileLayer=ln,t.GridLayer=hn,t.gridLayer=function(t){return new hn(t)},t.SVG=vn,t.svg=yn,t.Renderer=_n,t.Canvas=dn,t.canvas=pn,t.Path=Re,t.CircleMarker=Ne,t.circleMarker=function(t,i){return new Ne(t,i)},t.Circle=De,t.circle=function(t,i,e){return new De(t,i,e)},t.Polyline=je,t.polyline=function(t,i){return new je(t,i)},t.Polygon=We,t.polygon=function(t,i){return new We(t,i)},t.Rectangle=xn,t.rectangle=function(t,i){return new xn(t,i)},t.Map=$i,t.map=function(t,i){return new $i(t,i)};var Cn=window.L;t.noConflict=function(){return window.L=Cn,this},window.L=t});
\ No newline at end of file
diff --git a/viewer/leaflet-1.6.0/leaflet.js.map b/viewer/leaflet-1.6.0/leaflet.js.map
deleted file mode 100644
index 2273eed..0000000
--- a/viewer/leaflet-1.6.0/leaflet.js.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"sources":["dist/leaflet-src.js"],"names":["global","factory","exports","module","define","amd","L","this","freeze","Object","extend","dest","i","j","len","src","arguments","length","obj","create","proto","F","prototype","bind","fn","slice","Array","apply","call","args","concat","lastId","stamp","_leaflet_id","throttle","time","context","lock","wrapperFn","later","setTimeout","wrapNum","x","range","includeMax","max","min","d","falseFn","formatNum","num","digits","pow","Math","undefined","round","trim","str","replace","splitWords","split","setOptions","options","hasOwnProperty","getParamString","existingUrl","uppercase","params","push","encodeURIComponent","toUpperCase","indexOf","join","templateRe","template","data","key","value","Error","isArray","toString","array","el","emptyImageUrl","getPrefixed","name","window","lastTime","timeoutDefer","Date","timeToCall","requestFn","requestAnimationFrame","cancelFn","cancelAnimationFrame","id","clearTimeout","requestAnimFrame","immediate","cancelAnimFrame","Util","Class","props","NewClass","initialize","callInitHooks","parentProto","__super__","constructor","statics","includes","Mixin","Events","console","warn","stack","checkDeprecatedMixinEvents","_initHooks","_initHooksCalled","include","mergeOptions","addInitHook","init","on","types","type","_on","off","_off","_events","typeListeners","newListener","ctx","listeners","l","_firingCount","splice","fire","propagate","listens","event","target","sourceTarget","_propagateEvent","_eventParents","once","handler","addEventParent","removeEventParent","e","layer","propagatedFrom","addEventListener","removeEventListener","clearAllEventListeners","addOneTimeEventListener","fireEvent","hasEventListeners","Evented","Point","y","trunc","v","floor","ceil","toPoint","Bounds","a","b","points","toBounds","LatLngBounds","corner1","corner2","latlngs","toLatLngBounds","LatLng","lat","lng","alt","isNaN","toLatLng","c","lon","clone","add","point","_add","subtract","_subtract","divideBy","_divideBy","multiplyBy","_multiplyBy","scaleBy","unscaleBy","_round","_floor","_ceil","_trunc","distanceTo","sqrt","equals","contains","abs","getCenter","getBottomLeft","getTopRight","getTopLeft","getBottomRight","getSize","intersects","bounds","min2","max2","xIntersects","yIntersects","overlaps","xOverlaps","yOverlaps","isValid","sw2","ne2","sw","_southWest","ne","_northEast","pad","bufferRatio","heightBuffer","widthBuffer","getSouthWest","getNorthEast","getNorthWest","getNorth","getWest","getSouthEast","getSouth","getEast","latIntersects","lngIntersects","latOverlaps","lngOverlaps","toBBoxString","maxMargin","CRS","latLngToPoint","latlng","zoom","projectedPoint","projection","project","scale","transformation","_transform","pointToLatLng","untransformedPoint","untransform","unproject","log","LN2","getProjectedBounds","infinite","s","transform","precision","other","Earth","distance","wrap","wrapLatLng","sizeInMeters","latAccuracy","lngAccuracy","cos","PI","wrapLng","wrapLat","wrapLatLngBounds","center","newCenter","latShift","lngShift","R","latlng1","latlng2","rad","lat1","lat2","sinDLat","sin","sinDLon","atan2","earthRadius","SphericalMercator","MAX_LATITUDE","atan","exp","Transformation","_a","_b","_c","_d","toTransformation","EPSG3857","code","EPSG900913","svgCreate","document","createElementNS","pointsToPath","rings","closed","len2","p","svg","style$1","documentElement","style","ie","ielt9","edge","navigator","webkit","userAgentContains","android","android23","webkitVer","parseInt","exec","userAgent","androidStock","opera","chrome","gecko","safari","phantom","opera12","win","platform","ie3d","webkit3d","WebKitCSSMatrix","gecko3d","any3d","L_DISABLE_3D","mobile","orientation","mobileWebkit","mobileWebkit3d","msPointer","PointerEvent","MSPointerEvent","pointer","touch","L_NO_TOUCH","DocumentTouch","mobileOpera","mobileGecko","retina","devicePixelRatio","screen","deviceXDPI","logicalXDPI","passiveEvents","supportsPassiveOption","opts","defineProperty","get","canvas","createElement","getContext","createSVGRect","vml","div","innerHTML","shape","firstChild","behavior","adj","toLowerCase","Browser","POINTER_DOWN","POINTER_MOVE","POINTER_UP","POINTER_CANCEL","TAG_WHITE_LIST","_pointers","_pointerDocListener","_pointersCount","addPointerListener","onDown","pointerType","MSPOINTER_TYPE_MOUSE","tagName","preventDefault","_handlePointer","_globalPointerDown","_globalPointerMove","_globalPointerUp","_addPointerStart","onMove","buttons","_addPointerMove","onUp","_addPointerEnd","pointerId","touches","changedTouches","_touchstart","_touchend","_pre","addDoubleTapListener","last","touch$$1","doubleTap","onTouchStart","count","now","delta","onTouchEnd","cancelBubble","prop","newTouch","button","passive","removeDoubleTapListener","touchstart","touchend","dblclick","disableTextSelection","enableTextSelection","_userSelect","_outlineElement","_outlineStyle","TRANSFORM","testProp","TRANSITION","TRANSITION_END","getElementById","getStyle","currentStyle","defaultView","css","getComputedStyle","create$1","className","container","appendChild","remove","parent","parentNode","removeChild","empty","toFront","lastChild","toBack","insertBefore","hasClass","classList","getClass","RegExp","test","addClass","classes","setClass","removeClass","baseVal","correspondingElement","setOpacity","opacity","filter","filterName","filters","item","Enabled","Opacity","_setOpacityIE","setTransform","offset","pos","setPosition","_leaflet_pos","left","top","getPosition","userSelectProperty","disableImageDrag","enableImageDrag","preventOutline","element","tabIndex","restoreOutline","outline","getSizedParentNode","offsetWidth","offsetHeight","body","getScale","rect","getBoundingClientRect","width","height","boundingClientRect","DomUtil","addOne","eventsKey","removeOne","originalHandler","isExternalTarget","timeStamp","originalEvent","elapsed","lastClick","_simulatedClick","_simulated","stop","filterClick","attachEvent","removePointerListener","detachEvent","stopPropagation","_stopped","skipped","disableScrollPropagation","disableClickPropagation","fakeStop","returnValue","getMousePosition","clientX","clientY","clientLeft","clientTop","wheelPxFactor","getWheelDelta","wheelDeltaY","deltaY","deltaMode","deltaX","deltaZ","wheelDelta","detail","skipEvents","events","related","relatedTarget","err","DomEvent","addListener","removeListener","PosAnimation","run","newPos","duration","easeLinearity","_el","_inProgress","_duration","_easeOutPower","_startPos","_offset","_startTime","_animate","_step","_complete","_animId","_runFrame","_easeOut","progress","t","Map","crs","minZoom","maxZoom","layers","maxBounds","renderer","zoomAnimation","zoomAnimationThreshold","fadeAnimation","markerZoomAnimation","transform3DLimit","zoomSnap","zoomDelta","trackResize","_handlers","_layers","_zoomBoundLayers","_sizeChanged","_initContainer","_initLayout","_onResize","_initEvents","setMaxBounds","_zoom","_limitZoom","setView","reset","_zoomAnimated","_createAnimProxy","_proxy","_catchTransitionEnd","_addLayers","_limitCenter","_stop","_loaded","animate","pan","_tryAnimatedZoom","_tryAnimatedPan","_sizeTimer","_resetView","setZoom","zoomIn","zoomOut","setZoomAround","getZoomScale","viewHalf","centerOffset","latLngToContainerPoint","containerPointToLatLng","_getBoundsCenterZoom","getBounds","paddingTL","paddingTopLeft","padding","paddingBR","paddingBottomRight","getBoundsZoom","Infinity","paddingOffset","swPoint","nePoint","fitBounds","fitWorld","panTo","panBy","getZoom","_panAnim","step","_onPanTransitionStep","end","_onPanTransitionEnd","noMoveStart","_mapPane","_getMapPanePos","_rawPanBy","flyTo","targetCenter","targetZoom","from","to","size","startZoom","w0","w1","u1","rho","rho2","r","sq","sinh","n","cosh","r0","u","tanh","start","S","_moveStart","frame","easeOut","_flyToFrame","_move","getScaleZoom","w","_moveEnd","flyToBounds","_panInsideMaxBounds","setMinZoom","oldZoom","setMaxZoom","panInsideBounds","_enforcingBounds","panInside","pixelCenter","pixelPoint","pixelBounds","getPixelBounds","halfPixelBounds","paddedBounds","diff","invalidateSize","oldSize","_lastCenter","newSize","oldCenter","debounceMoveend","locate","_locateOptions","timeout","watch","_handleGeolocationError","message","onResponse","_handleGeolocationResponse","onError","_locationWatchId","geolocation","watchPosition","getCurrentPosition","stopLocate","clearWatch","error","coords","latitude","longitude","accuracy","timestamp","addHandler","HandlerClass","enable","_containerId","_container","_clearControlPos","_resizeRequest","_clearHandlers","_panes","_renderer","createPane","pane","_checkIfLoaded","_moved","layerPointToLatLng","_getCenterLayerPoint","getMinZoom","_layersMinZoom","getMaxZoom","_layersMaxZoom","inside","nw","se","boundsSize","snap","scalex","scaley","_size","clientWidth","clientHeight","topLeftPoint","_getTopLeftPoint","getPixelOrigin","_pixelOrigin","getPixelWorldBounds","getPane","getPanes","getContainer","toZoom","fromZoom","latLngToLayerPoint","containerPointToLayerPoint","layerPointToContainerPoint","layerPoint","mouseEventToContainerPoint","mouseEventToLayerPoint","mouseEventToLatLng","_onScroll","_fadeAnimated","position","_initPanes","_initControlPos","panes","_paneRenderers","markerPane","shadowPane","loading","zoomChanged","_getNewPixelOrigin","pinch","_getZoomSpan","remove$$1","_targets","onOff","_handleDOMEvent","_onMoveEnd","scrollTop","scrollLeft","_findEventTargets","targets","isHover","srcElement","dragging","_draggableMoved","_fireDOMEvent","_mouseEvents","synth","isMarker","getLatLng","_radius","containerPoint","bubblingMouseEvents","enabled","moved","boxZoom","disable","whenReady","callback","_latLngToNewLayerPoint","topLeft","_latLngBoundsToNewLayerBounds","latLngBounds","_getCenterOffset","centerPoint","viewBounds","_getBoundsOffset","_limitOffset","newBounds","pxBounds","projectedMaxBounds","minOffset","maxOffset","_rebound","right","proxy","mapPane","_animatingZoom","_onZoomTransitionEnd","_animMoveEnd","_destroyAnimProxy","z","propertyName","_nothingToAnimate","getElementsByClassName","_animateZoom","startAnim","noUpdate","_animateToCenter","_animateToZoom","control","Control","map","_map","removeControl","addControl","addTo","onAdd","corner","_controlCorners","onRemove","_refocusOnMap","screenX","screenY","focus","corners","_controlContainer","createCorner","vSide","hSide","Layers","collapsed","autoZIndex","hideSingleBase","sortLayers","sortFunction","layerA","layerB","nameA","nameB","baseLayers","overlays","_layerControlInputs","_lastZIndex","_handlingClick","_addLayer","_update","_checkDisabledLayers","_onLayerChange","_expandIfNotCollapsed","addBaseLayer","addOverlay","removeLayer","_getLayer","expand","_section","acceptableHeight","offsetTop","collapse","setAttribute","section","mouseenter","mouseleave","link","_layersLink","href","title","_baseLayersList","_separator","_overlaysList","overlay","sort","setZIndex","baseLayersPresent","overlaysPresent","baseLayersCount","_addItem","display","_createRadioElement","checked","radioHtml","radioFragment","input","label","hasLayer","defaultChecked","layerId","_onInputClick","holder","inputs","addedLayers","removedLayers","addLayer","disabled","_expand","_collapse","Zoom","zoomInText","zoomInTitle","zoomOutText","zoomOutTitle","zoomName","_zoomInButton","_createButton","_zoomIn","_zoomOutButton","_zoomOut","_updateDisabled","_disabled","shiftKey","html","zoomControl","Scale","maxWidth","metric","imperial","_addScales","updateWhenIdle","_mScale","_iScale","maxMeters","_updateScales","_updateMetric","_updateImperial","meters","_getRoundNum","_updateScale","maxMiles","miles","feet","maxFeet","text","ratio","pow10","Attribution","prefix","_attributions","attributionControl","getAttribution","addAttribution","setPrefix","removeAttribution","attribs","prefixAndAttribs","attribution","Handler","_enabled","addHooks","removeHooks","_lastCode","START","END","mousedown","pointerdown","MSPointerDown","MOVE","Draggable","clickTolerance","dragStartTarget","preventOutline$$1","_element","_dragStartTarget","_preventOutline","_onDown","_dragging","finishDrag","which","_moving","first","sizedParent","_startPoint","_parentScale","_onMove","_onUp","_lastTarget","SVGElementInstance","correspondingUseElement","_newPos","_animRequest","_lastEvent","_updatePosition","simplify","tolerance","sqTolerance","markers","Uint8Array","_simplifyDPStep","index","sqDist","maxSqDist","_sqClosestPointOnSegment","newPoints","_simplifyDP","reducedPoints","prev","p1","p2","dx","dy","_reducePoints","pointToSegmentDistance","clipSegment","useLastCode","codeOut","newCode","codeA","_getBitCode","codeB","_getEdgeIntersection","dot","isFlat","_flat","LineUtil","closestPointOnSegment","clipPolygon","clippedPoints","k","edges","_code","PolyUtil","LonLat","Mercator","R_MINOR","tmp","con","ts","tan","phi","dphi","EPSG3395","EPSG4326","Simple","Layer","removeFrom","_mapToAdd","addInteractiveTarget","targetEl","removeInteractiveTarget","_layerAdd","getEvents","beforeAdd","eachLayer","method","_addZoomLimit","_updateZoomLevels","_removeZoomLimit","oldZoomSpan","LayerGroup","getLayerId","clearLayers","invoke","methodName","getLayer","getLayers","zIndex","FeatureGroup","setStyle","bringToFront","bringToBack","Icon","popupAnchor","tooltipAnchor","createIcon","oldIcon","_createIcon","createShadow","_getIconUrl","img","_createImg","_setIconStyles","sizeOption","anchor","shadowAnchor","iconAnchor","marginLeft","marginTop","IconDefault","iconUrl","iconRetinaUrl","shadowUrl","iconSize","shadowSize","imagePath","_detectIconPath","path","MarkerDrag","marker","_marker","icon","_icon","_draggable","dragstart","_onDragStart","predrag","_onPreDrag","drag","_onDrag","dragend","_onDragEnd","_adjustPan","speed","autoPanSpeed","autoPanPadding","iconPos","origin","panBounds","movement","_panRequest","_oldLatLng","closePopup","autoPan","shadow","_shadow","_latlng","oldLatLng","Marker","interactive","keyboard","zIndexOffset","riseOnHover","riseOffset","draggable","_initIcon","update","_removeIcon","_removeShadow","viewreset","setLatLng","setZIndexOffset","getIcon","setIcon","_popup","bindPopup","getElement","_setPos","classToAdd","addIcon","mouseover","_bringToFront","mouseout","_resetZIndex","newShadow","addShadow","_updateOpacity","_initInteraction","_zIndex","_updateZIndex","opt","_getPopupAnchor","_getTooltipAnchor","Path","stroke","color","weight","lineCap","lineJoin","dashArray","dashOffset","fill","fillColor","fillOpacity","fillRule","getRenderer","_initPath","_reset","_addPath","_removePath","redraw","_updatePath","_updateStyle","_updateBounds","_bringToBack","_path","_project","_clickTolerance","CircleMarker","radius","setRadius","getRadius","_point","r2","_radiusY","_pxBounds","_updateCircle","_empty","_bounds","_containsPoint","Circle","legacyOptions","_mRadius","half","latR","bottom","lngR","acos","Polyline","smoothFactor","noClip","_setLatLngs","getLatLngs","_latlngs","setLatLngs","isEmpty","closestLayerPoint","minDistance","minPoint","closest","jLen","_parts","halfDist","segDist","dist","_rings","addLatLng","_defaultShape","_convertLatLngs","result","flat","_projectLatlngs","_rawPxBounds","projectedBounds","ring","_clipPoints","segment","parts","_simplifyPoints","_updatePoly","part","Polygon","f","area","pop","clipped","GeoJSON","geojson","addData","feature","features","geometries","geometry","coordinates","geometryToLayer","asFeature","defaultOptions","resetStyle","onEachFeature","_setLayerStyle","pointToLayer","_coordsToLatLng","coordsToLatLng","_pointToLayer","coordsToLatLngs","properties","pointToLayerFn","markersInheritOptions","levelsDeep","latLngToCoords","latLngsToCoords","getFeature","newGeometry","PointToGeoJSON","toGeoJSON","geoJSON","multi","holes","toMultiPoint","isGeometryCollection","jsons","json","geoJson","ImageOverlay","crossOrigin","errorOverlayUrl","url","_url","_image","_initImage","styleOpts","setUrl","setBounds","zoomanim","wasElementSupplied","onselectstart","onmousemove","onload","onerror","_overlayOnError","image","errorUrl","VideoOverlay","autoplay","loop","keepAspectRatio","vid","onloadeddata","sourceElements","getElementsByTagName","sources","source","SVGOverlay","DivOverlay","_source","_removeTimeout","getContent","_content","setContent","content","visibility","_updateContent","_updateLayout","isOpen","_prepareOpen","node","_contentNode","hasChildNodes","_getAnchor","_containerBottom","_containerLeft","_containerWidth","Popup","minWidth","maxHeight","autoPanPaddingTopLeft","autoPanPaddingBottomRight","keepInView","closeButton","autoClose","closeOnEscapeKey","openOn","openPopup","popup","closeOnClick","closePopupOnClick","preclick","_close","moveend","wrapper","_wrapper","_tipContainer","_tip","_closeButton","_onCloseButtonClick","whiteSpace","scrolledClass","marginBottom","containerHeight","containerWidth","layerPos","containerPos","_popupHandlersAdded","click","_openPopup","keypress","_onKeyPress","move","_movePopup","unbindPopup","togglePopup","isPopupOpen","setPopupContent","getPopup","keyCode","Tooltip","direction","permanent","sticky","tooltip","closeTooltip","_setPosition","tooltipPoint","tooltipWidth","tooltipHeight","openTooltip","bindTooltip","_tooltip","_initTooltipInteractions","unbindTooltip","_tooltipHandlersAdded","_moveTooltip","_openTooltip","mousemove","toggleTooltip","isTooltipOpen","setTooltipContent","getTooltip","DivIcon","bgPos","Element","backgroundPosition","Default","GridLayer","tileSize","updateWhenZooming","updateInterval","maxNativeZoom","minNativeZoom","noWrap","keepBuffer","_levels","_tiles","_removeAllTiles","_tileZoom","_setAutoZIndex","isLoading","_loading","viewprereset","_invalidateAll","createTile","getTileSize","compare","children","edgeZIndex","isFinite","nextFrame","willPrune","tile","current","loaded","fade","active","_onOpaqueTile","_noPrune","_pruneTiles","_fadeFrame","_updateLevels","_onUpdateLevel","_removeTilesAtZoom","_onRemoveLevel","level","_setZoomTransform","_onCreateLevel","_level","retain","_retainParent","_retainChildren","_removeTile","x2","y2","z2","coords2","_tileCoordsToKey","animating","_setView","_clampZoom","noPrune","tileZoom","tileZoomChanged","_abortLoading","_resetGrid","_setZoomTransforms","translate","_tileSize","_globalTileRange","_pxBoundsToTileRange","_wrapX","_wrapY","_getTiledPixelBounds","mapZoom","halfSize","tileRange","tileCenter","queue","margin","noPruneRange","_isValidTile","fragment","createDocumentFragment","_addTile","tileBounds","_tileCoordsToBounds","_keyToBounds","_keyToTileCoords","_tileCoordsToNwSe","nwPoint","sePoint","bp","_initTile","WebkitBackfaceVisibility","tilePos","_getTilePos","_wrapCoords","_tileReady","_noTilesToLoad","newCoords","TileLayer","subdomains","errorTileUrl","zoomOffset","tms","zoomReverse","detectRetina","_onTileRemove","noRedraw","done","_tileOnLoad","_tileOnError","getTileUrl","_getSubdomain","_getZoomForUrl","invertedY","getAttribute","tilePoint","complete","tileLayer","TileLayerWMS","defaultWmsParams","service","request","styles","format","transparent","version","wmsParams","realRetina","_crs","_wmsVersion","parseFloat","projectionKey","bbox","setParams","WMS","wms","Renderer","_updatePaths","_destroyContainer","_onZoom","zoomend","_onZoomEnd","_onAnimZoom","ev","_updateTransform","currentCenterPoint","_center","topLeftOffset","Canvas","_onViewPreReset","_postponeUpdatePaths","_draw","_onMouseMove","_onClick","_handleMouseOut","_ctx","_redrawRequest","_redrawBounds","_redraw","m","_updateDashArray","order","_order","_drawLast","next","_drawFirst","_requestRedraw","_extendRedrawBounds","dashValue","Number","_dashArray","_clear","clearRect","save","beginPath","clip","_drawing","restore","closePath","_fillStroke","arc","globalAlpha","fillStyle","setLineDash","lineWidth","strokeStyle","clickedLayer","_fireEvent","moving","_handleMouseHover","_hoveredLayer","_mouseHoverThrottled","candidateHoveredLayer","canvas$1","vmlCreate","namespaces","vmlMixin","coordsize","_stroke","_fill","stroked","filled","dashStyle","endcap","joinstyle","_setPath","create$2","SVG","zoomstart","_onZoomStart","_rootGroup","_svgSize","removeAttribute","svg$1","_getPaneRenderer","_createRenderer","preferCanvas","Rectangle","_boundsToLatLngs","BoxZoom","_pane","overlayPane","_resetStateTimeout","_destroy","_onMouseDown","_resetState","_clearDeferredResetState","contextmenu","mouseup","_onMouseUp","keydown","_onKeyDown","_box","_finish","boxZoomBounds","doubleClickZoom","DoubleClickZoom","_onDoubleClick","inertia","inertiaDeceleration","inertiaMaxSpeed","worldCopyJump","maxBoundsViscosity","Drag","_onPreDragLimit","_onPreDragWrap","_positions","_times","_offsetLimit","_viscosity","_lastTime","_lastPos","_absPos","_prunePositions","shift","pxCenter","pxWorldCenter","_initialWorldOffset","_worldWidth","_viscousLimit","threshold","limit","worldWidth","halfWidth","newX1","newX2","newX","noInertia","ease","speedVector","limitedSpeed","limitedSpeedVector","decelerationDuration","keyboardPanDelta","Keyboard","keyCodes","down","up","_setPanDelta","_setZoomDelta","_onFocus","blur","_onBlur","_addHooks","_removeHooks","_focused","docEl","scrollTo","panDelta","keys","_panKeys","codes","_zoomKeys","altKey","ctrlKey","metaKey","scrollWheelZoom","wheelDebounceTime","wheelPxPerZoomLevel","ScrollWheelZoom","_onWheelScroll","_delta","debounce","_lastMousePos","_timer","_performZoom","d2","d3","d4","tap","tapTolerance","Tap","_fireClick","_holdTimeout","_isTapValid","_simulateEvent","touchmove","simulatedEvent","createEvent","initMouseEvent","dispatchEvent","touchZoom","bounceAtZoomLimits","TouchZoom","_onTouchStart","_zooming","_centerPoint","_startLatLng","_pinchStartLatLng","_startDist","_startZoom","_onTouchMove","_onTouchEnd","moveFn","Projection","latLng","layerGroup","featureGroup","imageOverlay","videoOverlay","video","svgOverlay","divIcon","gridLayer","circleMarker","circle","polyline","polygon","rectangle","oldL","noConflict"],"mappings":";;;;CAKC,SAAUA,EAAQC,GACC,iBAAZC,SAA0C,oBAAXC,OAAyBF,EAAQC,SACrD,mBAAXE,QAAyBA,OAAOC,IAAMD,OAAO,CAAC,WAAYH,GAChEA,EAASD,EAAOM,EAAI,IAHtB,CAIEC,KAAM,SAAWL,GAAW,aAE9B,IAQIM,EAASC,OAAOD,OAKpB,SAASE,EAAOC,GACf,IAAIC,EAAGC,EAAGC,EAAKC,EAEf,IAAKF,EAAI,EAAGC,EAAME,UAAUC,OAAQJ,EAAIC,EAAKD,IAE5C,IAAKD,KADLG,EAAMC,UAAUH,GAEfF,EAAKC,GAAKG,EAAIH,GAGhB,OAAOD,EAbRF,OAAOD,OAAS,SAAUU,GAAO,OAAOA,GAkBxC,IAAIC,EAASV,OAAOU,QAEZ,SAAUC,GAEhB,OADAC,EAAEC,UAAYF,EACP,IAAIC,GAHZ,SAASA,KAUV,SAASE,EAAKC,EAAIN,GACjB,IAAIO,EAAQC,MAAMJ,UAAUG,MAE5B,GAAID,EAAGD,KACN,OAAOC,EAAGD,KAAKI,MAAMH,EAAIC,EAAMG,KAAKZ,UAAW,IAGhD,IAAIa,EAAOJ,EAAMG,KAAKZ,UAAW,GAEjC,OAAO,WACN,OAAOQ,EAAGG,MAAMT,EAAKW,EAAKZ,OAASY,EAAKC,OAAOL,EAAMG,KAAKZ,YAAcA,YAM1E,IAAIe,EAAS,EAIb,SAASC,EAAMd,GAGd,OADAA,EAAIe,YAAcf,EAAIe,eAAiBF,EAChCb,EAAIe,YAWZ,SAASC,EAASV,EAAIW,EAAMC,GAC3B,IAAIC,EAAMR,EAAMS,EAAWC,EAwB3B,OAtBAA,EAAQ,WAEPF,GAAO,EACHR,IACHS,EAAUX,MAAMS,EAASP,GACzBA,GAAO,IAITS,EAAY,WACPD,EAEHR,EAAOb,WAIPQ,EAAGG,MAAMS,EAASpB,WAClBwB,WAAWD,EAAOJ,GAClBE,GAAO,IAWV,SAASI,EAAQC,EAAGC,EAAOC,GAC1B,IAAIC,EAAMF,EAAM,GACZG,EAAMH,EAAM,GACZI,EAAIF,EAAMC,EACd,OAAOJ,IAAMG,GAAOD,EAAaF,IAAMA,EAAII,GAAOC,EAAIA,GAAKA,EAAID,EAKhE,SAASE,IAAY,OAAO,EAI5B,SAASC,EAAUC,EAAKC,GACvB,IAAIC,EAAMC,KAAKD,IAAI,QAAgBE,IAAXH,EAAuB,EAAIA,GACnD,OAAOE,KAAKE,MAAML,EAAME,GAAOA,EAKhC,SAASI,EAAKC,GACb,OAAOA,EAAID,KAAOC,EAAID,OAASC,EAAIC,QAAQ,aAAc,IAK1D,SAASC,EAAWF,GACnB,OAAOD,EAAKC,GAAKG,MAAM,OAKxB,SAASC,EAAW3C,EAAK4C,GAIxB,IAAK,IAAIlD,KAHJM,EAAI6C,eAAe,aACvB7C,EAAI4C,QAAU5C,EAAI4C,QAAU3C,EAAOD,EAAI4C,SAAW,IAErCA,EACb5C,EAAI4C,QAAQlD,GAAKkD,EAAQlD,GAE1B,OAAOM,EAAI4C,QAQZ,SAASE,EAAe9C,EAAK+C,EAAaC,GACzC,IAAIC,EAAS,GACb,IAAK,IAAIvD,KAAKM,EACbiD,EAAOC,KAAKC,mBAAmBH,EAAYtD,EAAE0D,cAAgB1D,GAAK,IAAMyD,mBAAmBnD,EAAIN,KAEhG,OAAUqD,IAA6C,IAA9BA,EAAYM,QAAQ,KAAqB,IAAN,KAAaJ,EAAOK,KAAK,KAGtF,IAAIC,EAAa,qBAOjB,SAASC,EAASjB,EAAKkB,GACtB,OAAOlB,EAAIC,QAAQe,EAAY,SAAUhB,EAAKmB,GAC7C,IAAIC,EAAQF,EAAKC,GAEjB,QAActB,IAAVuB,EACH,MAAM,IAAIC,MAAM,kCAAoCrB,GAKrD,MAH4B,mBAAVoB,IACjBA,EAAQA,EAAMF,IAERE,IAMT,IAAIE,EAAUrD,MAAMqD,SAAW,SAAU7D,GACxC,MAAgD,mBAAxCT,OAAOa,UAAU0D,SAASpD,KAAKV,IAKxC,SAASqD,EAAQU,EAAOC,GACvB,IAAK,IAAItE,EAAI,EAAGA,EAAIqE,EAAMhE,OAAQL,IACjC,GAAIqE,EAAMrE,KAAOsE,EAAM,OAAOtE,EAE/B,OAAQ,EAOT,IAAIuE,EAAgB,6DAIpB,SAASC,EAAYC,GACpB,OAAOC,OAAO,SAAWD,IAASC,OAAO,MAAQD,IAASC,OAAO,KAAOD,GAGzE,IAAIE,EAAW,EAGf,SAASC,EAAahE,GACrB,IAAIW,GAAQ,IAAIsD,KACZC,EAAarC,KAAKR,IAAI,EAAG,IAAMV,EAAOoD,IAG1C,OADAA,EAAWpD,EAAOuD,EACXJ,OAAO9C,WAAWhB,EAAIkE,GAG9B,IAAIC,EAAYL,OAAOM,uBAAyBR,EAAY,0BAA4BI,EACpFK,EAAWP,OAAOQ,sBAAwBV,EAAY,yBACxDA,EAAY,gCAAkC,SAAUW,GAAMT,OAAOU,aAAaD,IAQpF,SAASE,EAAiBzE,EAAIY,EAAS8D,GACtC,IAAIA,GAAaP,IAAcH,EAG9B,OAAOG,EAAU/D,KAAK0D,OAAQ/D,EAAKC,EAAIY,IAFvCZ,EAAGI,KAAKQ,GAQV,SAAS+D,EAAgBJ,GACpBA,GACHF,EAASjE,KAAK0D,OAAQS,GAKxB,IAAIK,GAAQ3F,OAAOD,QAAUC,QAAQ,CACpCD,OAAQA,EACRE,OAAQA,EACRS,OAAQA,EACRI,KAAMA,EACNQ,OAAQA,EACRC,MAAOA,EACPE,SAAUA,EACVO,QAASA,EACTO,QAASA,EACTC,UAAWA,EACXO,KAAMA,EACNG,WAAYA,EACZE,WAAYA,EACZG,eAAgBA,EAChBU,SAAUA,EACVK,QAASA,EACTR,QAASA,EACTY,cAAeA,EACfQ,UAAWA,EACXE,SAAUA,EACVI,iBAAkBA,EAClBE,gBAAiBA,IAWlB,SAASE,KAETA,EAAM3F,OAAS,SAAU4F,GAKT,SAAXC,IAGChG,KAAKiG,YACRjG,KAAKiG,WAAW7E,MAAMpB,KAAMS,WAI7BT,KAAKkG,gBARN,IAWIC,EAAcH,EAASI,UAAYpG,KAAKe,UAExCF,EAAQD,EAAOuF,GAMnB,IAAK,IAAI9F,KALTQ,EAAMwF,YAAcL,GAEXjF,UAAYF,EAGPb,KACTA,KAAKwD,eAAenD,IAAY,cAANA,GAA2B,cAANA,IAClD2F,EAAS3F,GAAKL,KAAKK,IA2CrB,OAtCI0F,EAAMO,UACTnG,EAAO6F,EAAUD,EAAMO,gBAChBP,EAAMO,SAIVP,EAAMQ,WAgEX,SAAoCA,GACnC,GAAiB,oBAANxG,IAAsBA,IAAMA,EAAEyG,MAAS,OAElDD,EAAW/B,EAAQ+B,GAAYA,EAAW,CAACA,GAE3C,IAAK,IAAIlG,EAAI,EAAGA,EAAIkG,EAAS7F,OAAQL,IAChCkG,EAASlG,KAAON,EAAEyG,MAAMC,QAC3BC,QAAQC,KAAK,kIAE8B,IAAIpC,OAAQqC,OAxExDC,CAA2Bd,EAAMQ,UACjCpG,EAAOiB,MAAM,KAAM,CAACP,GAAOU,OAAOwE,EAAMQ,kBACjCR,EAAMQ,UAIV1F,EAAM0C,UACTwC,EAAMxC,QAAUpD,EAAOS,EAAOC,EAAM0C,SAAUwC,EAAMxC,UAIrDpD,EAAOU,EAAOkF,GAEdlF,EAAMiG,WAAa,GAGnBjG,EAAMqF,cAAgB,WAErB,IAAIlG,KAAK+G,iBAAT,CAEIZ,EAAYD,eACfC,EAAYD,cAAc7E,KAAKrB,MAGhCA,KAAK+G,kBAAmB,EAExB,IAAK,IAAI1G,EAAI,EAAGE,EAAMM,EAAMiG,WAAWpG,OAAQL,EAAIE,EAAKF,IACvDQ,EAAMiG,WAAWzG,GAAGgB,KAAKrB,QAIpBgG,GAMRF,EAAMkB,QAAU,SAAUjB,GAEzB,OADA5F,EAAOH,KAAKe,UAAWgF,GAChB/F,MAKR8F,EAAMmB,aAAe,SAAU1D,GAE9B,OADApD,EAAOH,KAAKe,UAAUwC,QAASA,GACxBvD,MAKR8F,EAAMoB,YAAc,SAAUjG,GAC7B,IAAIK,EAAOH,MAAMJ,UAAUG,MAAMG,KAAKZ,UAAW,GAE7C0G,EAAqB,mBAAPlG,EAAoBA,EAAK,WAC1CjB,KAAKiB,GAAIG,MAAMpB,KAAMsB,IAKtB,OAFAtB,KAAKe,UAAU+F,WAAa9G,KAAKe,UAAU+F,YAAc,GACzD9G,KAAKe,UAAU+F,WAAWjD,KAAKsD,GACxBnH,MA0CR,IAAIyG,EAAS,CAQZW,GAAI,SAAUC,EAAOpG,EAAIY,GAGxB,GAAqB,iBAAVwF,EACV,IAAK,IAAIC,KAAQD,EAGhBrH,KAAKuH,IAAID,EAAMD,EAAMC,GAAOrG,QAO7B,IAAK,IAAIZ,EAAI,EAAGE,GAFhB8G,EAAQjE,EAAWiE,IAES3G,OAAQL,EAAIE,EAAKF,IAC5CL,KAAKuH,IAAIF,EAAMhH,GAAIY,EAAIY,GAIzB,OAAO7B,MAcRwH,IAAK,SAAUH,EAAOpG,EAAIY,GAEzB,GAAKwF,EAIE,GAAqB,iBAAVA,EACjB,IAAK,IAAIC,KAAQD,EAChBrH,KAAKyH,KAAKH,EAAMD,EAAMC,GAAOrG,QAM9B,IAAK,IAAIZ,EAAI,EAAGE,GAFhB8G,EAAQjE,EAAWiE,IAES3G,OAAQL,EAAIE,EAAKF,IAC5CL,KAAKyH,KAAKJ,EAAMhH,GAAIY,EAAIY,eAXlB7B,KAAK0H,QAeb,OAAO1H,MAIRuH,IAAK,SAAUD,EAAMrG,EAAIY,GACxB7B,KAAK0H,QAAU1H,KAAK0H,SAAW,GAG/B,IAAIC,EAAgB3H,KAAK0H,QAAQJ,GAC5BK,IACJA,EAAgB,GAChB3H,KAAK0H,QAAQJ,GAAQK,GAGlB9F,IAAY7B,OAEf6B,OAAUkB,GAMX,IAJA,IAAI6E,EAAc,CAAC3G,GAAIA,EAAI4G,IAAKhG,GAC5BiG,EAAYH,EAGPtH,EAAI,EAAGE,EAAMuH,EAAUpH,OAAQL,EAAIE,EAAKF,IAChD,GAAIyH,EAAUzH,GAAGY,KAAOA,GAAM6G,EAAUzH,GAAGwH,MAAQhG,EAClD,OAIFiG,EAAUjE,KAAK+D,IAGhBH,KAAM,SAAUH,EAAMrG,EAAIY,GACzB,IAAIiG,EACAzH,EACAE,EAEJ,GAAKP,KAAK0H,UAEVI,EAAY9H,KAAK0H,QAAQJ,IAMzB,GAAKrG,GAcL,GAJIY,IAAY7B,OACf6B,OAAUkB,GAGP+E,EAGH,IAAKzH,EAAI,EAAGE,EAAMuH,EAAUpH,OAAQL,EAAIE,EAAKF,IAAK,CACjD,IAAI0H,EAAID,EAAUzH,GAClB,GAAI0H,EAAEF,MAAQhG,GACVkG,EAAE9G,KAAOA,EAWZ,OARA8G,EAAE9G,GAAKwB,EAEHzC,KAAKgI,eAERhI,KAAK0H,QAAQJ,GAAQQ,EAAYA,EAAU5G,cAE5C4G,EAAUG,OAAO5H,EAAG,QA7BvB,CAEC,IAAKA,EAAI,EAAGE,EAAMuH,EAAUpH,OAAQL,EAAIE,EAAKF,IAC5CyH,EAAUzH,GAAGY,GAAKwB,SAGZzC,KAAK0H,QAAQJ,KAmCtBY,KAAM,SAAUZ,EAAMlD,EAAM+D,GAC3B,IAAKnI,KAAKoI,QAAQd,EAAMa,GAAc,OAAOnI,KAE7C,IAAIqI,EAAQlI,EAAO,GAAIiE,EAAM,CAC5BkD,KAAMA,EACNgB,OAAQtI,KACRuI,aAAcnE,GAAQA,EAAKmE,cAAgBvI,OAG5C,GAAIA,KAAK0H,QAAS,CACjB,IAAII,EAAY9H,KAAK0H,QAAQJ,GAE7B,GAAIQ,EAAW,CACd9H,KAAKgI,aAAgBhI,KAAKgI,aAAe,GAAM,EAC/C,IAAK,IAAI3H,EAAI,EAAGE,EAAMuH,EAAUpH,OAAQL,EAAIE,EAAKF,IAAK,CACrD,IAAI0H,EAAID,EAAUzH,GAClB0H,EAAE9G,GAAGI,KAAK0G,EAAEF,KAAO7H,KAAMqI,GAG1BrI,KAAKgI,gBASP,OALIG,GAEHnI,KAAKwI,gBAAgBH,GAGfrI,MAKRoI,QAAS,SAAUd,EAAMa,GACxB,IAAIL,EAAY9H,KAAK0H,SAAW1H,KAAK0H,QAAQJ,GAC7C,GAAIQ,GAAaA,EAAUpH,OAAU,OAAO,EAE5C,GAAIyH,EAEH,IAAK,IAAI3C,KAAMxF,KAAKyI,cACnB,GAAIzI,KAAKyI,cAAcjD,GAAI4C,QAAQd,EAAMa,GAAc,OAAO,EAGhE,OAAO,GAKRO,KAAM,SAAUrB,EAAOpG,EAAIY,GAE1B,GAAqB,iBAAVwF,EAAoB,CAC9B,IAAK,IAAIC,KAAQD,EAChBrH,KAAK0I,KAAKpB,EAAMD,EAAMC,GAAOrG,GAE9B,OAAOjB,KAGR,IAAI2I,EAAU3H,EAAK,WAClBhB,KACKwH,IAAIH,EAAOpG,EAAIY,GACf2F,IAAIH,EAAOsB,EAAS9G,IACvB7B,MAGH,OAAOA,KACFoH,GAAGC,EAAOpG,EAAIY,GACduF,GAAGC,EAAOsB,EAAS9G,IAKzB+G,eAAgB,SAAUjI,GAGzB,OAFAX,KAAKyI,cAAgBzI,KAAKyI,eAAiB,GAC3CzI,KAAKyI,cAAchH,EAAMd,IAAQA,EAC1BX,MAKR6I,kBAAmB,SAAUlI,GAI5B,OAHIX,KAAKyI,sBACDzI,KAAKyI,cAAchH,EAAMd,IAE1BX,MAGRwI,gBAAiB,SAAUM,GAC1B,IAAK,IAAItD,KAAMxF,KAAKyI,cACnBzI,KAAKyI,cAAcjD,GAAI0C,KAAKY,EAAExB,KAAMnH,EAAO,CAC1C4I,MAAOD,EAAER,OACTU,eAAgBF,EAAER,QAChBQ,IAAI,KASVrC,EAAOwC,iBAAmBxC,EAAOW,GAOjCX,EAAOyC,oBAAsBzC,EAAO0C,uBAAyB1C,EAAOe,IAIpEf,EAAO2C,wBAA0B3C,EAAOiC,KAIxCjC,EAAO4C,UAAY5C,EAAOyB,KAI1BzB,EAAO6C,kBAAoB7C,EAAO2B,QAElC,IAAImB,EAAUzD,EAAM3F,OAAOsG,GA0B3B,SAAS+C,EAAMrH,EAAGsH,EAAGzG,GAEpBhD,KAAKmC,EAAKa,EAAQF,KAAKE,MAAMb,GAAKA,EAElCnC,KAAKyJ,EAAKzG,EAAQF,KAAKE,MAAMyG,GAAKA,EAGnC,IAAIC,EAAQ5G,KAAK4G,OAAS,SAAUC,GACnC,OAAW,EAAJA,EAAQ7G,KAAK8G,MAAMD,GAAK7G,KAAK+G,KAAKF,IA6K1C,SAASG,EAAQ3H,EAAGsH,EAAGzG,GACtB,OAAIb,aAAaqH,EACTrH,EAEJqC,EAAQrC,GACJ,IAAIqH,EAAMrH,EAAE,GAAIA,EAAE,IAEtBA,MAAAA,EACIA,EAES,iBAANA,GAAkB,MAAOA,GAAK,MAAOA,EACxC,IAAIqH,EAAMrH,EAAEA,EAAGA,EAAEsH,GAElB,IAAID,EAAMrH,EAAGsH,EAAGzG,GA4BxB,SAAS+G,EAAOC,EAAGC,GAClB,GAAKD,EAIL,IAFA,IAAIE,EAASD,EAAI,CAACD,EAAGC,GAAKD,EAEjB3J,EAAI,EAAGE,EAAM2J,EAAOxJ,OAAQL,EAAIE,EAAKF,IAC7CL,KAAKG,OAAO+J,EAAO7J,IAsIrB,SAAS8J,EAASH,EAAGC,GACpB,OAAKD,GAAKA,aAAaD,EACfC,EAED,IAAID,EAAOC,EAAGC,GAiCtB,SAASG,EAAaC,EAASC,GAC9B,GAAKD,EAIL,IAFA,IAAIE,EAAUD,EAAU,CAACD,EAASC,GAAWD,EAEpChK,EAAI,EAAGE,EAAMgK,EAAQ7J,OAAQL,EAAIE,EAAKF,IAC9CL,KAAKG,OAAOoK,EAAQlK,IA+MtB,SAASmK,EAAeR,EAAGC,GAC1B,OAAID,aAAaI,EACTJ,EAED,IAAII,EAAaJ,EAAGC,GA4B5B,SAASQ,EAAOC,EAAKC,EAAKC,GACzB,GAAIC,MAAMH,IAAQG,MAAMF,GACvB,MAAM,IAAIpG,MAAM,2BAA6BmG,EAAM,KAAOC,EAAM,KAKjE3K,KAAK0K,KAAOA,EAIZ1K,KAAK2K,KAAOA,OAIA5H,IAAR6H,IACH5K,KAAK4K,KAAOA,GAoEd,SAASE,EAASd,EAAGC,EAAGc,GACvB,OAAIf,aAAaS,EACTT,EAEJxF,EAAQwF,IAAsB,iBAATA,EAAE,GACT,IAAbA,EAAEtJ,OACE,IAAI+J,EAAOT,EAAE,GAAIA,EAAE,GAAIA,EAAE,IAEhB,IAAbA,EAAEtJ,OACE,IAAI+J,EAAOT,EAAE,GAAIA,EAAE,IAEpB,KAEJA,MAAAA,EACIA,EAES,iBAANA,GAAkB,QAASA,EAC9B,IAAIS,EAAOT,EAAEU,IAAK,QAASV,EAAIA,EAAEW,IAAMX,EAAEgB,IAAKhB,EAAEY,UAE9C7H,IAANkH,EACI,KAED,IAAIQ,EAAOT,EAAGC,EAAGc,GAnuBzBvB,EAAMzI,UAAY,CAIjBkK,MAAO,WACN,OAAO,IAAIzB,EAAMxJ,KAAKmC,EAAGnC,KAAKyJ,IAK/ByB,IAAK,SAAUC,GAEd,OAAOnL,KAAKiL,QAAQG,KAAKtB,EAAQqB,KAGlCC,KAAM,SAAUD,GAIf,OAFAnL,KAAKmC,GAAKgJ,EAAMhJ,EAChBnC,KAAKyJ,GAAK0B,EAAM1B,EACTzJ,MAKRqL,SAAU,SAAUF,GACnB,OAAOnL,KAAKiL,QAAQK,UAAUxB,EAAQqB,KAGvCG,UAAW,SAAUH,GAGpB,OAFAnL,KAAKmC,GAAKgJ,EAAMhJ,EAChBnC,KAAKyJ,GAAK0B,EAAM1B,EACTzJ,MAKRuL,SAAU,SAAU5I,GACnB,OAAO3C,KAAKiL,QAAQO,UAAU7I,IAG/B6I,UAAW,SAAU7I,GAGpB,OAFA3C,KAAKmC,GAAKQ,EACV3C,KAAKyJ,GAAK9G,EACH3C,MAKRyL,WAAY,SAAU9I,GACrB,OAAO3C,KAAKiL,QAAQS,YAAY/I,IAGjC+I,YAAa,SAAU/I,GAGtB,OAFA3C,KAAKmC,GAAKQ,EACV3C,KAAKyJ,GAAK9G,EACH3C,MAQR2L,QAAS,SAAUR,GAClB,OAAO,IAAI3B,EAAMxJ,KAAKmC,EAAIgJ,EAAMhJ,EAAGnC,KAAKyJ,EAAI0B,EAAM1B,IAMnDmC,UAAW,SAAUT,GACpB,OAAO,IAAI3B,EAAMxJ,KAAKmC,EAAIgJ,EAAMhJ,EAAGnC,KAAKyJ,EAAI0B,EAAM1B,IAKnDzG,MAAO,WACN,OAAOhD,KAAKiL,QAAQY,UAGrBA,OAAQ,WAGP,OAFA7L,KAAKmC,EAAIW,KAAKE,MAAMhD,KAAKmC,GACzBnC,KAAKyJ,EAAI3G,KAAKE,MAAMhD,KAAKyJ,GAClBzJ,MAKR4J,MAAO,WACN,OAAO5J,KAAKiL,QAAQa,UAGrBA,OAAQ,WAGP,OAFA9L,KAAKmC,EAAIW,KAAK8G,MAAM5J,KAAKmC,GACzBnC,KAAKyJ,EAAI3G,KAAK8G,MAAM5J,KAAKyJ,GAClBzJ,MAKR6J,KAAM,WACL,OAAO7J,KAAKiL,QAAQc,SAGrBA,MAAO,WAGN,OAFA/L,KAAKmC,EAAIW,KAAK+G,KAAK7J,KAAKmC,GACxBnC,KAAKyJ,EAAI3G,KAAK+G,KAAK7J,KAAKyJ,GACjBzJ,MAKR0J,MAAO,WACN,OAAO1J,KAAKiL,QAAQe,UAGrBA,OAAQ,WAGP,OAFAhM,KAAKmC,EAAIuH,EAAM1J,KAAKmC,GACpBnC,KAAKyJ,EAAIC,EAAM1J,KAAKyJ,GACbzJ,MAKRiM,WAAY,SAAUd,GAGrB,IAAIhJ,GAFJgJ,EAAQrB,EAAQqB,IAEFhJ,EAAInC,KAAKmC,EACnBsH,EAAI0B,EAAM1B,EAAIzJ,KAAKyJ,EAEvB,OAAO3G,KAAKoJ,KAAK/J,EAAIA,EAAIsH,EAAIA,IAK9B0C,OAAQ,SAAUhB,GAGjB,OAFAA,EAAQrB,EAAQqB,IAEHhJ,IAAMnC,KAAKmC,GACjBgJ,EAAM1B,IAAMzJ,KAAKyJ,GAKzB2C,SAAU,SAAUjB,GAGnB,OAFAA,EAAQrB,EAAQqB,GAETrI,KAAKuJ,IAAIlB,EAAMhJ,IAAMW,KAAKuJ,IAAIrM,KAAKmC,IACnCW,KAAKuJ,IAAIlB,EAAM1B,IAAM3G,KAAKuJ,IAAIrM,KAAKyJ,IAK3ChF,SAAU,WACT,MAAO,SACC/B,EAAU1C,KAAKmC,GAAK,KACpBO,EAAU1C,KAAKyJ,GAAK,MAiE9BM,EAAOhJ,UAAY,CAGlBZ,OAAQ,SAAUgL,GAgBjB,OAfAA,EAAQrB,EAAQqB,GAMXnL,KAAKuC,KAAQvC,KAAKsC,KAItBtC,KAAKuC,IAAIJ,EAAIW,KAAKP,IAAI4I,EAAMhJ,EAAGnC,KAAKuC,IAAIJ,GACxCnC,KAAKsC,IAAIH,EAAIW,KAAKR,IAAI6I,EAAMhJ,EAAGnC,KAAKsC,IAAIH,GACxCnC,KAAKuC,IAAIkH,EAAI3G,KAAKP,IAAI4I,EAAM1B,EAAGzJ,KAAKuC,IAAIkH,GACxCzJ,KAAKsC,IAAImH,EAAI3G,KAAKR,IAAI6I,EAAM1B,EAAGzJ,KAAKsC,IAAImH,KANxCzJ,KAAKuC,IAAM4I,EAAMF,QACjBjL,KAAKsC,IAAM6I,EAAMF,SAOXjL,MAKRsM,UAAW,SAAUtJ,GACpB,OAAO,IAAIwG,GACFxJ,KAAKuC,IAAIJ,EAAInC,KAAKsC,IAAIH,GAAK,GAC3BnC,KAAKuC,IAAIkH,EAAIzJ,KAAKsC,IAAImH,GAAK,EAAGzG,IAKxCuJ,cAAe,WACd,OAAO,IAAI/C,EAAMxJ,KAAKuC,IAAIJ,EAAGnC,KAAKsC,IAAImH,IAKvC+C,YAAa,WACZ,OAAO,IAAIhD,EAAMxJ,KAAKsC,IAAIH,EAAGnC,KAAKuC,IAAIkH,IAKvCgD,WAAY,WACX,OAAOzM,KAAKuC,KAKbmK,eAAgB,WACf,OAAO1M,KAAKsC,KAKbqK,QAAS,WACR,OAAO3M,KAAKsC,IAAI+I,SAASrL,KAAKuC,MAQ/B6J,SAAU,SAAUzL,GACnB,IAAI4B,EAAKD,EAeT,OAZC3B,EADqB,iBAAXA,EAAI,IAAmBA,aAAe6I,EAC1CM,EAAQnJ,GAERwJ,EAASxJ,cAGGoJ,GAClBxH,EAAM5B,EAAI4B,IACVD,EAAM3B,EAAI2B,KAEVC,EAAMD,EAAM3B,EAGL4B,EAAIJ,GAAKnC,KAAKuC,IAAIJ,GAClBG,EAAIH,GAAKnC,KAAKsC,IAAIH,GAClBI,EAAIkH,GAAKzJ,KAAKuC,IAAIkH,GAClBnH,EAAImH,GAAKzJ,KAAKsC,IAAImH,GAM3BmD,WAAY,SAAUC,GACrBA,EAAS1C,EAAS0C,GAElB,IAAItK,EAAMvC,KAAKuC,IACXD,EAAMtC,KAAKsC,IACXwK,EAAOD,EAAOtK,IACdwK,EAAOF,EAAOvK,IACd0K,EAAeD,EAAK5K,GAAKI,EAAIJ,GAAO2K,EAAK3K,GAAKG,EAAIH,EAClD8K,EAAeF,EAAKtD,GAAKlH,EAAIkH,GAAOqD,EAAKrD,GAAKnH,EAAImH,EAEtD,OAAOuD,GAAeC,GAMvBC,SAAU,SAAUL,GACnBA,EAAS1C,EAAS0C,GAElB,IAAItK,EAAMvC,KAAKuC,IACXD,EAAMtC,KAAKsC,IACXwK,EAAOD,EAAOtK,IACdwK,EAAOF,EAAOvK,IACd6K,EAAaJ,EAAK5K,EAAII,EAAIJ,GAAO2K,EAAK3K,EAAIG,EAAIH,EAC9CiL,EAAaL,EAAKtD,EAAIlH,EAAIkH,GAAOqD,EAAKrD,EAAInH,EAAImH,EAElD,OAAO0D,GAAaC,GAGrBC,QAAS,WACR,SAAUrN,KAAKuC,MAAOvC,KAAKsC,OAyD7B8H,EAAarJ,UAAY,CAQxBZ,OAAQ,SAAUQ,GACjB,IAEI2M,EAAKC,EAFLC,EAAKxN,KAAKyN,WACVC,EAAK1N,KAAK2N,WAGd,GAAIhN,aAAe8J,EAElB8C,EADAD,EAAM3M,MAGA,CAAA,KAAIA,aAAeyJ,GAOzB,OAAOzJ,EAAMX,KAAKG,OAAO2K,EAASnK,IAAQ6J,EAAe7J,IAAQX,KAHjE,GAHAsN,EAAM3M,EAAI8M,WACVF,EAAM5M,EAAIgN,YAELL,IAAQC,EAAO,OAAOvN,KAgB5B,OAVKwN,GAAOE,GAIXF,EAAG9C,IAAM5H,KAAKP,IAAI+K,EAAI5C,IAAK8C,EAAG9C,KAC9B8C,EAAG7C,IAAM7H,KAAKP,IAAI+K,EAAI3C,IAAK6C,EAAG7C,KAC9B+C,EAAGhD,IAAM5H,KAAKR,IAAIiL,EAAI7C,IAAKgD,EAAGhD,KAC9BgD,EAAG/C,IAAM7H,KAAKR,IAAIiL,EAAI5C,IAAK+C,EAAG/C,OAN9B3K,KAAKyN,WAAa,IAAIhD,EAAO6C,EAAI5C,IAAK4C,EAAI3C,KAC1C3K,KAAK2N,WAAa,IAAIlD,EAAO8C,EAAI7C,IAAK6C,EAAI5C,MAQpC3K,MAOR4N,IAAK,SAAUC,GACd,IAAIL,EAAKxN,KAAKyN,WACVC,EAAK1N,KAAK2N,WACVG,EAAehL,KAAKuJ,IAAImB,EAAG9C,IAAMgD,EAAGhD,KAAOmD,EAC3CE,EAAcjL,KAAKuJ,IAAImB,EAAG7C,IAAM+C,EAAG/C,KAAOkD,EAE9C,OAAO,IAAIzD,EACH,IAAIK,EAAO+C,EAAG9C,IAAMoD,EAAcN,EAAG7C,IAAMoD,GAC3C,IAAItD,EAAOiD,EAAGhD,IAAMoD,EAAcJ,EAAG/C,IAAMoD,KAKpDzB,UAAW,WACV,OAAO,IAAI7B,GACFzK,KAAKyN,WAAW/C,IAAM1K,KAAK2N,WAAWjD,KAAO,GAC7C1K,KAAKyN,WAAW9C,IAAM3K,KAAK2N,WAAWhD,KAAO,IAKvDqD,aAAc,WACb,OAAOhO,KAAKyN,YAKbQ,aAAc,WACb,OAAOjO,KAAK2N,YAKbO,aAAc,WACb,OAAO,IAAIzD,EAAOzK,KAAKmO,WAAYnO,KAAKoO,YAKzCC,aAAc,WACb,OAAO,IAAI5D,EAAOzK,KAAKsO,WAAYtO,KAAKuO,YAKzCH,QAAS,WACR,OAAOpO,KAAKyN,WAAW9C,KAKxB2D,SAAU,WACT,OAAOtO,KAAKyN,WAAW/C,KAKxB6D,QAAS,WACR,OAAOvO,KAAK2N,WAAWhD,KAKxBwD,SAAU,WACT,OAAOnO,KAAK2N,WAAWjD,KASxB0B,SAAU,SAAUzL,GAElBA,EADqB,iBAAXA,EAAI,IAAmBA,aAAe8J,GAAU,QAAS9J,EAC7DmK,EAASnK,GAET6J,EAAe7J,GAGtB,IAEI2M,EAAKC,EAFLC,EAAKxN,KAAKyN,WACVC,EAAK1N,KAAK2N,WAUd,OAPIhN,aAAeyJ,GAClBkD,EAAM3M,EAAIqN,eACVT,EAAM5M,EAAIsN,gBAEVX,EAAMC,EAAM5M,EAGL2M,EAAI5C,KAAO8C,EAAG9C,KAAS6C,EAAI7C,KAAOgD,EAAGhD,KACrC4C,EAAI3C,KAAO6C,EAAG7C,KAAS4C,EAAI5C,KAAO+C,EAAG/C,KAK9CiC,WAAY,SAAUC,GACrBA,EAASrC,EAAeqC,GAExB,IAAIW,EAAKxN,KAAKyN,WACVC,EAAK1N,KAAK2N,WACVL,EAAMT,EAAOmB,eACbT,EAAMV,EAAOoB,eAEbO,EAAiBjB,EAAI7C,KAAO8C,EAAG9C,KAAS4C,EAAI5C,KAAOgD,EAAGhD,IACtD+D,EAAiBlB,EAAI5C,KAAO6C,EAAG7C,KAAS2C,EAAI3C,KAAO+C,EAAG/C,IAE1D,OAAO6D,GAAiBC,GAKzBvB,SAAU,SAAUL,GACnBA,EAASrC,EAAeqC,GAExB,IAAIW,EAAKxN,KAAKyN,WACVC,EAAK1N,KAAK2N,WACVL,EAAMT,EAAOmB,eACbT,EAAMV,EAAOoB,eAEbS,EAAenB,EAAI7C,IAAM8C,EAAG9C,KAAS4C,EAAI5C,IAAMgD,EAAGhD,IAClDiE,EAAepB,EAAI5C,IAAM6C,EAAG7C,KAAS2C,EAAI3C,IAAM+C,EAAG/C,IAEtD,OAAO+D,GAAeC,GAKvBC,aAAc,WACb,MAAO,CAAC5O,KAAKoO,UAAWpO,KAAKsO,WAAYtO,KAAKuO,UAAWvO,KAAKmO,YAAYlK,KAAK,MAKhFkI,OAAQ,SAAUU,EAAQgC,GACzB,QAAKhC,IAELA,EAASrC,EAAeqC,GAEjB7M,KAAKyN,WAAWtB,OAAOU,EAAOmB,eAAgBa,IAC9C7O,KAAK2N,WAAWxB,OAAOU,EAAOoB,eAAgBY,KAKtDxB,QAAS,WACR,SAAUrN,KAAKyN,aAAczN,KAAK2N,cA0KpC,IAwLMnL,EAxLFsM,EAAM,CAGTC,cAAe,SAAUC,EAAQC,GAChC,IAAIC,EAAiBlP,KAAKmP,WAAWC,QAAQJ,GACzCK,EAAQrP,KAAKqP,MAAMJ,GAEvB,OAAOjP,KAAKsP,eAAeC,WAAWL,EAAgBG,IAMvDG,cAAe,SAAUrE,EAAO8D,GAC/B,IAAII,EAAQrP,KAAKqP,MAAMJ,GACnBQ,EAAqBzP,KAAKsP,eAAeI,YAAYvE,EAAOkE,GAEhE,OAAOrP,KAAKmP,WAAWQ,UAAUF,IAMlCL,QAAS,SAAUJ,GAClB,OAAOhP,KAAKmP,WAAWC,QAAQJ,IAMhCW,UAAW,SAAUxE,GACpB,OAAOnL,KAAKmP,WAAWQ,UAAUxE,IAOlCkE,MAAO,SAAUJ,GAChB,OAAO,IAAMnM,KAAKD,IAAI,EAAGoM,IAM1BA,KAAM,SAAUI,GACf,OAAOvM,KAAK8M,IAAIP,EAAQ,KAAOvM,KAAK+M,KAKrCC,mBAAoB,SAAUb,GAC7B,GAAIjP,KAAK+P,SAAY,OAAO,KAE5B,IAAI9F,EAAIjK,KAAKmP,WAAWtC,OACpBmD,EAAIhQ,KAAKqP,MAAMJ,GAInB,OAAO,IAAIlF,EAHD/J,KAAKsP,eAAeW,UAAUhG,EAAE1H,IAAKyN,GACrChQ,KAAKsP,eAAeW,UAAUhG,EAAE3H,IAAK0N,KAwBhDD,WA3LDtF,EAAO1J,UAAY,CAGlBoL,OAAQ,SAAUxL,EAAKkO,GACtB,QAAKlO,IAELA,EAAMmK,EAASnK,GAEFmC,KAAKR,IACVQ,KAAKuJ,IAAIrM,KAAK0K,IAAM/J,EAAI+J,KACxB5H,KAAKuJ,IAAIrM,KAAK2K,IAAMhK,EAAIgK,aAEA5H,IAAd8L,EAA0B,KAASA,KAKtDpK,SAAU,SAAUyL,GACnB,MAAO,UACCxN,EAAU1C,KAAK0K,IAAKwF,GAAa,KACjCxN,EAAU1C,KAAK2K,IAAKuF,GAAa,KAK1CjE,WAAY,SAAUkE,GACrB,OAAOC,EAAMC,SAASrQ,KAAM8K,EAASqF,KAKtCG,KAAM,WACL,OAAOF,EAAMG,WAAWvQ,OAKzBmK,SAAU,SAAUqG,GACnB,IAAIC,EAAc,IAAMD,EAAe,SACnCE,EAAcD,EAAc3N,KAAK6N,IAAK7N,KAAK8N,GAAK,IAAO5Q,KAAK0K,KAEhE,OAAOF,EACC,CAACxK,KAAK0K,IAAM+F,EAAazQ,KAAK2K,IAAM+F,GACpC,CAAC1Q,KAAK0K,IAAM+F,EAAazQ,KAAK2K,IAAM+F,KAG7CzF,MAAO,WACN,OAAO,IAAIR,EAAOzK,KAAK0K,IAAK1K,KAAK2K,IAAK3K,KAAK4K,QAiJ5C2F,WAAY,SAAUvB,GACrB,IAAIrE,EAAM3K,KAAK6Q,QAAU3O,EAAQ8M,EAAOrE,IAAK3K,KAAK6Q,SAAS,GAAQ7B,EAAOrE,IAI1E,OAAO,IAAIF,EAHDzK,KAAK8Q,QAAU5O,EAAQ8M,EAAOtE,IAAK1K,KAAK8Q,SAAS,GAAQ9B,EAAOtE,IAGnDC,EAFbqE,EAAOpE,MASlBmG,iBAAkB,SAAUlE,GAC3B,IAAImE,EAASnE,EAAOP,YAChB2E,EAAYjR,KAAKuQ,WAAWS,GAC5BE,EAAWF,EAAOtG,IAAMuG,EAAUvG,IAClCyG,EAAWH,EAAOrG,IAAMsG,EAAUtG,IAEtC,GAAiB,GAAbuG,GAA+B,GAAbC,EACrB,OAAOtE,EAGR,IAAIW,EAAKX,EAAOmB,eACZN,EAAKb,EAAOoB,eAIhB,OAAO,IAAI7D,EAHC,IAAIK,EAAO+C,EAAG9C,IAAMwG,EAAU1D,EAAG7C,IAAMwG,GACvC,IAAI1G,EAAOiD,EAAGhD,IAAMwG,EAAUxD,EAAG/C,IAAMwG,MAgBjDf,EAAQjQ,EAAO,GAAI2O,EAAK,CAC3B+B,QAAS,EAAE,IAAK,KAKhBO,EAAG,OAGHf,SAAU,SAAUgB,EAASC,GAC5B,IAAIC,EAAMzO,KAAK8N,GAAK,IAChBY,EAAOH,EAAQ3G,IAAM6G,EACrBE,EAAOH,EAAQ5G,IAAM6G,EACrBG,EAAU5O,KAAK6O,KAAKL,EAAQ5G,IAAM2G,EAAQ3G,KAAO6G,EAAM,GACvDK,EAAU9O,KAAK6O,KAAKL,EAAQ3G,IAAM0G,EAAQ1G,KAAO4G,EAAM,GACvDvH,EAAI0H,EAAUA,EAAU5O,KAAK6N,IAAIa,GAAQ1O,KAAK6N,IAAIc,GAAQG,EAAUA,EACpE7G,EAAI,EAAIjI,KAAK+O,MAAM/O,KAAKoJ,KAAKlC,GAAIlH,KAAKoJ,KAAK,EAAIlC,IACnD,OAAOhK,KAAKoR,EAAIrG,KAad+G,EAAc,QAEdC,EAAoB,CAEvBX,EAAGU,EACHE,aAAc,cAEd5C,QAAS,SAAUJ,GAClB,IAAIxM,EAAIM,KAAK8N,GAAK,IACdtO,EAAMtC,KAAKgS,aACXtH,EAAM5H,KAAKR,IAAIQ,KAAKP,IAAID,EAAK0M,EAAOtE,MAAOpI,GAC3CqP,EAAM7O,KAAK6O,IAAIjH,EAAMlI,GAEzB,OAAO,IAAIgH,EACVxJ,KAAKoR,EAAIpC,EAAOrE,IAAMnI,EACtBxC,KAAKoR,EAAItO,KAAK8M,KAAK,EAAI+B,IAAQ,EAAIA,IAAQ,IAG7ChC,UAAW,SAAUxE,GACpB,IAAI3I,EAAI,IAAMM,KAAK8N,GAEnB,OAAO,IAAInG,GACT,EAAI3H,KAAKmP,KAAKnP,KAAKoP,IAAI/G,EAAM1B,EAAIzJ,KAAKoR,IAAOtO,KAAK8N,GAAK,GAAMpO,EAC9D2I,EAAMhJ,EAAIK,EAAIxC,KAAKoR,IAGrBvE,QACKrK,EAAIsP,EAAchP,KAAK8N,GACpB,IAAI7G,EAAO,EAAEvH,GAAIA,GAAI,CAACA,EAAGA,MAyBlC,SAAS2P,EAAenI,EAAGC,EAAGc,EAAGvI,GAChC,GAAIgC,EAAQwF,GAMX,OAJAhK,KAAKoS,GAAKpI,EAAE,GACZhK,KAAKqS,GAAKrI,EAAE,GACZhK,KAAKsS,GAAKtI,EAAE,QACZhK,KAAKuS,GAAKvI,EAAE,IAGbhK,KAAKoS,GAAKpI,EACVhK,KAAKqS,GAAKpI,EACVjK,KAAKsS,GAAKvH,EACV/K,KAAKuS,GAAK/P,EAwCX,SAASgQ,EAAiBxI,EAAGC,EAAGc,EAAGvI,GAClC,OAAO,IAAI2P,EAAenI,EAAGC,EAAGc,EAAGvI,GAtCpC2P,EAAepR,UAAY,CAI1BkP,UAAW,SAAU9E,EAAOkE,GAC3B,OAAOrP,KAAKuP,WAAWpE,EAAMF,QAASoE,IAIvCE,WAAY,SAAUpE,EAAOkE,GAI5B,OAHAA,EAAQA,GAAS,EACjBlE,EAAMhJ,EAAIkN,GAASrP,KAAKoS,GAAKjH,EAAMhJ,EAAInC,KAAKqS,IAC5ClH,EAAM1B,EAAI4F,GAASrP,KAAKsS,GAAKnH,EAAM1B,EAAIzJ,KAAKuS,IACrCpH,GAMRuE,YAAa,SAAUvE,EAAOkE,GAE7B,OADAA,EAAQA,GAAS,EACV,IAAI7F,GACF2B,EAAMhJ,EAAIkN,EAAQrP,KAAKqS,IAAMrS,KAAKoS,IAClCjH,EAAM1B,EAAI4F,EAAQrP,KAAKuS,IAAMvS,KAAKsS,MA2B7C,IAKMjD,EALFoD,EAAWtS,EAAO,GAAIiQ,EAAO,CAChCsC,KAAM,YACNvD,WAAY4C,EAEZzC,gBACKD,EAAQ,IAAOvM,KAAK8N,GAAKmB,EAAkBX,GACxCoB,EAAiBnD,EAAO,IAAMA,EAAO,OAI1CsD,EAAaxS,EAAO,GAAIsS,EAAU,CACrCC,KAAM,gBAUP,SAASE,EAAU9N,GAClB,OAAO+N,SAASC,gBAAgB,6BAA8BhO,GAM/D,SAASiO,EAAaC,EAAOC,GAC5B,IACA5S,EAAGC,EAAGC,EAAK2S,EAAMhJ,EAAQiJ,EADrBjQ,EAAM,GAGV,IAAK7C,EAAI,EAAGE,EAAMyS,EAAMtS,OAAQL,EAAIE,EAAKF,IAAK,CAG7C,IAAKC,EAAI,EAAG4S,GAFZhJ,EAAS8I,EAAM3S,IAEWK,OAAQJ,EAAI4S,EAAM5S,IAE3C4C,IAAQ5C,EAAI,IAAM,MADlB6S,EAAIjJ,EAAO5J,IACgB6B,EAAI,IAAMgR,EAAE1J,EAIxCvG,GAAO+P,EAAUG,GAAM,IAAM,IAAO,GAIrC,OAAOlQ,GAAO,OAkBf,IAAImQ,GAAUR,SAASS,gBAAgBC,MAGnCC,GAAK,kBAAmBzO,OAGxB0O,GAAQD,KAAOX,SAAS5J,iBAGxByK,GAAO,gBAAiBC,aAAe,iBAAkBd,UAIzDe,GAASC,GAAkB,UAI3BC,GAAUD,GAAkB,WAG5BE,GAAYF,GAAkB,cAAgBA,GAAkB,aAGhEG,GAAYC,SAAS,qBAAqBC,KAAKP,UAAUQ,WAAW,GAAI,IAExEC,GAAeN,IAAWD,GAAkB,WAAaG,GAAY,OAAS,cAAejP,QAG7FsP,KAAUtP,OAAOsP,MAGjBC,GAAST,GAAkB,UAG3BU,GAAQV,GAAkB,WAAaD,KAAWS,KAAUb,GAG5DgB,IAAUF,IAAUT,GAAkB,UAEtCY,GAAUZ,GAAkB,WAI5Ba,GAAU,gBAAiBrB,GAG3BsB,GAA4C,IAAtChB,UAAUiB,SAAS5Q,QAAQ,OAGjC6Q,GAAOrB,IAAO,eAAgBH,GAG9ByB,GAAY,oBAAqB/P,QAAY,QAAS,IAAIA,OAAOgQ,kBAAuBhB,GAGxFiB,GAAU,mBAAoB3B,GAI9B4B,IAASlQ,OAAOmQ,eAAiBL,IAAQC,IAAYE,MAAaN,KAAYD,GAG9EU,GAAgC,oBAAhBC,aAA+BvB,GAAkB,UAGjEwB,GAAeF,IAAUvB,GAIzB0B,GAAiBH,IAAUL,GAI3BS,IAAaxQ,OAAOyQ,cAAgBzQ,OAAO0Q,eAI3CC,KAAW9B,KAAa7O,OAAOyQ,eAAgBD,IAO/CI,IAAS5Q,OAAO6Q,aAAeF,IAAW,iBAAkB3Q,QAC7DA,OAAO8Q,eAAiBhD,oBAAoB9N,OAAO8Q,eAGlDC,GAAcX,IAAUd,GAIxB0B,GAAcZ,IAAUZ,GAIxByB,GAA+F,GAArFjR,OAAOkR,kBAAqBlR,OAAOmR,OAAOC,WAAapR,OAAOmR,OAAOE,aAI/EC,GAAgB,WACnB,IAAIC,GAAwB,EAC5B,IACC,IAAIC,EAAOrW,OAAOsW,eAAe,GAAI,UAAW,CAC/CC,IAAK,WACJH,GAAwB,KAG1BvR,OAAOkE,iBAAiB,0BAA2BxG,EAAS8T,GAC5DxR,OAAOmE,oBAAoB,0BAA2BzG,EAAS8T,GAC9D,MAAOzN,IAGT,OAAOwN,GAKJI,KACM7D,SAAS8D,cAAc,UAAUC,WAKvCxD,MAASP,SAASC,kBAAmBF,EAAU,OAAOiE,eAItDC,IAAO1D,IAAQ,WAClB,IACC,IAAI2D,EAAMlE,SAAS8D,cAAc,OACjCI,EAAIC,UAAY,qBAEhB,IAAIC,EAAQF,EAAIG,WAGhB,OAFAD,EAAM1D,MAAM4D,SAAW,oBAEhBF,GAA+B,iBAAdA,EAAMG,IAE7B,MAAOtO,GACR,OAAO,GAXS,GAgBlB,SAAS+K,GAAkB3Q,GAC1B,OAAyD,GAAlDyQ,UAAUQ,UAAUkD,cAAcrT,QAAQd,GAIlD,IAAIoU,IAAWpX,OAAOD,QAAUC,QAAQ,CACvCsT,GAAIA,GACJC,MAAOA,GACPC,KAAMA,GACNE,OAAQA,GACRE,QAASA,GACTC,UAAWA,GACXK,aAAcA,GACdC,MAAOA,GACPC,OAAQA,GACRC,MAAOA,GACPC,OAAQA,GACRC,QAASA,GACTC,QAASA,GACTC,IAAKA,GACLE,KAAMA,GACNC,SAAUA,GACVE,QAASA,GACTC,MAAOA,GACPE,OAAQA,GACRE,aAAcA,GACdC,eAAgBA,GAChBC,UAAWA,GACXG,QAASA,GACTC,MAAOA,GACPG,YAAaA,GACbC,YAAaA,GACbC,OAAQA,GACRK,cAAeA,GACfK,OAAQA,GACRtD,IAAKA,GACL0D,IAAKA,KAQFS,GAAiBhC,GAAY,gBAAoB,cACjDiC,GAAiBjC,GAAY,gBAAoB,cACjDkC,GAAiBlC,GAAY,cAAoB,YACjDmC,GAAiBnC,GAAY,kBAAoB,gBACjDoC,GAAiB,CAAC,QAAS,SAAU,UAErCC,GAAY,GACZC,IAAsB,EAGtBC,GAAiB,EAKrB,SAASC,GAAmBpX,EAAK2G,EAAMqB,EAASnD,GAW/C,MAVa,eAAT8B,EA8BL,SAA0B3G,EAAKgI,EAASnD,GACvC,IAAIwS,EAAShX,EAAK,SAAU8H,GAC3B,GAAsB,UAAlBA,EAAEmP,aAA2BnP,EAAEoP,sBAAwBpP,EAAEmP,cAAgBnP,EAAEoP,qBAAsB,CAIpG,KAAIP,GAAe3T,QAAQ8E,EAAER,OAAO6P,SAAW,GAG9C,OAFAC,GAAetP,GAMjBuP,GAAevP,EAAGH,KAGnBhI,EAAI,sBAAwB6E,GAAMwS,EAClCrX,EAAIsI,iBAAiBsO,GAAcS,GAAQ,GAGtCH,KAEJhF,SAASS,gBAAgBrK,iBAAiBsO,GAAce,IAAoB,GAC5EzF,SAASS,gBAAgBrK,iBAAiBuO,GAAce,IAAoB,GAC5E1F,SAASS,gBAAgBrK,iBAAiBwO,GAAYe,IAAkB,GACxE3F,SAASS,gBAAgBrK,iBAAiByO,GAAgBc,IAAkB,GAE5EX,IAAsB,GAxDtBY,CAAiB9X,EAAKgI,EAASnD,GAEZ,cAAT8B,EAoFZ,SAAyB3G,EAAKgI,EAASnD,GACzB,SAATkT,EAAmB5P,IAEjBA,EAAEmP,cAAgBnP,EAAEoP,sBAA0C,UAAlBpP,EAAEmP,aAA0C,IAAdnP,EAAE6P,UAEjFN,GAAevP,EAAGH,GAGnBhI,EAAI,qBAAuB6E,GAAMkT,EACjC/X,EAAIsI,iBAAiBuO,GAAckB,GAAQ,GA5F1CE,CAAgBjY,EAAKgI,EAASnD,GAEX,aAAT8B,GA6FZ,SAAwB3G,EAAKgI,EAASnD,GAC1B,SAAPqT,EAAiB/P,GACpBuP,GAAevP,EAAGH,GAGnBhI,EAAI,oBAAsB6E,GAAMqT,EAChClY,EAAIsI,iBAAiBwO,GAAYoB,GAAM,GACvClY,EAAIsI,iBAAiByO,GAAgBmB,GAAM,GAnG1CC,CAAenY,EAAKgI,EAASnD,GAGvBxF,KAmDR,SAASsY,GAAmBxP,GAC3B8O,GAAU9O,EAAEiQ,WAAajQ,EACzBgP,KAGD,SAASS,GAAmBzP,GACvB8O,GAAU9O,EAAEiQ,aACfnB,GAAU9O,EAAEiQ,WAAajQ,GAI3B,SAAS0P,GAAiB1P,UAClB8O,GAAU9O,EAAEiQ,WACnBjB,KAGD,SAASO,GAAevP,EAAGH,GAE1B,IAAK,IAAItI,KADTyI,EAAEkQ,QAAU,GACEpB,GACb9O,EAAEkQ,QAAQnV,KAAK+T,GAAUvX,IAE1ByI,EAAEmQ,eAAiB,CAACnQ,GAEpBH,EAAQG,GA6BT,IAAIoQ,GAAc3D,GAAY,gBAAkBG,GAAU,cAAgB,aACtEyD,GAAY5D,GAAY,cAAgBG,GAAU,YAAc,WAChE0D,GAAO,YAGX,SAASC,GAAqB1Y,EAAKgI,EAASnD,GAC3C,IAAI8T,EAAMC,EACNC,GAAY,EAGhB,SAASC,EAAa3Q,GACrB,IAAI4Q,EAEJ,GAAIhE,GAAS,CACZ,IAAMhC,IAA2B,UAAlB5K,EAAEmP,YAA2B,OAC5CyB,EAAQ5B,QAER4B,EAAQ5Q,EAAEkQ,QAAQtY,OAGnB,KAAY,EAARgZ,GAAJ,CAEA,IAAIC,EAAMzU,KAAKyU,MACXC,EAAQD,GAAOL,GAAQK,GAE3BJ,EAAWzQ,EAAEkQ,QAAUlQ,EAAEkQ,QAAQ,GAAKlQ,EACtC0Q,EAAqB,EAARI,GAAaA,GAlBf,IAmBXN,EAAOK,GAGR,SAASE,EAAW/Q,GACnB,GAAI0Q,IAAcD,EAASO,aAAc,CACxC,GAAIpE,GAAS,CACZ,IAAMhC,IAA2B,UAAlB5K,EAAEmP,YAA2B,OAE5C,IACI8B,EAAM1Z,EADN2Z,EAAW,GAGf,IAAK3Z,KAAKkZ,EACTQ,EAAOR,EAASlZ,GAChB2Z,EAAS3Z,GAAK0Z,GAAQA,EAAK/Y,KAAO+Y,EAAK/Y,KAAKuY,GAAYQ,EAEzDR,EAAWS,EAEZT,EAASjS,KAAO,WAChBiS,EAASU,OAAS,EAClBtR,EAAQ4Q,GACRD,EAAO,MAiBT,OAbA3Y,EAAIyY,GAAOF,GAAc1T,GAAMiU,EAC/B9Y,EAAIyY,GAAOD,GAAY3T,GAAMqU,EAC7BlZ,EAAIyY,GAAO,WAAa5T,GAAMmD,EAE9BhI,EAAIsI,iBAAiBiQ,GAAaO,IAAcpD,IAAgB,CAAC6D,SAAS,IAC1EvZ,EAAIsI,iBAAiBkQ,GAAWU,IAAYxD,IAAgB,CAAC6D,SAAS,IAMtEvZ,EAAIsI,iBAAiB,WAAYN,GAAS,GAEnC3I,KAGR,SAASma,GAAwBxZ,EAAK6E,GACrC,IAAI4U,EAAazZ,EAAIyY,GAAOF,GAAc1T,GACtC6U,EAAW1Z,EAAIyY,GAAOD,GAAY3T,GAClC8U,EAAW3Z,EAAIyY,GAAO,WAAa5T,GAQvC,OANA7E,EAAIuI,oBAAoBgQ,GAAakB,IAAY/D,IAAgB,CAAC6D,SAAS,IAC3EvZ,EAAIuI,oBAAoBiQ,GAAWkB,IAAUhE,IAAgB,CAAC6D,SAAS,IAClExG,IACJ/S,EAAIuI,oBAAoB,WAAYoR,GAAU,GAGxCta,KAiBR,IA8OIua,GACAC,GACAC,GAwCAC,GACAC,GAzRAC,GAAYC,GACf,CAAC,YAAa,kBAAmB,aAAc,eAAgB,gBAO5DC,GAAaD,GAChB,CAAC,mBAAoB,aAAc,cAAe,gBAAiB,iBAIhEE,GACY,qBAAfD,IAAoD,gBAAfA,GAA+BA,GAAa,MAAQ,gBAM1F,SAASrE,GAAIjR,GACZ,MAAqB,iBAAPA,EAAkBqN,SAASmI,eAAexV,GAAMA,EAM/D,SAASyV,GAAStW,EAAI4O,GACrB,IAAIjP,EAAQK,EAAG4O,MAAMA,IAAW5O,EAAGuW,cAAgBvW,EAAGuW,aAAa3H,GAEnE,KAAMjP,GAAmB,SAAVA,IAAqBuO,SAASsI,YAAa,CACzD,IAAIC,EAAMvI,SAASsI,YAAYE,iBAAiB1W,EAAI,MACpDL,EAAQ8W,EAAMA,EAAI7H,GAAS,KAE5B,MAAiB,SAAVjP,EAAmB,KAAOA,EAKlC,SAASgX,GAASnD,EAASoD,EAAWC,GACrC,IAAI7W,EAAKkO,SAAS8D,cAAcwB,GAMhC,OALAxT,EAAG4W,UAAYA,GAAa,GAExBC,GACHA,EAAUC,YAAY9W,GAEhBA,EAKR,SAAS+W,GAAO/W,GACf,IAAIgX,EAAShX,EAAGiX,WACZD,GACHA,EAAOE,YAAYlX,GAMrB,SAASmX,GAAMnX,GACd,KAAOA,EAAGuS,YACTvS,EAAGkX,YAAYlX,EAAGuS,YAMpB,SAAS6E,GAAQpX,GAChB,IAAIgX,EAAShX,EAAGiX,WACZD,GAAUA,EAAOK,YAAcrX,GAClCgX,EAAOF,YAAY9W,GAMrB,SAASsX,GAAOtX,GACf,IAAIgX,EAAShX,EAAGiX,WACZD,GAAUA,EAAOzE,aAAevS,GACnCgX,EAAOO,aAAavX,EAAIgX,EAAOzE,YAMjC,SAASiF,GAASxX,EAAIG,GACrB,QAAqB/B,IAAjB4B,EAAGyX,UACN,OAAOzX,EAAGyX,UAAUhQ,SAAStH,GAE9B,IAAIyW,EAAYc,GAAS1X,GACzB,OAA0B,EAAnB4W,EAAU7a,QAAc,IAAI4b,OAAO,UAAYxX,EAAO,WAAWyX,KAAKhB,GAK9E,SAASiB,GAAS7X,EAAIG,GACrB,QAAqB/B,IAAjB4B,EAAGyX,UAEN,IADA,IAAIK,EAAUrZ,EAAW0B,GAChBzE,EAAI,EAAGE,EAAMkc,EAAQ/b,OAAQL,EAAIE,EAAKF,IAC9CsE,EAAGyX,UAAUlR,IAAIuR,EAAQpc,SAEpB,IAAK8b,GAASxX,EAAIG,GAAO,CAC/B,IAAIyW,EAAYc,GAAS1X,GACzB+X,GAAS/X,GAAK4W,EAAYA,EAAY,IAAM,IAAMzW,IAMpD,SAAS6X,GAAYhY,EAAIG,QACH/B,IAAjB4B,EAAGyX,UACNzX,EAAGyX,UAAUV,OAAO5W,GAEpB4X,GAAS/X,EAAI1B,GAAM,IAAMoZ,GAAS1X,GAAM,KAAKxB,QAAQ,IAAM2B,EAAO,IAAK,OAMzE,SAAS4X,GAAS/X,EAAIG,QACQ/B,IAAzB4B,EAAG4W,UAAUqB,QAChBjY,EAAG4W,UAAYzW,EAGfH,EAAG4W,UAAUqB,QAAU9X,EAMzB,SAASuX,GAAS1X,GAMjB,OAHIA,EAAGkY,uBACNlY,EAAKA,EAAGkY,2BAEuB9Z,IAAzB4B,EAAG4W,UAAUqB,QAAwBjY,EAAG4W,UAAY5W,EAAG4W,UAAUqB,QAMzE,SAASE,GAAWnY,EAAIL,GACnB,YAAaK,EAAG4O,MACnB5O,EAAG4O,MAAMwJ,QAAUzY,EACT,WAAYK,EAAG4O,OAK3B,SAAuB5O,EAAIL,GAC1B,IAAI0Y,GAAS,EACTC,EAAa,mCAGjB,IACCD,EAASrY,EAAGuY,QAAQC,KAAKF,GACxB,MAAOnU,GAGR,GAAc,IAAVxE,EAAe,OAGpBA,EAAQxB,KAAKE,MAAc,IAARsB,GAEf0Y,GACHA,EAAOI,QAAqB,MAAV9Y,EAClB0Y,EAAOK,QAAU/Y,GAEjBK,EAAG4O,MAAMyJ,QAAU,WAAaC,EAAa,YAAc3Y,EAAQ,IAvBnEgZ,CAAc3Y,EAAIL,GA+BpB,SAASuW,GAAS9U,GAGjB,IAFA,IAAIwN,EAAQV,SAASS,gBAAgBC,MAE5BlT,EAAI,EAAGA,EAAI0F,EAAMrF,OAAQL,IACjC,GAAI0F,EAAM1F,KAAMkT,EACf,OAAOxN,EAAM1F,GAGf,OAAO,EAOR,SAASkd,GAAa5Y,EAAI6Y,EAAQnO,GACjC,IAAIoO,EAAMD,GAAU,IAAIhU,EAAM,EAAG,GAEjC7E,EAAG4O,MAAMqH,KACP/F,GACA,aAAe4I,EAAItb,EAAI,MAAQsb,EAAIhU,EAAI,MACvC,eAAiBgU,EAAItb,EAAI,MAAQsb,EAAIhU,EAAI,UACzC4F,EAAQ,UAAYA,EAAQ,IAAM,IAOrC,SAASqO,GAAY/Y,EAAIwG,GAGxBxG,EAAGgZ,aAAexS,EAGd8J,GACHsI,GAAa5Y,EAAIwG,IAEjBxG,EAAG4O,MAAMqK,KAAOzS,EAAMhJ,EAAI,KAC1BwC,EAAG4O,MAAMsK,IAAM1S,EAAM1B,EAAI,MAM3B,SAASqU,GAAYnZ,GAIpB,OAAOA,EAAGgZ,cAAgB,IAAInU,EAAM,EAAG,GAcxC,GAAI,kBAAmBqJ,SACtB0H,GAAuB,WACtBnT,GAAGrC,OAAQ,cAAeqT,KAE3BoC,GAAsB,WACrBhT,GAAIzC,OAAQ,cAAeqT,SAEtB,CACN,IAAI2F,GAAqBlD,GACxB,CAAC,aAAc,mBAAoB,cAAe,gBAAiB,iBAEpEN,GAAuB,WACtB,GAAIwD,GAAoB,CACvB,IAAIxK,EAAQV,SAASS,gBAAgBC,MACrCkH,GAAclH,EAAMwK,IACpBxK,EAAMwK,IAAsB,SAG9BvD,GAAsB,WACjBuD,KACHlL,SAASS,gBAAgBC,MAAMwK,IAAsBtD,GACrDA,QAAc1X,IAQjB,SAASib,KACR5W,GAAGrC,OAAQ,YAAaqT,IAKzB,SAAS6F,KACRzW,GAAIzC,OAAQ,YAAaqT,IAU1B,SAAS8F,GAAeC,GACvB,MAA6B,IAAtBA,EAAQC,UACdD,EAAUA,EAAQvC,WAEduC,EAAQ5K,QACb8K,KAEA1D,IADAD,GAAkByD,GACM5K,MAAM+K,QAC9BH,EAAQ5K,MAAM+K,QAAU,OACxBlX,GAAGrC,OAAQ,UAAWsZ,KAKvB,SAASA,KACH3D,KACLA,GAAgBnH,MAAM+K,QAAU3D,GAEhCA,GADAD,QAAkB3X,EAElByE,GAAIzC,OAAQ,UAAWsZ,KAKxB,SAASE,GAAmBJ,GAC3B,QACCA,EAAUA,EAAQvC,YACA4C,aAAgBL,EAAQM,cAAiBN,IAAYtL,SAAS6L,QACjF,OAAOP,EAOR,SAASQ,GAASR,GACjB,IAAIS,EAAOT,EAAQU,wBAEnB,MAAO,CACN1c,EAAGyc,EAAKE,MAAQX,EAAQK,aAAe,EACvC/U,EAAGmV,EAAKG,OAASZ,EAAQM,cAAgB,EACzCO,mBAAoBJ,GAKtB,IAAIK,IAAW/e,OAAOD,QAAUC,QAAQ,CACvC0a,UAAWA,GACXE,WAAYA,GACZC,eAAgBA,GAChBtE,IAAKA,GACLwE,SAAUA,GACVra,OAAQ0a,GACRI,OAAQA,GACRI,MAAOA,GACPC,QAASA,GACTE,OAAQA,GACRE,SAAUA,GACVK,SAAUA,GACVG,YAAaA,GACbD,SAAUA,GACVL,SAAUA,GACVS,WAAYA,GACZjC,SAAUA,GACV0C,aAAcA,GACdG,YAAaA,GACbI,YAAaA,GACbvD,qBAAsBA,GACtBC,oBAAqBA,GACrBwD,iBAAkBA,GAClBC,gBAAiBA,GACjBC,eAAgBA,GAChBG,eAAgBA,GAChBE,mBAAoBA,GACpBI,SAAUA,KAmBX,SAASvX,GAAGzG,EAAK0G,EAAOpG,EAAIY,GAE3B,GAAqB,iBAAVwF,EACV,IAAK,IAAIC,KAAQD,EAChB6X,GAAOve,EAAK2G,EAAMD,EAAMC,GAAOrG,QAKhC,IAAK,IAAIZ,EAAI,EAAGE,GAFhB8G,EAAQjE,EAAWiE,IAES3G,OAAQL,EAAIE,EAAKF,IAC5C6e,GAAOve,EAAK0G,EAAMhH,GAAIY,EAAIY,GAI5B,OAAO7B,KAGR,IAAImf,GAAY,kBAUhB,SAAS3X,GAAI7G,EAAK0G,EAAOpG,EAAIY,GAE5B,GAAqB,iBAAVwF,EACV,IAAK,IAAIC,KAAQD,EAChB+X,GAAUze,EAAK2G,EAAMD,EAAMC,GAAOrG,QAE7B,GAAIoG,EAGV,IAAK,IAAIhH,EAAI,EAAGE,GAFhB8G,EAAQjE,EAAWiE,IAES3G,OAAQL,EAAIE,EAAKF,IAC5C+e,GAAUze,EAAK0G,EAAMhH,GAAIY,EAAIY,OAExB,CACN,IAAK,IAAIvB,KAAKK,EAAIwe,IACjBC,GAAUze,EAAKL,EAAGK,EAAIwe,IAAW7e,WAE3BK,EAAIwe,IAGZ,OAAOnf,KAGR,SAASkf,GAAOve,EAAK2G,EAAMrG,EAAIY,GAC9B,IAAI2D,EAAK8B,EAAO7F,EAAMR,IAAOY,EAAU,IAAMJ,EAAMI,GAAW,IAE9D,GAAIlB,EAAIwe,KAAcxe,EAAIwe,IAAW3Z,GAAO,OAAOxF,KAEnD,IAAI2I,EAAU,SAAUG,GACvB,OAAO7H,EAAGI,KAAKQ,GAAWlB,EAAKmI,GAAK/D,OAAOsD,QAGxCgX,EAAkB1W,EAElB+M,IAAqC,IAA1BpO,EAAKtD,QAAQ,SAE3B+T,GAAmBpX,EAAK2G,EAAMqB,EAASnD,IAE7BmQ,IAAmB,aAATrO,GACRoO,IAAWpB,GAKb,qBAAsB3T,EAEnB,eAAT2G,EACH3G,EAAIsI,iBAAiB,YAAatI,EAAM,QAAU,aAAcgI,IAAS0N,IAAgB,CAAC6D,SAAS,IAE/E,eAAT5S,GAAoC,eAATA,GACtCqB,EAAU,SAAUG,GACnBA,EAAIA,GAAK/D,OAAOsD,MACZiX,GAAiB3e,EAAKmI,IACzBuW,EAAgBvW,IAGlBnI,EAAIsI,iBAA0B,eAAT3B,EAAwB,YAAc,WAAYqB,GAAS,KAGnE,UAATrB,GAAoBwM,KACvBnL,EAAU,SAAUG,IAsLxB,SAAqBA,EAAGH,GACvB,IAAI4W,EAAazW,EAAEyW,WAAczW,EAAE0W,eAAiB1W,EAAE0W,cAAcD,UAChEE,EAAUC,IAAcH,EAAYG,GAOxC,GAAKD,GAAqB,IAAVA,GAAiBA,EAAU,KAAS3W,EAAER,OAAOqX,kBAAoB7W,EAAE8W,WAElF,OADAC,GAAK/W,GAGN4W,GAAYH,EAEZ5W,EAAQG,GApMJgX,CAAYhX,EAAGuW,KAGjB1e,EAAIsI,iBAAiB3B,EAAMqB,GAAS,IAG3B,gBAAiBhI,GAC3BA,EAAIof,YAAY,KAAOzY,EAAMqB,GA1B7B0Q,GAAqB1Y,EAAKgI,EAASnD,GA6BpC7E,EAAIwe,IAAaxe,EAAIwe,KAAc,GACnCxe,EAAIwe,IAAW3Z,GAAMmD,EAGtB,SAASyW,GAAUze,EAAK2G,EAAMrG,EAAIY,GAEjC,IAAI2D,EAAK8B,EAAO7F,EAAMR,IAAOY,EAAU,IAAMJ,EAAMI,GAAW,IAC1D8G,EAAUhI,EAAIwe,KAAcxe,EAAIwe,IAAW3Z,GAE/C,IAAKmD,EAAW,OAAO3I,KAEnB0V,IAAqC,IAA1BpO,EAAKtD,QAAQ,SA3qB7B,SAA+BrD,EAAK2G,EAAM9B,GACzC,IAAImD,EAAUhI,EAAI,YAAc2G,EAAO9B,GAE1B,eAAT8B,EACH3G,EAAIuI,oBAAoBqO,GAAc5O,GAAS,GAE5B,cAATrB,EACV3G,EAAIuI,oBAAoBsO,GAAc7O,GAAS,GAE5B,aAATrB,IACV3G,EAAIuI,oBAAoBuO,GAAY9O,GAAS,GAC7ChI,EAAIuI,oBAAoBwO,GAAgB/O,GAAS,IAiqBjDqX,CAAsBrf,EAAK2G,EAAM9B,IAEvBmQ,IAAmB,aAATrO,GACRoO,IAAWpB,GAGb,wBAAyB3T,EAEtB,eAAT2G,EACH3G,EAAIuI,oBAAoB,YAAavI,EAAM,QAAU,aAAcgI,IAAS0N,IAAgB,CAAC6D,SAAS,IAGtGvZ,EAAIuI,oBACM,eAAT5B,EAAwB,YACf,eAATA,EAAwB,WAAaA,EAAMqB,GAAS,GAG5C,gBAAiBhI,GAC3BA,EAAIsf,YAAY,KAAO3Y,EAAMqB,GAd7BwR,GAAwBxZ,EAAK6E,GAiB9B7E,EAAIwe,IAAW3Z,GAAM,KAUtB,SAAS0a,GAAgBpX,GAWxB,OATIA,EAAEoX,gBACLpX,EAAEoX,kBACQpX,EAAE0W,cACZ1W,EAAE0W,cAAcW,UAAW,EAE3BrX,EAAEgR,cAAe,EAElBsG,GAAQtX,GAED9I,KAKR,SAASqgB,GAAyB1b,GAEjC,OADAua,GAAOva,EAAI,aAAcub,IAClBlgB,KAMR,SAASsgB,GAAwB3b,GAGhC,OAFAyC,GAAGzC,EAAI,gCAAiCub,IACxChB,GAAOva,EAAI,QAAS4b,IACbvgB,KAQR,SAASoY,GAAetP,GAMvB,OALIA,EAAEsP,eACLtP,EAAEsP,iBAEFtP,EAAE0X,aAAc,EAEVxgB,KAKR,SAAS6f,GAAK/W,GAGb,OAFAsP,GAAetP,GACfoX,GAAgBpX,GACT9I,KAMR,SAASygB,GAAiB3X,EAAG0S,GAC5B,IAAKA,EACJ,OAAO,IAAIhS,EAAMV,EAAE4X,QAAS5X,EAAE6X,SAG/B,IAAItR,EAAQsP,GAASnD,GACjBgC,EAASnO,EAAM2P,mBAEnB,OAAO,IAAIxV,GAGTV,EAAE4X,QAAUlD,EAAOI,MAAQvO,EAAMlN,EAAIqZ,EAAUoF,YAC/C9X,EAAE6X,QAAUnD,EAAOK,KAAOxO,EAAM5F,EAAI+R,EAAUqF,WAMjD,IAAIC,GACFnM,IAAOL,GAAU,EAAIvP,OAAOkR,iBAC7B1B,GAAQxP,OAAOkR,iBAAmB,EAOnC,SAAS8K,GAAcjY,GACtB,OAAO,GAASA,EAAEkY,YAAc,EACxBlY,EAAEmY,QAA0B,IAAhBnY,EAAEoY,WAAoBpY,EAAEmY,OAASH,GAC7ChY,EAAEmY,QAA0B,IAAhBnY,EAAEoY,UAA+B,IAAXpY,EAAEmY,OACpCnY,EAAEmY,QAA0B,IAAhBnY,EAAEoY,UAA+B,IAAXpY,EAAEmY,OACpCnY,EAAEqY,QAAUrY,EAAEsY,OAAU,EACzBtY,EAAEuY,YAAcvY,EAAEkY,aAAelY,EAAEuY,YAAc,EAChDvY,EAAEwY,QAAUxe,KAAKuJ,IAAIvD,EAAEwY,QAAU,MAAqB,IAAXxY,EAAEwY,OAC9CxY,EAAEwY,OAASxY,EAAEwY,QAAU,MAAQ,GAC/B,EAGR,IA+BI5B,GA/BA6B,GAAa,GAEjB,SAAShB,GAASzX,GAEjByY,GAAWzY,EAAExB,OAAQ,EAGtB,SAAS8Y,GAAQtX,GAChB,IAAI0Y,EAASD,GAAWzY,EAAExB,MAG1B,OADAia,GAAWzY,EAAExB,OAAQ,EACdka,EAIR,SAASlC,GAAiB3a,EAAImE,GAE7B,IAAI2Y,EAAU3Y,EAAE4Y,cAEhB,IAAKD,EAAW,OAAO,EAEvB,IACC,KAAOA,GAAYA,IAAY9c,GAC9B8c,EAAUA,EAAQ7F,WAElB,MAAO+F,GACR,OAAO,EAER,OAAQF,IAAY9c,EA2BrB,IAAIid,IAAY1hB,OAAOD,QAAUC,QAAQ,CACxCkH,GAAIA,GACJI,IAAKA,GACL0Y,gBAAiBA,GACjBG,yBAA0BA,GAC1BC,wBAAyBA,GACzBlI,eAAgBA,GAChByH,KAAMA,GACNY,iBAAkBA,GAClBM,cAAeA,GACfR,SAAUA,GACVH,QAASA,GACTd,iBAAkBA,GAClBuC,YAAaza,GACb0a,eAAgBta,KAoBbua,GAAexY,EAAQpJ,OAAO,CAOjC6hB,IAAK,SAAUrd,EAAIsd,EAAQC,EAAUC,GACpCniB,KAAK6f,OAEL7f,KAAKoiB,IAAMzd,EACX3E,KAAKqiB,aAAc,EACnBriB,KAAKsiB,UAAYJ,GAAY,IAC7BliB,KAAKuiB,cAAgB,EAAIzf,KAAKR,IAAI6f,GAAiB,GAAK,IAExDniB,KAAKwiB,UAAY1E,GAAYnZ,GAC7B3E,KAAKyiB,QAAUR,EAAO5W,SAASrL,KAAKwiB,WACpCxiB,KAAK0iB,YAAc,IAAIxd,KAIvBlF,KAAKkI,KAAK,SAEVlI,KAAK2iB,YAKN9C,KAAM,WACA7f,KAAKqiB,cAEVriB,KAAK4iB,OAAM,GACX5iB,KAAK6iB,cAGNF,SAAU,WAET3iB,KAAK8iB,QAAUpd,EAAiB1F,KAAK2iB,SAAU3iB,MAC/CA,KAAK4iB,SAGNA,MAAO,SAAU5f,GAChB,IAAIyc,GAAY,IAAIva,KAAUlF,KAAK0iB,WAC/BR,EAA4B,IAAjBliB,KAAKsiB,UAEhB7C,EAAUyC,EACbliB,KAAK+iB,UAAU/iB,KAAKgjB,SAASvD,EAAUyC,GAAWlf,IAElDhD,KAAK+iB,UAAU,GACf/iB,KAAK6iB,cAIPE,UAAW,SAAUE,EAAUjgB,GAC9B,IAAIya,EAAMzd,KAAKwiB,UAAUtX,IAAIlL,KAAKyiB,QAAQhX,WAAWwX,IACjDjgB,GACHya,EAAI5R,SAEL6R,GAAY1d,KAAKoiB,IAAK3E,GAItBzd,KAAKkI,KAAK,SAGX2a,UAAW,WACVjd,EAAgB5F,KAAK8iB,SAErB9iB,KAAKqiB,aAAc,EAGnBriB,KAAKkI,KAAK,QAGX8a,SAAU,SAAUE,GACnB,OAAO,EAAIpgB,KAAKD,IAAI,EAAIqgB,EAAGljB,KAAKuiB,kBAuB9BY,GAAM5Z,EAAQpJ,OAAO,CAExBoD,QAAS,CAKR6f,IAAK3Q,EAILzB,YAAQjO,EAIRkM,UAAMlM,EAMNsgB,aAAStgB,EAMTugB,aAASvgB,EAITwgB,OAAQ,GAORC,eAAWzgB,EAKX0gB,cAAU1gB,EAOV2gB,eAAe,EAIfC,uBAAwB,EAKxBC,eAAe,EAMfC,qBAAqB,EAMrBC,iBAAkB,QASlBC,SAAU,EAOVC,UAAW,EAIXC,aAAa,GAGdhe,WAAY,SAAUT,EAAIjC,GACzBA,EAAUD,EAAWtD,KAAMuD,GAI3BvD,KAAKkkB,UAAY,GACjBlkB,KAAKmkB,QAAU,GACfnkB,KAAKokB,iBAAmB,GACxBpkB,KAAKqkB,cAAe,EAEpBrkB,KAAKskB,eAAe9e,GACpBxF,KAAKukB,cAGLvkB,KAAKwkB,UAAYxjB,EAAKhB,KAAKwkB,UAAWxkB,MAEtCA,KAAKykB,cAEDlhB,EAAQigB,WACXxjB,KAAK0kB,aAAanhB,EAAQigB,gBAGNzgB,IAAjBQ,EAAQ0L,OACXjP,KAAK2kB,MAAQ3kB,KAAK4kB,WAAWrhB,EAAQ0L,OAGlC1L,EAAQyN,aAA2BjO,IAAjBQ,EAAQ0L,MAC7BjP,KAAK6kB,QAAQ/Z,EAASvH,EAAQyN,QAASzN,EAAQ0L,KAAM,CAAC6V,OAAO,IAG9D9kB,KAAKkG,gBAGLlG,KAAK+kB,cAAgBjK,IAAc7F,KAAUa,IAC3C9V,KAAKuD,QAAQmgB,cAIX1jB,KAAK+kB,gBACR/kB,KAAKglB,mBACL5d,GAAGpH,KAAKilB,OAAQlK,GAAgB/a,KAAKklB,oBAAqBllB,OAG3DA,KAAKmlB,WAAWnlB,KAAKuD,QAAQggB,SAS9BsB,QAAS,SAAU7T,EAAQ/B,EAAM1L,GAQhC,IANA0L,OAAgBlM,IAATkM,EAAqBjP,KAAK2kB,MAAQ3kB,KAAK4kB,WAAW3V,GACzD+B,EAAShR,KAAKolB,aAAata,EAASkG,GAAS/B,EAAMjP,KAAKuD,QAAQigB,WAChEjgB,EAAUA,GAAW,GAErBvD,KAAKqlB,QAEDrlB,KAAKslB,UAAY/hB,EAAQuhB,QAAqB,IAAZvhB,UAEbR,IAApBQ,EAAQgiB,UACXhiB,EAAQ0L,KAAO9O,EAAO,CAAColB,QAAShiB,EAAQgiB,SAAUhiB,EAAQ0L,MAC1D1L,EAAQiiB,IAAMrlB,EAAO,CAAColB,QAAShiB,EAAQgiB,QAASrD,SAAU3e,EAAQ2e,UAAW3e,EAAQiiB,MAIzExlB,KAAK2kB,QAAU1V,EAC3BjP,KAAKylB,kBAAoBzlB,KAAKylB,iBAAiBzU,EAAQ/B,EAAM1L,EAAQ0L,MACrEjP,KAAK0lB,gBAAgB1U,EAAQzN,EAAQiiB,MAKrC,OADA/f,aAAazF,KAAK2lB,YACX3lB,KAOT,OAFAA,KAAK4lB,WAAW5U,EAAQ/B,GAEjBjP,MAKR6lB,QAAS,SAAU5W,EAAM1L,GACxB,OAAKvD,KAAKslB,QAIHtlB,KAAK6kB,QAAQ7kB,KAAKsM,YAAa2C,EAAM,CAACA,KAAM1L,KAHlDvD,KAAK2kB,MAAQ1V,EACNjP,OAOT8lB,OAAQ,SAAUlM,EAAOrW,GAExB,OADAqW,EAAQA,IAAU3E,GAAQjV,KAAKuD,QAAQygB,UAAY,GAC5ChkB,KAAK6lB,QAAQ7lB,KAAK2kB,MAAQ/K,EAAOrW,IAKzCwiB,QAAS,SAAUnM,EAAOrW,GAEzB,OADAqW,EAAQA,IAAU3E,GAAQjV,KAAKuD,QAAQygB,UAAY,GAC5ChkB,KAAK6lB,QAAQ7lB,KAAK2kB,MAAQ/K,EAAOrW,IASzCyiB,cAAe,SAAUhX,EAAQC,EAAM1L,GACtC,IAAI8L,EAAQrP,KAAKimB,aAAahX,GAC1BiX,EAAWlmB,KAAK2M,UAAUpB,SAAS,GAGnC4a,GAFiBnX,aAAkBxF,EAAQwF,EAAShP,KAAKomB,uBAAuBpX,IAElD3D,SAAS6a,GAAUza,WAAW,EAAI,EAAI4D,GACpE4B,EAAYjR,KAAKqmB,uBAAuBH,EAAShb,IAAIib,IAEzD,OAAOnmB,KAAK6kB,QAAQ5T,EAAWhC,EAAM,CAACA,KAAM1L,KAG7C+iB,qBAAsB,SAAUzZ,EAAQtJ,GAEvCA,EAAUA,GAAW,GACrBsJ,EAASA,EAAO0Z,UAAY1Z,EAAO0Z,YAAc/b,EAAeqC,GAEhE,IAAI2Z,EAAY1c,EAAQvG,EAAQkjB,gBAAkBljB,EAAQmjB,SAAW,CAAC,EAAG,IACrEC,EAAY7c,EAAQvG,EAAQqjB,oBAAsBrjB,EAAQmjB,SAAW,CAAC,EAAG,IAEzEzX,EAAOjP,KAAK6mB,cAAcha,GAAQ,EAAO2Z,EAAUtb,IAAIyb,IAI3D,IAFA1X,EAAmC,iBAApB1L,EAAQ+f,QAAwBxgB,KAAKP,IAAIgB,EAAQ+f,QAASrU,GAAQA,KAEpE6X,EAAAA,EACZ,MAAO,CACN9V,OAAQnE,EAAOP,YACf2C,KAAMA,GAIR,IAAI8X,EAAgBJ,EAAUtb,SAASmb,GAAWjb,SAAS,GAEvDyb,EAAUhnB,KAAKoP,QAAQvC,EAAOmB,eAAgBiB,GAC9CgY,EAAUjnB,KAAKoP,QAAQvC,EAAOoB,eAAgBgB,GAGlD,MAAO,CACN+B,OAHYhR,KAAK2P,UAAUqX,EAAQ9b,IAAI+b,GAAS1b,SAAS,GAAGL,IAAI6b,GAAgB9X,GAIhFA,KAAMA,IAORiY,UAAW,SAAUra,EAAQtJ,GAI5B,KAFAsJ,EAASrC,EAAeqC,IAEZQ,UACX,MAAM,IAAI9I,MAAM,yBAGjB,IAAI+D,EAAStI,KAAKsmB,qBAAqBzZ,EAAQtJ,GAC/C,OAAOvD,KAAK6kB,QAAQvc,EAAO0I,OAAQ1I,EAAO2G,KAAM1L,IAMjD4jB,SAAU,SAAU5jB,GACnB,OAAOvD,KAAKknB,UAAU,CAAC,EAAE,IAAK,KAAM,CAAC,GAAI,MAAO3jB,IAKjD6jB,MAAO,SAAUpW,EAAQzN,GACxB,OAAOvD,KAAK6kB,QAAQ7T,EAAQhR,KAAK2kB,MAAO,CAACa,IAAKjiB,KAK/C8jB,MAAO,SAAU7J,EAAQja,GAIxB,GAFAA,EAAUA,GAAW,KADrBia,EAAS1T,EAAQ0T,GAAQxa,SAGbb,IAAMqb,EAAO/T,EACxB,OAAOzJ,KAAKkI,KAAK,WAIlB,IAAwB,IAApB3E,EAAQgiB,UAAqBvlB,KAAK2M,UAAUP,SAASoR,GAExD,OADAxd,KAAK4lB,WAAW5lB,KAAK2P,UAAU3P,KAAKoP,QAAQpP,KAAKsM,aAAapB,IAAIsS,IAAUxd,KAAKsnB,WAC1EtnB,KAkBR,GAfKA,KAAKunB,WACTvnB,KAAKunB,SAAW,IAAIxF,GAEpB/hB,KAAKunB,SAASngB,GAAG,CAChBogB,KAAQxnB,KAAKynB,qBACbC,IAAO1nB,KAAK2nB,qBACV3nB,OAICuD,EAAQqkB,aACZ5nB,KAAKkI,KAAK,cAIa,IAApB3E,EAAQgiB,QAAmB,CAC9B/I,GAASxc,KAAK6nB,SAAU,oBAExB,IAAI5F,EAASjiB,KAAK8nB,iBAAiBzc,SAASmS,GAAQxa,QACpDhD,KAAKunB,SAASvF,IAAIhiB,KAAK6nB,SAAU5F,EAAQ1e,EAAQ2e,UAAY,IAAM3e,EAAQ4e,oBAE3EniB,KAAK+nB,UAAUvK,GACfxd,KAAKkI,KAAK,QAAQA,KAAK,WAGxB,OAAOlI,MAMRgoB,MAAO,SAAUC,EAAcC,EAAY3kB,GAG1C,IAAwB,KADxBA,EAAUA,GAAW,IACTgiB,UAAsBtQ,GACjC,OAAOjV,KAAK6kB,QAAQoD,EAAcC,EAAY3kB,GAG/CvD,KAAKqlB,QAEL,IAAI8C,EAAOnoB,KAAKoP,QAAQpP,KAAKsM,aACzB8b,EAAKpoB,KAAKoP,QAAQ6Y,GAClBI,EAAOroB,KAAK2M,UACZ2b,EAAYtoB,KAAK2kB,MAErBsD,EAAend,EAASmd,GACxBC,OAA4BnlB,IAAfmlB,EAA2BI,EAAYJ,EAEpD,IAAIK,EAAKzlB,KAAKR,IAAI+lB,EAAKlmB,EAAGkmB,EAAK5e,GAC3B+e,EAAKD,EAAKvoB,KAAKimB,aAAaqC,EAAWJ,GACvCO,EAAML,EAAGnc,WAAWkc,IAAU,EAC9BO,EAAM,KACNC,EAAOD,EAAMA,EAEjB,SAASE,EAAEvoB,GACV,IAII4J,GAFKue,EAAKA,EAAKD,EAAKA,GAFfloB,GAAK,EAAI,GAEgBsoB,EAAOA,EAAOF,EAAKA,IAC5C,GAFApoB,EAAImoB,EAAKD,GAEAI,EAAOF,GAErBI,EAAK/lB,KAAKoJ,KAAKjC,EAAIA,EAAI,GAAKA,EAMhC,OAFc4e,EAAK,MAAe,GAAK/lB,KAAK8M,IAAIiZ,GAKjD,SAASC,EAAKC,GAAK,OAAQjmB,KAAKoP,IAAI6W,GAAKjmB,KAAKoP,KAAK6W,IAAM,EACzD,SAASC,EAAKD,GAAK,OAAQjmB,KAAKoP,IAAI6W,GAAKjmB,KAAKoP,KAAK6W,IAAM,EAGzD,IAAIE,EAAKL,EAAE,GAGX,SAASM,EAAElZ,GAAK,OAAOuY,GAAMS,EAAKC,GALlC,SAAcF,GAAK,OAAOD,EAAKC,GAAKC,EAAKD,GAKDI,CAAKF,EAAKP,EAAM1Y,GAAK8Y,EAAKG,IAAON,EAIzE,IAAIS,EAAQlkB,KAAKyU,MACb0P,GAAKT,EAAE,GAAKK,GAAMP,EAClBxG,EAAW3e,EAAQ2e,SAAW,IAAO3e,EAAQ2e,SAAW,IAAOmH,EAAI,GAwBvE,OAHArpB,KAAKspB,YAAW,EAAM/lB,EAAQqkB,aAnB9B,SAAS2B,IACR,IAAIrG,GAAKhe,KAAKyU,MAAQyP,GAASlH,EAC3BlS,EARL,SAAiBkT,GAAK,OAAO,EAAIpgB,KAAKD,IAAI,EAAIqgB,EAAG,KAQxCsG,CAAQtG,GAAKmG,EAEjBnG,GAAK,GACRljB,KAAKypB,YAAc/jB,EAAiB6jB,EAAOvpB,MAE3CA,KAAK0pB,MACJ1pB,KAAK2P,UAAUwY,EAAKjd,IAAIkd,EAAG/c,SAAS8c,GAAM1c,WAAWyd,EAAElZ,GAAKyY,IAAMH,GAClEtoB,KAAK2pB,aAAapB,EAlBrB,SAAWvY,GAAK,OAAOuY,GAAMS,EAAKC,GAAMD,EAAKC,EAAKP,EAAM1Y,IAkB9B4Z,CAAE5Z,GAAIsY,GAC7B,CAACN,OAAO,KAGThoB,KACE0pB,MAAMzB,EAAcC,GACpB2B,UAAS,IAMPxoB,KAAKrB,MACJA,MAMR8pB,YAAa,SAAUjd,EAAQtJ,GAC9B,IAAI+E,EAAStI,KAAKsmB,qBAAqBzZ,EAAQtJ,GAC/C,OAAOvD,KAAKgoB,MAAM1f,EAAO0I,OAAQ1I,EAAO2G,KAAM1L,IAK/CmhB,aAAc,SAAU7X,GAGvB,OAFAA,EAASrC,EAAeqC,IAEZQ,WAGDrN,KAAKuD,QAAQigB,WACvBxjB,KAAKwH,IAAI,UAAWxH,KAAK+pB,qBAG1B/pB,KAAKuD,QAAQigB,UAAY3W,EAErB7M,KAAKslB,SACRtlB,KAAK+pB,sBAGC/pB,KAAKoH,GAAG,UAAWpH,KAAK+pB,uBAZ9B/pB,KAAKuD,QAAQigB,UAAY,KAClBxjB,KAAKwH,IAAI,UAAWxH,KAAK+pB,uBAgBlCC,WAAY,SAAU/a,GACrB,IAAIgb,EAAUjqB,KAAKuD,QAAQ8f,QAG3B,OAFArjB,KAAKuD,QAAQ8f,QAAUpU,EAEnBjP,KAAKslB,SAAW2E,IAAYhb,IAC/BjP,KAAKkI,KAAK,oBAENlI,KAAKsnB,UAAYtnB,KAAKuD,QAAQ8f,SAC1BrjB,KAAK6lB,QAAQ5W,GAIfjP,MAKRkqB,WAAY,SAAUjb,GACrB,IAAIgb,EAAUjqB,KAAKuD,QAAQ+f,QAG3B,OAFAtjB,KAAKuD,QAAQ+f,QAAUrU,EAEnBjP,KAAKslB,SAAW2E,IAAYhb,IAC/BjP,KAAKkI,KAAK,oBAENlI,KAAKsnB,UAAYtnB,KAAKuD,QAAQ+f,SAC1BtjB,KAAK6lB,QAAQ5W,GAIfjP,MAKRmqB,gBAAiB,SAAUtd,EAAQtJ,GAClCvD,KAAKoqB,kBAAmB,EACxB,IAAIpZ,EAAShR,KAAKsM,YACd2E,EAAYjR,KAAKolB,aAAapU,EAAQhR,KAAK2kB,MAAOna,EAAeqC,IAOrE,OALKmE,EAAO7E,OAAO8E,IAClBjR,KAAKonB,MAAMnW,EAAW1N,GAGvBvD,KAAKoqB,kBAAmB,EACjBpqB,MASRqqB,UAAW,SAAUrb,EAAQzL,GAG5B,IAAIijB,EAAY1c,GAFhBvG,EAAUA,GAAW,IAEWkjB,gBAAkBljB,EAAQmjB,SAAW,CAAC,EAAG,IACrEC,EAAY7c,EAAQvG,EAAQqjB,oBAAsBrjB,EAAQmjB,SAAW,CAAC,EAAG,IACzE1V,EAAShR,KAAKsM,YACdge,EAActqB,KAAKoP,QAAQ4B,GAC3BuZ,EAAavqB,KAAKoP,QAAQJ,GAC1Bwb,EAAcxqB,KAAKyqB,iBACnBC,EAAkBF,EAAY7d,UAAUpB,SAAS,GACjDof,EAAexgB,EAAS,CAACqgB,EAAYjoB,IAAI2I,IAAIsb,GAAYgE,EAAYloB,IAAI+I,SAASsb,KAEtF,IAAKgE,EAAave,SAASme,GAAa,CACvCvqB,KAAKoqB,kBAAmB,EACxB,IAAIQ,EAAON,EAAYjf,SAASkf,GAC5BtZ,EAAYnH,EAAQygB,EAAWpoB,EAAIyoB,EAAKzoB,EAAGooB,EAAW9gB,EAAImhB,EAAKnhB,IAE/D8gB,EAAWpoB,EAAIwoB,EAAapoB,IAAIJ,GAAKooB,EAAWpoB,EAAIwoB,EAAaroB,IAAIH,KACxE8O,EAAU9O,EAAImoB,EAAYnoB,EAAIyoB,EAAKzoB,EACtB,EAATyoB,EAAKzoB,EACR8O,EAAU9O,GAAKuoB,EAAgBvoB,EAAIqkB,EAAUrkB,EAE7C8O,EAAU9O,GAAKuoB,EAAgBvoB,EAAIwkB,EAAUxkB,IAG3CooB,EAAW9gB,EAAIkhB,EAAapoB,IAAIkH,GAAK8gB,EAAW9gB,EAAIkhB,EAAaroB,IAAImH,KACxEwH,EAAUxH,EAAI6gB,EAAY7gB,EAAImhB,EAAKnhB,EACtB,EAATmhB,EAAKnhB,EACRwH,EAAUxH,GAAKihB,EAAgBjhB,EAAI+c,EAAU/c,EAE7CwH,EAAUxH,GAAKihB,EAAgBjhB,EAAIkd,EAAUld,GAG/CzJ,KAAKonB,MAAMpnB,KAAK2P,UAAUsB,GAAY1N,GACtCvD,KAAKoqB,kBAAmB,EAEzB,OAAOpqB,MAgBR6qB,eAAgB,SAAUtnB,GACzB,IAAKvD,KAAKslB,QAAW,OAAOtlB,KAE5BuD,EAAUpD,EAAO,CAChBolB,SAAS,EACTC,KAAK,IACS,IAAZjiB,EAAmB,CAACgiB,SAAS,GAAQhiB,GAExC,IAAIunB,EAAU9qB,KAAK2M,UACnB3M,KAAKqkB,cAAe,EACpBrkB,KAAK+qB,YAAc,KAEnB,IAAIC,EAAUhrB,KAAK2M,UACfse,EAAYH,EAAQvf,SAAS,GAAGvI,QAChCiO,EAAY+Z,EAAQzf,SAAS,GAAGvI,QAChCwa,EAASyN,EAAU5f,SAAS4F,GAEhC,OAAKuM,EAAOrb,GAAMqb,EAAO/T,GAErBlG,EAAQgiB,SAAWhiB,EAAQiiB,IAC9BxlB,KAAKqnB,MAAM7J,IAGPja,EAAQiiB,KACXxlB,KAAK+nB,UAAUvK,GAGhBxd,KAAKkI,KAAK,QAEN3E,EAAQ2nB,iBACXzlB,aAAazF,KAAK2lB,YAClB3lB,KAAK2lB,WAAa1jB,WAAWjB,EAAKhB,KAAKkI,KAAMlI,KAAM,WAAY,MAE/DA,KAAKkI,KAAK,YAOLlI,KAAKkI,KAAK,SAAU,CAC1B4iB,QAASA,EACTE,QAASA,KAzB2BhrB,MAgCtC6f,KAAM,WAKL,OAJA7f,KAAK6lB,QAAQ7lB,KAAK4kB,WAAW5kB,KAAK2kB,QAC7B3kB,KAAKuD,QAAQwgB,UACjB/jB,KAAKkI,KAAK,aAEJlI,KAAKqlB,SAYb8F,OAAQ,SAAU5nB,GAWjB,GATAA,EAAUvD,KAAKorB,eAAiBjrB,EAAO,CACtCkrB,QAAS,IACTC,OAAO,GAKL/nB,KAEG,gBAAiBoQ,WAKtB,OAJA3T,KAAKurB,wBAAwB,CAC5B7Y,KAAM,EACN8Y,QAAS,+BAEHxrB,KAGR,IAAIyrB,EAAazqB,EAAKhB,KAAK0rB,2BAA4B1rB,MACnD2rB,EAAU3qB,EAAKhB,KAAKurB,wBAAyBvrB,MAQjD,OANIuD,EAAQ+nB,MACXtrB,KAAK4rB,iBACGjY,UAAUkY,YAAYC,cAAcL,EAAYE,EAASpoB,GAEjEoQ,UAAUkY,YAAYE,mBAAmBN,EAAYE,EAASpoB,GAExDvD,MAORgsB,WAAY,WAOX,OANIrY,UAAUkY,aAAelY,UAAUkY,YAAYI,YAClDtY,UAAUkY,YAAYI,WAAWjsB,KAAK4rB,kBAEnC5rB,KAAKorB,iBACRprB,KAAKorB,eAAevG,SAAU,GAExB7kB,MAGRurB,wBAAyB,SAAUW,GAClC,IAAInhB,EAAImhB,EAAMxZ,KACV8Y,EAAUU,EAAMV,UACD,IAANzgB,EAAU,oBACJ,IAANA,EAAU,uBAAyB,WAE5C/K,KAAKorB,eAAevG,UAAY7kB,KAAKslB,SACxCtlB,KAAKmnB,WAMNnnB,KAAKkI,KAAK,gBAAiB,CAC1BwK,KAAM3H,EACNygB,QAAS,sBAAwBA,EAAU,OAI7CE,2BAA4B,SAAUjO,GACrC,IAEIzO,EAAS,IAAIvE,EAFPgT,EAAI0O,OAAOC,SACX3O,EAAI0O,OAAOE,WAEjBxf,EAASmC,EAAO7E,SAA+B,EAAtBsT,EAAI0O,OAAOG,UACpC/oB,EAAUvD,KAAKorB,eAEnB,GAAI7nB,EAAQshB,QAAS,CACpB,IAAI5V,EAAOjP,KAAK6mB,cAAcha,GAC9B7M,KAAK6kB,QAAQ7V,EAAQzL,EAAQ+f,QAAUxgB,KAAKP,IAAI0M,EAAM1L,EAAQ+f,SAAWrU,GAG1E,IAAI7K,EAAO,CACV4K,OAAQA,EACRnC,OAAQA,EACR0f,UAAW9O,EAAI8O,WAGhB,IAAK,IAAIlsB,KAAKod,EAAI0O,OACY,iBAAlB1O,EAAI0O,OAAO9rB,KACrB+D,EAAK/D,GAAKod,EAAI0O,OAAO9rB,IAOvBL,KAAKkI,KAAK,gBAAiB9D,IAO5BooB,WAAY,SAAU1nB,EAAM2nB,GAC3B,IAAKA,EAAgB,OAAOzsB,KAE5B,IAAI2I,EAAU3I,KAAK8E,GAAQ,IAAI2nB,EAAazsB,MAQ5C,OANAA,KAAKkkB,UAAUrgB,KAAK8E,GAEhB3I,KAAKuD,QAAQuB,IAChB6D,EAAQ+jB,SAGF1sB,MAKR0b,OAAQ,WAIP,GAFA1b,KAAKykB,aAAY,GAEbzkB,KAAK2sB,eAAiB3sB,KAAK4sB,WAAWlrB,YACzC,MAAM,IAAI6C,MAAM,qDAGjB,WAEQvE,KAAK4sB,WAAWlrB,mBAChB1B,KAAK2sB,aACX,MAAO7jB,GAER9I,KAAK4sB,WAAWlrB,iBAAcqB,EAE9B/C,KAAK2sB,kBAAe5pB,EA4BrB,IAAI1C,EACJ,IAAKA,UA1ByB0C,IAA1B/C,KAAK4rB,kBACR5rB,KAAKgsB,aAGNhsB,KAAKqlB,QAEL3J,GAAO1b,KAAK6nB,UAER7nB,KAAK6sB,kBACR7sB,KAAK6sB,mBAEF7sB,KAAK8sB,iBACRlnB,EAAgB5F,KAAK8sB,gBACrB9sB,KAAK8sB,eAAiB,MAGvB9sB,KAAK+sB,iBAED/sB,KAAKslB,SAIRtlB,KAAKkI,KAAK,UAIDlI,KAAKmkB,QACdnkB,KAAKmkB,QAAQ9jB,GAAGqb,SAEjB,IAAKrb,KAAKL,KAAKgtB,OACdtR,GAAO1b,KAAKgtB,OAAO3sB,IAQpB,OALAL,KAAKmkB,QAAU,GACfnkB,KAAKgtB,OAAS,UACPhtB,KAAK6nB,gBACL7nB,KAAKitB,UAELjtB,MAQRktB,WAAY,SAAUpoB,EAAM0W,GAC3B,IACI2R,EAAO7R,GAAS,MADJ,gBAAkBxW,EAAO,YAAcA,EAAK3B,QAAQ,OAAQ,IAAM,QAAU,IACtDqY,GAAaxb,KAAK6nB,UAKxD,OAHI/iB,IACH9E,KAAKgtB,OAAOloB,GAAQqoB,GAEdA,GAOR7gB,UAAW,WAGV,OAFAtM,KAAKotB,iBAEDptB,KAAK+qB,cAAgB/qB,KAAKqtB,SACtBrtB,KAAK+qB,YAEN/qB,KAAKstB,mBAAmBttB,KAAKutB,yBAKrCjG,QAAS,WACR,OAAOtnB,KAAK2kB,OAKb4B,UAAW,WACV,IAAI1Z,EAAS7M,KAAKyqB,iBAIlB,OAAO,IAAIrgB,EAHFpK,KAAK2P,UAAU9C,EAAON,iBACtBvM,KAAK2P,UAAU9C,EAAOL,iBAOhCghB,WAAY,WACX,YAAgCzqB,IAAzB/C,KAAKuD,QAAQ8f,QAAwBrjB,KAAKytB,gBAAkB,EAAIztB,KAAKuD,QAAQ8f,SAKrFqK,WAAY,WACX,YAAgC3qB,IAAzB/C,KAAKuD,QAAQ+f,aACMvgB,IAAxB/C,KAAK2tB,eAA+B7G,EAAAA,EAAW9mB,KAAK2tB,eACrD3tB,KAAKuD,QAAQ+f,SAQfuD,cAAe,SAAUha,EAAQ+gB,EAAQlH,GACxC7Z,EAASrC,EAAeqC,GACxB6Z,EAAU5c,EAAQ4c,GAAW,CAAC,EAAG,IAEjC,IAAIzX,EAAOjP,KAAKsnB,WAAa,EACzB/kB,EAAMvC,KAAKwtB,aACXlrB,EAAMtC,KAAK0tB,aACXG,EAAKhhB,EAAOqB,eACZ4f,EAAKjhB,EAAOwB,eACZga,EAAOroB,KAAK2M,UAAUtB,SAASqb,GAC/BqH,EAAa5jB,EAASnK,KAAKoP,QAAQ0e,EAAI7e,GAAOjP,KAAKoP,QAAQye,EAAI5e,IAAOtC,UACtEqhB,EAAO/Y,GAAQjV,KAAKuD,QAAQwgB,SAAW,EACvCkK,EAAS5F,EAAKlmB,EAAI4rB,EAAW5rB,EAC7B+rB,EAAS7F,EAAK5e,EAAIskB,EAAWtkB,EAC7B4F,EAAQue,EAAS9qB,KAAKR,IAAI2rB,EAAQC,GAAUprB,KAAKP,IAAI0rB,EAAQC,GASjE,OAPAjf,EAAOjP,KAAK2pB,aAAata,EAAOJ,GAE5B+e,IACH/e,EAAOnM,KAAKE,MAAMiM,GAAQ+e,EAAO,OAASA,EAAO,KACjD/e,EAAO2e,EAAS9qB,KAAK+G,KAAKoF,EAAO+e,GAAQA,EAAOlrB,KAAK8G,MAAMqF,EAAO+e,GAAQA,GAGpElrB,KAAKR,IAAIC,EAAKO,KAAKP,IAAID,EAAK2M,KAKpCtC,QAAS,WAQR,OAPK3M,KAAKmuB,QAASnuB,KAAKqkB,eACvBrkB,KAAKmuB,MAAQ,IAAI3kB,EAChBxJ,KAAK4sB,WAAWwB,aAAe,EAC/BpuB,KAAK4sB,WAAWyB,cAAgB,GAEjCruB,KAAKqkB,cAAe,GAEdrkB,KAAKmuB,MAAMljB,SAMnBwf,eAAgB,SAAUzZ,EAAQ/B,GACjC,IAAIqf,EAAetuB,KAAKuuB,iBAAiBvd,EAAQ/B,GACjD,OAAO,IAAIlF,EAAOukB,EAAcA,EAAapjB,IAAIlL,KAAK2M,aASvD6hB,eAAgB,WAEf,OADAxuB,KAAKotB,iBACEptB,KAAKyuB,cAMbC,oBAAqB,SAAUzf,GAC9B,OAAOjP,KAAKuD,QAAQ6f,IAAItT,wBAA4B/M,IAATkM,EAAqBjP,KAAKsnB,UAAYrY,IAOlF0f,QAAS,SAAUxB,GAClB,MAAuB,iBAATA,EAAoBntB,KAAKgtB,OAAOG,GAAQA,GAMvDyB,SAAU,WACT,OAAO5uB,KAAKgtB,QAKb6B,aAAc,WACb,OAAO7uB,KAAK4sB,YASb3G,aAAc,SAAU6I,EAAQC,GAE/B,IAAI3L,EAAMpjB,KAAKuD,QAAQ6f,IAEvB,OADA2L,OAAwBhsB,IAAbgsB,EAAyB/uB,KAAK2kB,MAAQoK,EAC1C3L,EAAI/T,MAAMyf,GAAU1L,EAAI/T,MAAM0f,IAOtCpF,aAAc,SAAUta,EAAO0f,GAC9B,IAAI3L,EAAMpjB,KAAKuD,QAAQ6f,IACvB2L,OAAwBhsB,IAAbgsB,EAAyB/uB,KAAK2kB,MAAQoK,EACjD,IAAI9f,EAAOmU,EAAInU,KAAKI,EAAQ+T,EAAI/T,MAAM0f,IACtC,OAAOlkB,MAAMoE,GAAQ6X,EAAAA,EAAW7X,GAQjCG,QAAS,SAAUJ,EAAQC,GAE1B,OADAA,OAAgBlM,IAATkM,EAAqBjP,KAAK2kB,MAAQ1V,EAClCjP,KAAKuD,QAAQ6f,IAAIrU,cAAcjE,EAASkE,GAASC,IAKzDU,UAAW,SAAUxE,EAAO8D,GAE3B,OADAA,OAAgBlM,IAATkM,EAAqBjP,KAAK2kB,MAAQ1V,EAClCjP,KAAKuD,QAAQ6f,IAAI5T,cAAc1F,EAAQqB,GAAQ8D,IAMvDqe,mBAAoB,SAAUniB,GAC7B,IAAI+D,EAAiBpF,EAAQqB,GAAOD,IAAIlL,KAAKwuB,kBAC7C,OAAOxuB,KAAK2P,UAAUT,IAMvB8f,mBAAoB,SAAUhgB,GAE7B,OADqBhP,KAAKoP,QAAQtE,EAASkE,IAASnD,SAC9BP,UAAUtL,KAAKwuB,mBAStCje,WAAY,SAAUvB,GACrB,OAAOhP,KAAKuD,QAAQ6f,IAAI7S,WAAWzF,EAASkE,KAS7C+B,iBAAkB,SAAU/B,GAC3B,OAAOhP,KAAKuD,QAAQ6f,IAAIrS,iBAAiBvG,EAAewE,KAMzDqB,SAAU,SAAUgB,EAASC,GAC5B,OAAOtR,KAAKuD,QAAQ6f,IAAI/S,SAASvF,EAASuG,GAAUvG,EAASwG,KAM9D2d,2BAA4B,SAAU9jB,GACrC,OAAOrB,EAAQqB,GAAOE,SAASrL,KAAK8nB,mBAMrCoH,2BAA4B,SAAU/jB,GACrC,OAAOrB,EAAQqB,GAAOD,IAAIlL,KAAK8nB,mBAMhCzB,uBAAwB,SAAUlb,GACjC,IAAIgkB,EAAanvB,KAAKivB,2BAA2BnlB,EAAQqB,IACzD,OAAOnL,KAAKstB,mBAAmB6B,IAMhC/I,uBAAwB,SAAUpX,GACjC,OAAOhP,KAAKkvB,2BAA2BlvB,KAAKgvB,mBAAmBlkB,EAASkE,MAMzEogB,2BAA4B,SAAUtmB,GACrC,OAAO2X,GAAiB3X,EAAG9I,KAAK4sB,aAMjCyC,uBAAwB,SAAUvmB,GACjC,OAAO9I,KAAKivB,2BAA2BjvB,KAAKovB,2BAA2BtmB,KAMxEwmB,mBAAoB,SAAUxmB,GAC7B,OAAO9I,KAAKstB,mBAAmBttB,KAAKqvB,uBAAuBvmB,KAM5Dwb,eAAgB,SAAU9e,GACzB,IAAIgW,EAAYxb,KAAK4sB,WAAanW,GAAIjR,GAEtC,IAAKgW,EACJ,MAAM,IAAIjX,MAAM,4BACV,GAAIiX,EAAU9Z,YACpB,MAAM,IAAI6C,MAAM,yCAGjB6C,GAAGoU,EAAW,SAAUxb,KAAKuvB,UAAWvvB,MACxCA,KAAK2sB,aAAelrB,EAAM+Z,IAG3B+I,YAAa,WACZ,IAAI/I,EAAYxb,KAAK4sB,WAErB5sB,KAAKwvB,cAAgBxvB,KAAKuD,QAAQqgB,eAAiB3O,GAEnDuH,GAAShB,EAAW,qBAClB7F,GAAQ,iBAAmB,KAC3BK,GAAS,kBAAoB,KAC7BvC,GAAQ,iBAAmB,KAC3Be,GAAS,kBAAoB,KAC7BxU,KAAKwvB,cAAgB,qBAAuB,KAE9C,IAAIC,EAAWxU,GAASO,EAAW,YAElB,aAAbiU,GAAwC,aAAbA,GAAwC,UAAbA,IACzDjU,EAAUjI,MAAMkc,SAAW,YAG5BzvB,KAAK0vB,aAED1vB,KAAK2vB,iBACR3vB,KAAK2vB,mBAIPD,WAAY,WACX,IAAIE,EAAQ5vB,KAAKgtB,OAAS,GAC1BhtB,KAAK6vB,eAAiB,GActB7vB,KAAK6nB,SAAW7nB,KAAKktB,WAAW,UAAWltB,KAAK4sB,YAChDlP,GAAY1d,KAAK6nB,SAAU,IAAIre,EAAM,EAAG,IAIxCxJ,KAAKktB,WAAW,YAGhBltB,KAAKktB,WAAW,cAGhBltB,KAAKktB,WAAW,eAGhBltB,KAAKktB,WAAW,cAGhBltB,KAAKktB,WAAW,eAGhBltB,KAAKktB,WAAW,aAEXltB,KAAKuD,QAAQsgB,sBACjBrH,GAASoT,EAAME,WAAY,qBAC3BtT,GAASoT,EAAMG,WAAY,uBAQ7BnK,WAAY,SAAU5U,EAAQ/B,GAC7ByO,GAAY1d,KAAK6nB,SAAU,IAAIre,EAAM,EAAG,IAExC,IAAIwmB,GAAWhwB,KAAKslB,QACpBtlB,KAAKslB,SAAU,EACfrW,EAAOjP,KAAK4kB,WAAW3V,GAEvBjP,KAAKkI,KAAK,gBAEV,IAAI+nB,EAAcjwB,KAAK2kB,QAAU1V,EACjCjP,KACEspB,WAAW2G,GAAa,GACxBvG,MAAM1Y,EAAQ/B,GACd4a,SAASoG,GAKXjwB,KAAKkI,KAAK,aAKN8nB,GACHhwB,KAAKkI,KAAK,SAIZohB,WAAY,SAAU2G,EAAarI,GAWlC,OANIqI,GACHjwB,KAAKkI,KAAK,aAEN0f,GACJ5nB,KAAKkI,KAAK,aAEJlI,MAGR0pB,MAAO,SAAU1Y,EAAQ/B,EAAM7K,QACjBrB,IAATkM,IACHA,EAAOjP,KAAK2kB,OAEb,IAAIsL,EAAcjwB,KAAK2kB,QAAU1V,EAgBjC,OAdAjP,KAAK2kB,MAAQ1V,EACbjP,KAAK+qB,YAAc/Z,EACnBhR,KAAKyuB,aAAezuB,KAAKkwB,mBAAmBlf,IAKxCif,GAAgB7rB,GAAQA,EAAK+rB,QAChCnwB,KAAKkI,KAAK,OAAQ9D,GAMZpE,KAAKkI,KAAK,OAAQ9D,IAG1BylB,SAAU,SAAUoG,GAUnB,OAPIA,GACHjwB,KAAKkI,KAAK,WAMJlI,KAAKkI,KAAK,YAGlBmd,MAAO,WAKN,OAJAzf,EAAgB5F,KAAKypB,aACjBzpB,KAAKunB,UACRvnB,KAAKunB,SAAS1H,OAER7f,MAGR+nB,UAAW,SAAUvK,GACpBE,GAAY1d,KAAK6nB,SAAU7nB,KAAK8nB,iBAAiBzc,SAASmS,KAG3D4S,aAAc,WACb,OAAOpwB,KAAK0tB,aAAe1tB,KAAKwtB,cAGjCzD,oBAAqB,WACf/pB,KAAKoqB,kBACTpqB,KAAKmqB,gBAAgBnqB,KAAKuD,QAAQigB,YAIpC4J,eAAgB,WACf,IAAKptB,KAAKslB,QACT,MAAM,IAAI/gB,MAAM,mCAOlBkgB,YAAa,SAAU4L,GACtBrwB,KAAKswB,SAAW,GAGhB,IAAIC,EAAQF,EAAY7oB,GAAMJ,GA6B9BmpB,GA/BAvwB,KAAKswB,SAAS7uB,EAAMzB,KAAK4sB,aAAe5sB,MA+B7B4sB,WAAY,mGAC6C5sB,KAAKwwB,gBAAiBxwB,MAEtFA,KAAKuD,QAAQ0gB,aAChBsM,EAAMxrB,OAAQ,SAAU/E,KAAKwkB,UAAWxkB,MAGrCiV,IAASjV,KAAKuD,QAAQugB,mBACxBuM,EAAYrwB,KAAKwH,IAAMxH,KAAKoH,IAAI/F,KAAKrB,KAAM,UAAWA,KAAKywB,aAI9DjM,UAAW,WACV5e,EAAgB5F,KAAK8sB,gBACrB9sB,KAAK8sB,eAAiBpnB,EACd,WAAc1F,KAAK6qB,eAAe,CAACK,iBAAiB,KAAWlrB,OAGxEuvB,UAAW,WACVvvB,KAAK4sB,WAAW8D,UAAa,EAC7B1wB,KAAK4sB,WAAW+D,WAAa,GAG9BF,WAAY,WACX,IAAIhT,EAAMzd,KAAK8nB,iBACXhlB,KAAKR,IAAIQ,KAAKuJ,IAAIoR,EAAItb,GAAIW,KAAKuJ,IAAIoR,EAAIhU,KAAOzJ,KAAKuD,QAAQugB,kBAG9D9jB,KAAK4lB,WAAW5lB,KAAKsM,YAAatM,KAAKsnB,YAIzCsJ,kBAAmB,SAAU9nB,EAAGxB,GAO/B,IANA,IACIgB,EADAuoB,EAAU,GAEVC,EAAmB,aAATxpB,GAAgC,cAATA,EACjC9G,EAAMsI,EAAER,QAAUQ,EAAEioB,WACpBC,GAAW,EAERxwB,GAAK,CAEX,IADA8H,EAAStI,KAAKswB,SAAS7uB,EAAMjB,OACL,UAAT8G,GAA6B,aAATA,KAAyBwB,EAAE8W,YAAc5f,KAAKixB,gBAAgB3oB,GAAS,CAEzG0oB,GAAW,EACX,MAED,GAAI1oB,GAAUA,EAAOF,QAAQd,GAAM,GAAO,CACzC,GAAIwpB,IAAYxR,GAAiB9e,EAAKsI,GAAM,MAE5C,GADA+nB,EAAQhtB,KAAKyE,GACTwoB,EAAW,MAEhB,GAAItwB,IAAQR,KAAK4sB,WAAc,MAC/BpsB,EAAMA,EAAIob,WAKX,OAHKiV,EAAQnwB,QAAWswB,GAAaF,IAAWxR,GAAiB9e,EAAKsI,KACrE+nB,EAAU,CAAC7wB,OAEL6wB,GAGRL,gBAAiB,SAAU1nB,GAC1B,GAAK9I,KAAKslB,UAAWlF,GAAQtX,GAA7B,CAEA,IAAIxB,EAAOwB,EAAExB,KAEA,cAATA,GAAiC,aAATA,GAAgC,UAATA,GAA6B,YAATA,GAEtE4W,GAAepV,EAAER,QAAUQ,EAAEioB,YAG9B/wB,KAAKkxB,cAAcpoB,EAAGxB,KAGvB6pB,aAAc,CAAC,QAAS,WAAY,YAAa,WAAY,eAE7DD,cAAe,SAAUpoB,EAAGxB,EAAMupB,GAEjC,GAAe,UAAX/nB,EAAExB,KAAkB,CAMvB,IAAI8pB,EAAQjxB,EAAO,GAAI2I,GACvBsoB,EAAM9pB,KAAO,WACbtH,KAAKkxB,cAAcE,EAAOA,EAAM9pB,KAAMupB,GAGvC,IAAI/nB,EAAEqX,WAGN0Q,GAAWA,GAAW,IAAItvB,OAAOvB,KAAK4wB,kBAAkB9nB,EAAGxB,KAE9C5G,OAAb,CAEA,IAAI4H,EAASuoB,EAAQ,GACR,gBAATvpB,GAA0BgB,EAAOF,QAAQd,GAAM,IAClD8Q,GAAetP,GAGhB,IAAI1E,EAAO,CACVob,cAAe1W,GAGhB,GAAe,aAAXA,EAAExB,MAAkC,YAAXwB,EAAExB,MAAiC,UAAXwB,EAAExB,KAAkB,CACxE,IAAI+pB,EAAW/oB,EAAOgpB,aAAehpB,EAAOipB,SAAWjpB,EAAOipB,SAAW,IACzEntB,EAAKotB,eAAiBH,EACrBrxB,KAAKomB,uBAAuB9d,EAAOgpB,aAAetxB,KAAKovB,2BAA2BtmB,GACnF1E,EAAK+qB,WAAanvB,KAAKivB,2BAA2B7qB,EAAKotB,gBACvDptB,EAAK4K,OAASqiB,EAAW/oB,EAAOgpB,YAActxB,KAAKstB,mBAAmBlpB,EAAK+qB,YAG5E,IAAK,IAAI9uB,EAAI,EAAGA,EAAIwwB,EAAQnwB,OAAQL,IAEnC,GADAwwB,EAAQxwB,GAAG6H,KAAKZ,EAAMlD,GAAM,GACxBA,EAAKob,cAAcW,WACsB,IAA3C0Q,EAAQxwB,GAAGkD,QAAQkuB,sBAAuE,IAAtCztB,EAAQhE,KAAKmxB,aAAc7pB,GAAiB,SAIpG2pB,gBAAiB,SAAUtwB,GAE1B,OADAA,EAAMA,EAAIqwB,UAAYrwB,EAAIqwB,SAASU,UAAY/wB,EAAMX,MACzCgxB,UAAYrwB,EAAIqwB,SAASW,SAAa3xB,KAAK4xB,SAAW5xB,KAAK4xB,QAAQD,SAGhF5E,eAAgB,WACf,IAAK,IAAI1sB,EAAI,EAAGE,EAAMP,KAAKkkB,UAAUxjB,OAAQL,EAAIE,EAAKF,IACrDL,KAAKkkB,UAAU7jB,GAAGwxB,WAUpBC,UAAW,SAAUC,EAAUlwB,GAM9B,OALI7B,KAAKslB,QACRyM,EAAS1wB,KAAKQ,GAAW7B,KAAM,CAACsI,OAAQtI,OAExCA,KAAKoH,GAAG,OAAQ2qB,EAAUlwB,GAEpB7B,MAMR8nB,eAAgB,WACf,OAAOhK,GAAY9d,KAAK6nB,WAAa,IAAIre,EAAM,EAAG,IAGnD6jB,OAAQ,WACP,IAAI5P,EAAMzd,KAAK8nB,iBACf,OAAOrK,IAAQA,EAAItR,OAAO,CAAC,EAAG,KAG/BoiB,iBAAkB,SAAUvd,EAAQ/B,GAInC,OAHkB+B,QAAmBjO,IAATkM,EAC3BjP,KAAKkwB,mBAAmBlf,EAAQ/B,GAChCjP,KAAKwuB,kBACanjB,SAASrL,KAAK8nB,mBAGlCoI,mBAAoB,SAAUlf,EAAQ/B,GACrC,IAAIiX,EAAWlmB,KAAK2M,UAAUnB,UAAU,GACxC,OAAOxL,KAAKoP,QAAQ4B,EAAQ/B,GAAM3D,UAAU4a,GAAU9a,KAAKpL,KAAK8nB,kBAAkBjc,UAGnFmmB,uBAAwB,SAAUhjB,EAAQC,EAAM+B,GAC/C,IAAIihB,EAAUjyB,KAAKkwB,mBAAmBlf,EAAQ/B,GAC9C,OAAOjP,KAAKoP,QAAQJ,EAAQC,GAAM3D,UAAU2mB,IAG7CC,8BAA+B,SAAUC,EAAcljB,EAAM+B,GAC5D,IAAIihB,EAAUjyB,KAAKkwB,mBAAmBlf,EAAQ/B,GAC9C,OAAO9E,EAAS,CACfnK,KAAKoP,QAAQ+iB,EAAankB,eAAgBiB,GAAM3D,UAAU2mB,GAC1DjyB,KAAKoP,QAAQ+iB,EAAajkB,eAAgBe,GAAM3D,UAAU2mB,GAC1DjyB,KAAKoP,QAAQ+iB,EAAa9jB,eAAgBY,GAAM3D,UAAU2mB,GAC1DjyB,KAAKoP,QAAQ+iB,EAAalkB,eAAgBgB,GAAM3D,UAAU2mB,MAK5D1E,qBAAsB,WACrB,OAAOvtB,KAAKivB,2BAA2BjvB,KAAK2M,UAAUnB,UAAU,KAIjE4mB,iBAAkB,SAAUpjB,GAC3B,OAAOhP,KAAKgvB,mBAAmBhgB,GAAQ3D,SAASrL,KAAKutB,yBAItDnI,aAAc,SAAUpU,EAAQ/B,EAAMpC,GAErC,IAAKA,EAAU,OAAOmE,EAEtB,IAAIqhB,EAAcryB,KAAKoP,QAAQ4B,EAAQ/B,GACnCiX,EAAWlmB,KAAK2M,UAAUpB,SAAS,GACnC+mB,EAAa,IAAIvoB,EAAOsoB,EAAYhnB,SAAS6a,GAAWmM,EAAYnnB,IAAIgb,IACxE1I,EAASxd,KAAKuyB,iBAAiBD,EAAYzlB,EAAQoC,GAKvD,OAAIuO,EAAOxa,QAAQmJ,OAAO,CAAC,EAAG,IACtB6E,EAGDhR,KAAK2P,UAAU0iB,EAAYnnB,IAAIsS,GAASvO,IAIhDujB,aAAc,SAAUhV,EAAQ3Q,GAC/B,IAAKA,EAAU,OAAO2Q,EAEtB,IAAI8U,EAAatyB,KAAKyqB,iBAClBgI,EAAY,IAAI1oB,EAAOuoB,EAAW/vB,IAAI2I,IAAIsS,GAAS8U,EAAWhwB,IAAI4I,IAAIsS,IAE1E,OAAOA,EAAOtS,IAAIlL,KAAKuyB,iBAAiBE,EAAW5lB,KAIpD0lB,iBAAkB,SAAUG,EAAUlP,EAAWvU,GAChD,IAAI0jB,EAAqBxoB,EACjBnK,KAAKoP,QAAQoU,EAAUvV,eAAgBgB,GACvCjP,KAAKoP,QAAQoU,EAAUxV,eAAgBiB,IAE3C2jB,EAAYD,EAAmBpwB,IAAI8I,SAASqnB,EAASnwB,KACrDswB,EAAYF,EAAmBrwB,IAAI+I,SAASqnB,EAASpwB,KAKzD,OAAO,IAAIkH,EAHFxJ,KAAK8yB,SAASF,EAAUzwB,GAAI0wB,EAAU1wB,GACtCnC,KAAK8yB,SAASF,EAAUnpB,GAAIopB,EAAUppB,KAKhDqpB,SAAU,SAAUlV,EAAMmV,GACzB,OAAsB,EAAfnV,EAAOmV,EACbjwB,KAAKE,MAAM4a,EAAOmV,GAAS,EAC3BjwB,KAAKR,IAAI,EAAGQ,KAAK+G,KAAK+T,IAAS9a,KAAKR,IAAI,EAAGQ,KAAK8G,MAAMmpB,KAGxDnO,WAAY,SAAU3V,GACrB,IAAI1M,EAAMvC,KAAKwtB,aACXlrB,EAAMtC,KAAK0tB,aACXM,EAAO/Y,GAAQjV,KAAKuD,QAAQwgB,SAAW,EAI3C,OAHIiK,IACH/e,EAAOnM,KAAKE,MAAMiM,EAAO+e,GAAQA,GAE3BlrB,KAAKR,IAAIC,EAAKO,KAAKP,IAAID,EAAK2M,KAGpCwY,qBAAsB,WACrBznB,KAAKkI,KAAK,SAGXyf,oBAAqB,WACpBhL,GAAY3c,KAAK6nB,SAAU,oBAC3B7nB,KAAKkI,KAAK,YAGXwd,gBAAiB,SAAU1U,EAAQzN,GAElC,IAAIia,EAASxd,KAAKoyB,iBAAiBphB,GAAQhF,SAG3C,SAAqC,KAAhCzI,GAAWA,EAAQgiB,WAAsBvlB,KAAK2M,UAAUP,SAASoR,MAEtExd,KAAKqnB,MAAM7J,EAAQja,IAEZ,IAGRyhB,iBAAkB,WAEjB,IAAIgO,EAAQhzB,KAAKilB,OAAS3J,GAAS,MAAO,uCAC1Ctb,KAAKgtB,OAAOiG,QAAQxX,YAAYuX,GAEhChzB,KAAKoH,GAAG,WAAY,SAAU0B,GAC7B,IAAIiR,EAAOa,GACP3K,EAAYjQ,KAAKilB,OAAO1R,MAAMwG,GAElCwD,GAAavd,KAAKilB,OAAQjlB,KAAKoP,QAAQtG,EAAEkI,OAAQlI,EAAEmG,MAAOjP,KAAKimB,aAAand,EAAEmG,KAAM,IAGhFgB,IAAcjQ,KAAKilB,OAAO1R,MAAMwG,IAAS/Z,KAAKkzB,gBACjDlzB,KAAKmzB,wBAEJnzB,MAEHA,KAAKoH,GAAG,eAAgBpH,KAAKozB,aAAcpzB,MAE3CA,KAAKuH,IAAI,SAAUvH,KAAKqzB,kBAAmBrzB,OAG5CqzB,kBAAmB,WAClB3X,GAAO1b,KAAKilB,QACZjlB,KAAKwH,IAAI,eAAgBxH,KAAKozB,aAAcpzB,aACrCA,KAAKilB,QAGbmO,aAAc,WACb,IAAIroB,EAAI/K,KAAKsM,YACTgnB,EAAItzB,KAAKsnB,UACb/J,GAAavd,KAAKilB,OAAQjlB,KAAKoP,QAAQrE,EAAGuoB,GAAItzB,KAAKimB,aAAaqN,EAAG,KAGpEpO,oBAAqB,SAAUpc,GAC1B9I,KAAKkzB,gBAAyD,GAAvCpqB,EAAEyqB,aAAavvB,QAAQ,cACjDhE,KAAKmzB,wBAIPK,kBAAmB,WAClB,OAAQxzB,KAAK4sB,WAAW6G,uBAAuB,yBAAyB/yB,QAGzE+kB,iBAAkB,SAAUzU,EAAQ/B,EAAM1L,GAEzC,GAAIvD,KAAKkzB,eAAkB,OAAO,EAKlC,GAHA3vB,EAAUA,GAAW,IAGhBvD,KAAK+kB,gBAAqC,IAApBxhB,EAAQgiB,SAAqBvlB,KAAKwzB,qBACrD1wB,KAAKuJ,IAAI4C,EAAOjP,KAAK2kB,OAAS3kB,KAAKuD,QAAQogB,uBAA0B,OAAO,EAGpF,IAAItU,EAAQrP,KAAKimB,aAAahX,GAC1BuO,EAASxd,KAAKoyB,iBAAiBphB,GAAQxF,UAAU,EAAI,EAAI6D,GAG7D,SAAwB,IAApB9L,EAAQgiB,UAAqBvlB,KAAK2M,UAAUP,SAASoR,MAEzD9X,EAAiB,WAChB1F,KACKspB,YAAW,GAAM,GACjBoK,aAAa1iB,EAAQ/B,GAAM,IAC9BjP,OAEI,IAGR0zB,aAAc,SAAU1iB,EAAQ/B,EAAM0kB,EAAWC,GAC3C5zB,KAAK6nB,WAEN8L,IACH3zB,KAAKkzB,gBAAiB,EAGtBlzB,KAAK6zB,iBAAmB7iB,EACxBhR,KAAK8zB,eAAiB7kB,EAEtBuN,GAASxc,KAAK6nB,SAAU,sBAMzB7nB,KAAKkI,KAAK,WAAY,CACrB8I,OAAQA,EACR/B,KAAMA,EACN2kB,SAAUA,IAIX3xB,WAAWjB,EAAKhB,KAAKmzB,qBAAsBnzB,MAAO,OAGnDmzB,qBAAsB,WAChBnzB,KAAKkzB,iBAENlzB,KAAK6nB,UACRlL,GAAY3c,KAAK6nB,SAAU,qBAG5B7nB,KAAKkzB,gBAAiB,EAEtBlzB,KAAK0pB,MAAM1pB,KAAK6zB,iBAAkB7zB,KAAK8zB,gBAGvCpuB,EAAiB,WAChB1F,KAAK6pB,UAAS,IACZ7pB,UA6HS,SAAV+zB,GAAoBxwB,GACvB,OAAO,IAAIywB,GAAQzwB,GAnGpB,IAAIywB,GAAUluB,EAAM3F,OAAO,CAG1BoD,QAAS,CAIRksB,SAAU,YAGXxpB,WAAY,SAAU1C,GACrBD,EAAWtD,KAAMuD,IASlBua,YAAa,WACZ,OAAO9d,KAAKuD,QAAQksB,UAKrB/R,YAAa,SAAU+R,GACtB,IAAIwE,EAAMj0B,KAAKk0B,KAYf,OAVID,GACHA,EAAIE,cAAcn0B,MAGnBA,KAAKuD,QAAQksB,SAAWA,EAEpBwE,GACHA,EAAIG,WAAWp0B,MAGTA,MAKR6uB,aAAc,WACb,OAAO7uB,KAAK4sB,YAKbyH,MAAO,SAAUJ,GAChBj0B,KAAK0b,SACL1b,KAAKk0B,KAAOD,EAEZ,IAAIzY,EAAYxb,KAAK4sB,WAAa5sB,KAAKs0B,MAAML,GACzCxW,EAAMzd,KAAK8d,cACXyW,EAASN,EAAIO,gBAAgB/W,GAYjC,OAVAjB,GAAShB,EAAW,oBAEW,IAA3BiC,EAAIzZ,QAAQ,UACfuwB,EAAOrY,aAAaV,EAAW+Y,EAAOrd,YAEtCqd,EAAO9Y,YAAYD,GAGpBxb,KAAKk0B,KAAK9sB,GAAG,SAAUpH,KAAK0b,OAAQ1b,MAE7BA,MAKR0b,OAAQ,WACP,OAAK1b,KAAKk0B,OAIVxY,GAAO1b,KAAK4sB,YAER5sB,KAAKy0B,UACRz0B,KAAKy0B,SAASz0B,KAAKk0B,MAGpBl0B,KAAKk0B,KAAK1sB,IAAI,SAAUxH,KAAK0b,OAAQ1b,MACrCA,KAAKk0B,KAAO,MAELl0B,MAGR00B,cAAe,SAAU5rB,GAEpB9I,KAAKk0B,MAAQprB,GAAiB,EAAZA,EAAE6rB,SAA2B,EAAZ7rB,EAAE8rB,SACxC50B,KAAKk0B,KAAKrF,eAAegG,WAwB5B1R,GAAInc,QAAQ,CAGXotB,WAAY,SAAUL,GAErB,OADAA,EAAQM,MAAMr0B,MACPA,MAKRm0B,cAAe,SAAUJ,GAExB,OADAA,EAAQrY,SACD1b,MAGR2vB,gBAAiB,WAChB,IAAImF,EAAU90B,KAAKw0B,gBAAkB,GACjCzsB,EAAI,WACJyT,EAAYxb,KAAK+0B,kBACTzZ,GAAS,MAAOvT,EAAI,oBAAqB/H,KAAK4sB,YAE1D,SAASoI,EAAaC,EAAOC,GAC5B,IAAI3Z,EAAYxT,EAAIktB,EAAQ,IAAMltB,EAAImtB,EAEtCJ,EAAQG,EAAQC,GAAS5Z,GAAS,MAAOC,EAAWC,GAGrDwZ,EAAa,MAAO,QACpBA,EAAa,MAAO,SACpBA,EAAa,SAAU,QACvBA,EAAa,SAAU,UAGxBnI,iBAAkB,WACjB,IAAK,IAAIxsB,KAAKL,KAAKw0B,gBAClB9Y,GAAO1b,KAAKw0B,gBAAgBn0B,IAE7Bqb,GAAO1b,KAAK+0B,0BACL/0B,KAAKw0B,uBACLx0B,KAAK+0B,qBA2Cd,IAAII,GAASnB,GAAQ7zB,OAAO,CAG3BoD,QAAS,CAGR6xB,WAAW,EACX3F,SAAU,WAIV4F,YAAY,EAIZC,gBAAgB,EAKhBC,YAAY,EAQZC,aAAc,SAAUC,EAAQC,EAAQC,EAAOC,GAC9C,OAAOD,EAAQC,GAAS,EAAKA,EAAQD,EAAQ,EAAI,IAInD1vB,WAAY,SAAU4vB,EAAYC,EAAUvyB,GAQ3C,IAAK,IAAIlD,KAPTiD,EAAWtD,KAAMuD,GAEjBvD,KAAK+1B,oBAAsB,GAC3B/1B,KAAKmkB,QAAU,GACfnkB,KAAKg2B,YAAc,EACnBh2B,KAAKi2B,gBAAiB,EAERJ,EACb71B,KAAKk2B,UAAUL,EAAWx1B,GAAIA,GAG/B,IAAKA,KAAKy1B,EACT91B,KAAKk2B,UAAUJ,EAASz1B,GAAIA,GAAG,IAIjCi0B,MAAO,SAAUL,GAChBj0B,KAAKukB,cACLvkB,KAAKm2B,WAELn2B,KAAKk0B,KAAOD,GACR7sB,GAAG,UAAWpH,KAAKo2B,qBAAsBp2B,MAE7C,IAAK,IAAIK,EAAI,EAAGA,EAAIL,KAAKmkB,QAAQzjB,OAAQL,IACxCL,KAAKmkB,QAAQ9jB,GAAG0I,MAAM3B,GAAG,aAAcpH,KAAKq2B,eAAgBr2B,MAG7D,OAAOA,KAAK4sB,YAGbyH,MAAO,SAAUJ,GAGhB,OAFAD,GAAQjzB,UAAUszB,MAAMhzB,KAAKrB,KAAMi0B,GAE5Bj0B,KAAKs2B,yBAGb7B,SAAU,WACTz0B,KAAKk0B,KAAK1sB,IAAI,UAAWxH,KAAKo2B,qBAAsBp2B,MAEpD,IAAK,IAAIK,EAAI,EAAGA,EAAIL,KAAKmkB,QAAQzjB,OAAQL,IACxCL,KAAKmkB,QAAQ9jB,GAAG0I,MAAMvB,IAAI,aAAcxH,KAAKq2B,eAAgBr2B,OAM/Du2B,aAAc,SAAUxtB,EAAOjE,GAE9B,OADA9E,KAAKk2B,UAAUntB,EAAOjE,GACd9E,KAAS,KAAIA,KAAKm2B,UAAYn2B,MAKvCw2B,WAAY,SAAUztB,EAAOjE,GAE5B,OADA9E,KAAKk2B,UAAUntB,EAAOjE,GAAM,GACpB9E,KAAS,KAAIA,KAAKm2B,UAAYn2B,MAKvCy2B,YAAa,SAAU1tB,GACtBA,EAAMvB,IAAI,aAAcxH,KAAKq2B,eAAgBr2B,MAE7C,IAAIW,EAAMX,KAAK02B,UAAUj1B,EAAMsH,IAI/B,OAHIpI,GACHX,KAAKmkB,QAAQlc,OAAOjI,KAAKmkB,QAAQngB,QAAQrD,GAAM,GAExCX,KAAS,KAAIA,KAAKm2B,UAAYn2B,MAKvC22B,OAAQ,WACPna,GAASxc,KAAK4sB,WAAY,mCAC1B5sB,KAAK42B,SAASrjB,MAAMwL,OAAS,KAC7B,IAAI8X,EAAmB72B,KAAKk0B,KAAKvnB,UAAUlD,GAAKzJ,KAAK4sB,WAAWkK,UAAY,IAQ5E,OAPID,EAAmB72B,KAAK42B,SAASvI,cACpC7R,GAASxc,KAAK42B,SAAU,oCACxB52B,KAAK42B,SAASrjB,MAAMwL,OAAS8X,EAAmB,MAEhDla,GAAY3c,KAAK42B,SAAU,oCAE5B52B,KAAKo2B,uBACEp2B,MAKR+2B,SAAU,WAET,OADApa,GAAY3c,KAAK4sB,WAAY,mCACtB5sB,MAGRukB,YAAa,WACZ,IAAIhJ,EAAY,yBACZC,EAAYxb,KAAK4sB,WAAatR,GAAS,MAAOC,GAC9C6Z,EAAYp1B,KAAKuD,QAAQ6xB,UAG7B5Z,EAAUwb,aAAa,iBAAiB,GAExC1W,GAAwB9E,GACxB6E,GAAyB7E,GAEzB,IAAIyb,EAAUj3B,KAAK42B,SAAWtb,GAAS,UAAWC,EAAY,SAE1D6Z,IACHp1B,KAAKk0B,KAAK9sB,GAAG,QAASpH,KAAK+2B,SAAU/2B,MAEhC8T,IACJ1M,GAAGoU,EAAW,CACb0b,WAAYl3B,KAAK22B,OACjBQ,WAAYn3B,KAAK+2B,UACf/2B,OAIL,IAAIo3B,EAAOp3B,KAAKq3B,YAAc/b,GAAS,IAAKC,EAAY,UAAWC,GACnE4b,EAAKE,KAAO,IACZF,EAAKG,MAAQ,SAET5hB,IACHvO,GAAGgwB,EAAM,QAASvX,IAClBzY,GAAGgwB,EAAM,QAASp3B,KAAK22B,OAAQ32B,OAE/BoH,GAAGgwB,EAAM,QAASp3B,KAAK22B,OAAQ32B,MAG3Bo1B,GACJp1B,KAAK22B,SAGN32B,KAAKw3B,gBAAkBlc,GAAS,MAAOC,EAAY,QAAS0b,GAC5Dj3B,KAAKy3B,WAAanc,GAAS,MAAOC,EAAY,aAAc0b,GAC5Dj3B,KAAK03B,cAAgBpc,GAAS,MAAOC,EAAY,YAAa0b,GAE9Dzb,EAAUC,YAAYwb,IAGvBP,UAAW,SAAUlxB,GACpB,IAAK,IAAInF,EAAI,EAAGA,EAAIL,KAAKmkB,QAAQzjB,OAAQL,IAExC,GAAIL,KAAKmkB,QAAQ9jB,IAAMoB,EAAMzB,KAAKmkB,QAAQ9jB,GAAG0I,SAAWvD,EACvD,OAAOxF,KAAKmkB,QAAQ9jB,IAKvB61B,UAAW,SAAUntB,EAAOjE,EAAM6yB,GAC7B33B,KAAKk0B,MACRnrB,EAAM3B,GAAG,aAAcpH,KAAKq2B,eAAgBr2B,MAG7CA,KAAKmkB,QAAQtgB,KAAK,CACjBkF,MAAOA,EACPjE,KAAMA,EACN6yB,QAASA,IAGN33B,KAAKuD,QAAQgyB,YAChBv1B,KAAKmkB,QAAQyT,KAAK52B,EAAK,SAAUgJ,EAAGC,GACnC,OAAOjK,KAAKuD,QAAQiyB,aAAaxrB,EAAEjB,MAAOkB,EAAElB,MAAOiB,EAAElF,KAAMmF,EAAEnF,OAC3D9E,OAGAA,KAAKuD,QAAQ8xB,YAActsB,EAAM8uB,YACpC73B,KAAKg2B,cACLjtB,EAAM8uB,UAAU73B,KAAKg2B,cAGtBh2B,KAAKs2B,yBAGNH,QAAS,WACR,IAAKn2B,KAAK4sB,WAAc,OAAO5sB,KAE/B8b,GAAM9b,KAAKw3B,iBACX1b,GAAM9b,KAAK03B,eAEX13B,KAAK+1B,oBAAsB,GAC3B,IAAI+B,EAAmBC,EAAiB13B,EAAGM,EAAKq3B,EAAkB,EAElE,IAAK33B,EAAI,EAAGA,EAAIL,KAAKmkB,QAAQzjB,OAAQL,IACpCM,EAAMX,KAAKmkB,QAAQ9jB,GACnBL,KAAKi4B,SAASt3B,GACdo3B,EAAkBA,GAAmBp3B,EAAIg3B,QACzCG,EAAoBA,IAAsBn3B,EAAIg3B,QAC9CK,GAAoBr3B,EAAIg3B,QAAc,EAAJ,EAWnC,OAPI33B,KAAKuD,QAAQ+xB,iBAChBwC,EAAoBA,GAAuC,EAAlBE,EACzCh4B,KAAKw3B,gBAAgBjkB,MAAM2kB,QAAUJ,EAAoB,GAAK,QAG/D93B,KAAKy3B,WAAWlkB,MAAM2kB,QAAUH,GAAmBD,EAAoB,GAAK,OAErE93B,MAGRq2B,eAAgB,SAAUvtB,GACpB9I,KAAKi2B,gBACTj2B,KAAKm2B,UAGN,IAAIx1B,EAAMX,KAAK02B,UAAUj1B,EAAMqH,EAAER,SAW7BhB,EAAO3G,EAAIg3B,QACF,QAAX7uB,EAAExB,KAAiB,aAAe,gBACvB,QAAXwB,EAAExB,KAAiB,kBAAoB,KAErCA,GACHtH,KAAKk0B,KAAKhsB,KAAKZ,EAAM3G,IAKvBw3B,oBAAqB,SAAUrzB,EAAMszB,GAEpC,IAAIC,EAAY,qEACdvzB,EAAO,KAAOszB,EAAU,qBAAuB,IAAM,KAEnDE,EAAgBzlB,SAAS8D,cAAc,OAG3C,OAFA2hB,EAActhB,UAAYqhB,EAEnBC,EAAcphB,YAGtB+gB,SAAU,SAAUt3B,GACnB,IAEI43B,EAFAC,EAAQ3lB,SAAS8D,cAAc,SAC/ByhB,EAAUp4B,KAAKk0B,KAAKuE,SAAS93B,EAAIoI,OAGjCpI,EAAIg3B,UACPY,EAAQ1lB,SAAS8D,cAAc,UACzBrP,KAAO,WACbixB,EAAMhd,UAAY,kCAClBgd,EAAMG,eAAiBN,GAEvBG,EAAQv4B,KAAKm4B,oBAAoB,uBAAyB12B,EAAMzB,MAAOo4B,GAGxEp4B,KAAK+1B,oBAAoBlyB,KAAK00B,GAC9BA,EAAMI,QAAUl3B,EAAMd,EAAIoI,OAE1B3B,GAAGmxB,EAAO,QAASv4B,KAAK44B,cAAe54B,MAEvC,IAAI8E,EAAO+N,SAAS8D,cAAc,QAClC7R,EAAKkS,UAAY,IAAMrW,EAAImE,KAI3B,IAAI+zB,EAAShmB,SAAS8D,cAAc,OAUpC,OARA6hB,EAAM/c,YAAYod,GAClBA,EAAOpd,YAAY8c,GACnBM,EAAOpd,YAAY3W,IAEHnE,EAAIg3B,QAAU33B,KAAK03B,cAAgB13B,KAAKw3B,iBAC9C/b,YAAY+c,GAEtBx4B,KAAKo2B,uBACEoC,GAGRI,cAAe,WACd,IACIL,EAAOxvB,EADP+vB,EAAS94B,KAAK+1B,oBAEdgD,EAAc,GACdC,EAAgB,GAEpBh5B,KAAKi2B,gBAAiB,EAEtB,IAAK,IAAI51B,EAAIy4B,EAAOp4B,OAAS,EAAQ,GAALL,EAAQA,IACvCk4B,EAAQO,EAAOz4B,GACf0I,EAAQ/I,KAAK02B,UAAU6B,EAAMI,SAAS5vB,MAElCwvB,EAAMH,QACTW,EAAYl1B,KAAKkF,GACNwvB,EAAMH,SACjBY,EAAcn1B,KAAKkF,GAKrB,IAAK1I,EAAI,EAAGA,EAAI24B,EAAct4B,OAAQL,IACjCL,KAAKk0B,KAAKuE,SAASO,EAAc34B,KACpCL,KAAKk0B,KAAKuC,YAAYuC,EAAc34B,IAGtC,IAAKA,EAAI,EAAGA,EAAI04B,EAAYr4B,OAAQL,IAC9BL,KAAKk0B,KAAKuE,SAASM,EAAY14B,KACnCL,KAAKk0B,KAAK+E,SAASF,EAAY14B,IAIjCL,KAAKi2B,gBAAiB,EAEtBj2B,KAAK00B,iBAGN0B,qBAAsB,WAMrB,IALA,IACImC,EACAxvB,EAFA+vB,EAAS94B,KAAK+1B,oBAGd9mB,EAAOjP,KAAKk0B,KAAK5M,UAEZjnB,EAAIy4B,EAAOp4B,OAAS,EAAQ,GAALL,EAAQA,IACvCk4B,EAAQO,EAAOz4B,GACf0I,EAAQ/I,KAAK02B,UAAU6B,EAAMI,SAAS5vB,MACtCwvB,EAAMW,cAAsCn2B,IAA1BgG,EAAMxF,QAAQ8f,SAAyBpU,EAAOlG,EAAMxF,QAAQ8f,cAClCtgB,IAA1BgG,EAAMxF,QAAQ+f,SAAyBrU,EAAOlG,EAAMxF,QAAQ+f,SAKhFgT,sBAAuB,WAItB,OAHIt2B,KAAKk0B,OAASl0B,KAAKuD,QAAQ6xB,WAC9Bp1B,KAAK22B,SAEC32B,MAGRm5B,QAAS,WAER,OAAOn5B,KAAK22B,UAGbyC,UAAW,WAEV,OAAOp5B,KAAK+2B,cAoBVsC,GAAOrF,GAAQ7zB,OAAO,CAGzBoD,QAAS,CACRksB,SAAU,UAIV6J,WAAY,IAIZC,YAAa,UAIbC,YAAa,WAIbC,aAAc,YAGfnF,MAAO,SAAUL,GAChB,IAAIyF,EAAW,uBACXle,EAAYF,GAAS,MAAOoe,EAAW,gBACvCn2B,EAAUvD,KAAKuD,QAUnB,OARAvD,KAAK25B,cAAiB35B,KAAK45B,cAAcr2B,EAAQ+1B,WAAY/1B,EAAQg2B,YAC7DG,EAAW,MAAQle,EAAWxb,KAAK65B,SAC3C75B,KAAK85B,eAAiB95B,KAAK45B,cAAcr2B,EAAQi2B,YAAaj2B,EAAQk2B,aAC9DC,EAAW,OAAQle,EAAWxb,KAAK+5B,UAE3C/5B,KAAKg6B,kBACL/F,EAAI7sB,GAAG,2BAA4BpH,KAAKg6B,gBAAiBh6B,MAElDwb,GAGRiZ,SAAU,SAAUR,GACnBA,EAAIzsB,IAAI,2BAA4BxH,KAAKg6B,gBAAiBh6B,OAG3D6xB,QAAS,WAGR,OAFA7xB,KAAKi6B,WAAY,EACjBj6B,KAAKg6B,kBACEh6B,MAGR0sB,OAAQ,WAGP,OAFA1sB,KAAKi6B,WAAY,EACjBj6B,KAAKg6B,kBACEh6B,MAGR65B,QAAS,SAAU/wB,IACb9I,KAAKi6B,WAAaj6B,KAAKk0B,KAAKvP,MAAQ3kB,KAAKk0B,KAAKxG,cAClD1tB,KAAKk0B,KAAKpO,OAAO9lB,KAAKk0B,KAAK3wB,QAAQygB,WAAalb,EAAEoxB,SAAW,EAAI,KAInEH,SAAU,SAAUjxB,IACd9I,KAAKi6B,WAAaj6B,KAAKk0B,KAAKvP,MAAQ3kB,KAAKk0B,KAAK1G,cAClDxtB,KAAKk0B,KAAKnO,QAAQ/lB,KAAKk0B,KAAK3wB,QAAQygB,WAAalb,EAAEoxB,SAAW,EAAI,KAIpEN,cAAe,SAAUO,EAAM5C,EAAOhc,EAAWC,EAAWva,GAC3D,IAAIm2B,EAAO9b,GAAS,IAAKC,EAAWC,GAgBpC,OAfA4b,EAAKpgB,UAAYmjB,EACjB/C,EAAKE,KAAO,IACZF,EAAKG,MAAQA,EAKbH,EAAKJ,aAAa,OAAQ,UAC1BI,EAAKJ,aAAa,aAAcO,GAEhCjX,GAAwB8W,GACxBhwB,GAAGgwB,EAAM,QAASvX,IAClBzY,GAAGgwB,EAAM,QAASn2B,EAAIjB,MACtBoH,GAAGgwB,EAAM,QAASp3B,KAAK00B,cAAe10B,MAE/Bo3B,GAGR4C,gBAAiB,WAChB,IAAI/F,EAAMj0B,KAAKk0B,KACX3Y,EAAY,mBAEhBoB,GAAY3c,KAAK25B,cAAepe,GAChCoB,GAAY3c,KAAK85B,eAAgBve,IAE7Bvb,KAAKi6B,WAAahG,EAAItP,QAAUsP,EAAIzG,cACvChR,GAASxc,KAAK85B,eAAgBve,IAE3Bvb,KAAKi6B,WAAahG,EAAItP,QAAUsP,EAAIvG,cACvClR,GAASxc,KAAK25B,cAAepe,MAShC4H,GAAIlc,aAAa,CAChBmzB,aAAa,IAGdjX,GAAIjc,YAAY,WACXlH,KAAKuD,QAAQ62B,cAKhBp6B,KAAKo6B,YAAc,IAAIf,GACvBr5B,KAAKo0B,WAAWp0B,KAAKo6B,gBAOvB,IAkBIC,GAAQrG,GAAQ7zB,OAAO,CAG1BoD,QAAS,CACRksB,SAAU,aAIV6K,SAAU,IAIVC,QAAQ,EAIRC,UAAU,GAMXlG,MAAO,SAAUL,GAChB,IAAI1Y,EAAY,wBACZC,EAAYF,GAAS,MAAOC,GAC5BhY,EAAUvD,KAAKuD,QAOnB,OALAvD,KAAKy6B,WAAWl3B,EAASgY,EAAY,QAASC,GAE9CyY,EAAI7sB,GAAG7D,EAAQm3B,eAAiB,UAAY,OAAQ16B,KAAKm2B,QAASn2B,MAClEi0B,EAAInC,UAAU9xB,KAAKm2B,QAASn2B,MAErBwb,GAGRiZ,SAAU,SAAUR,GACnBA,EAAIzsB,IAAIxH,KAAKuD,QAAQm3B,eAAiB,UAAY,OAAQ16B,KAAKm2B,QAASn2B,OAGzEy6B,WAAY,SAAUl3B,EAASgY,EAAWC,GACrCjY,EAAQg3B,SACXv6B,KAAK26B,QAAUrf,GAAS,MAAOC,EAAWC,IAEvCjY,EAAQi3B,WACXx6B,KAAK46B,QAAUtf,GAAS,MAAOC,EAAWC,KAI5C2a,QAAS,WACR,IAAIlC,EAAMj0B,KAAKk0B,KACXzqB,EAAIwqB,EAAItnB,UAAUlD,EAAI,EAEtBoxB,EAAY5G,EAAI5jB,SACnB4jB,EAAI5N,uBAAuB,CAAC,EAAG5c,IAC/BwqB,EAAI5N,uBAAuB,CAACrmB,KAAKuD,QAAQ+2B,SAAU7wB,KAEpDzJ,KAAK86B,cAAcD,IAGpBC,cAAe,SAAUD,GACpB76B,KAAKuD,QAAQg3B,QAAUM,GAC1B76B,KAAK+6B,cAAcF,GAEhB76B,KAAKuD,QAAQi3B,UAAYK,GAC5B76B,KAAKg7B,gBAAgBH,IAIvBE,cAAe,SAAUF,GACxB,IAAII,EAASj7B,KAAKk7B,aAAaL,GAC3BrC,EAAQyC,EAAS,IAAOA,EAAS,KAAQA,EAAS,IAAQ,MAE9Dj7B,KAAKm7B,aAAan7B,KAAK26B,QAASnC,EAAOyC,EAASJ,IAGjDG,gBAAiB,SAAUH,GAC1B,IACIO,EAAUC,EAAOC,EADjBC,EAAsB,UAAZV,EAGA,KAAVU,GACHH,EAAWG,EAAU,KACrBF,EAAQr7B,KAAKk7B,aAAaE,GAC1Bp7B,KAAKm7B,aAAan7B,KAAK46B,QAASS,EAAQ,MAAOA,EAAQD,KAGvDE,EAAOt7B,KAAKk7B,aAAaK,GACzBv7B,KAAKm7B,aAAan7B,KAAK46B,QAASU,EAAO,MAAOA,EAAOC,KAIvDJ,aAAc,SAAU9rB,EAAOmsB,EAAMC,GACpCpsB,EAAMkE,MAAMuL,MAAQhc,KAAKE,MAAMhD,KAAKuD,QAAQ+2B,SAAWmB,GAAS,KAChEpsB,EAAM2H,UAAYwkB,GAGnBN,aAAc,SAAUv4B,GACvB,IAAI+4B,EAAQ54B,KAAKD,IAAI,IAAKC,KAAK8G,MAAMjH,GAAO,IAAIjC,OAAS,GACrD8B,EAAIG,EAAM+4B,EAOd,OAAOA,GALPl5B,EAAS,IAALA,EAAU,GACL,GAALA,EAAS,EACJ,GAALA,EAAS,EACJ,GAALA,EAAS,EAAI,MAqBfm5B,GAAc3H,GAAQ7zB,OAAO,CAGhCoD,QAAS,CACRksB,SAAU,cAIVmM,OAAQ,yFAGT31B,WAAY,SAAU1C,GACrBD,EAAWtD,KAAMuD,GAEjBvD,KAAK67B,cAAgB,IAGtBvH,MAAO,SAAUL,GAMhB,IAAK,IAAI5zB,KALT4zB,EAAI6H,mBAAqB97B,MACpB4sB,WAAatR,GAAS,MAAO,+BAClCgF,GAAwBtgB,KAAK4sB,YAGfqH,EAAI9P,QACb8P,EAAI9P,QAAQ9jB,GAAG07B,gBAClB/7B,KAAKg8B,eAAe/H,EAAI9P,QAAQ9jB,GAAG07B,kBAMrC,OAFA/7B,KAAKm2B,UAEEn2B,KAAK4sB,YAKbqP,UAAW,SAAUL,GAGpB,OAFA57B,KAAKuD,QAAQq4B,OAASA,EACtB57B,KAAKm2B,UACEn2B,MAKRg8B,eAAgB,SAAUR,GACzB,OAAKA,IAEAx7B,KAAK67B,cAAcL,KACvBx7B,KAAK67B,cAAcL,GAAQ,GAE5Bx7B,KAAK67B,cAAcL,KAEnBx7B,KAAKm2B,WAEEn2B,MAKRk8B,kBAAmB,SAAUV,GAC5B,OAAKA,GAEDx7B,KAAK67B,cAAcL,KACtBx7B,KAAK67B,cAAcL,KACnBx7B,KAAKm2B,WAGCn2B,MAGRm2B,QAAS,WACR,GAAKn2B,KAAKk0B,KAAV,CAEA,IAAIiI,EAAU,GAEd,IAAK,IAAI97B,KAAKL,KAAK67B,cACd77B,KAAK67B,cAAcx7B,IACtB87B,EAAQt4B,KAAKxD,GAIf,IAAI+7B,EAAmB,GAEnBp8B,KAAKuD,QAAQq4B,QAChBQ,EAAiBv4B,KAAK7D,KAAKuD,QAAQq4B,QAEhCO,EAAQz7B,QACX07B,EAAiBv4B,KAAKs4B,EAAQl4B,KAAK,OAGpCjE,KAAK4sB,WAAW5V,UAAYolB,EAAiBn4B,KAAK,WAQpDkf,GAAIlc,aAAa,CAChB60B,oBAAoB,IAGrB3Y,GAAIjc,YAAY,WACXlH,KAAKuD,QAAQu4B,qBAChB,IAAIH,IAActH,MAAMr0B,QAW1Bg0B,GAAQmB,OAASA,GACjBnB,GAAQqF,KAAOA,GACfrF,GAAQqG,MAAQA,GAChBrG,GAAQ2H,YAAcA,GAEtB5H,GAAQxQ,OA9YK,SAAUsS,EAAYC,EAAUvyB,GAC5C,OAAO,IAAI4xB,GAAOU,EAAYC,EAAUvyB,IA8YzCwwB,GAAQ9kB,KAtQG,SAAU1L,GACpB,OAAO,IAAI81B,GAAK91B,IAsQjBwwB,GAAQ1kB,MAtII,SAAU9L,GACrB,OAAO,IAAI82B,GAAM92B,IAsIlBwwB,GAAQsI,YAZU,SAAU94B,GAC3B,OAAO,IAAIo4B,GAAYp4B,IAsBxB,IAAI+4B,GAAUx2B,EAAM3F,OAAO,CAC1B8F,WAAY,SAAUguB,GACrBj0B,KAAKk0B,KAAOD,GAKbvH,OAAQ,WACP,OAAI1sB,KAAKu8B,WAETv8B,KAAKu8B,UAAW,EAChBv8B,KAAKw8B,YAHuBx8B,MAS7B6xB,QAAS,WACR,OAAK7xB,KAAKu8B,WAEVv8B,KAAKu8B,UAAW,EAChBv8B,KAAKy8B,eACEz8B,MAKR0xB,QAAS,WACR,QAAS1xB,KAAKu8B,YAchBD,GAAQjI,MAAQ,SAAUJ,EAAKnvB,GAE9B,OADAmvB,EAAIzH,WAAW1nB,EAAM9E,MACdA,MAGR,IAkVI08B,GAlVAl2B,GAAQ,CAACC,OAAQA,GAkBjBk2B,GAAQhnB,GAAQ,uBAAyB,YACzCinB,GAAM,CACTC,UAAW,UACXziB,WAAY,WACZ0iB,YAAa,WACbC,cAAe,YAEZC,GAAO,CACVH,UAAW,YACXziB,WAAY,YACZ0iB,YAAa,YACbC,cAAe,aAIZE,GAAY1zB,EAAQpJ,OAAO,CAE9BoD,QAAS,CAMR25B,eAAgB,GAKjBj3B,WAAY,SAAUkY,EAASgf,EAAiBC,EAAmB75B,GAClED,EAAWtD,KAAMuD,GAEjBvD,KAAKq9B,SAAWlf,EAChBne,KAAKs9B,iBAAmBH,GAAmBhf,EAC3Cne,KAAKu9B,gBAAkBH,GAKxB1Q,OAAQ,WACH1sB,KAAKu8B,WAETn1B,GAAGpH,KAAKs9B,iBAAkBX,GAAO38B,KAAKw9B,QAASx9B,MAE/CA,KAAKu8B,UAAW,IAKjB1K,QAAS,WACH7xB,KAAKu8B,WAINU,GAAUQ,YAAcz9B,MAC3BA,KAAK09B,aAGNl2B,GAAIxH,KAAKs9B,iBAAkBX,GAAO38B,KAAKw9B,QAASx9B,MAEhDA,KAAKu8B,UAAW,EAChBv8B,KAAKqtB,QAAS,IAGfmQ,QAAS,SAAU10B,GAMlB,IAAIA,EAAE8W,YAAe5f,KAAKu8B,WAE1Bv8B,KAAKqtB,QAAS,GAEVlR,GAASnc,KAAKq9B,SAAU,wBAExBJ,GAAUQ,WAAa30B,EAAEoxB,UAA0B,IAAZpxB,EAAE60B,OAA8B,IAAb70B,EAAEmR,SAAkBnR,EAAEkQ,WACpFikB,GAAUQ,UAAYz9B,MAEbu9B,iBACRrf,GAAele,KAAKq9B,UAGrBrf,KACAzD,KAEIva,KAAK49B,WAAT,CAIA59B,KAAKkI,KAAK,QAEV,IAAI21B,EAAQ/0B,EAAEkQ,QAAUlQ,EAAEkQ,QAAQ,GAAKlQ,EACnCg1B,EAAcvf,GAAmBve,KAAKq9B,UAE1Cr9B,KAAK+9B,YAAc,IAAIv0B,EAAMq0B,EAAMnd,QAASmd,EAAMld,SAGlD3gB,KAAKg+B,aAAerf,GAASmf,GAE7B12B,GAAGyL,SAAUmqB,GAAKl0B,EAAExB,MAAOtH,KAAKi+B,QAASj+B,MACzCoH,GAAGyL,SAAU+pB,GAAI9zB,EAAExB,MAAOtH,KAAKk+B,MAAOl+B,QAGvCi+B,QAAS,SAAUn1B,GAMlB,IAAIA,EAAE8W,YAAe5f,KAAKu8B,SAE1B,GAAIzzB,EAAEkQ,SAA8B,EAAnBlQ,EAAEkQ,QAAQtY,OAC1BV,KAAKqtB,QAAS,MADf,CAKA,IAAIwQ,EAAS/0B,EAAEkQ,SAAgC,IAArBlQ,EAAEkQ,QAAQtY,OAAeoI,EAAEkQ,QAAQ,GAAKlQ,EAC9D0U,EAAS,IAAIhU,EAAMq0B,EAAMnd,QAASmd,EAAMld,SAASrV,UAAUtL,KAAK+9B,cAE/DvgB,EAAOrb,GAAMqb,EAAO/T,KACrB3G,KAAKuJ,IAAImR,EAAOrb,GAAKW,KAAKuJ,IAAImR,EAAO/T,GAAKzJ,KAAKuD,QAAQ25B,iBAK3D1f,EAAOrb,GAAKnC,KAAKg+B,aAAa77B,EAC9Bqb,EAAO/T,GAAKzJ,KAAKg+B,aAAav0B,EAE9B2O,GAAetP,GAEV9I,KAAKqtB,SAGTrtB,KAAKkI,KAAK,aAEVlI,KAAKqtB,QAAS,EACdrtB,KAAKwiB,UAAY1E,GAAY9d,KAAKq9B,UAAUhyB,SAASmS,GAErDhB,GAAS3J,SAAS6L,KAAM,oBAExB1e,KAAKm+B,YAAcr1B,EAAER,QAAUQ,EAAEioB,WAG5BhsB,OAAyB,oBAAM/E,KAAKm+B,uBAAuBC,qBAC/Dp+B,KAAKm+B,YAAcn+B,KAAKm+B,YAAYE,yBAErC7hB,GAASxc,KAAKm+B,YAAa,wBAG5Bn+B,KAAKs+B,QAAUt+B,KAAKwiB,UAAUtX,IAAIsS,GAClCxd,KAAK49B,SAAU,EAEfh4B,EAAgB5F,KAAKu+B,cACrBv+B,KAAKw+B,WAAa11B,EAClB9I,KAAKu+B,aAAe74B,EAAiB1F,KAAKy+B,gBAAiBz+B,MAAM,OAGlEy+B,gBAAiB,WAChB,IAAI31B,EAAI,CAAC0W,cAAexf,KAAKw+B,YAK7Bx+B,KAAKkI,KAAK,UAAWY,GACrB4U,GAAY1d,KAAKq9B,SAAUr9B,KAAKs+B,SAIhCt+B,KAAKkI,KAAK,OAAQY,IAGnBo1B,MAAO,SAAUp1B,IAMZA,EAAE8W,YAAe5f,KAAKu8B,UAC1Bv8B,KAAK09B,cAGNA,WAAY,WAQX,IAAK,IAAIr9B,KAPTsc,GAAY9J,SAAS6L,KAAM,oBAEvB1e,KAAKm+B,cACRxhB,GAAY3c,KAAKm+B,YAAa,uBAC9Bn+B,KAAKm+B,YAAc,MAGNnB,GACbx1B,GAAIqL,SAAUmqB,GAAK38B,GAAIL,KAAKi+B,QAASj+B,MACrCwH,GAAIqL,SAAU+pB,GAAIv8B,GAAIL,KAAKk+B,MAAOl+B,MAGnCie,KACAzD,KAEIxa,KAAKqtB,QAAUrtB,KAAK49B,UAEvBh4B,EAAgB5F,KAAKu+B,cAIrBv+B,KAAKkI,KAAK,UAAW,CACpBmI,SAAUrQ,KAAKs+B,QAAQryB,WAAWjM,KAAKwiB,cAIzCxiB,KAAK49B,SAAU,EACfX,GAAUQ,WAAY,KAsBxB,SAASiB,GAASx0B,EAAQy0B,GACzB,IAAKA,IAAcz0B,EAAOxJ,OACzB,OAAOwJ,EAAOhJ,QAGf,IAAI09B,EAAcD,EAAYA,EAQ9B,OAFIz0B,EAkBL,SAAqBA,EAAQ00B,GAE5B,IAAIr+B,EAAM2J,EAAOxJ,OAEbm+B,EAAU,WADgBC,iBAAe/7B,EAAY,GAAK+7B,WAAa39B,OACxCZ,GAE/Bs+B,EAAQ,GAAKA,EAAQt+B,EAAM,GAAK,EAgBrC,SAASw+B,EAAgB70B,EAAQ20B,EAASD,EAAaf,EAAOvkB,GAE7D,IACA0lB,EAAO3+B,EAAG4+B,EADNC,EAAY,EAGhB,IAAK7+B,EAAIw9B,EAAQ,EAAGx9B,GAAKiZ,EAAO,EAAGjZ,IAClC4+B,EAASE,GAAyBj1B,EAAO7J,GAAI6J,EAAO2zB,GAAQ3zB,EAAOoP,IAAO,GAE7D4lB,EAATD,IACHD,EAAQ3+B,EACR6+B,EAAYD,GAIEL,EAAZM,IACHL,EAAQG,GAAS,EAEjBD,EAAgB70B,EAAQ20B,EAASD,EAAaf,EAAOmB,GACrDD,EAAgB70B,EAAQ20B,EAASD,EAAaI,EAAO1lB,IAhCtDylB,CAAgB70B,EAAQ20B,EAASD,EAAa,EAAGr+B,EAAM,GAEvD,IAAIF,EACA++B,EAAY,GAEhB,IAAK/+B,EAAI,EAAGA,EAAIE,EAAKF,IAChBw+B,EAAQx+B,IACX++B,EAAUv7B,KAAKqG,EAAO7J,IAIxB,OAAO++B,EArCMC,CAHTn1B,EAkEL,SAAuBA,EAAQ00B,GAG9B,IAFA,IAAIU,EAAgB,CAACp1B,EAAO,IAEnB7J,EAAI,EAAGk/B,EAAO,EAAGh/B,EAAM2J,EAAOxJ,OAAQL,EAAIE,EAAKF,IAoGxCm/B,EAnGHt1B,EAAO7J,GAmGAo/B,EAnGIv1B,EAAOq1B,QAoG3BG,EAAAA,EAAKD,EAAGt9B,EAAIq9B,EAAGr9B,EACfw9B,EAAKF,EAAGh2B,EAAI+1B,EAAG/1B,EArGqBm1B,EAsGjCc,EAAKA,EAAKC,EAAKA,IArGpBL,EAAcz7B,KAAKqG,EAAO7J,IAC1Bk/B,EAAOl/B,GAiGV,IAAiBm/B,EAAIC,EAChBC,EACAC,EAhGAJ,EAAOh/B,EAAM,GAChB++B,EAAcz7B,KAAKqG,EAAO3J,EAAM,IAEjC,OAAO++B,EA9EMM,CAAc11B,EAAQ00B,GAGFA,GAOlC,SAASiB,GAAuB1sB,EAAGqsB,EAAIC,GACtC,OAAO38B,KAAKoJ,KAAKizB,GAAyBhsB,EAAGqsB,EAAIC,GAAI,IA6EtD,SAASK,GAAY91B,EAAGC,EAAG4C,EAAQkzB,EAAa/8B,GAC/C,IAGIg9B,EAAS7sB,EAAG8sB,EAHZC,EAAQH,EAAcrD,GAAYyD,GAAYn2B,EAAG6C,GACjDuzB,EAAQD,GAAYl2B,EAAG4C,GAO3B,IAFI6vB,GAAY0D,IAEH,CAEZ,KAAMF,EAAQE,GACb,MAAO,CAACp2B,EAAGC,GAIZ,GAAIi2B,EAAQE,EACX,OAAO,EAMRH,EAAUE,GADVhtB,EAAIktB,GAAqBr2B,EAAGC,EAD5B+1B,EAAUE,GAASE,EACqBvzB,EAAQ7J,GACvB6J,GAErBmzB,IAAYE,GACfl2B,EAAImJ,EACJ+sB,EAAQD,IAERh2B,EAAIkJ,EACJitB,EAAQH,IAKX,SAASI,GAAqBr2B,EAAGC,EAAGyI,EAAM7F,EAAQ7J,GACjD,IAIIb,EAAGsH,EAJHi2B,EAAKz1B,EAAE9H,EAAI6H,EAAE7H,EACbw9B,EAAK11B,EAAER,EAAIO,EAAEP,EACblH,EAAMsK,EAAOtK,IACbD,EAAMuK,EAAOvK,IAoBjB,OAjBW,EAAPoQ,GACHvQ,EAAI6H,EAAE7H,EAAIu9B,GAAMp9B,EAAImH,EAAIO,EAAEP,GAAKk2B,EAC/Bl2B,EAAInH,EAAImH,GAES,EAAPiJ,GACVvQ,EAAI6H,EAAE7H,EAAIu9B,GAAMn9B,EAAIkH,EAAIO,EAAEP,GAAKk2B,EAC/Bl2B,EAAIlH,EAAIkH,GAES,EAAPiJ,GACVvQ,EAAIG,EAAIH,EACRsH,EAAIO,EAAEP,EAAIk2B,GAAMr9B,EAAIH,EAAI6H,EAAE7H,GAAKu9B,GAEd,EAAPhtB,IACVvQ,EAAII,EAAIJ,EACRsH,EAAIO,EAAEP,EAAIk2B,GAAMp9B,EAAIJ,EAAI6H,EAAE7H,GAAKu9B,GAGzB,IAAIl2B,EAAMrH,EAAGsH,EAAGzG,GAGxB,SAASm9B,GAAYhtB,EAAGtG,GACvB,IAAI6F,EAAO,EAcX,OAZIS,EAAEhR,EAAI0K,EAAOtK,IAAIJ,EACpBuQ,GAAQ,EACES,EAAEhR,EAAI0K,EAAOvK,IAAIH,IAC3BuQ,GAAQ,GAGLS,EAAE1J,EAAIoD,EAAOtK,IAAIkH,EACpBiJ,GAAQ,EACES,EAAE1J,EAAIoD,EAAOvK,IAAImH,IAC3BiJ,GAAQ,GAGFA,EAWR,SAASysB,GAAyBhsB,EAAGqsB,EAAIC,EAAIR,GAC5C,IAKI/b,EALA/gB,EAAIq9B,EAAGr9B,EACPsH,EAAI+1B,EAAG/1B,EACPi2B,EAAKD,EAAGt9B,EAAIA,EACZw9B,EAAKF,EAAGh2B,EAAIA,EACZ62B,EAAMZ,EAAKA,EAAKC,EAAKA,EAkBzB,OAfU,EAANW,IAGK,GAFRpd,IAAM/P,EAAEhR,EAAIA,GAAKu9B,GAAMvsB,EAAE1J,EAAIA,GAAKk2B,GAAMW,IAGvCn+B,EAAIs9B,EAAGt9B,EACPsH,EAAIg2B,EAAGh2B,GACO,EAAJyZ,IACV/gB,GAAKu9B,EAAKxc,EACVzZ,GAAKk2B,EAAKzc,IAIZwc,EAAKvsB,EAAEhR,EAAIA,EACXw9B,EAAKxsB,EAAE1J,EAAIA,EAEJw1B,EAASS,EAAKA,EAAKC,EAAKA,EAAK,IAAIn2B,EAAMrH,EAAGsH,GAMlD,SAAS82B,GAAOh2B,GACf,OAAQ/F,EAAQ+F,EAAQ,KAAiC,iBAAlBA,EAAQ,GAAG,SAA4C,IAAlBA,EAAQ,GAAG,GAGxF,SAASi2B,GAAMj2B,GAEd,OADA7D,QAAQC,KAAK,kEACN45B,GAAOh2B,GAIf,IAAIk2B,IAAYvgC,OAAOD,QAAUC,QAAQ,CACxCw+B,SAAUA,GACVmB,uBAAwBA,GACxBa,sBA1MD,SAA+BvtB,EAAGqsB,EAAIC,GACrC,OAAON,GAAyBhsB,EAAGqsB,EAAIC,IA0MvCK,YAAaA,GACbO,qBAAsBA,GACtBF,YAAaA,GACbhB,yBAA0BA,GAC1BoB,OAAQA,GACRC,MAAOA,KAcR,SAASG,GAAYz2B,EAAQ2C,EAAQ7J,GACpC,IAAI49B,EAEAvgC,EAAGC,EAAGugC,EACN72B,EAAGC,EACH1J,EAAKmT,EAAMP,EAHX2tB,EAAQ,CAAC,EAAG,EAAG,EAAG,GAKtB,IAAKzgC,EAAI,EAAGE,EAAM2J,EAAOxJ,OAAQL,EAAIE,EAAKF,IACzC6J,EAAO7J,GAAG0gC,MAAQZ,GAAYj2B,EAAO7J,GAAIwM,GAI1C,IAAKg0B,EAAI,EAAGA,EAAI,EAAGA,IAAK,CAIvB,IAHAntB,EAAOotB,EAAMD,GACbD,EAAgB,GAEXvgC,EAAI,EAAwBC,GAArBC,EAAM2J,EAAOxJ,QAAkB,EAAGL,EAAIE,EAAKD,EAAID,IAC1D2J,EAAIE,EAAO7J,GACX4J,EAAIC,EAAO5J,GAGL0J,EAAE+2B,MAAQrtB,EAUHzJ,EAAE82B,MAAQrtB,KACtBP,EAAIktB,GAAqBp2B,EAAGD,EAAG0J,EAAM7G,EAAQ7J,IAC3C+9B,MAAQZ,GAAYhtB,EAAGtG,GACzB+zB,EAAc/8B,KAAKsP,KAXflJ,EAAE82B,MAAQrtB,KACbP,EAAIktB,GAAqBp2B,EAAGD,EAAG0J,EAAM7G,EAAQ7J,IAC3C+9B,MAAQZ,GAAYhtB,EAAGtG,GACzB+zB,EAAc/8B,KAAKsP,IAEpBytB,EAAc/8B,KAAKmG,IASrBE,EAAS02B,EAGV,OAAO12B,EAIR,IAsHMmF,GAtHF2xB,IAAY9gC,OAAOD,QAAUC,QAAQ,CACxCygC,YAAaA,KAgBVM,GAAS,CACZ7xB,QAAS,SAAUJ,GAClB,OAAO,IAAIxF,EAAMwF,EAAOrE,IAAKqE,EAAOtE,MAGrCiF,UAAW,SAAUxE,GACpB,OAAO,IAAIV,EAAOU,EAAM1B,EAAG0B,EAAMhJ,IAGlC0K,OAAQ,IAAI9C,EAAO,EAAE,KAAM,IAAK,CAAC,IAAK,MAUnCm3B,GAAW,CACd9vB,EAAG,QACH+vB,QAAS,kBAETt0B,OAAQ,IAAI9C,EAAO,EAAE,gBAAiB,gBAAiB,CAAC,eAAgB,iBAExEqF,QAAS,SAAUJ,GAClB,IAAIxM,EAAIM,KAAK8N,GAAK,IACdgY,EAAI5oB,KAAKoR,EACT3H,EAAIuF,EAAOtE,IAAMlI,EACjB4+B,EAAMphC,KAAKmhC,QAAUvY,EACrB9f,EAAIhG,KAAKoJ,KAAK,EAAIk1B,EAAMA,GACxBC,EAAMv4B,EAAIhG,KAAK6O,IAAIlI,GAEnB63B,EAAKx+B,KAAKy+B,IAAIz+B,KAAK8N,GAAK,EAAInH,EAAI,GAAK3G,KAAKD,KAAK,EAAIw+B,IAAQ,EAAIA,GAAMv4B,EAAI,GAG7E,OAFAW,GAAKmf,EAAI9lB,KAAK8M,IAAI9M,KAAKR,IAAIg/B,EAAI,QAExB,IAAI93B,EAAMwF,EAAOrE,IAAMnI,EAAIomB,EAAGnf,IAGtCkG,UAAW,SAAUxE,GAQpB,IAPA,IAO4Bk2B,EAPxB7+B,EAAI,IAAMM,KAAK8N,GACfgY,EAAI5oB,KAAKoR,EACTgwB,EAAMphC,KAAKmhC,QAAUvY,EACrB9f,EAAIhG,KAAKoJ,KAAK,EAAIk1B,EAAMA,GACxBE,EAAKx+B,KAAKoP,KAAK/G,EAAM1B,EAAImf,GACzB4Y,EAAM1+B,KAAK8N,GAAK,EAAI,EAAI9N,KAAKmP,KAAKqvB,GAE7BjhC,EAAI,EAAGohC,EAAO,GAAUphC,EAAI,IAAuB,KAAjByC,KAAKuJ,IAAIo1B,GAAcphC,IACjEghC,EAAMv4B,EAAIhG,KAAK6O,IAAI6vB,GACnBH,EAAMv+B,KAAKD,KAAK,EAAIw+B,IAAQ,EAAIA,GAAMv4B,EAAI,GAE1C04B,GADAC,EAAO3+B,KAAK8N,GAAK,EAAI,EAAI9N,KAAKmP,KAAKqvB,EAAKD,GAAOG,EAIhD,OAAO,IAAI/2B,EAAO+2B,EAAMh/B,EAAG2I,EAAMhJ,EAAIK,EAAIomB,KA8BvCoW,IAAS9+B,OAAOD,QAAUC,QAAQ,CACrC+gC,OAAQA,GACRC,SAAUA,GACVnvB,kBAAmBA,IAShB2vB,GAAWvhC,EAAO,GAAIiQ,EAAO,CAChCsC,KAAM,YACNvD,WAAY+xB,GAEZ5xB,gBACKD,GAAQ,IAAOvM,KAAK8N,GAAKswB,GAAS9vB,GAC/BoB,EAAiBnD,GAAO,IAAMA,GAAO,OAiB1CsyB,GAAWxhC,EAAO,GAAIiQ,EAAO,CAChCsC,KAAM,YACNvD,WAAY8xB,GACZ3xB,eAAgBkD,EAAiB,EAAI,IAAK,GAAI,EAAI,IAAK,MAapDovB,GAASzhC,EAAO,GAAI2O,EAAK,CAC5BK,WAAY8xB,GACZ3xB,eAAgBkD,EAAiB,EAAG,GAAI,EAAG,GAE3CnD,MAAO,SAAUJ,GAChB,OAAOnM,KAAKD,IAAI,EAAGoM,IAGpBA,KAAM,SAAUI,GACf,OAAOvM,KAAK8M,IAAIP,GAASvM,KAAK+M,KAG/BQ,SAAU,SAAUgB,EAASC,GAC5B,IAAIouB,EAAKpuB,EAAQ3G,IAAM0G,EAAQ1G,IAC3Bg1B,EAAKruB,EAAQ5G,IAAM2G,EAAQ3G,IAE/B,OAAO5H,KAAKoJ,KAAKwzB,EAAKA,EAAKC,EAAKA,IAGjC5vB,UAAU,IAGXjB,EAAIsB,MAAQA,EACZtB,EAAI4yB,SAAWA,GACf5yB,EAAI2D,SAAWA,EACf3D,EAAI6D,WAAaA,EACjB7D,EAAI6yB,SAAWA,GACf7yB,EAAI8yB,OAASA,GA2Bb,IAAIC,GAAQt4B,EAAQpJ,OAAO,CAG1BoD,QAAS,CAGR4pB,KAAM,cAINkP,YAAa,KAEb5K,qBAAqB,GAStB4C,MAAO,SAAUJ,GAEhB,OADAA,EAAIgF,SAASj5B,MACNA,MAKR0b,OAAQ,WACP,OAAO1b,KAAK8hC,WAAW9hC,KAAKk0B,MAAQl0B,KAAK+hC,YAK1CD,WAAY,SAAUnhC,GAIrB,OAHIA,GACHA,EAAI81B,YAAYz2B,MAEVA,MAKR2uB,QAAS,SAAU7pB,GAClB,OAAO9E,KAAKk0B,KAAKvF,QAAQ7pB,EAAQ9E,KAAKuD,QAAQuB,IAASA,EAAQ9E,KAAKuD,QAAQ4pB,OAG7E6U,qBAAsB,SAAUC,GAE/B,OADAjiC,KAAKk0B,KAAK5D,SAAS7uB,EAAMwgC,IAAajiC,MAIvCkiC,wBAAyB,SAAUD,GAElC,cADOjiC,KAAKk0B,KAAK5D,SAAS7uB,EAAMwgC,IACzBjiC,MAKR+7B,eAAgB,WACf,OAAO/7B,KAAKuD,QAAQ84B,aAGrB8F,UAAW,SAAUr5B,GACpB,IAAImrB,EAAMnrB,EAAER,OAGZ,GAAK2rB,EAAIwE,SAASz4B,MAAlB,CAKA,GAHAA,KAAKk0B,KAAOD,EACZj0B,KAAK+kB,cAAgBkP,EAAIlP,cAErB/kB,KAAKoiC,UAAW,CACnB,IAAI5gB,EAASxhB,KAAKoiC,YAClBnO,EAAI7sB,GAAGoa,EAAQxhB,MACfA,KAAK0I,KAAK,SAAU,WACnBurB,EAAIzsB,IAAIga,EAAQxhB,OACdA,MAGJA,KAAKs0B,MAAML,GAEPj0B,KAAK+7B,gBAAkB9H,EAAI6H,oBAC9B7H,EAAI6H,mBAAmBE,eAAeh8B,KAAK+7B,kBAG5C/7B,KAAKkI,KAAK,OACV+rB,EAAI/rB,KAAK,WAAY,CAACa,MAAO/I,WAqC/BmjB,GAAInc,QAAQ,CAGXiyB,SAAU,SAAUlwB,GACnB,IAAKA,EAAMo5B,UACV,MAAM,IAAI59B,MAAM,uCAGjB,IAAIiB,EAAK/D,EAAMsH,GACf,OAAI/I,KAAKmkB,QAAQ3e,MACjBxF,KAAKmkB,QAAQ3e,GAAMuD,GAEbg5B,UAAY/hC,KAEd+I,EAAMs5B,WACTt5B,EAAMs5B,UAAUriC,MAGjBA,KAAK8xB,UAAU/oB,EAAMo5B,UAAWp5B,IATD/I,MAgBhCy2B,YAAa,SAAU1tB,GACtB,IAAIvD,EAAK/D,EAAMsH,GAEf,OAAK/I,KAAKmkB,QAAQ3e,KAEdxF,KAAKslB,SACRvc,EAAM0rB,SAASz0B,MAGZ+I,EAAMgzB,gBAAkB/7B,KAAK87B,oBAChC97B,KAAK87B,mBAAmBI,kBAAkBnzB,EAAMgzB,yBAG1C/7B,KAAKmkB,QAAQ3e,GAEhBxF,KAAKslB,UACRtlB,KAAKkI,KAAK,cAAe,CAACa,MAAOA,IACjCA,EAAMb,KAAK,WAGZa,EAAMmrB,KAAOnrB,EAAMg5B,UAAY,MAExB/hC,MAKRy4B,SAAU,SAAU1vB,GACnB,QAASA,GAAUtH,EAAMsH,KAAU/I,KAAKmkB,SAWzCme,UAAW,SAAUC,EAAQ1gC,GAC5B,IAAK,IAAIxB,KAAKL,KAAKmkB,QAClBoe,EAAOlhC,KAAKQ,EAAS7B,KAAKmkB,QAAQ9jB,IAEnC,OAAOL,MAGRmlB,WAAY,SAAU5B,GAGrB,IAAK,IAAIljB,EAAI,EAAGE,GAFhBgjB,EAASA,EAAU/e,EAAQ+e,GAAUA,EAAS,CAACA,GAAW,IAE7B7iB,OAAQL,EAAIE,EAAKF,IAC7CL,KAAKi5B,SAAS1V,EAAOljB,KAIvBmiC,cAAe,SAAUz5B,IACpB8B,MAAM9B,EAAMxF,QAAQ+f,UAAazY,MAAM9B,EAAMxF,QAAQ8f,WACxDrjB,KAAKokB,iBAAiB3iB,EAAMsH,IAAUA,EACtC/I,KAAKyiC,sBAIPC,iBAAkB,SAAU35B,GAC3B,IAAIvD,EAAK/D,EAAMsH,GAEX/I,KAAKokB,iBAAiB5e,YAClBxF,KAAKokB,iBAAiB5e,GAC7BxF,KAAKyiC,sBAIPA,kBAAmB,WAClB,IAAIpf,EAAUyD,EAAAA,EACVxD,GAAWwD,EAAAA,EACX6b,EAAc3iC,KAAKowB,eAEvB,IAAK,IAAI/vB,KAAKL,KAAKokB,iBAAkB,CACpC,IAAI7gB,EAAUvD,KAAKokB,iBAAiB/jB,GAAGkD,QAEvC8f,OAA8BtgB,IAApBQ,EAAQ8f,QAAwBA,EAAUvgB,KAAKP,IAAI8gB,EAAS9f,EAAQ8f,SAC9EC,OAA8BvgB,IAApBQ,EAAQ+f,QAAwBA,EAAUxgB,KAAKR,IAAIghB,EAAS/f,EAAQ+f,SAG/EtjB,KAAK2tB,eAAiBrK,KAAawD,EAAAA,OAAW/jB,EAAYugB,EAC1DtjB,KAAKytB,eAAiBpK,IAAYyD,EAAAA,OAAW/jB,EAAYsgB,EAMrDsf,IAAgB3iC,KAAKowB,gBACxBpwB,KAAKkI,KAAK,yBAGkBnF,IAAzB/C,KAAKuD,QAAQ+f,SAAyBtjB,KAAK2tB,gBAAkB3tB,KAAKsnB,UAAYtnB,KAAK2tB,gBACtF3tB,KAAK6lB,QAAQ7lB,KAAK2tB,qBAEU5qB,IAAzB/C,KAAKuD,QAAQ8f,SAAyBrjB,KAAKytB,gBAAkBztB,KAAKsnB,UAAYtnB,KAAKytB,gBACtFztB,KAAK6lB,QAAQ7lB,KAAKytB,mBAuBrB,IAAImV,GAAaf,GAAM1hC,OAAO,CAE7B8F,WAAY,SAAUsd,EAAQhgB,GAK7B,IAAIlD,EAAGE,EAEP,GANA+C,EAAWtD,KAAMuD,GAEjBvD,KAAKmkB,QAAU,GAIXZ,EACH,IAAKljB,EAAI,EAAGE,EAAMgjB,EAAO7iB,OAAQL,EAAIE,EAAKF,IACzCL,KAAKi5B,SAAS1V,EAAOljB,KAOxB44B,SAAU,SAAUlwB,GACnB,IAAIvD,EAAKxF,KAAK6iC,WAAW95B,GAQzB,OANA/I,KAAKmkB,QAAQ3e,GAAMuD,EAEf/I,KAAKk0B,MACRl0B,KAAKk0B,KAAK+E,SAASlwB,GAGb/I,MAQRy2B,YAAa,SAAU1tB,GACtB,IAAIvD,EAAKuD,KAAS/I,KAAKmkB,QAAUpb,EAAQ/I,KAAK6iC,WAAW95B,GAQzD,OANI/I,KAAKk0B,MAAQl0B,KAAKmkB,QAAQ3e,IAC7BxF,KAAKk0B,KAAKuC,YAAYz2B,KAAKmkB,QAAQ3e,WAG7BxF,KAAKmkB,QAAQ3e,GAEbxF,MAQRy4B,SAAU,SAAU1vB,GACnB,QAASA,IAAUA,KAAS/I,KAAKmkB,SAAWnkB,KAAK6iC,WAAW95B,KAAU/I,KAAKmkB,UAK5E2e,YAAa,WACZ,OAAO9iC,KAAKsiC,UAAUtiC,KAAKy2B,YAAaz2B,OAOzC+iC,OAAQ,SAAUC,GACjB,IACI3iC,EAAG0I,EADHzH,EAAOH,MAAMJ,UAAUG,MAAMG,KAAKZ,UAAW,GAGjD,IAAKJ,KAAKL,KAAKmkB,SACdpb,EAAQ/I,KAAKmkB,QAAQ9jB,IAEX2iC,IACTj6B,EAAMi6B,GAAY5hC,MAAM2H,EAAOzH,GAIjC,OAAOtB,MAGRs0B,MAAO,SAAUL,GAChBj0B,KAAKsiC,UAAUrO,EAAIgF,SAAUhF,IAG9BQ,SAAU,SAAUR,GACnBj0B,KAAKsiC,UAAUrO,EAAIwC,YAAaxC,IAUjCqO,UAAW,SAAUC,EAAQ1gC,GAC5B,IAAK,IAAIxB,KAAKL,KAAKmkB,QAClBoe,EAAOlhC,KAAKQ,EAAS7B,KAAKmkB,QAAQ9jB,IAEnC,OAAOL,MAKRijC,SAAU,SAAUz9B,GACnB,OAAOxF,KAAKmkB,QAAQ3e,IAKrB09B,UAAW,WACV,IAAI3f,EAAS,GAEb,OADAvjB,KAAKsiC,UAAU/e,EAAO1f,KAAM0f,GACrBA,GAKRsU,UAAW,SAAUsL,GACpB,OAAOnjC,KAAK+iC,OAAO,YAAaI,IAKjCN,WAAY,SAAU95B,GACrB,OAAOtH,EAAMsH,MAiCXq6B,GAAeR,GAAWziC,OAAO,CAEpC84B,SAAU,SAAUlwB,GACnB,OAAI/I,KAAKy4B,SAAS1vB,GACV/I,MAGR+I,EAAMH,eAAe5I,MAErB4iC,GAAW7hC,UAAUk4B,SAAS53B,KAAKrB,KAAM+I,GAIlC/I,KAAKkI,KAAK,WAAY,CAACa,MAAOA,MAGtC0tB,YAAa,SAAU1tB,GACtB,OAAK/I,KAAKy4B,SAAS1vB,IAGfA,KAAS/I,KAAKmkB,UACjBpb,EAAQ/I,KAAKmkB,QAAQpb,IAGtBA,EAAMF,kBAAkB7I,MAExB4iC,GAAW7hC,UAAU01B,YAAYp1B,KAAKrB,KAAM+I,GAIrC/I,KAAKkI,KAAK,cAAe,CAACa,MAAOA,KAZhC/I,MAiBTqjC,SAAU,SAAU9vB,GACnB,OAAOvT,KAAK+iC,OAAO,WAAYxvB,IAKhC+vB,aAAc,WACb,OAAOtjC,KAAK+iC,OAAO,iBAKpBQ,YAAa,WACZ,OAAOvjC,KAAK+iC,OAAO,gBAKpBxc,UAAW,WACV,IAAI1Z,EAAS,IAAIzC,EAEjB,IAAK,IAAI5E,KAAMxF,KAAKmkB,QAAS,CAC5B,IAAIpb,EAAQ/I,KAAKmkB,QAAQ3e,GACzBqH,EAAO1M,OAAO4I,EAAMwd,UAAYxd,EAAMwd,YAAcxd,EAAMuoB,aAE3D,OAAOzkB,KAsCL22B,GAAO19B,EAAM3F,OAAO,CA0CvBoD,QAAS,CACRkgC,YAAa,CAAC,EAAG,GACjBC,cAAe,CAAC,EAAG,IAGpBz9B,WAAY,SAAU1C,GACrBD,EAAWtD,KAAMuD,IAMlBogC,WAAY,SAAUC,GACrB,OAAO5jC,KAAK6jC,YAAY,OAAQD,IAKjCE,aAAc,SAAUF,GACvB,OAAO5jC,KAAK6jC,YAAY,SAAUD,IAGnCC,YAAa,SAAU/+B,EAAM8+B,GAC5B,IAAIpjC,EAAMR,KAAK+jC,YAAYj/B,GAE3B,IAAKtE,EAAK,CACT,GAAa,SAATsE,EACH,MAAM,IAAIP,MAAM,mDAEjB,OAAO,KAGR,IAAIy/B,EAAMhkC,KAAKikC,WAAWzjC,EAAKojC,GAA+B,QAApBA,EAAQzrB,QAAoByrB,EAAU,MAGhF,OAFA5jC,KAAKkkC,eAAeF,EAAKl/B,GAElBk/B,GAGRE,eAAgB,SAAUF,EAAKl/B,GAC9B,IAAIvB,EAAUvD,KAAKuD,QACf4gC,EAAa5gC,EAAQuB,EAAO,QAEN,iBAAfq/B,IACVA,EAAa,CAACA,EAAYA,IAG3B,IAAI9b,EAAOve,EAAQq6B,GACfC,EAASt6B,EAAiB,WAAThF,GAAqBvB,EAAQ8gC,cAAgB9gC,EAAQ+gC,YAC9Djc,GAAQA,EAAK9c,SAAS,GAAG,IAErCy4B,EAAIzoB,UAAY,kBAAoBzW,EAAO,KAAOvB,EAAQgY,WAAa,IAEnE6oB,IACHJ,EAAIzwB,MAAMgxB,YAAeH,EAAOjiC,EAAK,KACrC6hC,EAAIzwB,MAAMixB,WAAeJ,EAAO36B,EAAK,MAGlC4e,IACH2b,EAAIzwB,MAAMuL,MAASuJ,EAAKlmB,EAAI,KAC5B6hC,EAAIzwB,MAAMwL,OAASsJ,EAAK5e,EAAI,OAI9Bw6B,WAAY,SAAUzjC,EAAKmE,GAG1B,OAFAA,EAAKA,GAAMkO,SAAS8D,cAAc,QAC/BnW,IAAMA,EACFmE,GAGRo/B,YAAa,SAAUj/B,GACtB,OAAOkR,IAAUhW,KAAKuD,QAAQuB,EAAO,cAAgB9E,KAAKuD,QAAQuB,EAAO,UA2B3E,IAAI2/B,GAAcjB,GAAKrjC,OAAO,CAE7BoD,QAAS,CACRmhC,QAAe,kBACfC,cAAe,qBACfC,UAAe,oBACfC,SAAa,CAAC,GAAI,IAClBP,WAAa,CAAC,GAAI,IAClBb,YAAa,CAAC,GAAI,IAClBC,cAAe,CAAC,IAAK,IACrBoB,WAAa,CAAC,GAAI,KAGnBf,YAAa,SAAUj/B,GAStB,OARK2/B,GAAYM,YAChBN,GAAYM,UAAY/kC,KAAKglC,oBAOtBhlC,KAAKuD,QAAQwhC,WAAaN,GAAYM,WAAavB,GAAKziC,UAAUgjC,YAAY1iC,KAAKrB,KAAM8E,IAGlGkgC,gBAAiB,WAChB,IAAIrgC,EAAK2W,GAAS,MAAQ,4BAA6BzI,SAAS6L,MAC5DumB,EAAOhqB,GAAStW,EAAI,qBACbsW,GAAStW,EAAI,mBAUxB,OARAkO,SAAS6L,KAAK7C,YAAYlX,GAGzBsgC,EADY,OAATA,GAAyC,IAAxBA,EAAKjhC,QAAQ,OAC1B,GAEAihC,EAAK9hC,QAAQ,cAAe,IAAIA,QAAQ,2BAA4B,OAyB1E+hC,GAAa5I,GAAQn8B,OAAO,CAC/B8F,WAAY,SAAUk/B,GACrBnlC,KAAKolC,QAAUD,GAGhB3I,SAAU,WACT,IAAI6I,EAAOrlC,KAAKolC,QAAQE,MAEnBtlC,KAAKulC,aACTvlC,KAAKulC,WAAa,IAAItI,GAAUoI,EAAMA,GAAM,IAG7CrlC,KAAKulC,WAAWn+B,GAAG,CAClBo+B,UAAWxlC,KAAKylC,aAChBC,QAAS1lC,KAAK2lC,WACdC,KAAM5lC,KAAK6lC,QACXC,QAAS9lC,KAAK+lC,YACZ/lC,MAAM0sB,SAETlQ,GAAS6oB,EAAM,6BAGhB5I,YAAa,WACZz8B,KAAKulC,WAAW/9B,IAAI,CACnBg+B,UAAWxlC,KAAKylC,aAChBC,QAAS1lC,KAAK2lC,WACdC,KAAM5lC,KAAK6lC,QACXC,QAAS9lC,KAAK+lC,YACZ/lC,MAAM6xB,UAEL7xB,KAAKolC,QAAQE,OAChB3oB,GAAY3c,KAAKolC,QAAQE,MAAO,6BAIlC3T,MAAO,WACN,OAAO3xB,KAAKulC,YAAcvlC,KAAKulC,WAAWlY,QAG3C2Y,WAAY,SAAUl9B,GACrB,IAAIq8B,EAASnlC,KAAKolC,QACdnR,EAAMkR,EAAOjR,KACb+R,EAAQjmC,KAAKolC,QAAQ7hC,QAAQ2iC,aAC7Bxf,EAAU1mB,KAAKolC,QAAQ7hC,QAAQ4iC,eAC/BC,EAAUtoB,GAAYqnB,EAAOG,OAC7Bz4B,EAASonB,EAAIxJ,iBACb4b,EAASpS,EAAIzF,iBAEb8X,EAAYn8B,EACf0C,EAAOtK,IAAI+I,UAAU+6B,GAAQn7B,IAAIwb,GACjC7Z,EAAOvK,IAAIgJ,UAAU+6B,GAAQh7B,SAASqb,IAGvC,IAAK4f,EAAUl6B,SAASg6B,GAAU,CAEjC,IAAIG,EAAWz8B,GACbhH,KAAKR,IAAIgkC,EAAUhkC,IAAIH,EAAGikC,EAAQjkC,GAAKmkC,EAAUhkC,IAAIH,IAAM0K,EAAOvK,IAAIH,EAAImkC,EAAUhkC,IAAIH,IACxFW,KAAKP,IAAI+jC,EAAU/jC,IAAIJ,EAAGikC,EAAQjkC,GAAKmkC,EAAU/jC,IAAIJ,IAAM0K,EAAOtK,IAAIJ,EAAImkC,EAAU/jC,IAAIJ,IAExFW,KAAKR,IAAIgkC,EAAUhkC,IAAImH,EAAG28B,EAAQ38B,GAAK68B,EAAUhkC,IAAImH,IAAMoD,EAAOvK,IAAImH,EAAI68B,EAAUhkC,IAAImH,IACxF3G,KAAKP,IAAI+jC,EAAU/jC,IAAIkH,EAAG28B,EAAQ38B,GAAK68B,EAAU/jC,IAAIkH,IAAMoD,EAAOtK,IAAIkH,EAAI68B,EAAU/jC,IAAIkH,IACxFgC,WAAWw6B,GAEbhS,EAAI5M,MAAMkf,EAAU,CAAChhB,SAAS,IAE9BvlB,KAAKulC,WAAWjH,QAAQlzB,KAAKm7B,GAC7BvmC,KAAKulC,WAAW/iB,UAAUpX,KAAKm7B,GAE/B7oB,GAAYynB,EAAOG,MAAOtlC,KAAKulC,WAAWjH,SAC1Ct+B,KAAK6lC,QAAQ/8B,GAEb9I,KAAKwmC,YAAc9gC,EAAiB1F,KAAKgmC,WAAWhlC,KAAKhB,KAAM8I,MAIjE28B,aAAc,WAQbzlC,KAAKymC,WAAazmC,KAAKolC,QAAQ9T,YAC/BtxB,KAAKolC,QACAsB,aACAx+B,KAAK,aACLA,KAAK,cAGXy9B,WAAY,SAAU78B,GACjB9I,KAAKolC,QAAQ7hC,QAAQojC,UACxB/gC,EAAgB5F,KAAKwmC,aACrBxmC,KAAKwmC,YAAc9gC,EAAiB1F,KAAKgmC,WAAWhlC,KAAKhB,KAAM8I,MAIjE+8B,QAAS,SAAU/8B,GAClB,IAAIq8B,EAASnlC,KAAKolC,QACdwB,EAASzB,EAAO0B,QAChBT,EAAUtoB,GAAYqnB,EAAOG,OAC7Bt2B,EAASm2B,EAAOjR,KAAK5G,mBAAmB8Y,GAGxCQ,GACHlpB,GAAYkpB,EAAQR,GAGrBjB,EAAO2B,QAAU93B,EACjBlG,EAAEkG,OAASA,EACXlG,EAAEi+B,UAAY/mC,KAAKymC,WAInBtB,EACKj9B,KAAK,OAAQY,GACbZ,KAAK,OAAQY,IAGnBi9B,WAAY,SAAUj9B,GAIpBlD,EAAgB5F,KAAKwmC,oBAIfxmC,KAAKymC,WACZzmC,KAAKolC,QACAl9B,KAAK,WACLA,KAAK,UAAWY,MAiBnBk+B,GAASnF,GAAM1hC,OAAO,CAIzBoD,QAAS,CAKR8hC,KAAM,IAAIZ,GAGVwC,aAAa,EAIbC,UAAU,EAIV3P,MAAO,GAIP3sB,IAAK,GAILu8B,aAAc,EAIdpqB,QAAS,EAITqqB,aAAa,EAIbC,WAAY,IAIZla,KAAM,aAIN4C,WAAY,aAKZ0B,qBAAqB,EAKrB6V,WAAW,EAIXX,SAAS,EAKTR,eAAgB,CAAC,GAAI,IAIrBD,aAAc,IAQfjgC,WAAY,SAAU+I,EAAQzL,GAC7BD,EAAWtD,KAAMuD,GACjBvD,KAAK8mC,QAAUh8B,EAASkE,IAGzBslB,MAAO,SAAUL,GAChBj0B,KAAK+kB,cAAgB/kB,KAAK+kB,eAAiBkP,EAAI1wB,QAAQsgB,oBAEnD7jB,KAAK+kB,eACRkP,EAAI7sB,GAAG,WAAYpH,KAAK0zB,aAAc1zB,MAGvCA,KAAKunC,YACLvnC,KAAKwnC,UAGN/S,SAAU,SAAUR,GACfj0B,KAAKgxB,UAAYhxB,KAAKgxB,SAASU,YAClC1xB,KAAKuD,QAAQ+jC,WAAY,EACzBtnC,KAAKgxB,SAASyL,sBAERz8B,KAAKgxB,SAERhxB,KAAK+kB,eACRkP,EAAIzsB,IAAI,WAAYxH,KAAK0zB,aAAc1zB,MAGxCA,KAAKynC,cACLznC,KAAK0nC,iBAGNtF,UAAW,WACV,MAAO,CACNnzB,KAAMjP,KAAKwnC,OACXG,UAAW3nC,KAAKwnC,SAMlBlW,UAAW,WACV,OAAOtxB,KAAK8mC,SAKbc,UAAW,SAAU54B,GACpB,IAAI+3B,EAAY/mC,KAAK8mC,QAMrB,OALA9mC,KAAK8mC,QAAUh8B,EAASkE,GACxBhP,KAAKwnC,SAIExnC,KAAKkI,KAAK,OAAQ,CAAC6+B,UAAWA,EAAW/3B,OAAQhP,KAAK8mC,WAK9De,gBAAiB,SAAUrqB,GAE1B,OADAxd,KAAKuD,QAAQ4jC,aAAe3pB,EACrBxd,KAAKwnC,UAKbM,QAAS,WACR,OAAO9nC,KAAKuD,QAAQ8hC,MAKrB0C,QAAS,SAAU1C,GAalB,OAXArlC,KAAKuD,QAAQ8hC,KAAOA,EAEhBrlC,KAAKk0B,OACRl0B,KAAKunC,YACLvnC,KAAKwnC,UAGFxnC,KAAKgoC,QACRhoC,KAAKioC,UAAUjoC,KAAKgoC,OAAQhoC,KAAKgoC,OAAOzkC,SAGlCvD,MAGRkoC,WAAY,WACX,OAAOloC,KAAKslC,OAGbkC,OAAQ,WAEP,GAAIxnC,KAAKslC,OAAStlC,KAAKk0B,KAAM,CAC5B,IAAIzW,EAAMzd,KAAKk0B,KAAKlF,mBAAmBhvB,KAAK8mC,SAAS9jC,QACrDhD,KAAKmoC,QAAQ1qB,GAGd,OAAOzd,MAGRunC,UAAW,WACV,IAAIhkC,EAAUvD,KAAKuD,QACf6kC,EAAa,iBAAmBpoC,KAAK+kB,cAAgB,WAAa,QAElEsgB,EAAO9hC,EAAQ8hC,KAAK1B,WAAW3jC,KAAKslC,OACpC+C,GAAU,EAGVhD,IAASrlC,KAAKslC,QACbtlC,KAAKslC,OACRtlC,KAAKynC,cAENY,GAAU,EAEN9kC,EAAQg0B,QACX8N,EAAK9N,MAAQh0B,EAAQg0B,OAGD,QAAjB8N,EAAKltB,UACRktB,EAAKz6B,IAAMrH,EAAQqH,KAAO,KAI5B4R,GAAS6oB,EAAM+C,GAEX7kC,EAAQ2jC,WACX7B,EAAKjnB,SAAW,KAGjBpe,KAAKslC,MAAQD,EAET9hC,EAAQ6jC,aACXpnC,KAAKoH,GAAG,CACPkhC,UAAWtoC,KAAKuoC,cAChBC,SAAUxoC,KAAKyoC,eAIjB,IAAIC,EAAYnlC,EAAQ8hC,KAAKvB,aAAa9jC,KAAK6mC,SAC3C8B,GAAY,EAEZD,IAAc1oC,KAAK6mC,UACtB7mC,KAAK0nC,gBACLiB,GAAY,GAGTD,IACHlsB,GAASksB,EAAWN,GACpBM,EAAU99B,IAAM,IAEjB5K,KAAK6mC,QAAU6B,EAGXnlC,EAAQwZ,QAAU,GACrB/c,KAAK4oC,iBAIFP,GACHroC,KAAK2uB,UAAUlT,YAAYzb,KAAKslC,OAEjCtlC,KAAK6oC,mBACDH,GAAaC,GAChB3oC,KAAK2uB,QAAQprB,EAAQwsB,YAAYtU,YAAYzb,KAAK6mC,UAIpDY,YAAa,WACRznC,KAAKuD,QAAQ6jC,aAChBpnC,KAAKwH,IAAI,CACR8gC,UAAWtoC,KAAKuoC,cAChBC,SAAUxoC,KAAKyoC,eAIjB/sB,GAAO1b,KAAKslC,OACZtlC,KAAKkiC,wBAAwBliC,KAAKslC,OAElCtlC,KAAKslC,MAAQ,MAGdoC,cAAe,WACV1nC,KAAK6mC,SACRnrB,GAAO1b,KAAK6mC,SAEb7mC,KAAK6mC,QAAU,MAGhBsB,QAAS,SAAU1qB,GAEdzd,KAAKslC,OACR5nB,GAAY1d,KAAKslC,MAAO7nB,GAGrBzd,KAAK6mC,SACRnpB,GAAY1d,KAAK6mC,QAASppB,GAG3Bzd,KAAK8oC,QAAUrrB,EAAIhU,EAAIzJ,KAAKuD,QAAQ4jC,aAEpCnnC,KAAKyoC,gBAGNM,cAAe,SAAUvrB,GACpBxd,KAAKslC,QACRtlC,KAAKslC,MAAM/xB,MAAM4vB,OAASnjC,KAAK8oC,QAAUtrB,IAI3CkW,aAAc,SAAUsV,GACvB,IAAIvrB,EAAMzd,KAAKk0B,KAAKlC,uBAAuBhyB,KAAK8mC,QAASkC,EAAI/5B,KAAM+5B,EAAIh4B,QAAQhO,QAE/EhD,KAAKmoC,QAAQ1qB,IAGdorB,iBAAkB,WAEjB,GAAK7oC,KAAKuD,QAAQ0jC,cAElBzqB,GAASxc,KAAKslC,MAAO,uBAErBtlC,KAAKgiC,qBAAqBhiC,KAAKslC,OAE3BJ,IAAY,CACf,IAAIoC,EAAYtnC,KAAKuD,QAAQ+jC,UACzBtnC,KAAKgxB,WACRsW,EAAYtnC,KAAKgxB,SAASU,UAC1B1xB,KAAKgxB,SAASa,WAGf7xB,KAAKgxB,SAAW,IAAIkU,GAAWllC,MAE3BsnC,GACHtnC,KAAKgxB,SAAStE,WAOjB5P,WAAY,SAAUC,GAMrB,OALA/c,KAAKuD,QAAQwZ,QAAUA,EACnB/c,KAAKk0B,MACRl0B,KAAK4oC,iBAGC5oC,MAGR4oC,eAAgB,WACf,IAAI7rB,EAAU/c,KAAKuD,QAAQwZ,QAEvB/c,KAAKslC,OACRxoB,GAAW9c,KAAKslC,MAAOvoB,GAGpB/c,KAAK6mC,SACR/pB,GAAW9c,KAAK6mC,QAAS9pB,IAI3BwrB,cAAe,WACdvoC,KAAK+oC,cAAc/oC,KAAKuD,QAAQ8jC,aAGjCoB,aAAc,WACbzoC,KAAK+oC,cAAc,IAGpBE,gBAAiB,WAChB,OAAOjpC,KAAKuD,QAAQ8hC,KAAK9hC,QAAQkgC,aAGlCyF,kBAAmB,WAClB,OAAOlpC,KAAKuD,QAAQ8hC,KAAK9hC,QAAQmgC,iBAsBnC,IAAIyF,GAAOtH,GAAM1hC,OAAO,CAIvBoD,QAAS,CAGR6lC,QAAQ,EAIRC,MAAO,UAIPC,OAAQ,EAIRvsB,QAAS,EAITwsB,QAAS,QAITC,SAAU,QAIVC,UAAW,KAIXC,WAAY,KAIZC,MAAM,EAINC,UAAW,KAIXC,YAAa,GAIbC,SAAU,UAKV7C,aAAa,EAKbxV,qBAAqB,GAGtB4Q,UAAW,SAAUpO,GAGpBj0B,KAAKitB,UAAYgH,EAAI8V,YAAY/pC,OAGlCs0B,MAAO,WACNt0B,KAAKitB,UAAU+c,UAAUhqC,MACzBA,KAAKiqC,SACLjqC,KAAKitB,UAAUid,SAASlqC,OAGzBy0B,SAAU,WACTz0B,KAAKitB,UAAUkd,YAAYnqC,OAK5BoqC,OAAQ,WAIP,OAHIpqC,KAAKk0B,MACRl0B,KAAKitB,UAAUod,YAAYrqC,MAErBA,MAKRqjC,SAAU,SAAU9vB,GAQnB,OAPAjQ,EAAWtD,KAAMuT,GACbvT,KAAKitB,YACRjtB,KAAKitB,UAAUqd,aAAatqC,MACxBA,KAAKuD,QAAQ6lC,QAAU71B,GAASA,EAAM/P,eAAe,WACxDxD,KAAKuqC,iBAGAvqC,MAKRsjC,aAAc,WAIb,OAHItjC,KAAKitB,WACRjtB,KAAKitB,UAAUsb,cAAcvoC,MAEvBA,MAKRujC,YAAa,WAIZ,OAHIvjC,KAAKitB,WACRjtB,KAAKitB,UAAUud,aAAaxqC,MAEtBA,MAGRkoC,WAAY,WACX,OAAOloC,KAAKyqC,OAGbR,OAAQ,WAEPjqC,KAAK0qC,WACL1qC,KAAKm2B,WAGNwU,gBAAiB,WAEhB,OAAQ3qC,KAAKuD,QAAQ6lC,OAASppC,KAAKuD,QAAQ+lC,OAAS,EAAI,GAAKtpC,KAAKitB,UAAU1pB,QAAQo7B,aAYlFiM,GAAezB,GAAKhpC,OAAO,CAI9BoD,QAAS,CACRomC,MAAM,EAINkB,OAAQ,IAGT5kC,WAAY,SAAU+I,EAAQzL,GAC7BD,EAAWtD,KAAMuD,GACjBvD,KAAK8mC,QAAUh8B,EAASkE,GACxBhP,KAAKuxB,QAAUvxB,KAAKuD,QAAQsnC,QAK7BjD,UAAW,SAAU54B,GACpB,IAAI+3B,EAAY/mC,KAAK8mC,QAMrB,OALA9mC,KAAK8mC,QAAUh8B,EAASkE,GACxBhP,KAAKoqC,SAIEpqC,KAAKkI,KAAK,OAAQ,CAAC6+B,UAAWA,EAAW/3B,OAAQhP,KAAK8mC,WAK9DxV,UAAW,WACV,OAAOtxB,KAAK8mC,SAKbgE,UAAW,SAAUD,GAEpB,OADA7qC,KAAKuD,QAAQsnC,OAAS7qC,KAAKuxB,QAAUsZ,EAC9B7qC,KAAKoqC,UAKbW,UAAW,WACV,OAAO/qC,KAAKuxB,SAGb8R,SAAW,SAAU9/B,GACpB,IAAIsnC,EAAStnC,GAAWA,EAAQsnC,QAAU7qC,KAAKuxB,QAG/C,OAFA4X,GAAKpoC,UAAUsiC,SAAShiC,KAAKrB,KAAMuD,GACnCvD,KAAK8qC,UAAUD,GACR7qC,MAGR0qC,SAAU,WACT1qC,KAAKgrC,OAAShrC,KAAKk0B,KAAKlF,mBAAmBhvB,KAAK8mC,SAChD9mC,KAAKuqC,iBAGNA,cAAe,WACd,IAAI3hB,EAAI5oB,KAAKuxB,QACT0Z,EAAKjrC,KAAKkrC,UAAYtiB,EACtBgB,EAAI5pB,KAAK2qC,kBACTx3B,EAAI,CAACyV,EAAIgB,EAAGqhB,EAAKrhB,GACrB5pB,KAAKmrC,UAAY,IAAIphC,EAAO/J,KAAKgrC,OAAO3/B,SAAS8H,GAAInT,KAAKgrC,OAAO9/B,IAAIiI,KAGtEgjB,QAAS,WACJn2B,KAAKk0B,MACRl0B,KAAKqqC,eAIPA,YAAa,WACZrqC,KAAKitB,UAAUme,cAAcprC,OAG9BqrC,OAAQ,WACP,OAAOrrC,KAAKuxB,UAAYvxB,KAAKitB,UAAUqe,QAAQ1+B,WAAW5M,KAAKmrC,YAIhEI,eAAgB,SAAUp4B,GACzB,OAAOA,EAAElH,WAAWjM,KAAKgrC,SAAWhrC,KAAKuxB,QAAUvxB,KAAK2qC,qBA2B1D,IAAIa,GAASZ,GAAazqC,OAAO,CAEhC8F,WAAY,SAAU+I,EAAQzL,EAASkoC,GAQtC,GAPuB,iBAAZloC,IAEVA,EAAUpD,EAAO,GAAIsrC,EAAe,CAACZ,OAAQtnC,KAE9CD,EAAWtD,KAAMuD,GACjBvD,KAAK8mC,QAAUh8B,EAASkE,GAEpBnE,MAAM7K,KAAKuD,QAAQsnC,QAAW,MAAM,IAAItmC,MAAM,+BAKlDvE,KAAK0rC,SAAW1rC,KAAKuD,QAAQsnC,QAK9BC,UAAW,SAAUD,GAEpB,OADA7qC,KAAK0rC,SAAWb,EACT7qC,KAAKoqC,UAKbW,UAAW,WACV,OAAO/qC,KAAK0rC,UAKbnlB,UAAW,WACV,IAAIolB,EAAO,CAAC3rC,KAAKuxB,QAASvxB,KAAKkrC,UAAYlrC,KAAKuxB,SAEhD,OAAO,IAAInnB,EACVpK,KAAKk0B,KAAK5G,mBAAmBttB,KAAKgrC,OAAO3/B,SAASsgC,IAClD3rC,KAAKk0B,KAAK5G,mBAAmBttB,KAAKgrC,OAAO9/B,IAAIygC,MAG/CtI,SAAU8F,GAAKpoC,UAAUsiC,SAEzBqH,SAAU,WAET,IAAI//B,EAAM3K,KAAK8mC,QAAQn8B,IACnBD,EAAM1K,KAAK8mC,QAAQp8B,IACnBupB,EAAMj0B,KAAKk0B,KACX9Q,EAAM6Q,EAAI1wB,QAAQ6f,IAEtB,GAAIA,EAAI/S,WAAaD,EAAMC,SAAU,CACpC,IAAI7N,EAAIM,KAAK8N,GAAK,IACdg7B,EAAQ5rC,KAAK0rC,SAAWt7B,EAAMgB,EAAK5O,EACnCqb,EAAMoW,EAAI7kB,QAAQ,CAAC1E,EAAMkhC,EAAMjhC,IAC/BkhC,EAAS5X,EAAI7kB,QAAQ,CAAC1E,EAAMkhC,EAAMjhC,IAClCwI,EAAI0K,EAAI3S,IAAI2gC,GAAQtgC,SAAS,GAC7BkG,EAAOwiB,EAAItkB,UAAUwD,GAAGzI,IACxBohC,EAAOhpC,KAAKipC,MAAMjpC,KAAK6N,IAAIi7B,EAAOppC,GAAKM,KAAK6O,IAAIjH,EAAMlI,GAAKM,KAAK6O,IAAIF,EAAOjP,KAClEM,KAAK6N,IAAIjG,EAAMlI,GAAKM,KAAK6N,IAAIc,EAAOjP,KAAOA,GAEpDqI,MAAMihC,IAAkB,IAATA,IAClBA,EAAOF,EAAO9oC,KAAK6N,IAAI7N,KAAK8N,GAAK,IAAMlG,IAGxC1K,KAAKgrC,OAAS73B,EAAE9H,SAAS4oB,EAAIzF,kBAC7BxuB,KAAKuxB,QAAU1mB,MAAMihC,GAAQ,EAAI34B,EAAEhR,EAAI8xB,EAAI7kB,QAAQ,CAACqC,EAAM9G,EAAMmhC,IAAO3pC,EACvEnC,KAAKkrC,SAAW/3B,EAAE1J,EAAIoU,EAAIpU,MAEpB,CACN,IAAI6H,EAAU8R,EAAIzT,UAAUyT,EAAIhU,QAAQpP,KAAK8mC,SAASz7B,SAAS,CAACrL,KAAK0rC,SAAU,KAE/E1rC,KAAKgrC,OAAS/W,EAAIjF,mBAAmBhvB,KAAK8mC,SAC1C9mC,KAAKuxB,QAAUvxB,KAAKgrC,OAAO7oC,EAAI8xB,EAAIjF,mBAAmB1d,GAASnP,EAGhEnC,KAAKuqC,mBAsDP,IAAIyB,GAAW7C,GAAKhpC,OAAO,CAI1BoD,QAAS,CAIR0oC,aAAc,EAIdC,QAAQ,GAGTjmC,WAAY,SAAUsE,EAAShH,GAC9BD,EAAWtD,KAAMuD,GACjBvD,KAAKmsC,YAAY5hC,IAKlB6hC,WAAY,WACX,OAAOpsC,KAAKqsC,UAKbC,WAAY,SAAU/hC,GAErB,OADAvK,KAAKmsC,YAAY5hC,GACVvK,KAAKoqC,UAKbmC,QAAS,WACR,OAAQvsC,KAAKqsC,SAAS3rC,QAKvB8rC,kBAAmB,SAAUr5B,GAM5B,IALA,IAGIqsB,EAAIC,EAHJgN,EAAc3lB,EAAAA,EACd4lB,EAAW,KACXC,EAAUxN,GAGL7+B,EAAI,EAAGssC,EAAO5sC,KAAK6sC,OAAOnsC,OAAQJ,EAAIssC,EAAMtsC,IAGpD,IAFA,IAAI4J,EAASlK,KAAK6sC,OAAOvsC,GAEhBD,EAAI,EAAGE,EAAM2J,EAAOxJ,OAAQL,EAAIE,EAAKF,IAAK,CAIlD,IAAI4+B,EAAS0N,EAAQx5B,EAHrBqsB,EAAKt1B,EAAO7J,EAAI,GAChBo/B,EAAKv1B,EAAO7J,IAEoB,GAE5B4+B,EAASwN,IACZA,EAAcxN,EACdyN,EAAWC,EAAQx5B,EAAGqsB,EAAIC,IAO7B,OAHIiN,IACHA,EAASr8B,SAAWvN,KAAKoJ,KAAKugC,IAExBC,GAKRpgC,UAAW,WAEV,IAAKtM,KAAKk0B,KACT,MAAM,IAAI3vB,MAAM,kDAGjB,IAAIlE,EAAGysC,EAAUC,EAASC,EAAMxN,EAAIC,EAAIhE,EACpCvxB,EAASlK,KAAKitC,OAAO,GACrB1sC,EAAM2J,EAAOxJ,OAEjB,IAAKH,EAAO,OAAO,KAInB,IAAYusC,EAAPzsC,EAAI,EAAiBA,EAAIE,EAAM,EAAGF,IACtCysC,GAAY5iC,EAAO7J,GAAG4L,WAAW/B,EAAO7J,EAAI,IAAM,EAInD,GAAiB,IAAbysC,EACH,OAAO9sC,KAAKk0B,KAAK5G,mBAAmBpjB,EAAO,IAG5C,IAAY8iC,EAAP3sC,EAAI,EAAaA,EAAIE,EAAM,EAAGF,IAMlC,GALAm/B,EAAKt1B,EAAO7J,GACZo/B,EAAKv1B,EAAO7J,EAAI,GAILysC,GAFXE,GADAD,EAAUvN,EAAGvzB,WAAWwzB,IAKvB,OADAhE,GAASuR,EAAOF,GAAYC,EACrB/sC,KAAKk0B,KAAK5G,mBAAmB,CACnCmS,EAAGt9B,EAAIs5B,GAASgE,EAAGt9B,EAAIq9B,EAAGr9B,GAC1Bs9B,EAAGh2B,EAAIgyB,GAASgE,EAAGh2B,EAAI+1B,EAAG/1B,MAQ9B8c,UAAW,WACV,OAAOvmB,KAAKsrC,SAOb4B,UAAW,SAAUl+B,EAAQzE,GAK5B,OAJAA,EAAUA,GAAWvK,KAAKmtC,gBAC1Bn+B,EAASlE,EAASkE,GAClBzE,EAAQ1G,KAAKmL,GACbhP,KAAKsrC,QAAQnrC,OAAO6O,GACbhP,KAAKoqC,UAGb+B,YAAa,SAAU5hC,GACtBvK,KAAKsrC,QAAU,IAAIlhC,EACnBpK,KAAKqsC,SAAWrsC,KAAKotC,gBAAgB7iC,IAGtC4iC,cAAe,WACd,OAAO5M,GAAOvgC,KAAKqsC,UAAYrsC,KAAKqsC,SAAWrsC,KAAKqsC,SAAS,IAI9De,gBAAiB,SAAU7iC,GAI1B,IAHA,IAAI8iC,EAAS,GACTC,EAAO/M,GAAOh2B,GAETlK,EAAI,EAAGE,EAAMgK,EAAQ7J,OAAQL,EAAIE,EAAKF,IAC1CitC,GACHD,EAAOhtC,GAAKyK,EAASP,EAAQlK,IAC7BL,KAAKsrC,QAAQnrC,OAAOktC,EAAOhtC,KAE3BgtC,EAAOhtC,GAAKL,KAAKotC,gBAAgB7iC,EAAQlK,IAI3C,OAAOgtC,GAGR3C,SAAU,WACT,IAAIhY,EAAW,IAAI3oB,EACnB/J,KAAKitC,OAAS,GACdjtC,KAAKutC,gBAAgBvtC,KAAKqsC,SAAUrsC,KAAKitC,OAAQva,GAE7C1yB,KAAKsrC,QAAQj+B,WAAaqlB,EAASrlB,YACtCrN,KAAKwtC,aAAe9a,EACpB1yB,KAAKuqC,kBAIPA,cAAe,WACd,IAAI3gB,EAAI5pB,KAAK2qC,kBACTx3B,EAAI,IAAI3J,EAAMogB,EAAGA,GACrB5pB,KAAKmrC,UAAY,IAAIphC,EAAO,CAC3B/J,KAAKwtC,aAAajrC,IAAI8I,SAAS8H,GAC/BnT,KAAKwtC,aAAalrC,IAAI4I,IAAIiI,MAK5Bo6B,gBAAiB,SAAUhjC,EAAS8iC,EAAQI,GAC3C,IAEIptC,EAAGqtC,EAFHJ,EAAO/iC,EAAQ,aAAcE,EAC7BlK,EAAMgK,EAAQ7J,OAGlB,GAAI4sC,EAAM,CAET,IADAI,EAAO,GACFrtC,EAAI,EAAGA,EAAIE,EAAKF,IACpBqtC,EAAKrtC,GAAKL,KAAKk0B,KAAKlF,mBAAmBzkB,EAAQlK,IAC/CotC,EAAgBttC,OAAOutC,EAAKrtC,IAE7BgtC,EAAOxpC,KAAK6pC,QAEZ,IAAKrtC,EAAI,EAAGA,EAAIE,EAAKF,IACpBL,KAAKutC,gBAAgBhjC,EAAQlK,GAAIgtC,EAAQI,IAM5CE,YAAa,WACZ,IAAI9gC,EAAS7M,KAAKitB,UAAUqe,QAG5B,GADAtrC,KAAK6sC,OAAS,GACT7sC,KAAKmrC,WAAcnrC,KAAKmrC,UAAUv+B,WAAWC,GAIlD,GAAI7M,KAAKuD,QAAQ2oC,OAChBlsC,KAAK6sC,OAAS7sC,KAAKitC,WADpB,CAKA,IACI5sC,EAAGC,EAAGugC,EAAGtgC,EAAK2S,EAAM06B,EAAS1jC,EAD7B2jC,EAAQ7tC,KAAK6sC,OAGjB,IAAYhM,EAAPxgC,EAAI,EAAUE,EAAMP,KAAKitC,OAAOvsC,OAAQL,EAAIE,EAAKF,IAGrD,IAAKC,EAAI,EAAG4S,GAFZhJ,EAASlK,KAAKitC,OAAO5sC,IAEKK,OAAQJ,EAAI4S,EAAO,EAAG5S,KAC/CstC,EAAU9N,GAAY51B,EAAO5J,GAAI4J,EAAO5J,EAAI,GAAIuM,EAAQvM,GAAG,MAI3DutC,EAAMhN,GAAKgN,EAAMhN,IAAM,GACvBgN,EAAMhN,GAAGh9B,KAAK+pC,EAAQ,IAGjBA,EAAQ,KAAO1jC,EAAO5J,EAAI,IAAQA,IAAM4S,EAAO,IACnD26B,EAAMhN,GAAGh9B,KAAK+pC,EAAQ,IACtB/M,QAOJiN,gBAAiB,WAIhB,IAHA,IAAID,EAAQ7tC,KAAK6sC,OACblO,EAAY3+B,KAAKuD,QAAQ0oC,aAEpB5rC,EAAI,EAAGE,EAAMstC,EAAMntC,OAAQL,EAAIE,EAAKF,IAC5CwtC,EAAMxtC,GAAKq+B,GAASmP,EAAMxtC,GAAIs+B,IAIhCxI,QAAS,WACHn2B,KAAKk0B,OAEVl0B,KAAK2tC,cACL3tC,KAAK8tC,kBACL9tC,KAAKqqC,gBAGNA,YAAa,WACZrqC,KAAKitB,UAAU8gB,YAAY/tC,OAI5BurC,eAAgB,SAAUp4B,EAAGF,GAC5B,IAAI5S,EAAGC,EAAGugC,EAAGtgC,EAAK2S,EAAM86B,EACpBpkB,EAAI5pB,KAAK2qC,kBAEb,IAAK3qC,KAAKmrC,YAAcnrC,KAAKmrC,UAAU/+B,SAAS+G,GAAM,OAAO,EAG7D,IAAK9S,EAAI,EAAGE,EAAMP,KAAK6sC,OAAOnsC,OAAQL,EAAIE,EAAKF,IAG9C,IAAKC,EAAI,EAAuBugC,GAApB3tB,GAFZ86B,EAAOhuC,KAAK6sC,OAAOxsC,IAEKK,QAAmB,EAAGJ,EAAI4S,EAAM2tB,EAAIvgC,IAC3D,IAAK2S,GAAiB,IAAN3S,IAEZu/B,GAAuB1sB,EAAG66B,EAAKnN,GAAImN,EAAK1tC,KAAOspB,EAClD,OAAO,EAIV,OAAO,KAcToiB,GAASxL,MAAQA,GAgDjB,IAAIyN,GAAUjC,GAAS7rC,OAAO,CAE7BoD,QAAS,CACRomC,MAAM,GAGP4C,QAAS,WACR,OAAQvsC,KAAKqsC,SAAS3rC,SAAWV,KAAKqsC,SAAS,GAAG3rC,QAGnD4L,UAAW,WAEV,IAAKtM,KAAKk0B,KACT,MAAM,IAAI3vB,MAAM,kDAGjB,IAAIlE,EAAGC,EAAGk/B,EAAIC,EAAIyO,EAAGC,EAAMhsC,EAAGsH,EAAGuH,EAC7B9G,EAASlK,KAAKitC,OAAO,GACrB1sC,EAAM2J,EAAOxJ,OAEjB,IAAKH,EAAO,OAAO,KAMnB,IAFA4tC,EAAOhsC,EAAIsH,EAAI,EAEVpJ,EAAI,EAAGC,EAAIC,EAAM,EAAGF,EAAIE,EAAKD,EAAID,IACrCm/B,EAAKt1B,EAAO7J,GACZo/B,EAAKv1B,EAAO5J,GAEZ4tC,EAAI1O,EAAG/1B,EAAIg2B,EAAGt9B,EAAIs9B,EAAGh2B,EAAI+1B,EAAGr9B,EAC5BA,IAAMq9B,EAAGr9B,EAAIs9B,EAAGt9B,GAAK+rC,EACrBzkC,IAAM+1B,EAAG/1B,EAAIg2B,EAAGh2B,GAAKykC,EACrBC,GAAY,EAAJD,EAST,OAJCl9B,EAFY,IAATm9B,EAEMjkC,EAAO,GAEP,CAAC/H,EAAIgsC,EAAM1kC,EAAI0kC,GAElBnuC,KAAKk0B,KAAK5G,mBAAmBtc,IAGrCo8B,gBAAiB,SAAU7iC,GAC1B,IAAI8iC,EAASrB,GAASjrC,UAAUqsC,gBAAgB/rC,KAAKrB,KAAMuK,GACvDhK,EAAM8sC,EAAO3sC,OAMjB,OAHW,GAAPH,GAAY8sC,EAAO,aAAc5iC,GAAU4iC,EAAO,GAAGlhC,OAAOkhC,EAAO9sC,EAAM,KAC5E8sC,EAAOe,MAEDf,GAGRlB,YAAa,SAAU5hC,GACtByhC,GAASjrC,UAAUorC,YAAY9qC,KAAKrB,KAAMuK,GACtCg2B,GAAOvgC,KAAKqsC,YACfrsC,KAAKqsC,SAAW,CAACrsC,KAAKqsC,YAIxBc,cAAe,WACd,OAAO5M,GAAOvgC,KAAKqsC,SAAS,IAAMrsC,KAAKqsC,SAAS,GAAKrsC,KAAKqsC,SAAS,GAAG,IAGvEsB,YAAa,WAGZ,IAAI9gC,EAAS7M,KAAKitB,UAAUqe,QACxB1hB,EAAI5pB,KAAKuD,QAAQ+lC,OACjBn2B,EAAI,IAAI3J,EAAMogB,EAAGA,GAMrB,GAHA/c,EAAS,IAAI9C,EAAO8C,EAAOtK,IAAI8I,SAAS8H,GAAItG,EAAOvK,IAAI4I,IAAIiI,IAE3DnT,KAAK6sC,OAAS,GACT7sC,KAAKmrC,WAAcnrC,KAAKmrC,UAAUv+B,WAAWC,GAIlD,GAAI7M,KAAKuD,QAAQ2oC,OAChBlsC,KAAK6sC,OAAS7sC,KAAKitC,YAIpB,IAAK,IAAqCoB,EAAjChuC,EAAI,EAAGE,EAAMP,KAAKitC,OAAOvsC,OAAiBL,EAAIE,EAAKF,KAC3DguC,EAAU1N,GAAY3gC,KAAKitC,OAAO5sC,GAAIwM,GAAQ,IAClCnM,QACXV,KAAK6sC,OAAOhpC,KAAKwqC,IAKpBhE,YAAa,WACZrqC,KAAKitB,UAAU8gB,YAAY/tC,MAAM,IAIlCurC,eAAgB,SAAUp4B,GACzB,IACI66B,EAAMxO,EAAIC,EAAIp/B,EAAGC,EAAGugC,EAAGtgC,EAAK2S,EAD5B0a,GAAS,EAGb,IAAK5tB,KAAKmrC,YAAcnrC,KAAKmrC,UAAU/+B,SAAS+G,GAAM,OAAO,EAG7D,IAAK9S,EAAI,EAAGE,EAAMP,KAAK6sC,OAAOnsC,OAAQL,EAAIE,EAAKF,IAG9C,IAAKC,EAAI,EAAuBugC,GAApB3tB,GAFZ86B,EAAOhuC,KAAK6sC,OAAOxsC,IAEKK,QAAmB,EAAGJ,EAAI4S,EAAM2tB,EAAIvgC,IAC3Dk/B,EAAKwO,EAAK1tC,GACVm/B,EAAKuO,EAAKnN,GAEJrB,EAAG/1B,EAAI0J,EAAE1J,GAAQg2B,EAAGh2B,EAAI0J,EAAE1J,GAAQ0J,EAAEhR,GAAKs9B,EAAGt9B,EAAIq9B,EAAGr9B,IAAMgR,EAAE1J,EAAI+1B,EAAG/1B,IAAMg2B,EAAGh2B,EAAI+1B,EAAG/1B,GAAK+1B,EAAGr9B,IAC/FyrB,GAAUA,GAMb,OAAOA,GAAUoe,GAASjrC,UAAUwqC,eAAelqC,KAAKrB,KAAMmT,GAAG,MAgCnE,IAAIm7B,GAAUlL,GAAajjC,OAAO,CAoDjC8F,WAAY,SAAUsoC,EAAShrC,GAC9BD,EAAWtD,KAAMuD,GAEjBvD,KAAKmkB,QAAU,GAEXoqB,GACHvuC,KAAKwuC,QAAQD,IAMfC,QAAS,SAAUD,GAClB,IACIluC,EAAGE,EAAKkuC,EADRC,EAAWlqC,EAAQ+pC,GAAWA,EAAUA,EAAQG,SAGpD,GAAIA,EAAU,CACb,IAAKruC,EAAI,EAAGE,EAAMmuC,EAAShuC,OAAQL,EAAIE,EAAKF,MAE3CouC,EAAUC,EAASruC,IACPsuC,YAAcF,EAAQG,UAAYH,EAAQC,UAAYD,EAAQI,cACzE7uC,KAAKwuC,QAAQC,GAGf,OAAOzuC,KAGR,IAAIuD,EAAUvD,KAAKuD,QAEnB,GAAIA,EAAQyZ,SAAWzZ,EAAQyZ,OAAOuxB,GAAY,OAAOvuC,KAEzD,IAAI+I,EAAQ+lC,GAAgBP,EAAShrC,GACrC,OAAKwF,GAGLA,EAAM0lC,QAAUM,GAAUR,GAE1BxlC,EAAMimC,eAAiBjmC,EAAMxF,QAC7BvD,KAAKivC,WAAWlmC,GAEZxF,EAAQ2rC,eACX3rC,EAAQ2rC,cAAcX,EAASxlC,GAGzB/I,KAAKi5B,SAASlwB,IAXb/I,MAiBTivC,WAAY,SAAUlmC,GACrB,YAAchG,IAAVgG,EACI/I,KAAKsiC,UAAUtiC,KAAKivC,WAAYjvC,OAGxC+I,EAAMxF,QAAUpD,EAAO,GAAI4I,EAAMimC,gBACjChvC,KAAKmvC,eAAepmC,EAAO/I,KAAKuD,QAAQgQ,OACjCvT,OAKRqjC,SAAU,SAAU9vB,GACnB,OAAOvT,KAAKsiC,UAAU,SAAUv5B,GAC/B/I,KAAKmvC,eAAepmC,EAAOwK,IACzBvT,OAGJmvC,eAAgB,SAAUpmC,EAAOwK,GAC5BxK,EAAMs6B,WACY,mBAAV9vB,IACVA,EAAQA,EAAMxK,EAAM0lC,UAErB1lC,EAAMs6B,SAAS9vB,OAYlB,SAASu7B,GAAgBP,EAAShrC,GAEjC,IAKIyL,EAAQzE,EAASlK,EAAGE,EALpBquC,EAA4B,YAAjBL,EAAQjnC,KAAqBinC,EAAQK,SAAWL,EAC3DpiB,EAASyiB,EAAWA,EAASC,YAAc,KAC3CtrB,EAAS,GACT6rB,EAAe7rC,GAAWA,EAAQ6rC,aAClCC,EAAkB9rC,GAAWA,EAAQ+rC,gBAAkBA,GAG3D,IAAKnjB,IAAWyiB,EACf,OAAO,KAGR,OAAQA,EAAStnC,MACjB,IAAK,QAEJ,OAAOioC,GAAcH,EAAcb,EADnCv/B,EAASqgC,EAAgBljB,GAC2B5oB,GAErD,IAAK,aACJ,IAAKlD,EAAI,EAAGE,EAAM4rB,EAAOzrB,OAAQL,EAAIE,EAAKF,IACzC2O,EAASqgC,EAAgBljB,EAAO9rB,IAChCkjB,EAAO1f,KAAK0rC,GAAcH,EAAcb,EAASv/B,EAAQzL,IAE1D,OAAO,IAAI6/B,GAAa7f,GAEzB,IAAK,aACL,IAAK,kBAEJ,OADAhZ,EAAUilC,GAAgBrjB,EAA0B,eAAlByiB,EAAStnC,KAAwB,EAAI,EAAG+nC,GACnE,IAAIrD,GAASzhC,EAAShH,GAE9B,IAAK,UACL,IAAK,eAEJ,OADAgH,EAAUilC,GAAgBrjB,EAA0B,YAAlByiB,EAAStnC,KAAqB,EAAI,EAAG+nC,GAChE,IAAIpB,GAAQ1jC,EAAShH,GAE7B,IAAK,qBACJ,IAAKlD,EAAI,EAAGE,EAAMquC,EAASD,WAAWjuC,OAAQL,EAAIE,EAAKF,IAAK,CAC3D,IAAI0I,EAAQ+lC,GAAgB,CAC3BF,SAAUA,EAASD,WAAWtuC,GAC9BiH,KAAM,UACNmoC,WAAYlB,EAAQkB,YAClBlsC,GAECwF,GACHwa,EAAO1f,KAAKkF,GAGd,OAAO,IAAIq6B,GAAa7f,GAEzB,QACC,MAAM,IAAIhf,MAAM,4BAIlB,SAASgrC,GAAcG,EAAgBnB,EAASv/B,EAAQzL,GACvD,OAAOmsC,EACNA,EAAenB,EAASv/B,GACxB,IAAIg4B,GAAOh4B,EAAQzL,GAAWA,EAAQosC,uBAAyBpsC,GAMjE,SAAS+rC,GAAenjB,GACvB,OAAO,IAAI1hB,EAAO0hB,EAAO,GAAIA,EAAO,GAAIA,EAAO,IAOhD,SAASqjB,GAAgBrjB,EAAQyjB,EAAYP,GAG5C,IAFA,IAEqCrgC,EAFjCzE,EAAU,GAELlK,EAAI,EAAGE,EAAM4rB,EAAOzrB,OAAgBL,EAAIE,EAAKF,IACrD2O,EAAS4gC,EACRJ,GAAgBrjB,EAAO9rB,GAAIuvC,EAAa,EAAGP,IAC1CA,GAAmBC,IAAgBnjB,EAAO9rB,IAE5CkK,EAAQ1G,KAAKmL,GAGd,OAAOzE,EAKR,SAASslC,GAAe7gC,EAAQkB,GAE/B,OADAA,EAAiC,iBAAdA,EAAyBA,EAAY,OAClCnN,IAAfiM,EAAOpE,IACb,CAAClI,EAAUsM,EAAOrE,IAAKuF,GAAYxN,EAAUsM,EAAOtE,IAAKwF,GAAYxN,EAAUsM,EAAOpE,IAAKsF,IAC3F,CAACxN,EAAUsM,EAAOrE,IAAKuF,GAAYxN,EAAUsM,EAAOtE,IAAKwF,IAM3D,SAAS4/B,GAAgBvlC,EAASqlC,EAAY38B,EAAQ/C,GAGrD,IAFA,IAAIic,EAAS,GAEJ9rB,EAAI,EAAGE,EAAMgK,EAAQ7J,OAAQL,EAAIE,EAAKF,IAC9C8rB,EAAOtoB,KAAK+rC,EACXE,GAAgBvlC,EAAQlK,GAAIuvC,EAAa,EAAG38B,EAAQ/C,GACpD2/B,GAAetlC,EAAQlK,GAAI6P,IAO7B,OAJK0/B,GAAc38B,GAClBkZ,EAAOtoB,KAAKsoB,EAAO,IAGbA,EAGR,SAAS4jB,GAAWhnC,EAAOinC,GAC1B,OAAOjnC,EAAM0lC,QACZtuC,EAAO,GAAI4I,EAAM0lC,QAAS,CAACG,SAAUoB,IACrCjB,GAAUiB,GAKZ,SAASjB,GAAUR,GAClB,MAAqB,YAAjBA,EAAQjnC,MAAuC,sBAAjBinC,EAAQjnC,KAClCinC,EAGD,CACNjnC,KAAM,UACNmoC,WAAY,GACZb,SAAUL,GAIZ,IAAI0B,GAAiB,CACpBC,UAAW,SAAUhgC,GACpB,OAAO6/B,GAAW/vC,KAAM,CACvBsH,KAAM,QACNunC,YAAagB,GAAe7vC,KAAKsxB,YAAaphB,OAkIjD,SAASigC,GAAQ5B,EAAShrC,GACzB,OAAO,IAAI+qC,GAAQC,EAAShrC,GAxH7ByjC,GAAOhgC,QAAQipC,IAOfzE,GAAOxkC,QAAQipC,IACfrF,GAAa5jC,QAAQipC,IAQrBjE,GAAShlC,QAAQ,CAChBkpC,UAAW,SAAUhgC,GACpB,IAAIkgC,GAAS7P,GAAOvgC,KAAKqsC,UAIzB,OAAO0D,GAAW/vC,KAAM,CACvBsH,MAAO8oC,EAAQ,QAAU,IAAM,aAC/BvB,YAJYiB,GAAgB9vC,KAAKqsC,SAAU+D,EAAQ,EAAI,GAAG,EAAOlgC,QAcpE+9B,GAAQjnC,QAAQ,CACfkpC,UAAW,SAAUhgC,GACpB,IAAImgC,GAAS9P,GAAOvgC,KAAKqsC,UACrB+D,EAAQC,IAAU9P,GAAOvgC,KAAKqsC,SAAS,IAEvClgB,EAAS2jB,GAAgB9vC,KAAKqsC,SAAU+D,EAAQ,EAAIC,EAAQ,EAAI,GAAG,EAAMngC,GAM7E,OAJKmgC,IACJlkB,EAAS,CAACA,IAGJ4jB,GAAW/vC,KAAM,CACvBsH,MAAO8oC,EAAQ,QAAU,IAAM,UAC/BvB,YAAa1iB,OAOhByW,GAAW57B,QAAQ,CAClBspC,aAAc,SAAUpgC,GACvB,IAAIic,EAAS,GAMb,OAJAnsB,KAAKsiC,UAAU,SAAUv5B,GACxBojB,EAAOtoB,KAAKkF,EAAMmnC,UAAUhgC,GAAW0+B,SAASC,eAG1CkB,GAAW/vC,KAAM,CACvBsH,KAAM,aACNunC,YAAa1iB,KAQf+jB,UAAW,SAAUhgC,GAEpB,IAAI5I,EAAOtH,KAAKyuC,SAAWzuC,KAAKyuC,QAAQG,UAAY5uC,KAAKyuC,QAAQG,SAAStnC,KAE1E,GAAa,eAATA,EACH,OAAOtH,KAAKswC,aAAapgC,GAG1B,IAAIqgC,EAAgC,uBAATjpC,EACvBkpC,EAAQ,GAmBZ,OAjBAxwC,KAAKsiC,UAAU,SAAUv5B,GACxB,GAAIA,EAAMmnC,UAAW,CACpB,IAAIO,EAAO1nC,EAAMmnC,UAAUhgC,GAC3B,GAAIqgC,EACHC,EAAM3sC,KAAK4sC,EAAK7B,cACV,CACN,IAAIH,EAAUM,GAAU0B,GAEH,sBAAjBhC,EAAQnnC,KACXkpC,EAAM3sC,KAAKzC,MAAMovC,EAAO/B,EAAQC,UAEhC8B,EAAM3sC,KAAK4qC,OAMX8B,EACIR,GAAW/vC,KAAM,CACvB2uC,WAAY6B,EACZlpC,KAAM,uBAID,CACNA,KAAM,oBACNonC,SAAU8B,MAeb,IAAIE,GAAUP,GAkBVQ,GAAe9O,GAAM1hC,OAAO,CAI/BoD,QAAS,CAGRwZ,QAAS,EAITnS,IAAK,GAILq8B,aAAa,EAMb2J,aAAa,EAIbC,gBAAiB,GAIjB1N,OAAQ,EAIR5nB,UAAW,IAGZtV,WAAY,SAAU6qC,EAAKjkC,EAAQtJ,GAClCvD,KAAK+wC,KAAOD,EACZ9wC,KAAKsrC,QAAU9gC,EAAeqC,GAE9BvJ,EAAWtD,KAAMuD,IAGlB+wB,MAAO,WACDt0B,KAAKgxC,SACThxC,KAAKixC,aAEDjxC,KAAKuD,QAAQwZ,QAAU,GAC1B/c,KAAK4oC,kBAIH5oC,KAAKuD,QAAQ0jC,cAChBzqB,GAASxc,KAAKgxC,OAAQ,uBACtBhxC,KAAKgiC,qBAAqBhiC,KAAKgxC,SAGhChxC,KAAK2uB,UAAUlT,YAAYzb,KAAKgxC,QAChChxC,KAAKiqC,UAGNxV,SAAU,WACT/Y,GAAO1b,KAAKgxC,QACRhxC,KAAKuD,QAAQ0jC,aAChBjnC,KAAKkiC,wBAAwBliC,KAAKgxC,SAMpCl0B,WAAY,SAAUC,GAMrB,OALA/c,KAAKuD,QAAQwZ,QAAUA,EAEnB/c,KAAKgxC,QACRhxC,KAAK4oC,iBAEC5oC,MAGRqjC,SAAU,SAAU6N,GAInB,OAHIA,EAAUn0B,SACb/c,KAAK8c,WAAWo0B,EAAUn0B,SAEpB/c,MAKRsjC,aAAc,WAIb,OAHItjC,KAAKk0B,MACRnY,GAAQ/b,KAAKgxC,QAEPhxC,MAKRujC,YAAa,WAIZ,OAHIvjC,KAAKk0B,MACRjY,GAAOjc,KAAKgxC,QAENhxC,MAKRmxC,OAAQ,SAAUL,GAMjB,OALA9wC,KAAK+wC,KAAOD,EAER9wC,KAAKgxC,SACRhxC,KAAKgxC,OAAOxwC,IAAMswC,GAEZ9wC,MAKRoxC,UAAW,SAAUvkC,GAMpB,OALA7M,KAAKsrC,QAAU9gC,EAAeqC,GAE1B7M,KAAKk0B,MACRl0B,KAAKiqC,SAECjqC,MAGRoiC,UAAW,WACV,IAAI5gB,EAAS,CACZvS,KAAMjP,KAAKiqC,OACXtC,UAAW3nC,KAAKiqC,QAOjB,OAJIjqC,KAAK+kB,gBACRvD,EAAO6vB,SAAWrxC,KAAK0zB,cAGjBlS,GAKRqW,UAAW,SAAUvzB,GAGpB,OAFAtE,KAAKuD,QAAQ4/B,OAAS7+B,EACtBtE,KAAK+oC,gBACE/oC,MAKRumB,UAAW,WACV,OAAOvmB,KAAKsrC,SAMbpD,WAAY,WACX,OAAOloC,KAAKgxC,QAGbC,WAAY,WACX,IAAIK,EAA2C,QAAtBtxC,KAAK+wC,KAAK54B,QAC/B6rB,EAAMhkC,KAAKgxC,OAASM,EAAqBtxC,KAAK+wC,KAAOz1B,GAAS,OAElEkB,GAASwnB,EAAK,uBACVhkC,KAAK+kB,eAAiBvI,GAASwnB,EAAK,yBACpChkC,KAAKuD,QAAQgY,WAAaiB,GAASwnB,EAAKhkC,KAAKuD,QAAQgY,WAEzDyoB,EAAIuN,cAAgB9uC,EACpBuhC,EAAIwN,YAAc/uC,EAIlBuhC,EAAIyN,OAASzwC,EAAKhB,KAAKkI,KAAMlI,KAAM,QACnCgkC,EAAI0N,QAAU1wC,EAAKhB,KAAK2xC,gBAAiB3xC,KAAM,UAE3CA,KAAKuD,QAAQqtC,aAA4C,KAA7B5wC,KAAKuD,QAAQqtC,cAC5C5M,EAAI4M,aAA2C,IAA7B5wC,KAAKuD,QAAQqtC,YAAuB,GAAK5wC,KAAKuD,QAAQqtC,aAGrE5wC,KAAKuD,QAAQ4/B,QAChBnjC,KAAK+oC,gBAGFuI,EACHtxC,KAAK+wC,KAAO/M,EAAIxjC,KAIjBwjC,EAAIxjC,IAAMR,KAAK+wC,KACf/M,EAAIp5B,IAAM5K,KAAKuD,QAAQqH,MAGxB8oB,aAAc,SAAU5qB,GACvB,IAAIuG,EAAQrP,KAAKk0B,KAAKjO,aAAand,EAAEmG,MACjCuO,EAASxd,KAAKk0B,KAAKhC,8BAA8BlyB,KAAKsrC,QAASxiC,EAAEmG,KAAMnG,EAAEkI,QAAQzO,IAErFgb,GAAavd,KAAKgxC,OAAQxzB,EAAQnO,IAGnC46B,OAAQ,WACP,IAAI2H,EAAQ5xC,KAAKgxC,OACbnkC,EAAS,IAAI9C,EACT/J,KAAKk0B,KAAKlF,mBAAmBhvB,KAAKsrC,QAAQp9B,gBAC1ClO,KAAKk0B,KAAKlF,mBAAmBhvB,KAAKsrC,QAAQj9B,iBAC9Cga,EAAOxb,EAAOF,UAElB+Q,GAAYk0B,EAAO/kC,EAAOtK,KAE1BqvC,EAAMr+B,MAAMuL,MAASuJ,EAAKlmB,EAAI,KAC9ByvC,EAAMr+B,MAAMwL,OAASsJ,EAAK5e,EAAI,MAG/Bm/B,eAAgB,WACf9rB,GAAW9c,KAAKgxC,OAAQhxC,KAAKuD,QAAQwZ,UAGtCgsB,cAAe,WACV/oC,KAAKgxC,aAAkCjuC,IAAxB/C,KAAKuD,QAAQ4/B,QAAgD,OAAxBnjC,KAAKuD,QAAQ4/B,SACpEnjC,KAAKgxC,OAAOz9B,MAAM4vB,OAASnjC,KAAKuD,QAAQ4/B,SAI1CwO,gBAAiB,WAGhB3xC,KAAKkI,KAAK,SAEV,IAAI2pC,EAAW7xC,KAAKuD,QAAQstC,gBACxBgB,GAAY7xC,KAAK+wC,OAASc,IAC7B7xC,KAAK+wC,KAAOc,EACZ7xC,KAAKgxC,OAAOxwC,IAAMqxC,MA+BjBC,GAAenB,GAAaxwC,OAAO,CAItCoD,QAAS,CAGRwuC,UAAU,EAIVC,MAAM,EAKNC,iBAAiB,GAGlBhB,WAAY,WACX,IAAIK,EAA2C,UAAtBtxC,KAAK+wC,KAAK54B,QAC/B+5B,EAAMlyC,KAAKgxC,OAASM,EAAqBtxC,KAAK+wC,KAAOz1B,GAAS,SAalE,GAXAkB,GAAS01B,EAAK,uBACVlyC,KAAK+kB,eAAiBvI,GAAS01B,EAAK,yBACpClyC,KAAKuD,QAAQgY,WAAaiB,GAAS01B,EAAKlyC,KAAKuD,QAAQgY,WAEzD22B,EAAIX,cAAgB9uC,EACpByvC,EAAIV,YAAc/uC,EAIlByvC,EAAIC,aAAenxC,EAAKhB,KAAKkI,KAAMlI,KAAM,QAErCsxC,EAAJ,CAGC,IAFA,IAAIc,EAAiBF,EAAIG,qBAAqB,UAC1CC,EAAU,GACLhyC,EAAI,EAAGA,EAAI8xC,EAAe1xC,OAAQJ,IAC1CgyC,EAAQzuC,KAAKuuC,EAAe9xC,GAAGE,KAGhCR,KAAK+wC,KAAgC,EAAxBqB,EAAe1xC,OAAc4xC,EAAU,CAACJ,EAAI1xC,SAP1D,CAWKgE,EAAQxE,KAAK+wC,QAAS/wC,KAAK+wC,KAAO,CAAC/wC,KAAK+wC,QAExC/wC,KAAKuD,QAAQ0uC,iBAAmBC,EAAI3+B,MAAM/P,eAAe,eAAgB0uC,EAAI3+B,MAAiB,UAAI,QACvG2+B,EAAIH,WAAa/xC,KAAKuD,QAAQwuC,SAC9BG,EAAIF,OAAShyC,KAAKuD,QAAQyuC,KAC1B,IAAK,IAAI3xC,EAAI,EAAGA,EAAIL,KAAK+wC,KAAKrwC,OAAQL,IAAK,CAC1C,IAAIkyC,EAASj3B,GAAS,UACtBi3B,EAAO/xC,IAAMR,KAAK+wC,KAAK1wC,GACvB6xC,EAAIz2B,YAAY82B,QAuCnB,IAAIC,GAAa7B,GAAaxwC,OAAO,CACpC8wC,WAAY,WACX,IAAItsC,EAAK3E,KAAKgxC,OAAShxC,KAAK+wC,KAE5Bv0B,GAAS7X,EAAI,uBACT3E,KAAK+kB,eAAiBvI,GAAS7X,EAAI,yBACnC3E,KAAKuD,QAAQgY,WAAaiB,GAAS7X,EAAI3E,KAAKuD,QAAQgY,WAExD5W,EAAG4sC,cAAgB9uC,EACnBkC,EAAG6sC,YAAc/uC,KAyBnB,IAAIgwC,GAAa5Q,GAAM1hC,OAAO,CAI7BoD,QAAS,CAIRia,OAAQ,CAAC,EAAG,GAIZjC,UAAW,GAIX4R,KAAM,aAGPlnB,WAAY,SAAU1C,EAASgvC,GAC9BjvC,EAAWtD,KAAMuD,GAEjBvD,KAAK0yC,QAAUH,GAGhBje,MAAO,SAAUL,GAChBj0B,KAAK+kB,cAAgBkP,EAAIlP,cAEpB/kB,KAAK4sB,YACT5sB,KAAKukB,cAGF0P,EAAIzE,eACP1S,GAAW9c,KAAK4sB,WAAY,GAG7BnnB,aAAazF,KAAK2yC,gBAClB3yC,KAAK2uB,UAAUlT,YAAYzb,KAAK4sB,YAChC5sB,KAAKwnC,SAEDvT,EAAIzE,eACP1S,GAAW9c,KAAK4sB,WAAY,GAG7B5sB,KAAKsjC,gBAGN7O,SAAU,SAAUR,GACfA,EAAIzE,eACP1S,GAAW9c,KAAK4sB,WAAY,GAC5B5sB,KAAK2yC,eAAiB1wC,WAAWjB,EAAK0a,QAAQ3Y,EAAW/C,KAAK4sB,YAAa,MAE3ElR,GAAO1b,KAAK4sB,aAOd0E,UAAW,WACV,OAAOtxB,KAAK8mC,SAKbc,UAAW,SAAU54B,GAMpB,OALAhP,KAAK8mC,QAAUh8B,EAASkE,GACpBhP,KAAKk0B,OACRl0B,KAAKy+B,kBACLz+B,KAAKgmC,cAEChmC,MAKR4yC,WAAY,WACX,OAAO5yC,KAAK6yC,UAKbC,WAAY,SAAUC,GAGrB,OAFA/yC,KAAK6yC,SAAWE,EAChB/yC,KAAKwnC,SACExnC,MAKRkoC,WAAY,WACX,OAAOloC,KAAK4sB,YAKb4a,OAAQ,WACFxnC,KAAKk0B,OAEVl0B,KAAK4sB,WAAWrZ,MAAMy/B,WAAa,SAEnChzC,KAAKizC,iBACLjzC,KAAKkzC,gBACLlzC,KAAKy+B,kBAELz+B,KAAK4sB,WAAWrZ,MAAMy/B,WAAa,GAEnChzC,KAAKgmC,eAGN5D,UAAW,WACV,IAAI5gB,EAAS,CACZvS,KAAMjP,KAAKy+B,gBACXkJ,UAAW3nC,KAAKy+B,iBAMjB,OAHIz+B,KAAK+kB,gBACRvD,EAAO6vB,SAAWrxC,KAAK0zB,cAEjBlS,GAKR2xB,OAAQ,WACP,QAASnzC,KAAKk0B,MAAQl0B,KAAKk0B,KAAKuE,SAASz4B,OAK1CsjC,aAAc,WAIb,OAHItjC,KAAKk0B,MACRnY,GAAQ/b,KAAK4sB,YAEP5sB,MAKRujC,YAAa,WAIZ,OAHIvjC,KAAKk0B,MACRjY,GAAOjc,KAAK4sB,YAEN5sB,MAGRozC,aAAc,SAAUz3B,EAAQ5S,EAAOiG,GAMtC,GALMjG,aAAiB84B,KACtB7yB,EAASjG,EACTA,EAAQ4S,GAGL5S,aAAiBq6B,GACpB,IAAK,IAAI59B,KAAMmW,EAAOwI,QAAS,CAC9Bpb,EAAQ4S,EAAOwI,QAAQ3e,GACvB,MAIF,IAAKwJ,EACJ,GAAIjG,EAAMuD,UACT0C,EAASjG,EAAMuD,gBACT,CAAA,IAAIvD,EAAMuoB,UAGhB,MAAM,IAAI/sB,MAAM,sCAFhByK,EAASjG,EAAMuoB,YAYjB,OALAtxB,KAAK0yC,QAAU3pC,EAGf/I,KAAKwnC,SAEEx4B,GAGRikC,eAAgB,WACf,GAAKjzC,KAAK6yC,SAAV,CAEA,IAAIQ,EAAOrzC,KAAKszC,aACZP,EAAoC,mBAAlB/yC,KAAK6yC,SAA2B7yC,KAAK6yC,SAAS7yC,KAAK0yC,SAAW1yC,MAAQA,KAAK6yC,SAEjG,GAAuB,iBAAZE,EACVM,EAAKr8B,UAAY+7B,MACX,CACN,KAAOM,EAAKE,iBACXF,EAAKx3B,YAAYw3B,EAAKn8B,YAEvBm8B,EAAK53B,YAAYs3B,GAElB/yC,KAAKkI,KAAK,mBAGXu2B,gBAAiB,WAChB,GAAKz+B,KAAKk0B,KAAV,CAEA,IAAIzW,EAAMzd,KAAKk0B,KAAKlF,mBAAmBhvB,KAAK8mC,SACxCtpB,EAAS1T,EAAQ9J,KAAKuD,QAAQia,QAC9B4mB,EAASpkC,KAAKwzC,aAEdxzC,KAAK+kB,cACRrH,GAAY1d,KAAK4sB,WAAYnP,EAAIvS,IAAIk5B,IAErC5mB,EAASA,EAAOtS,IAAIuS,GAAKvS,IAAIk5B,GAG9B,IAAIyH,EAAS7rC,KAAKyzC,kBAAoBj2B,EAAO/T,EACzCmU,EAAO5d,KAAK0zC,gBAAkB5wC,KAAKE,MAAMhD,KAAK2zC,gBAAkB,GAAKn2B,EAAOrb,EAGhFnC,KAAK4sB,WAAWrZ,MAAMs4B,OAASA,EAAS,KACxC7rC,KAAK4sB,WAAWrZ,MAAMqK,KAAOA,EAAO,OAGrC41B,WAAY,WACX,MAAO,CAAC,EAAG,MAiCTI,GAAQnB,GAAWtyC,OAAO,CAI7BoD,QAAS,CAGR+2B,SAAU,IAIVuZ,SAAU,GAKVC,UAAW,KAKXnN,SAAS,EAKToN,sBAAuB,KAKvBC,0BAA2B,KAI3B7N,eAAgB,CAAC,EAAG,GAKpB8N,YAAY,EAIZC,aAAa,EAKbC,WAAW,EAKXC,kBAAkB,EAQlB74B,UAAW,IAMZ84B,OAAQ,SAAUpgB,GAEjB,OADAA,EAAIqgB,UAAUt0C,MACPA,MAGRs0B,MAAO,SAAUL,GAChBwe,GAAW1xC,UAAUuzB,MAAMjzB,KAAKrB,KAAMi0B,GAMtCA,EAAI/rB,KAAK,YAAa,CAACqsC,MAAOv0C,OAE1BA,KAAK0yC,UAKR1yC,KAAK0yC,QAAQxqC,KAAK,YAAa,CAACqsC,MAAOv0C,OAAO,GAGxCA,KAAK0yC,mBAAmBvJ,IAC7BnpC,KAAK0yC,QAAQtrC,GAAG,WAAY8Y,MAK/BuU,SAAU,SAAUR,GACnBwe,GAAW1xC,UAAU0zB,SAASpzB,KAAKrB,KAAMi0B,GAMzCA,EAAI/rB,KAAK,aAAc,CAACqsC,MAAOv0C,OAE3BA,KAAK0yC,UAKR1yC,KAAK0yC,QAAQxqC,KAAK,aAAc,CAACqsC,MAAOv0C,OAAO,GACzCA,KAAK0yC,mBAAmBvJ,IAC7BnpC,KAAK0yC,QAAQlrC,IAAI,WAAY0Y,MAKhCkiB,UAAW,WACV,IAAI5gB,EAASixB,GAAW1xC,UAAUqhC,UAAU/gC,KAAKrB,MAUjD,YARkC+C,IAA9B/C,KAAKuD,QAAQixC,aAA6Bx0C,KAAKuD,QAAQixC,aAAex0C,KAAKk0B,KAAK3wB,QAAQkxC,qBAC3FjzB,EAAOkzB,SAAW10C,KAAK20C,QAGpB30C,KAAKuD,QAAQ0wC,aAChBzyB,EAAOozB,QAAU50C,KAAKgmC,YAGhBxkB,GAGRmzB,OAAQ,WACH30C,KAAKk0B,MACRl0B,KAAKk0B,KAAKwS,WAAW1mC,OAIvBukB,YAAa,WACZ,IAAIqX,EAAS,gBACTpgB,EAAYxb,KAAK4sB,WAAatR,GAAS,MAC1CsgB,EAAS,KAAO57B,KAAKuD,QAAQgY,WAAa,IAC1C,0BAEGs5B,EAAU70C,KAAK80C,SAAWx5B,GAAS,MAAOsgB,EAAS,mBAAoBpgB,GAU3E,GATAxb,KAAKszC,aAAeh4B,GAAS,MAAOsgB,EAAS,WAAYiZ,GAEzDv0B,GAAwBu0B,GACxBx0B,GAAyBrgB,KAAKszC,cAC9BlsC,GAAGytC,EAAS,cAAe30B,IAE3BlgB,KAAK+0C,cAAgBz5B,GAAS,MAAOsgB,EAAS,iBAAkBpgB,GAChExb,KAAKg1C,KAAO15B,GAAS,MAAOsgB,EAAS,OAAQ57B,KAAK+0C,eAE9C/0C,KAAKuD,QAAQ2wC,YAAa,CAC7B,IAAIA,EAAcl0C,KAAKi1C,aAAe35B,GAAS,IAAKsgB,EAAS,gBAAiBpgB,GAC9E04B,EAAY5c,KAAO,SACnB4c,EAAYl9B,UAAY,SAExB5P,GAAG8sC,EAAa,QAASl0C,KAAKk1C,oBAAqBl1C,QAIrDkzC,cAAe,WACd,IAAI13B,EAAYxb,KAAKszC,aACjB//B,EAAQiI,EAAUjI,MAEtBA,EAAMuL,MAAQ,GACdvL,EAAM4hC,WAAa,SAEnB,IAAIr2B,EAAQtD,EAAUgD,YACtBM,EAAQhc,KAAKP,IAAIuc,EAAO9e,KAAKuD,QAAQ+2B,UACrCxb,EAAQhc,KAAKR,IAAIwc,EAAO9e,KAAKuD,QAAQswC,UAErCtgC,EAAMuL,MAASA,EAAQ,EAAK,KAC5BvL,EAAM4hC,WAAa,GAEnB5hC,EAAMwL,OAAS,GAEf,IAAIA,EAASvD,EAAUiD,aACnBq1B,EAAY9zC,KAAKuD,QAAQuwC,UACzBsB,EAAgB,yBAEhBtB,GAAsBA,EAAT/0B,GAChBxL,EAAMwL,OAAS+0B,EAAY,KAC3Bt3B,GAAShB,EAAW45B,IAEpBz4B,GAAYnB,EAAW45B,GAGxBp1C,KAAK2zC,gBAAkB3zC,KAAK4sB,WAAWpO,aAGxCkV,aAAc,SAAU5qB,GACvB,IAAI2U,EAAMzd,KAAKk0B,KAAKlC,uBAAuBhyB,KAAK8mC,QAASh+B,EAAEmG,KAAMnG,EAAEkI,QAC/DozB,EAASpkC,KAAKwzC,aAClB91B,GAAY1d,KAAK4sB,WAAYnP,EAAIvS,IAAIk5B,KAGtC4B,WAAY,WACX,GAAKhmC,KAAKuD,QAAQojC,QAAlB,CACI3mC,KAAKk0B,KAAK3M,UAAYvnB,KAAKk0B,KAAK3M,SAAS1H,OAE7C,IAAIoU,EAAMj0B,KAAKk0B,KACXmhB,EAAephC,SAASgH,GAASjb,KAAK4sB,WAAY,gBAAiB,KAAO,EAC1E0oB,EAAkBt1C,KAAK4sB,WAAWnO,aAAe42B,EACjDE,EAAiBv1C,KAAK2zC,gBACtB6B,EAAW,IAAIhsC,EAAMxJ,KAAK0zC,gBAAiB4B,EAAkBt1C,KAAKyzC,kBAEtE+B,EAASpqC,KAAK0S,GAAY9d,KAAK4sB,aAE/B,IAAI6oB,EAAexhB,EAAI/E,2BAA2BsmB,GAC9C9uB,EAAU5c,EAAQ9J,KAAKuD,QAAQ4iC,gBAC/B3f,EAAY1c,EAAQ9J,KAAKuD,QAAQwwC,uBAAyBrtB,GAC1DC,EAAY7c,EAAQ9J,KAAKuD,QAAQywC,2BAA6BttB,GAC9D2B,EAAO4L,EAAItnB,UACX+yB,EAAK,EACLC,EAAK,EAEL8V,EAAatzC,EAAIozC,EAAiB5uB,EAAUxkB,EAAIkmB,EAAKlmB,IACxDu9B,EAAK+V,EAAatzC,EAAIozC,EAAiBltB,EAAKlmB,EAAIwkB,EAAUxkB,GAEvDszC,EAAatzC,EAAIu9B,EAAKlZ,EAAUrkB,EAAI,IACvCu9B,EAAK+V,EAAatzC,EAAIqkB,EAAUrkB,GAE7BszC,EAAahsC,EAAI6rC,EAAkB3uB,EAAUld,EAAI4e,EAAK5e,IACzDk2B,EAAK8V,EAAahsC,EAAI6rC,EAAkBjtB,EAAK5e,EAAIkd,EAAUld,GAExDgsC,EAAahsC,EAAIk2B,EAAKnZ,EAAU/c,EAAI,IACvCk2B,EAAK8V,EAAahsC,EAAI+c,EAAU/c,IAO7Bi2B,GAAMC,IACT1L,EACK/rB,KAAK,gBACLmf,MAAM,CAACqY,EAAIC,MAIlBuV,oBAAqB,SAAUpsC,GAC9B9I,KAAK20C,SACL90B,GAAK/W,IAGN0qC,WAAY,WAEX,OAAO1pC,EAAQ9J,KAAK0yC,SAAW1yC,KAAK0yC,QAAQzJ,gBAAkBjpC,KAAK0yC,QAAQzJ,kBAAoB,CAAC,EAAG,OAkBrG9lB,GAAIlc,aAAa,CAChBwtC,mBAAmB,IAMpBtxB,GAAInc,QAAQ,CAMXstC,UAAW,SAAUC,EAAOvlC,EAAQzL,GASnC,OARMgxC,aAAiBX,KACtBW,EAAQ,IAAIX,GAAMrwC,GAASuvC,WAAWyB,IAGnCvlC,GACHulC,EAAM3M,UAAU54B,GAGbhP,KAAKy4B,SAAS8b,GACVv0C,MAGJA,KAAKgoC,QAAUhoC,KAAKgoC,OAAOzkC,QAAQ4wC,WACtCn0C,KAAK0mC,aAGN1mC,KAAKgoC,OAASuM,EACPv0C,KAAKi5B,SAASsb,KAKtB7N,WAAY,SAAU6N,GAQrB,OAPKA,GAASA,IAAUv0C,KAAKgoC,SAC5BuM,EAAQv0C,KAAKgoC,OACbhoC,KAAKgoC,OAAS,MAEXuM,GACHv0C,KAAKy2B,YAAY8d,GAEXv0C,QAoBT6hC,GAAM76B,QAAQ,CAMbihC,UAAW,SAAU8K,EAASxvC,GAuB7B,OArBIwvC,aAAmBa,IACtBtwC,EAAWyvC,EAASxvC,IACpBvD,KAAKgoC,OAAS+K,GACNL,QAAU1yC,OAEbA,KAAKgoC,SAAUzkC,IACnBvD,KAAKgoC,OAAS,IAAI4L,GAAMrwC,EAASvD,OAElCA,KAAKgoC,OAAO8K,WAAWC,IAGnB/yC,KAAK01C,sBACT11C,KAAKoH,GAAG,CACPuuC,MAAO31C,KAAK41C,WACZC,SAAU71C,KAAK81C,YACfp6B,OAAQ1b,KAAK0mC,WACbqP,KAAM/1C,KAAKg2C,aAEZh2C,KAAK01C,qBAAsB,GAGrB11C,MAKRi2C,YAAa,WAWZ,OAVIj2C,KAAKgoC,SACRhoC,KAAKwH,IAAI,CACRmuC,MAAO31C,KAAK41C,WACZC,SAAU71C,KAAK81C,YACfp6B,OAAQ1b,KAAK0mC,WACbqP,KAAM/1C,KAAKg2C,aAEZh2C,KAAK01C,qBAAsB,EAC3B11C,KAAKgoC,OAAS,MAERhoC,MAKRs0C,UAAW,SAAUvrC,EAAOiG,GAQ3B,OAPIhP,KAAKgoC,QAAUhoC,KAAKk0B,OACvBllB,EAAShP,KAAKgoC,OAAOoL,aAAapzC,KAAM+I,EAAOiG,GAG/ChP,KAAKk0B,KAAKogB,UAAUt0C,KAAKgoC,OAAQh5B,IAG3BhP,MAKR0mC,WAAY,WAIX,OAHI1mC,KAAKgoC,QACRhoC,KAAKgoC,OAAO2M,SAEN30C,MAKRk2C,YAAa,SAAU5tC,GAQtB,OAPItI,KAAKgoC,SACJhoC,KAAKgoC,OAAO9T,KACfl0B,KAAK0mC,aAEL1mC,KAAKs0C,UAAUhsC,IAGVtI,MAKRm2C,YAAa,WACZ,QAAQn2C,KAAKgoC,QAAShoC,KAAKgoC,OAAOmL,UAKnCiD,gBAAiB,SAAUrD,GAI1B,OAHI/yC,KAAKgoC,QACRhoC,KAAKgoC,OAAO8K,WAAWC,GAEjB/yC,MAKRq2C,SAAU,WACT,OAAOr2C,KAAKgoC,QAGb4N,WAAY,SAAU9sC,GACrB,IAAIC,EAAQD,EAAEC,OAASD,EAAER,OAEpBtI,KAAKgoC,QAILhoC,KAAKk0B,OAKVrU,GAAK/W,GAIDC,aAAiBogC,GACpBnpC,KAAKs0C,UAAUxrC,EAAEC,OAASD,EAAER,OAAQQ,EAAEkG,QAMnChP,KAAKk0B,KAAKuE,SAASz4B,KAAKgoC,SAAWhoC,KAAKgoC,OAAO0K,UAAY3pC,EAC9D/I,KAAK0mC,aAEL1mC,KAAKs0C,UAAUvrC,EAAOD,EAAEkG,UAI1BgnC,WAAY,SAAUltC,GACrB9I,KAAKgoC,OAAOJ,UAAU9+B,EAAEkG,SAGzB8mC,YAAa,SAAUhtC,GACU,KAA5BA,EAAE0W,cAAc82B,SACnBt2C,KAAK41C,WAAW9sC,MA2BnB,IAAIytC,GAAU9D,GAAWtyC,OAAO,CAI/BoD,QAAS,CAGR4pB,KAAM,cAIN3P,OAAQ,CAAC,EAAG,GAOZg5B,UAAW,OAIXC,WAAW,EAIXC,QAAQ,EAIRzP,aAAa,EAIblqB,QAAS,IAGVuX,MAAO,SAAUL,GAChBwe,GAAW1xC,UAAUuzB,MAAMjzB,KAAKrB,KAAMi0B,GACtCj0B,KAAK8c,WAAW9c,KAAKuD,QAAQwZ,SAM7BkX,EAAI/rB,KAAK,cAAe,CAACyuC,QAAS32C,OAE9BA,KAAK0yC,SAKR1yC,KAAK0yC,QAAQxqC,KAAK,cAAe,CAACyuC,QAAS32C,OAAO,IAIpDy0B,SAAU,SAAUR,GACnBwe,GAAW1xC,UAAU0zB,SAASpzB,KAAKrB,KAAMi0B,GAMzCA,EAAI/rB,KAAK,eAAgB,CAACyuC,QAAS32C,OAE/BA,KAAK0yC,SAKR1yC,KAAK0yC,QAAQxqC,KAAK,eAAgB,CAACyuC,QAAS32C,OAAO,IAIrDoiC,UAAW,WACV,IAAI5gB,EAASixB,GAAW1xC,UAAUqhC,UAAU/gC,KAAKrB,MAMjD,OAJI2V,KAAU3V,KAAKuD,QAAQkzC,YAC1Bj1B,EAAOkzB,SAAW10C,KAAK20C,QAGjBnzB,GAGRmzB,OAAQ,WACH30C,KAAKk0B,MACRl0B,KAAKk0B,KAAK0iB,aAAa52C,OAIzBukB,YAAa,WACZ,IACIhJ,EAAYqgB,oBAAgB57B,KAAKuD,QAAQgY,WAAa,IAAM,kBAAoBvb,KAAK+kB,cAAgB,WAAa,QAEtH/kB,KAAKszC,aAAetzC,KAAK4sB,WAAatR,GAAS,MAAOC,IAGvD23B,cAAe,aAEflN,WAAY,aAEZ6Q,aAAc,SAAUp5B,GACvB,IAAIwW,EAAMj0B,KAAKk0B,KACX1Y,EAAYxb,KAAK4sB,WACjByF,EAAc4B,EAAI7N,uBAAuB6N,EAAI3nB,aAC7CwqC,EAAe7iB,EAAI/E,2BAA2BzR,GAC9C+4B,EAAYx2C,KAAKuD,QAAQizC,UACzBO,EAAev7B,EAAUgD,YACzBw4B,EAAgBx7B,EAAUiD,aAC1BjB,EAAS1T,EAAQ9J,KAAKuD,QAAQia,QAC9B4mB,EAASpkC,KAAKwzC,aAGjB/1B,EADiB,QAAd+4B,EACG/4B,EAAIvS,IAAIpB,GAASitC,EAAe,EAAIv5B,EAAOrb,GAAI60C,EAAgBx5B,EAAO/T,EAAI26B,EAAO36B,GAAG,IAClE,WAAd+sC,EACJ/4B,EAAIpS,SAASvB,EAAQitC,EAAe,EAAIv5B,EAAOrb,GAAIqb,EAAO/T,GAAG,IAC3C,WAAd+sC,EACJ/4B,EAAIpS,SAASvB,EAAQitC,EAAe,EAAIv5B,EAAOrb,EAAG60C,EAAgB,EAAI5S,EAAO36B,EAAI+T,EAAO/T,GAAG,IACzE,UAAd+sC,GAAuC,SAAdA,GAAwBM,EAAa30C,EAAIkwB,EAAYlwB,GACxFq0C,EAAY,QACN/4B,EAAIvS,IAAIpB,EAAQ0T,EAAOrb,EAAIiiC,EAAOjiC,EAAGiiC,EAAO36B,EAAIutC,EAAgB,EAAIx5B,EAAO/T,GAAG,MAEpF+sC,EAAY,OACN/4B,EAAIpS,SAASvB,EAAQitC,EAAe3S,EAAOjiC,EAAIqb,EAAOrb,EAAG60C,EAAgB,EAAI5S,EAAO36B,EAAI+T,EAAO/T,GAAG,KAGzGkT,GAAYnB,EAAW,yBACvBmB,GAAYnB,EAAW,wBACvBmB,GAAYnB,EAAW,uBACvBmB,GAAYnB,EAAW,0BACvBgB,GAAShB,EAAW,mBAAqBg7B,GACzC94B,GAAYlC,EAAWiC,IAGxBghB,gBAAiB,WAChB,IAAIhhB,EAAMzd,KAAKk0B,KAAKlF,mBAAmBhvB,KAAK8mC,SAC5C9mC,KAAK62C,aAAap5B,IAGnBX,WAAY,SAAUC,GACrB/c,KAAKuD,QAAQwZ,QAAUA,EAEnB/c,KAAK4sB,YACR9P,GAAW9c,KAAK4sB,WAAY7P,IAI9B2W,aAAc,SAAU5qB,GACvB,IAAI2U,EAAMzd,KAAKk0B,KAAKlC,uBAAuBhyB,KAAK8mC,QAASh+B,EAAEmG,KAAMnG,EAAEkI,QACnEhR,KAAK62C,aAAap5B,IAGnB+1B,WAAY,WAEX,OAAO1pC,EAAQ9J,KAAK0yC,SAAW1yC,KAAK0yC,QAAQxJ,oBAAsBlpC,KAAKuD,QAAQmzC,OAAS12C,KAAK0yC,QAAQxJ,oBAAsB,CAAC,EAAG,OAcjI/lB,GAAInc,QAAQ,CAOXiwC,YAAa,SAAUN,EAAS3nC,EAAQzL,GASvC,OARMozC,aAAmBJ,KACxBI,EAAU,IAAIJ,GAAQhzC,GAASuvC,WAAW6D,IAGvC3nC,GACH2nC,EAAQ/O,UAAU54B,GAGfhP,KAAKy4B,SAASke,GACV32C,KAGDA,KAAKi5B,SAAS0d,IAKtBC,aAAc,SAAUD,GAIvB,OAHIA,GACH32C,KAAKy2B,YAAYkgB,GAEX32C,QAmBT6hC,GAAM76B,QAAQ,CAMbkwC,YAAa,SAAUnE,EAASxvC,GAoB/B,OAlBIwvC,aAAmBwD,IACtBjzC,EAAWyvC,EAASxvC,IACpBvD,KAAKm3C,SAAWpE,GACRL,QAAU1yC,OAEbA,KAAKm3C,WAAY5zC,IACrBvD,KAAKm3C,SAAW,IAAIZ,GAAQhzC,EAASvD,OAEtCA,KAAKm3C,SAASrE,WAAWC,IAI1B/yC,KAAKo3C,2BAEDp3C,KAAKm3C,SAAS5zC,QAAQkzC,WAAaz2C,KAAKk0B,MAAQl0B,KAAKk0B,KAAKuE,SAASz4B,OACtEA,KAAKi3C,cAGCj3C,MAKRq3C,cAAe,WAMd,OALIr3C,KAAKm3C,WACRn3C,KAAKo3C,0BAAyB,GAC9Bp3C,KAAK42C,eACL52C,KAAKm3C,SAAW,MAEVn3C,MAGRo3C,yBAA0B,SAAU/mB,GACnC,GAAKA,IAAarwB,KAAKs3C,sBAAvB,CACA,IAAI/mB,EAAQF,EAAY,MAAQ,KAC5B7O,EAAS,CACZ9F,OAAQ1b,KAAK42C,aACbb,KAAM/1C,KAAKu3C,cAEPv3C,KAAKm3C,SAAS5zC,QAAQkzC,UAU1Bj1B,EAAOtW,IAAMlL,KAAKw3C,cATlBh2B,EAAO8mB,UAAYtoC,KAAKw3C,aACxBh2B,EAAOgnB,SAAWxoC,KAAK42C,aACnB52C,KAAKm3C,SAAS5zC,QAAQmzC,SACzBl1B,EAAOi2B,UAAYz3C,KAAKu3C,cAErB5hC,KACH6L,EAAOm0B,MAAQ31C,KAAKw3C,eAKtBx3C,KAAKuwB,GAAO/O,GACZxhB,KAAKs3C,uBAAyBjnB,IAK/B4mB,YAAa,SAAUluC,EAAOiG,GAe7B,OAdIhP,KAAKm3C,UAAYn3C,KAAKk0B,OACzBllB,EAAShP,KAAKm3C,SAAS/D,aAAapzC,KAAM+I,EAAOiG,GAGjDhP,KAAKk0B,KAAK+iB,YAAYj3C,KAAKm3C,SAAUnoC,GAIjChP,KAAKm3C,SAAS5zC,QAAQ0jC,aAAejnC,KAAKm3C,SAASvqB,aACtDpQ,GAASxc,KAAKm3C,SAASvqB,WAAY,qBACnC5sB,KAAKgiC,qBAAqBhiC,KAAKm3C,SAASvqB,cAInC5sB,MAKR42C,aAAc,WAQb,OAPI52C,KAAKm3C,WACRn3C,KAAKm3C,SAASxC,SACV30C,KAAKm3C,SAAS5zC,QAAQ0jC,aAAejnC,KAAKm3C,SAASvqB,aACtDjQ,GAAY3c,KAAKm3C,SAASvqB,WAAY,qBACtC5sB,KAAKkiC,wBAAwBliC,KAAKm3C,SAASvqB,cAGtC5sB,MAKR03C,cAAe,SAAUpvC,GAQxB,OAPItI,KAAKm3C,WACJn3C,KAAKm3C,SAASjjB,KACjBl0B,KAAK42C,eAEL52C,KAAKi3C,YAAY3uC,IAGZtI,MAKR23C,cAAe,WACd,OAAO33C,KAAKm3C,SAAShE,UAKtByE,kBAAmB,SAAU7E,GAI5B,OAHI/yC,KAAKm3C,UACRn3C,KAAKm3C,SAASrE,WAAWC,GAEnB/yC,MAKR63C,WAAY,WACX,OAAO73C,KAAKm3C,UAGbK,aAAc,SAAU1uC,GACvB,IAAIC,EAAQD,EAAEC,OAASD,EAAER,OAEpBtI,KAAKm3C,UAAan3C,KAAKk0B,MAG5Bl0B,KAAKi3C,YAAYluC,EAAO/I,KAAKm3C,SAAS5zC,QAAQmzC,OAAS5tC,EAAEkG,YAASjM,IAGnEw0C,aAAc,SAAUzuC,GACvB,IAAuB0oB,EAAgBrC,EAAnCngB,EAASlG,EAAEkG,OACXhP,KAAKm3C,SAAS5zC,QAAQmzC,QAAU5tC,EAAE0W,gBACrCgS,EAAiBxxB,KAAKk0B,KAAK9E,2BAA2BtmB,EAAE0W,eACxD2P,EAAanvB,KAAKk0B,KAAKjF,2BAA2BuC,GAClDxiB,EAAShP,KAAKk0B,KAAK5G,mBAAmB6B,IAEvCnvB,KAAKm3C,SAASvP,UAAU54B,MAuB1B,IAAI8oC,GAAUtU,GAAKrjC,OAAO,CACzBoD,QAAS,CAGRshC,SAAU,CAAC,GAAI,IAQf1K,MAAM,EAIN4d,MAAO,KAEPx8B,UAAW,oBAGZooB,WAAY,SAAUC,GACrB,IAAI7sB,EAAO6sB,GAA+B,QAApBA,EAAQzrB,QAAqByrB,EAAU/wB,SAAS8D,cAAc,OAChFpT,EAAUvD,KAAKuD,QASnB,GAPIA,EAAQ42B,gBAAgB6d,SAC3Bl8B,GAAM/E,GACNA,EAAI0E,YAAYlY,EAAQ42B,OAExBpjB,EAAIC,WAA6B,IAAjBzT,EAAQ42B,KAAiB52B,EAAQ42B,KAAO,GAGrD52B,EAAQw0C,MAAO,CAClB,IAAIA,EAAQjuC,EAAQvG,EAAQw0C,OAC5BhhC,EAAIxD,MAAM0kC,oBAAuBF,EAAM51C,EAAK,OAAU41C,EAAMtuC,EAAK,KAIlE,OAFAzJ,KAAKkkC,eAAentB,EAAK,QAElBA,GAGR+sB,aAAc,WACb,OAAO,QAUTN,GAAK0U,QAAUzT,GAoEf,IAAI0T,GAAYtW,GAAM1hC,OAAO,CAI5BoD,QAAS,CAGR60C,SAAU,IAIVr7B,QAAS,EAOT2d,eAAgBvlB,GAIhBkjC,mBAAmB,EAInBC,eAAgB,IAIhBnV,OAAQ,EAIRt2B,OAAQ,KAIRwW,QAAS,EAITC,aAASvgB,EAMTw1C,mBAAex1C,EAMfy1C,mBAAez1C,EAQf01C,QAAQ,EAIRtrB,KAAM,WAIN5R,UAAW,GAIXm9B,WAAY,GAGbzyC,WAAY,SAAU1C,GACrBD,EAAWtD,KAAMuD,IAGlB+wB,MAAO,WACNt0B,KAAKskB,iBAELtkB,KAAK24C,QAAU,GACf34C,KAAK44C,OAAS,GAEd54C,KAAK4lB,aACL5lB,KAAKm2B,WAGNkM,UAAW,SAAUpO,GACpBA,EAAIuO,cAAcxiC,OAGnBy0B,SAAU,SAAUR,GACnBj0B,KAAK64C,kBACLn9B,GAAO1b,KAAK4sB,YACZqH,EAAIyO,iBAAiB1iC,MACrBA,KAAK4sB,WAAa,KAClB5sB,KAAK84C,eAAY/1C,GAKlBugC,aAAc,WAKb,OAJItjC,KAAKk0B,OACRnY,GAAQ/b,KAAK4sB,YACb5sB,KAAK+4C,eAAej2C,KAAKR,MAEnBtC,MAKRujC,YAAa,WAKZ,OAJIvjC,KAAKk0B,OACRjY,GAAOjc,KAAK4sB,YACZ5sB,KAAK+4C,eAAej2C,KAAKP,MAEnBvC,MAKR6uB,aAAc,WACb,OAAO7uB,KAAK4sB,YAKb9P,WAAY,SAAUC,GAGrB,OAFA/c,KAAKuD,QAAQwZ,QAAUA,EACvB/c,KAAK4oC,iBACE5oC,MAKR63B,UAAW,SAAUsL,GAIpB,OAHAnjC,KAAKuD,QAAQ4/B,OAASA,EACtBnjC,KAAK+oC,gBAEE/oC,MAKRg5C,UAAW,WACV,OAAOh5C,KAAKi5C,UAKb7O,OAAQ,WAKP,OAJIpqC,KAAKk0B,OACRl0B,KAAK64C,kBACL74C,KAAKm2B,WAECn2B,MAGRoiC,UAAW,WACV,IAAI5gB,EAAS,CACZ03B,aAAcl5C,KAAKm5C,eACnBxR,UAAW3nC,KAAK4lB,WAChB3W,KAAMjP,KAAK4lB,WACXgvB,QAAS50C,KAAKywB,YAgBf,OAbKzwB,KAAKuD,QAAQm3B,iBAEZ16B,KAAKi+B,UACTj+B,KAAKi+B,QAAUt8B,EAAS3B,KAAKywB,WAAYzwB,KAAKuD,QAAQ+0C,eAAgBt4C,OAGvEwhB,EAAOu0B,KAAO/1C,KAAKi+B,SAGhBj+B,KAAK+kB,gBACRvD,EAAO6vB,SAAWrxC,KAAK0zB,cAGjBlS,GASR43B,WAAY,WACX,OAAOvmC,SAAS8D,cAAc,QAM/B0iC,YAAa,WACZ,IAAIrpC,EAAIhQ,KAAKuD,QAAQ60C,SACrB,OAAOpoC,aAAaxG,EAAQwG,EAAI,IAAIxG,EAAMwG,EAAGA,IAG9C+4B,cAAe,WACV/oC,KAAK4sB,iBAAsC7pB,IAAxB/C,KAAKuD,QAAQ4/B,QAAgD,OAAxBnjC,KAAKuD,QAAQ4/B,SACxEnjC,KAAK4sB,WAAWrZ,MAAM4vB,OAASnjC,KAAKuD,QAAQ4/B,SAI9C4V,eAAgB,SAAUO,GAMzB,IAHA,IAGqCnW,EAHjC5f,EAASvjB,KAAK2uB,UAAU4qB,SACxBC,GAAcF,GAASxyB,EAAAA,EAAUA,EAAAA,GAE5BzmB,EAAI,EAAGE,EAAMgjB,EAAO7iB,OAAgBL,EAAIE,EAAKF,IAErD8iC,EAAS5f,EAAOljB,GAAGkT,MAAM4vB,OAErB5f,EAAOljB,KAAOL,KAAK4sB,YAAcuW,IACpCqW,EAAaF,EAAQE,GAAarW,IAIhCsW,SAASD,KACZx5C,KAAKuD,QAAQ4/B,OAASqW,EAAaF,GAAS,EAAG,GAC/Ct5C,KAAK+oC,kBAIPH,eAAgB,WACf,GAAK5oC,KAAKk0B,OAGNzgB,GAAJ,CAEAqJ,GAAW9c,KAAK4sB,WAAY5sB,KAAKuD,QAAQwZ,SAEzC,IAAIpD,GAAO,IAAIzU,KACXw0C,GAAY,EACZC,GAAY,EAEhB,IAAK,IAAIt1C,KAAOrE,KAAK44C,OAAQ,CAC5B,IAAIgB,EAAO55C,KAAK44C,OAAOv0C,GACvB,GAAKu1C,EAAKC,SAAYD,EAAKE,OAA3B,CAEA,IAAIC,EAAOj3C,KAAKP,IAAI,GAAIoX,EAAMigC,EAAKE,QAAU,KAE7Ch9B,GAAW88B,EAAKj1C,GAAIo1C,GAChBA,EAAO,EACVL,GAAY,GAERE,EAAKI,OACRL,GAAY,EAEZ35C,KAAKi6C,cAAcL,GAEpBA,EAAKI,QAAS,IAIZL,IAAc35C,KAAKk6C,UAAYl6C,KAAKm6C,cAEpCT,IACH9zC,EAAgB5F,KAAKo6C,YACrBp6C,KAAKo6C,WAAa10C,EAAiB1F,KAAK4oC,eAAgB5oC,SAI1Di6C,cAAex3C,EAEf6hB,eAAgB,WACXtkB,KAAK4sB,aAET5sB,KAAK4sB,WAAatR,GAAS,MAAO,kBAAoBtb,KAAKuD,QAAQgY,WAAa,KAChFvb,KAAK+oC,gBAED/oC,KAAKuD,QAAQwZ,QAAU,GAC1B/c,KAAK4oC,iBAGN5oC,KAAK2uB,UAAUlT,YAAYzb,KAAK4sB,cAGjCytB,cAAe,WAEd,IAAIprC,EAAOjP,KAAK84C,UACZx1B,EAAUtjB,KAAKuD,QAAQ+f,QAE3B,QAAavgB,IAATkM,EAAJ,CAEA,IAAK,IAAIqkB,KAAKtzB,KAAK24C,QACd34C,KAAK24C,QAAQrlB,GAAG3uB,GAAG40C,SAAS74C,QAAU4yB,IAAMrkB,GAC/CjP,KAAK24C,QAAQrlB,GAAG3uB,GAAG4O,MAAM4vB,OAAS7f,EAAUxgB,KAAKuJ,IAAI4C,EAAOqkB,GAC5DtzB,KAAKs6C,eAAehnB,KAEpB5X,GAAO1b,KAAK24C,QAAQrlB,GAAG3uB,IACvB3E,KAAKu6C,mBAAmBjnB,GACxBtzB,KAAKw6C,eAAelnB,UACbtzB,KAAK24C,QAAQrlB,IAItB,IAAImnB,EAAQz6C,KAAK24C,QAAQ1pC,GACrBglB,EAAMj0B,KAAKk0B,KAqBf,OAnBKumB,KACJA,EAAQz6C,KAAK24C,QAAQ1pC,GAAQ,IAEvBtK,GAAK2W,GAAS,MAAO,+CAAgDtb,KAAK4sB,YAChF6tB,EAAM91C,GAAG4O,MAAM4vB,OAAS7f,EAExBm3B,EAAMpU,OAASpS,EAAI7kB,QAAQ6kB,EAAItkB,UAAUskB,EAAIzF,kBAAmBvf,GAAMjM,QACtEy3C,EAAMxrC,KAAOA,EAEbjP,KAAK06C,kBAAkBD,EAAOxmB,EAAI3nB,YAAa2nB,EAAI3M,WAG3CmzB,EAAM91C,GAAG6Z,YAEjBxe,KAAK26C,eAAeF,IAGrBz6C,KAAK46C,OAASH,IAKfH,eAAgB73C,EAEhB+3C,eAAgB/3C,EAEhBk4C,eAAgBl4C,EAEhB03C,YAAa,WACZ,GAAKn6C,KAAKk0B,KAAV,CAIA,IAAI7vB,EAAKu1C,EAEL3qC,EAAOjP,KAAKk0B,KAAK5M,UACrB,GAAIrY,EAAOjP,KAAKuD,QAAQ+f,SACvBrU,EAAOjP,KAAKuD,QAAQ8f,QACpBrjB,KAAK64C,sBAFN,CAMA,IAAKx0C,KAAOrE,KAAK44C,QAChBgB,EAAO55C,KAAK44C,OAAOv0C,IACdw2C,OAASjB,EAAKC,QAGpB,IAAKx1C,KAAOrE,KAAK44C,OAEhB,IADAgB,EAAO55C,KAAK44C,OAAOv0C,IACVw1C,UAAYD,EAAKI,OAAQ,CACjC,IAAI7tB,EAASytB,EAAKztB,OACbnsB,KAAK86C,cAAc3uB,EAAOhqB,EAAGgqB,EAAO1iB,EAAG0iB,EAAOmH,EAAGnH,EAAOmH,EAAI,IAChEtzB,KAAK+6C,gBAAgB5uB,EAAOhqB,EAAGgqB,EAAO1iB,EAAG0iB,EAAOmH,EAAGnH,EAAOmH,EAAI,GAKjE,IAAKjvB,KAAOrE,KAAK44C,OACX54C,KAAK44C,OAAOv0C,GAAKw2C,QACrB76C,KAAKg7C,YAAY32C,MAKpBk2C,mBAAoB,SAAUtrC,GAC7B,IAAK,IAAI5K,KAAOrE,KAAK44C,OAChB54C,KAAK44C,OAAOv0C,GAAK8nB,OAAOmH,IAAMrkB,GAGlCjP,KAAKg7C,YAAY32C,IAInBw0C,gBAAiB,WAChB,IAAK,IAAIx0C,KAAOrE,KAAK44C,OACpB54C,KAAKg7C,YAAY32C,IAInB80C,eAAgB,WACf,IAAK,IAAI7lB,KAAKtzB,KAAK24C,QAClBj9B,GAAO1b,KAAK24C,QAAQrlB,GAAG3uB,IACvB3E,KAAKw6C,eAAelnB,UACbtzB,KAAK24C,QAAQrlB,GAErBtzB,KAAK64C,kBAEL74C,KAAK84C,eAAY/1C,GAGlB+3C,cAAe,SAAU34C,EAAGsH,EAAG6pB,EAAGjQ,GACjC,IAAI43B,EAAKn4C,KAAK8G,MAAMzH,EAAI,GACpB+4C,EAAKp4C,KAAK8G,MAAMH,EAAI,GACpB0xC,EAAK7nB,EAAI,EACT8nB,EAAU,IAAI5xC,GAAOyxC,GAAKC,GAC9BE,EAAQ9nB,GAAK6nB,EAEb,IAAI92C,EAAMrE,KAAKq7C,iBAAiBD,GAC5BxB,EAAO55C,KAAK44C,OAAOv0C,GAEvB,OAAIu1C,GAAQA,EAAKI,OAChBJ,EAAKiB,QAAS,GAGJjB,GAAQA,EAAKE,SACvBF,EAAKiB,QAAS,GAGNx3B,EAAL83B,GACIn7C,KAAK86C,cAAcG,EAAIC,EAAIC,EAAI93B,KAMxC03B,gBAAiB,SAAU54C,EAAGsH,EAAG6pB,EAAGhQ,GAEnC,IAAK,IAAIjjB,EAAI,EAAI8B,EAAG9B,EAAI,EAAI8B,EAAI,EAAG9B,IAClC,IAAK,IAAIC,EAAI,EAAImJ,EAAGnJ,EAAI,EAAImJ,EAAI,EAAGnJ,IAAK,CAEvC,IAAI6rB,EAAS,IAAI3iB,EAAMnJ,EAAGC,GAC1B6rB,EAAOmH,EAAIA,EAAI,EAEf,IAAIjvB,EAAMrE,KAAKq7C,iBAAiBlvB,GAC5BytB,EAAO55C,KAAK44C,OAAOv0C,GAEnBu1C,GAAQA,EAAKI,OAChBJ,EAAKiB,QAAS,GAGJjB,GAAQA,EAAKE,SACvBF,EAAKiB,QAAS,GAGXvnB,EAAI,EAAIhQ,GACXtjB,KAAK+6C,gBAAgB16C,EAAGC,EAAGgzB,EAAI,EAAGhQ,MAMtCsC,WAAY,SAAU9c,GACrB,IAAIwyC,EAAYxyC,IAAMA,EAAEqnB,OAASrnB,EAAEkf,OACnChoB,KAAKu7C,SAASv7C,KAAKk0B,KAAK5nB,YAAatM,KAAKk0B,KAAK5M,UAAWg0B,EAAWA,IAGtE5nB,aAAc,SAAU5qB,GACvB9I,KAAKu7C,SAASzyC,EAAEkI,OAAQlI,EAAEmG,MAAM,EAAMnG,EAAE8qB,WAGzC4nB,WAAY,SAAUvsC,GACrB,IAAI1L,EAAUvD,KAAKuD,QAEnB,YAAIR,IAAcQ,EAAQi1C,eAAiBvpC,EAAO1L,EAAQi1C,cAClDj1C,EAAQi1C,mBAGZz1C,IAAcQ,EAAQg1C,eAAiBh1C,EAAQg1C,cAAgBtpC,EAC3D1L,EAAQg1C,cAGTtpC,GAGRssC,SAAU,SAAUvqC,EAAQ/B,EAAMwsC,EAAS7nB,GAC1C,IAAI8nB,EAAW17C,KAAKw7C,WAAW14C,KAAKE,MAAMiM,UACZlM,IAAzB/C,KAAKuD,QAAQ+f,SAAyBo4B,EAAW17C,KAAKuD,QAAQ+f,cACrCvgB,IAAzB/C,KAAKuD,QAAQ8f,SAAyBq4B,EAAW17C,KAAKuD,QAAQ8f,WAClEq4B,OAAW34C,GAGZ,IAAI44C,EAAkB37C,KAAKuD,QAAQ80C,mBAAsBqD,IAAa17C,KAAK84C,UAEtEllB,IAAY+nB,IAEhB37C,KAAK84C,UAAY4C,EAEb17C,KAAK47C,eACR57C,KAAK47C,gBAGN57C,KAAKq6C,gBACLr6C,KAAK67C,kBAEY94C,IAAb24C,GACH17C,KAAKm2B,QAAQnlB,GAGTyqC,GACJz7C,KAAKm6C,cAKNn6C,KAAKk6C,WAAauB,GAGnBz7C,KAAK87C,mBAAmB9qC,EAAQ/B,IAGjC6sC,mBAAoB,SAAU9qC,EAAQ/B,GACrC,IAAK,IAAI5O,KAAKL,KAAK24C,QAClB34C,KAAK06C,kBAAkB16C,KAAK24C,QAAQt4C,GAAI2Q,EAAQ/B,IAIlDyrC,kBAAmB,SAAUD,EAAOzpC,EAAQ/B,GAC3C,IAAII,EAAQrP,KAAKk0B,KAAKjO,aAAahX,EAAMwrC,EAAMxrC,MAC3C8sC,EAAYtB,EAAMpU,OAAO56B,WAAW4D,GAC/BhE,SAASrL,KAAKk0B,KAAKhE,mBAAmBlf,EAAQ/B,IAAOjM,QAE1DiS,GACHsI,GAAak9B,EAAM91C,GAAIo3C,EAAW1sC,GAElCqO,GAAY+8B,EAAM91C,GAAIo3C,IAIxBF,WAAY,WACX,IAAI5nB,EAAMj0B,KAAKk0B,KACX9Q,EAAM6Q,EAAI1wB,QAAQ6f,IAClBg1B,EAAWp4C,KAAKg8C,UAAYh8C,KAAKq5C,cACjCqC,EAAW17C,KAAK84C,UAEhBjsC,EAAS7M,KAAKk0B,KAAKxF,oBAAoB1uB,KAAK84C,WAC5CjsC,IACH7M,KAAKi8C,iBAAmBj8C,KAAKk8C,qBAAqBrvC,IAGnD7M,KAAKm8C,OAAS/4B,EAAIvS,UAAY7Q,KAAKuD,QAAQk1C,QAAU,CACpD31C,KAAK8G,MAAMqqB,EAAI7kB,QAAQ,CAAC,EAAGgU,EAAIvS,QAAQ,IAAK6qC,GAAUv5C,EAAIi2C,EAASj2C,GACnEW,KAAK+G,KAAKoqB,EAAI7kB,QAAQ,CAAC,EAAGgU,EAAIvS,QAAQ,IAAK6qC,GAAUv5C,EAAIi2C,EAAS3uC,IAEnEzJ,KAAKo8C,OAASh5B,EAAItS,UAAY9Q,KAAKuD,QAAQk1C,QAAU,CACpD31C,KAAK8G,MAAMqqB,EAAI7kB,QAAQ,CAACgU,EAAItS,QAAQ,GAAI,GAAI4qC,GAAUjyC,EAAI2uC,EAASj2C,GACnEW,KAAK+G,KAAKoqB,EAAI7kB,QAAQ,CAACgU,EAAItS,QAAQ,GAAI,GAAI4qC,GAAUjyC,EAAI2uC,EAAS3uC,KAIpEgnB,WAAY,WACNzwB,KAAKk0B,OAAQl0B,KAAKk0B,KAAKhB,gBAE5BlzB,KAAKm2B,WAGNkmB,qBAAsB,SAAUrrC,GAC/B,IAAIijB,EAAMj0B,KAAKk0B,KACXooB,EAAUroB,EAAIf,eAAiBpwB,KAAKR,IAAI2xB,EAAIH,eAAgBG,EAAI3M,WAAa2M,EAAI3M,UACjFjY,EAAQ4kB,EAAIhO,aAAaq2B,EAASt8C,KAAK84C,WACvCxuB,EAAc2J,EAAI7kB,QAAQ4B,EAAQhR,KAAK84C,WAAWlvC,QAClD2yC,EAAWtoB,EAAItnB,UAAUpB,SAAiB,EAAR8D,GAEtC,OAAO,IAAItF,EAAOugB,EAAYjf,SAASkxC,GAAWjyB,EAAYpf,IAAIqxC,KAInEpmB,QAAS,SAAUnlB,GAClB,IAAIijB,EAAMj0B,KAAKk0B,KACf,GAAKD,EAAL,CACA,IAAIhlB,EAAOjP,KAAKw7C,WAAWvnB,EAAI3M,WAG/B,QADevkB,IAAXiO,IAAwBA,EAASijB,EAAI3nB,kBAClBvJ,IAAnB/C,KAAK84C,UAAT,CAEA,IAAItuB,EAAcxqB,KAAKq8C,qBAAqBrrC,GACxCwrC,EAAYx8C,KAAKk8C,qBAAqB1xB,GACtCiyB,EAAaD,EAAUlwC,YACvBowC,EAAQ,GACRC,EAAS38C,KAAKuD,QAAQm1C,WACtBkE,EAAe,IAAI7yC,EAAOyyC,EAAUjwC,gBAAgBlB,SAAS,CAACsxC,GAASA,IAC7CH,EAAUhwC,cAActB,IAAI,CAACyxC,GAASA,KAGpE,KAAMlD,SAAS+C,EAAUj6C,IAAIJ,IACvBs3C,SAAS+C,EAAUj6C,IAAIkH,IACvBgwC,SAAS+C,EAAUl6C,IAAIH,IACvBs3C,SAAS+C,EAAUl6C,IAAImH,IAAO,MAAM,IAAIlF,MAAM,iDAEpD,IAAK,IAAIF,KAAOrE,KAAK44C,OAAQ,CAC5B,IAAI7tC,EAAI/K,KAAK44C,OAAOv0C,GAAK8nB,OACrBphB,EAAEuoB,IAAMtzB,KAAK84C,WAAc8D,EAAaxwC,SAAS,IAAI5C,EAAMuB,EAAE5I,EAAG4I,EAAEtB,MACrEzJ,KAAK44C,OAAOv0C,GAAKw1C,SAAU,GAM7B,GAAsC,EAAlC/2C,KAAKuJ,IAAI4C,EAAOjP,KAAK84C,WAAkB94C,KAAKu7C,SAASvqC,EAAQ/B,OAAjE,CAGA,IAAK,IAAI3O,EAAIk8C,EAAUj6C,IAAIkH,EAAGnJ,GAAKk8C,EAAUl6C,IAAImH,EAAGnJ,IACnD,IAAK,IAAID,EAAIm8C,EAAUj6C,IAAIJ,EAAG9B,GAAKm8C,EAAUl6C,IAAIH,EAAG9B,IAAK,CACxD,IAAI8rB,EAAS,IAAI3iB,EAAMnJ,EAAGC,GAG1B,GAFA6rB,EAAOmH,EAAItzB,KAAK84C,UAEX94C,KAAK68C,aAAa1wB,GAAvB,CAEA,IAAIytB,EAAO55C,KAAK44C,OAAO54C,KAAKq7C,iBAAiBlvB,IACzCytB,EACHA,EAAKC,SAAU,EAEf6C,EAAM74C,KAAKsoB,IAUd,GAJAuwB,EAAM9kB,KAAK,SAAU5tB,EAAGC,GACvB,OAAOD,EAAEiC,WAAWwwC,GAAcxyC,EAAEgC,WAAWwwC,KAG3B,IAAjBC,EAAMh8C,OAAc,CAElBV,KAAKi5C,WACTj5C,KAAKi5C,UAAW,EAGhBj5C,KAAKkI,KAAK,YAIX,IAAI40C,EAAWjqC,SAASkqC,yBAExB,IAAK18C,EAAI,EAAGA,EAAIq8C,EAAMh8C,OAAQL,IAC7BL,KAAKg9C,SAASN,EAAMr8C,GAAIy8C,GAGzB98C,KAAK46C,OAAOj2C,GAAG8W,YAAYqhC,QAI7BD,aAAc,SAAU1wB,GACvB,IAAI/I,EAAMpjB,KAAKk0B,KAAK3wB,QAAQ6f,IAE5B,IAAKA,EAAIrT,SAAU,CAElB,IAAIlD,EAAS7M,KAAKi8C,iBAClB,IAAM74B,EAAIvS,UAAYsb,EAAOhqB,EAAI0K,EAAOtK,IAAIJ,GAAKgqB,EAAOhqB,EAAI0K,EAAOvK,IAAIH,KACjEihB,EAAItS,UAAYqb,EAAO1iB,EAAIoD,EAAOtK,IAAIkH,GAAK0iB,EAAO1iB,EAAIoD,EAAOvK,IAAImH,GAAO,OAAO,EAGtF,IAAKzJ,KAAKuD,QAAQsJ,OAAU,OAAO,EAGnC,IAAIowC,EAAaj9C,KAAKk9C,oBAAoB/wB,GAC1C,OAAO3hB,EAAexK,KAAKuD,QAAQsJ,QAAQK,SAAS+vC,IAGrDE,aAAc,SAAU94C,GACvB,OAAOrE,KAAKk9C,oBAAoBl9C,KAAKo9C,iBAAiB/4C,KAGvDg5C,kBAAmB,SAAUlxB,GAC5B,IAAI8H,EAAMj0B,KAAKk0B,KACXkkB,EAAWp4C,KAAKq5C,cAChBiE,EAAUnxB,EAAOxgB,QAAQysC,GACzBmF,EAAUD,EAAQpyC,IAAIktC,GAG1B,MAAO,CAFEnkB,EAAItkB,UAAU2tC,EAASnxB,EAAOmH,GAC9BW,EAAItkB,UAAU4tC,EAASpxB,EAAOmH,KAKxC4pB,oBAAqB,SAAU/wB,GAC9B,IAAIqxB,EAAKx9C,KAAKq9C,kBAAkBlxB,GAC5Btf,EAAS,IAAIzC,EAAaozC,EAAG,GAAIA,EAAG,IAKxC,OAHKx9C,KAAKuD,QAAQk1C,SACjB5rC,EAAS7M,KAAKk0B,KAAKnjB,iBAAiBlE,IAE9BA,GAGRwuC,iBAAkB,SAAUlvB,GAC3B,OAAOA,EAAOhqB,EAAI,IAAMgqB,EAAO1iB,EAAI,IAAM0iB,EAAOmH,GAIjD8pB,iBAAkB,SAAU/4C,GAC3B,IAAIw8B,EAAIx8B,EAAIhB,MAAM,KACd8oB,EAAS,IAAI3iB,GAAOq3B,EAAE,IAAKA,EAAE,IAEjC,OADA1U,EAAOmH,GAAKuN,EAAE,GACP1U,GAGR6uB,YAAa,SAAU32C,GACtB,IAAIu1C,EAAO55C,KAAK44C,OAAOv0C,GAClBu1C,IAELl+B,GAAOk+B,EAAKj1C,WAEL3E,KAAK44C,OAAOv0C,GAInBrE,KAAKkI,KAAK,aAAc,CACvB0xC,KAAMA,EAAKj1C,GACXwnB,OAAQnsB,KAAKo9C,iBAAiB/4C,OAIhCo5C,UAAW,SAAU7D,GACpBp9B,GAASo9B,EAAM,gBAEf,IAAIxB,EAAWp4C,KAAKq5C,cACpBO,EAAKrmC,MAAMuL,MAAQs5B,EAASj2C,EAAI,KAChCy3C,EAAKrmC,MAAMwL,OAASq5B,EAAS3uC,EAAI,KAEjCmwC,EAAKrI,cAAgB9uC,EACrBm3C,EAAKpI,YAAc/uC,EAGfgR,IAASzT,KAAKuD,QAAQwZ,QAAU,GACnCD,GAAW88B,EAAM55C,KAAKuD,QAAQwZ,SAK3BjJ,KAAYC,KACf6lC,EAAKrmC,MAAMmqC,yBAA2B,WAIxCV,SAAU,SAAU7wB,EAAQ3Q,GAC3B,IAAImiC,EAAU39C,KAAK49C,YAAYzxB,GAC3B9nB,EAAMrE,KAAKq7C,iBAAiBlvB,GAE5BytB,EAAO55C,KAAKo5C,WAAWp5C,KAAK69C,YAAY1xB,GAASnrB,EAAKhB,KAAK89C,WAAY99C,KAAMmsB,IAEjFnsB,KAAKy9C,UAAU7D,GAIX55C,KAAKo5C,WAAW14C,OAAS,GAE5BgF,EAAiB1E,EAAKhB,KAAK89C,WAAY99C,KAAMmsB,EAAQ,KAAMytB,IAG5Dl8B,GAAYk8B,EAAM+D,GAGlB39C,KAAK44C,OAAOv0C,GAAO,CAClBM,GAAIi1C,EACJztB,OAAQA,EACR0tB,SAAS,GAGVr+B,EAAUC,YAAYm+B,GAGtB55C,KAAKkI,KAAK,gBAAiB,CAC1B0xC,KAAMA,EACNztB,OAAQA,KAIV2xB,WAAY,SAAU3xB,EAAQxK,EAAKi4B,GAC9Bj4B,GAGH3hB,KAAKkI,KAAK,YAAa,CACtBgkB,MAAOvK,EACPi4B,KAAMA,EACNztB,OAAQA,IAIV,IAAI9nB,EAAMrE,KAAKq7C,iBAAiBlvB,IAEhCytB,EAAO55C,KAAK44C,OAAOv0C,MAGnBu1C,EAAKE,QAAU,IAAI50C,KACflF,KAAKk0B,KAAK1E,eACb1S,GAAW88B,EAAKj1C,GAAI,GACpBiB,EAAgB5F,KAAKo6C,YACrBp6C,KAAKo6C,WAAa10C,EAAiB1F,KAAK4oC,eAAgB5oC,QAExD45C,EAAKI,QAAS,EACdh6C,KAAKm6C,eAGDx4B,IACJnF,GAASo9B,EAAKj1C,GAAI,uBAIlB3E,KAAKkI,KAAK,WAAY,CACrB0xC,KAAMA,EAAKj1C,GACXwnB,OAAQA,KAINnsB,KAAK+9C,mBACR/9C,KAAKi5C,UAAW,EAGhBj5C,KAAKkI,KAAK,QAENuL,KAAUzT,KAAKk0B,KAAK1E,cACvB9pB,EAAiB1F,KAAKm6C,YAAan6C,MAInCiC,WAAWjB,EAAKhB,KAAKm6C,YAAan6C,MAAO,QAK5C49C,YAAa,SAAUzxB,GACtB,OAAOA,EAAOxgB,QAAQ3L,KAAKq5C,eAAehuC,SAASrL,KAAK46C,OAAOvU,SAGhEwX,YAAa,SAAU1xB,GACtB,IAAI6xB,EAAY,IAAIx0C,EACnBxJ,KAAKm8C,OAASj6C,EAAQiqB,EAAOhqB,EAAGnC,KAAKm8C,QAAUhwB,EAAOhqB,EACtDnC,KAAKo8C,OAASl6C,EAAQiqB,EAAO1iB,EAAGzJ,KAAKo8C,QAAUjwB,EAAO1iB,GAEvD,OADAu0C,EAAU1qB,EAAInH,EAAOmH,EACd0qB,GAGR9B,qBAAsB,SAAUrvC,GAC/B,IAAIurC,EAAWp4C,KAAKq5C,cACpB,OAAO,IAAItvC,EACV8C,EAAOtK,IAAIqJ,UAAUwsC,GAAUxuC,QAC/BiD,EAAOvK,IAAIsJ,UAAUwsC,GAAUvuC,OAAOwB,SAAS,CAAC,EAAG,MAGrD0yC,eAAgB,WACf,IAAK,IAAI15C,KAAOrE,KAAK44C,OACpB,IAAK54C,KAAK44C,OAAOv0C,GAAKy1C,OAAU,OAAO,EAExC,OAAO,KAyCT,IAAImE,GAAY9F,GAAUh4C,OAAO,CAIhCoD,QAAS,CAGR8f,QAAS,EAITC,QAAS,GAIT46B,WAAY,MAIZC,aAAc,GAIdC,WAAY,EAIZC,KAAK,EAILC,aAAa,EAIbC,cAAc,EAMd3N,aAAa,GAGd3qC,WAAY,SAAU6qC,EAAKvtC,GAE1BvD,KAAK+wC,KAAOD,GAEZvtC,EAAUD,EAAWtD,KAAMuD,IAGfg7C,cAAgBvoC,IAA4B,EAAlBzS,EAAQ+f,UAE7C/f,EAAQ60C,SAAWt1C,KAAK8G,MAAMrG,EAAQ60C,SAAW,GAE5C70C,EAAQ+6C,aAIZ/6C,EAAQ66C,aACR76C,EAAQ8f,YAJR9f,EAAQ66C,aACR76C,EAAQ+f,WAMT/f,EAAQ8f,QAAUvgB,KAAKR,IAAI,EAAGiB,EAAQ8f,UAGL,iBAAvB9f,EAAQ26C,aAClB36C,EAAQ26C,WAAa36C,EAAQ26C,WAAW76C,MAAM,KAI1CyQ,IACJ9T,KAAKoH,GAAG,aAAcpH,KAAKw+C,gBAQ7BrN,OAAQ,SAAUL,EAAK2N,GAUtB,OATIz+C,KAAK+wC,OAASD,QAAoB/tC,IAAb07C,IACxBA,GAAW,GAGZz+C,KAAK+wC,KAAOD,EAEP2N,GACJz+C,KAAKoqC,SAECpqC,MAORo5C,WAAY,SAAUjtB,EAAQuyB,GAC7B,IAAI9E,EAAO/mC,SAAS8D,cAAc,OAuBlC,OArBAvP,GAAGwyC,EAAM,OAAQ54C,EAAKhB,KAAK2+C,YAAa3+C,KAAM0+C,EAAM9E,IACpDxyC,GAAGwyC,EAAM,QAAS54C,EAAKhB,KAAK4+C,aAAc5+C,KAAM0+C,EAAM9E,KAElD55C,KAAKuD,QAAQqtC,aAA4C,KAA7B5wC,KAAKuD,QAAQqtC,cAC5CgJ,EAAKhJ,aAA2C,IAA7B5wC,KAAKuD,QAAQqtC,YAAuB,GAAK5wC,KAAKuD,QAAQqtC,aAO1EgJ,EAAKhvC,IAAM,GAMXgvC,EAAK5iB,aAAa,OAAQ,gBAE1B4iB,EAAKp5C,IAAMR,KAAK6+C,WAAW1yB,GAEpBytB,GASRiF,WAAY,SAAU1yB,GACrB,IAAI/nB,EAAO,CACVwkB,EAAG5S,GAAS,MAAQ,GACpBhG,EAAGhQ,KAAK8+C,cAAc3yB,GACtBhqB,EAAGgqB,EAAOhqB,EACVsH,EAAG0iB,EAAO1iB,EACV6pB,EAAGtzB,KAAK++C,kBAET,GAAI/+C,KAAKk0B,OAASl0B,KAAKk0B,KAAK3wB,QAAQ6f,IAAIrT,SAAU,CACjD,IAAIivC,EAAYh/C,KAAKi8C,iBAAiB35C,IAAImH,EAAI0iB,EAAO1iB,EACjDzJ,KAAKuD,QAAQ86C,MAChBj6C,EAAQ,EAAI46C,GAEb56C,EAAK,MAAQ46C,EAGd,OAAO76C,EAASnE,KAAK+wC,KAAM5wC,EAAOiE,EAAMpE,KAAKuD,WAG9Co7C,YAAa,SAAUD,EAAM9E,GAExBnmC,GACHxR,WAAWjB,EAAK09C,EAAM1+C,KAAM,KAAM45C,GAAO,GAEzC8E,EAAK,KAAM9E,IAIbgF,aAAc,SAAUF,EAAM9E,EAAM9wC,GACnC,IAAI+oC,EAAW7xC,KAAKuD,QAAQ46C,aACxBtM,GAAY+H,EAAKqF,aAAa,SAAWpN,IAC5C+H,EAAKp5C,IAAMqxC,GAEZ6M,EAAK51C,EAAG8wC,IAGT4E,cAAe,SAAU11C,GACxBA,EAAE8wC,KAAKnI,OAAS,MAGjBsN,eAAgB,WACf,IAAI9vC,EAAOjP,KAAK84C,UAChBx1B,EAAUtjB,KAAKuD,QAAQ+f,QAQvB,OAPctjB,KAAKuD,QAAQ+6C,cAI1BrvC,EAAOqU,EAAUrU,GAGXA,EANMjP,KAAKuD,QAAQ66C,YAS3BU,cAAe,SAAUI,GACxB,IAAIlgB,EAAQl8B,KAAKuJ,IAAI6yC,EAAU/8C,EAAI+8C,EAAUz1C,GAAKzJ,KAAKuD,QAAQ26C,WAAWx9C,OAC1E,OAAOV,KAAKuD,QAAQ26C,WAAWlf,IAIhC4c,cAAe,WACd,IAAIv7C,EAAGu5C,EACP,IAAKv5C,KAAKL,KAAK44C,OACV54C,KAAK44C,OAAOv4C,GAAG8rB,OAAOmH,IAAMtzB,KAAK84C,aACpCc,EAAO55C,KAAK44C,OAAOv4C,GAAGsE,IAEjB8sC,OAAShvC,EACdm3C,EAAKlI,QAAUjvC,EAEVm3C,EAAKuF,WACTvF,EAAKp5C,IAAMoE,EACX8W,GAAOk+B,UACA55C,KAAK44C,OAAOv4C,MAMvB26C,YAAa,SAAU32C,GACtB,IAAIu1C,EAAO55C,KAAK44C,OAAOv0C,GACvB,GAAKu1C,EASL,OAJKxlC,IACJwlC,EAAKj1C,GAAGqyB,aAAa,MAAOpyB,GAGtBuzC,GAAUp3C,UAAUi6C,YAAY35C,KAAKrB,KAAMqE,IAGnDy5C,WAAY,SAAU3xB,EAAQxK,EAAKi4B,GAClC,GAAK55C,KAAKk0B,QAAS0lB,GAAQA,EAAKqF,aAAa,SAAWr6C,GAIxD,OAAOuzC,GAAUp3C,UAAU+8C,WAAWz8C,KAAKrB,KAAMmsB,EAAQxK,EAAKi4B,MAQhE,SAASwF,GAAUtO,EAAKvtC,GACvB,OAAO,IAAI06C,GAAUnN,EAAKvtC,GAqB3B,IAAI87C,GAAepB,GAAU99C,OAAO,CAOnCm/C,iBAAkB,CACjBC,QAAS,MACTC,QAAS,SAITj8B,OAAQ,GAIRk8B,OAAQ,GAIRC,OAAQ,aAIRC,aAAa,EAIbC,QAAS,SAGVr8C,QAAS,CAIR6f,IAAK,KAILzf,WAAW,GAGZsC,WAAY,SAAU6qC,EAAKvtC,GAE1BvD,KAAK+wC,KAAOD,EAEZ,IAAI+O,EAAY1/C,EAAO,GAAIH,KAAKs/C,kBAGhC,IAAK,IAAIj/C,KAAKkD,EACPlD,KAAKL,KAAKuD,UACfs8C,EAAUx/C,GAAKkD,EAAQlD,IAMzB,IAAIy/C,GAFJv8C,EAAUD,EAAWtD,KAAMuD,IAEFg7C,cAAgBvoC,GAAS,EAAI,EAClDoiC,EAAWp4C,KAAKq5C,cACpBwG,EAAU/gC,MAAQs5B,EAASj2C,EAAI29C,EAC/BD,EAAU9gC,OAASq5B,EAAS3uC,EAAIq2C,EAEhC9/C,KAAK6/C,UAAYA,GAGlBvrB,MAAO,SAAUL,GAEhBj0B,KAAK+/C,KAAO//C,KAAKuD,QAAQ6f,KAAO6Q,EAAI1wB,QAAQ6f,IAC5CpjB,KAAKggD,YAAcC,WAAWjgD,KAAK6/C,UAAUD,SAE7C,IAAIM,EAAoC,KAApBlgD,KAAKggD,YAAqB,MAAQ,MACtDhgD,KAAK6/C,UAAUK,GAAiBlgD,KAAK+/C,KAAKrtC,KAE1CurC,GAAUl9C,UAAUuzB,MAAMjzB,KAAKrB,KAAMi0B,IAGtC4qB,WAAY,SAAU1yB,GAErB,IAAI8wB,EAAaj9C,KAAKq9C,kBAAkBlxB,GACpC/I,EAAMpjB,KAAK+/C,KACXlzC,EAAS1C,EAASiZ,EAAIhU,QAAQ6tC,EAAW,IAAK75B,EAAIhU,QAAQ6tC,EAAW,KACrE16C,EAAMsK,EAAOtK,IACbD,EAAMuK,EAAOvK,IACb69C,GAA4B,KAApBngD,KAAKggD,aAAsBhgD,KAAK+/C,OAASpe,GACjD,CAACp/B,EAAIkH,EAAGlH,EAAIJ,EAAGG,EAAImH,EAAGnH,EAAIH,GAC1B,CAACI,EAAIJ,EAAGI,EAAIkH,EAAGnH,EAAIH,EAAGG,EAAImH,IAAIxF,KAAK,KACnC6sC,EAAMmN,GAAUl9C,UAAU89C,WAAWx9C,KAAKrB,KAAMmsB,GACpD,OAAO2kB,EACNrtC,EAAezD,KAAK6/C,UAAW/O,EAAK9wC,KAAKuD,QAAQI,YAChD3D,KAAKuD,QAAQI,UAAY,SAAW,UAAYw8C,GAKnDC,UAAW,SAAUx8C,EAAQ66C,GAQ5B,OANAt+C,EAAOH,KAAK6/C,UAAWj8C,GAElB66C,GACJz+C,KAAKoqC,SAGCpqC,QAWTi+C,GAAUoC,IAAMhB,GAChBD,GAAUkB,IALV,SAAsBxP,EAAKvtC,GAC1B,OAAO,IAAI87C,GAAavO,EAAKvtC,IA0B9B,IAAIg9C,GAAW1e,GAAM1hC,OAAO,CAI3BoD,QAAS,CAIRmjB,QAAS,GAITiY,UAAY,GAGb14B,WAAY,SAAU1C,GACrBD,EAAWtD,KAAMuD,GACjB9B,EAAMzB,MACNA,KAAKmkB,QAAUnkB,KAAKmkB,SAAW,IAGhCmQ,MAAO,WACDt0B,KAAK4sB,aACT5sB,KAAKskB,iBAEDtkB,KAAK+kB,eACRvI,GAASxc,KAAK4sB,WAAY,0BAI5B5sB,KAAK2uB,UAAUlT,YAAYzb,KAAK4sB,YAChC5sB,KAAKm2B,UACLn2B,KAAKoH,GAAG,SAAUpH,KAAKwgD,aAAcxgD,OAGtCy0B,SAAU,WACTz0B,KAAKwH,IAAI,SAAUxH,KAAKwgD,aAAcxgD,MACtCA,KAAKygD,qBAGNre,UAAW,WACV,IAAI5gB,EAAS,CACZmmB,UAAW3nC,KAAKiqC,OAChBh7B,KAAMjP,KAAK0gD,QACX9L,QAAS50C,KAAKm2B,QACdwqB,QAAS3gD,KAAK4gD,YAKf,OAHI5gD,KAAK+kB,gBACRvD,EAAO6vB,SAAWrxC,KAAK6gD,aAEjBr/B,GAGRq/B,YAAa,SAAUC,GACtB9gD,KAAK+gD,iBAAiBD,EAAG9vC,OAAQ8vC,EAAG7xC,OAGrCyxC,QAAS,WACR1gD,KAAK+gD,iBAAiB/gD,KAAKk0B,KAAK5nB,YAAatM,KAAKk0B,KAAK5M,YAGxDy5B,iBAAkB,SAAU/vC,EAAQ/B,GACnC,IAAII,EAAQrP,KAAKk0B,KAAKjO,aAAahX,EAAMjP,KAAK2kB,OAC1C8K,EAAW3R,GAAY9d,KAAK4sB,YAC5B1G,EAAWlmB,KAAKk0B,KAAKvnB,UAAUlB,WAAW,GAAMzL,KAAKuD,QAAQmjB,SAC7Ds6B,EAAqBhhD,KAAKk0B,KAAK9kB,QAAQpP,KAAKihD,QAAShyC,GAErDkX,EADkBnmB,KAAKk0B,KAAK9kB,QAAQ4B,EAAQ/B,GACb5D,SAAS21C,GAExCE,EAAgBh7B,EAASza,YAAY4D,GAAOnE,IAAIukB,GAAUvkB,IAAIgb,GAAU7a,SAAS8a,GAEjFlR,GACHsI,GAAavd,KAAK4sB,WAAYs0B,EAAe7xC,GAE7CqO,GAAY1d,KAAK4sB,WAAYs0B,IAI/BjX,OAAQ,WAIP,IAAK,IAAIzkC,KAHTxF,KAAKm2B,UACLn2B,KAAK+gD,iBAAiB/gD,KAAKihD,QAASjhD,KAAK2kB,OAE1B3kB,KAAKmkB,QACnBnkB,KAAKmkB,QAAQ3e,GAAIykC,UAInB2W,WAAY,WACX,IAAK,IAAIp7C,KAAMxF,KAAKmkB,QACnBnkB,KAAKmkB,QAAQ3e,GAAIklC,YAInB8V,aAAc,WACb,IAAK,IAAIh7C,KAAMxF,KAAKmkB,QACnBnkB,KAAKmkB,QAAQ3e,GAAI2wB,WAInBA,QAAS,WAGR,IAAIhjB,EAAInT,KAAKuD,QAAQmjB,QACjB2B,EAAOroB,KAAKk0B,KAAKvnB,UACjBpK,EAAMvC,KAAKk0B,KAAKjF,2BAA2B5G,EAAK5c,YAAY0H,IAAInQ,QAEpEhD,KAAKsrC,QAAU,IAAIvhC,EAAOxH,EAAKA,EAAI2I,IAAImd,EAAK5c,WAAW,EAAQ,EAAJ0H,IAAQnQ,SAEnEhD,KAAKihD,QAAUjhD,KAAKk0B,KAAK5nB,YACzBtM,KAAK2kB,MAAQ3kB,KAAKk0B,KAAK5M,aAoCrB65B,GAASZ,GAASpgD,OAAO,CAC5BiiC,UAAW,WACV,IAAI5gB,EAAS++B,GAASx/C,UAAUqhC,UAAU/gC,KAAKrB,MAE/C,OADAwhB,EAAO03B,aAAel5C,KAAKohD,gBACpB5/B,GAGR4/B,gBAAiB,WAEhBphD,KAAKqhD,sBAAuB,GAG7B/sB,MAAO,WACNisB,GAASx/C,UAAUuzB,MAAMjzB,KAAKrB,MAI9BA,KAAKshD,SAGNh9B,eAAgB,WACf,IAAI9I,EAAYxb,KAAK4sB,WAAa/Z,SAAS8D,cAAc,UAEzDvP,GAAGoU,EAAW,YAAaxb,KAAKuhD,aAAcvhD,MAC9CoH,GAAGoU,EAAW,+CAAgDxb,KAAKwhD,SAAUxhD,MAC7EoH,GAAGoU,EAAW,WAAYxb,KAAKyhD,gBAAiBzhD,MAEhDA,KAAK0hD,KAAOlmC,EAAU5E,WAAW,OAGlC6pC,kBAAmB,WAClB76C,EAAgB5F,KAAK2hD,uBACd3hD,KAAK0hD,KACZhmC,GAAO1b,KAAK4sB,YACZplB,GAAIxH,KAAK4sB,mBACF5sB,KAAK4sB,YAGb4zB,aAAc,WACb,IAAIxgD,KAAKqhD,qBAAT,CAIA,IAAK,IAAI77C,KADTxF,KAAK4hD,cAAgB,KACN5hD,KAAKmkB,QACXnkB,KAAKmkB,QAAQ3e,GACf2wB,UAEPn2B,KAAK6hD,YAGN1rB,QAAS,WACR,IAAIn2B,KAAKk0B,KAAKhB,iBAAkBlzB,KAAKsrC,QAArC,CAEAiV,GAASx/C,UAAUo1B,QAAQ90B,KAAKrB,MAEhC,IAAIiK,EAAIjK,KAAKsrC,QACT9vB,EAAYxb,KAAK4sB,WACjBvE,EAAOpe,EAAE0C,UACTm1C,EAAI9rC,GAAS,EAAI,EAErB0H,GAAYlC,EAAWvR,EAAE1H,KAGzBiZ,EAAUsD,MAAQgjC,EAAIz5B,EAAKlmB,EAC3BqZ,EAAUuD,OAAS+iC,EAAIz5B,EAAK5e,EAC5B+R,EAAUjI,MAAMuL,MAAQuJ,EAAKlmB,EAAI,KACjCqZ,EAAUjI,MAAMwL,OAASsJ,EAAK5e,EAAI,KAE9BuM,IACHhW,KAAK0hD,KAAKryC,MAAM,EAAG,GAIpBrP,KAAK0hD,KAAK3F,WAAW9xC,EAAE1H,IAAIJ,GAAI8H,EAAE1H,IAAIkH,GAGrCzJ,KAAKkI,KAAK,YAGX+hC,OAAQ,WACPsW,GAASx/C,UAAUkpC,OAAO5oC,KAAKrB,MAE3BA,KAAKqhD,uBACRrhD,KAAKqhD,sBAAuB,EAC5BrhD,KAAKwgD,iBAIPxW,UAAW,SAAUjhC,GACpB/I,KAAK+hD,iBAAiBh5C,GAGtB,IAAIi5C,GAFJhiD,KAAKmkB,QAAQ1iB,EAAMsH,IAAUA,GAEXk5C,OAAS,CAC1Bl5C,MAAOA,EACPw2B,KAAMv/B,KAAKkiD,UACXC,KAAM,MAEHniD,KAAKkiD,YAAaliD,KAAKkiD,UAAUC,KAAOH,GAC5ChiD,KAAKkiD,UAAYF,EACjBhiD,KAAKoiD,WAAapiD,KAAKoiD,YAAcpiD,KAAKkiD,WAG3ChY,SAAU,SAAUnhC,GACnB/I,KAAKqiD,eAAet5C,IAGrBohC,YAAa,SAAUphC,GACtB,IAAIi5C,EAAQj5C,EAAMk5C,OACdE,EAAOH,EAAMG,KACb5iB,EAAOyiB,EAAMziB,KAEb4iB,EACHA,EAAK5iB,KAAOA,EAEZv/B,KAAKkiD,UAAY3iB,EAEdA,EACHA,EAAK4iB,KAAOA,EAEZniD,KAAKoiD,WAAaD,SAGZp5C,EAAMk5C,cAENjiD,KAAKmkB,QAAQ1iB,EAAMsH,IAE1B/I,KAAKqiD,eAAet5C,IAGrBshC,YAAa,SAAUthC,GAGtB/I,KAAKsiD,oBAAoBv5C,GACzBA,EAAM2hC,WACN3hC,EAAMotB,UAGNn2B,KAAKqiD,eAAet5C,IAGrBuhC,aAAc,SAAUvhC,GACvB/I,KAAK+hD,iBAAiBh5C,GACtB/I,KAAKqiD,eAAet5C,IAGrBg5C,iBAAkB,SAAUh5C,GAC3B,GAAuC,iBAA5BA,EAAMxF,QAAQkmC,UAAwB,CAChD,IAEI8Y,EACAliD,EAHAwtC,EAAQ9kC,EAAMxF,QAAQkmC,UAAUpmC,MAAM,SACtComC,EAAY,GAGhB,IAAKppC,EAAI,EAAGA,EAAIwtC,EAAMntC,OAAQL,IAAK,CAGlC,GAFAkiD,EAAYC,OAAO3U,EAAMxtC,IAErBwK,MAAM03C,GAAc,OACxB9Y,EAAU5lC,KAAK0+C,GAEhBx5C,EAAMxF,QAAQk/C,WAAahZ,OAE3B1gC,EAAMxF,QAAQk/C,WAAa15C,EAAMxF,QAAQkmC,WAI3C4Y,eAAgB,SAAUt5C,GACpB/I,KAAKk0B,OAEVl0B,KAAKsiD,oBAAoBv5C,GACzB/I,KAAK2hD,eAAiB3hD,KAAK2hD,gBAAkBj8C,EAAiB1F,KAAK6hD,QAAS7hD,QAG7EsiD,oBAAqB,SAAUv5C,GAC9B,GAAIA,EAAMoiC,UAAW,CACpB,IAAIzkB,GAAW3d,EAAMxF,QAAQ+lC,QAAU,GAAK,EAC5CtpC,KAAK4hD,cAAgB5hD,KAAK4hD,eAAiB,IAAI73C,EAC/C/J,KAAK4hD,cAAczhD,OAAO4I,EAAMoiC,UAAU5oC,IAAI8I,SAAS,CAACqb,EAASA,KACjE1mB,KAAK4hD,cAAczhD,OAAO4I,EAAMoiC,UAAU7oC,IAAI4I,IAAI,CAACwb,EAASA,OAI9Dm7B,QAAS,WACR7hD,KAAK2hD,eAAiB,KAElB3hD,KAAK4hD,gBACR5hD,KAAK4hD,cAAcr/C,IAAIuJ,SACvB9L,KAAK4hD,cAAct/C,IAAIyJ,SAGxB/L,KAAK0iD,SACL1iD,KAAKshD,QAELthD,KAAK4hD,cAAgB,MAGtBc,OAAQ,WACP,IAAI71C,EAAS7M,KAAK4hD,cAClB,GAAI/0C,EAAQ,CACX,IAAIwb,EAAOxb,EAAOF,UAClB3M,KAAK0hD,KAAKiB,UAAU91C,EAAOtK,IAAIJ,EAAG0K,EAAOtK,IAAIkH,EAAG4e,EAAKlmB,EAAGkmB,EAAK5e,QAE7DzJ,KAAK0hD,KAAKiB,UAAU,EAAG,EAAG3iD,KAAK4sB,WAAW9N,MAAO9e,KAAK4sB,WAAW7N,SAInEuiC,MAAO,WACN,IAAIv4C,EAAO8D,EAAS7M,KAAK4hD,cAEzB,GADA5hD,KAAK0hD,KAAKkB,OACN/1C,EAAQ,CACX,IAAIwb,EAAOxb,EAAOF,UAClB3M,KAAK0hD,KAAKmB,YACV7iD,KAAK0hD,KAAK9iC,KAAK/R,EAAOtK,IAAIJ,EAAG0K,EAAOtK,IAAIkH,EAAG4e,EAAKlmB,EAAGkmB,EAAK5e,GACxDzJ,KAAK0hD,KAAKoB,OAGX9iD,KAAK+iD,UAAW,EAEhB,IAAK,IAAIf,EAAQhiD,KAAKoiD,WAAYJ,EAAOA,EAAQA,EAAMG,KACtDp5C,EAAQi5C,EAAMj5C,QACT8D,GAAW9D,EAAMoiC,WAAapiC,EAAMoiC,UAAUv+B,WAAWC,KAC7D9D,EAAMshC,cAIRrqC,KAAK+iD,UAAW,EAEhB/iD,KAAK0hD,KAAKsB,WAGXjV,YAAa,SAAUhlC,EAAOkK,GAC7B,GAAKjT,KAAK+iD,SAAV,CAEA,IAAI1iD,EAAGC,EAAG4S,EAAMC,EACZ06B,EAAQ9kC,EAAM8jC,OACdtsC,EAAMstC,EAAMntC,OACZmH,EAAM7H,KAAK0hD,KAEf,GAAKnhD,EAAL,CAIA,IAFAsH,EAAIg7C,YAECxiD,EAAI,EAAGA,EAAIE,EAAKF,IAAK,CACzB,IAAKC,EAAI,EAAG4S,EAAO26B,EAAMxtC,GAAGK,OAAQJ,EAAI4S,EAAM5S,IAC7C6S,EAAI06B,EAAMxtC,GAAGC,GACbuH,EAAIvH,EAAI,SAAW,UAAU6S,EAAEhR,EAAGgR,EAAE1J,GAEjCwJ,GACHpL,EAAIo7C,YAINjjD,KAAKkjD,YAAYr7C,EAAKkB,MAKvBqiC,cAAe,SAAUriC,GAExB,GAAK/I,KAAK+iD,WAAYh6C,EAAMsiC,SAA5B,CAEA,IAAIl4B,EAAIpK,EAAMiiC,OACVnjC,EAAM7H,KAAK0hD,KACX94B,EAAI9lB,KAAKR,IAAIQ,KAAKE,MAAM+F,EAAMwoB,SAAU,GACxCvhB,GAAKlN,KAAKR,IAAIQ,KAAKE,MAAM+F,EAAMmiC,UAAW,IAAMtiB,GAAKA,EAE/C,GAAN5Y,IACHnI,EAAI+6C,OACJ/6C,EAAIwH,MAAM,EAAGW,IAGdnI,EAAIg7C,YACJh7C,EAAIs7C,IAAIhwC,EAAEhR,EAAGgR,EAAE1J,EAAIuG,EAAG4Y,EAAG,EAAa,EAAV9lB,KAAK8N,IAAQ,GAE/B,GAANZ,GACHnI,EAAIm7C,UAGLhjD,KAAKkjD,YAAYr7C,EAAKkB,KAGvBm6C,YAAa,SAAUr7C,EAAKkB,GAC3B,IAAIxF,EAAUwF,EAAMxF,QAEhBA,EAAQomC,OACX9hC,EAAIu7C,YAAc7/C,EAAQsmC,YAC1BhiC,EAAIw7C,UAAY9/C,EAAQqmC,WAAarmC,EAAQ8lC,MAC7CxhC,EAAI8hC,KAAKpmC,EAAQumC,UAAY,YAG1BvmC,EAAQ6lC,QAA6B,IAAnB7lC,EAAQ+lC,SACzBzhC,EAAIy7C,aACPz7C,EAAIy7C,YAAYv6C,EAAMxF,SAAWwF,EAAMxF,QAAQk/C,YAAc,IAE9D56C,EAAIu7C,YAAc7/C,EAAQwZ,QAC1BlV,EAAI07C,UAAYhgD,EAAQ+lC,OACxBzhC,EAAI27C,YAAcjgD,EAAQ8lC,MAC1BxhC,EAAI0hC,QAAUhmC,EAAQgmC,QACtB1hC,EAAI2hC,SAAWjmC,EAAQimC,SACvB3hC,EAAIuhC,WAONoY,SAAU,SAAU14C,GAGnB,IAFA,IAAiDC,EAAO06C,EAApDt4C,EAAQnL,KAAKk0B,KAAK7E,uBAAuBvmB,GAEpCk5C,EAAQhiD,KAAKoiD,WAAYJ,EAAOA,EAAQA,EAAMG,MACtDp5C,EAAQi5C,EAAMj5C,OACJxF,QAAQ0jC,aAAel+B,EAAMwiC,eAAepgC,KAAWnL,KAAKk0B,KAAKjD,gBAAgBloB,KAC1F06C,EAAe16C,GAGb06C,IACHljC,GAASzX,GACT9I,KAAK0jD,WAAW,CAACD,GAAe36C,KAIlCy4C,aAAc,SAAUz4C,GACvB,GAAK9I,KAAKk0B,OAAQl0B,KAAKk0B,KAAKlD,SAAS2yB,WAAY3jD,KAAKk0B,KAAKhB,eAA3D,CAEA,IAAI/nB,EAAQnL,KAAKk0B,KAAK7E,uBAAuBvmB,GAC7C9I,KAAK4jD,kBAAkB96C,EAAGqC,KAI3Bs2C,gBAAiB,SAAU34C,GAC1B,IAAIC,EAAQ/I,KAAK6jD,cACb96C,IAEH4T,GAAY3c,KAAK4sB,WAAY,uBAC7B5sB,KAAK0jD,WAAW,CAAC36C,GAAQD,EAAG,YAC5B9I,KAAK6jD,cAAgB,KACrB7jD,KAAK8jD,sBAAuB,IAI9BF,kBAAmB,SAAU96C,EAAGqC,GAC/B,IAAInL,KAAK8jD,qBAAT,CAMA,IAFA,IAAI/6C,EAAOg7C,EAEF/B,EAAQhiD,KAAKoiD,WAAYJ,EAAOA,EAAQA,EAAMG,MACtDp5C,EAAQi5C,EAAMj5C,OACJxF,QAAQ0jC,aAAel+B,EAAMwiC,eAAepgC,KACrD44C,EAAwBh7C,GAItBg7C,IAA0B/jD,KAAK6jD,gBAClC7jD,KAAKyhD,gBAAgB34C,GAEjBi7C,IACHvnC,GAASxc,KAAK4sB,WAAY,uBAC1B5sB,KAAK0jD,WAAW,CAACK,GAAwBj7C,EAAG,aAC5C9I,KAAK6jD,cAAgBE,IAInB/jD,KAAK6jD,eACR7jD,KAAK0jD,WAAW,CAAC1jD,KAAK6jD,eAAgB/6C,GAGvC9I,KAAK8jD,sBAAuB,EAC5B7hD,WAAWlC,EAAEiB,KAAK,WACjBhB,KAAK8jD,sBAAuB,GAC1B9jD,MAAO,MAGX0jD,WAAY,SAAUngC,EAAQza,EAAGxB,GAChCtH,KAAKk0B,KAAKhD,cAAcpoB,EAAGxB,GAAQwB,EAAExB,KAAMic,IAG5CglB,cAAe,SAAUx/B,GACxB,IAAIi5C,EAAQj5C,EAAMk5C,OAElB,GAAKD,EAAL,CAEA,IAAIG,EAAOH,EAAMG,KACb5iB,EAAOyiB,EAAMziB,KAEb4iB,KACHA,EAAK5iB,KAAOA,GAMZA,EAAK4iB,KAAOA,EACFA,IAGVniD,KAAKoiD,WAAaD,GAGnBH,EAAMziB,KAAOv/B,KAAKkiD,WAClBliD,KAAKkiD,UAAUC,KAAOH,GAEhBG,KAAO,KACbniD,KAAKkiD,UAAYF,EAEjBhiD,KAAKqiD,eAAet5C,MAGrByhC,aAAc,SAAUzhC,GACvB,IAAIi5C,EAAQj5C,EAAMk5C,OAElB,GAAKD,EAAL,CAEA,IAAIG,EAAOH,EAAMG,KACb5iB,EAAOyiB,EAAMziB,KAEbA,KACHA,EAAK4iB,KAAOA,GAMZA,EAAK5iB,KAAOA,EACFA,IAGVv/B,KAAKkiD,UAAY3iB,GAGlByiB,EAAMziB,KAAO,KAEbyiB,EAAMG,KAAOniD,KAAKoiD,WAClBpiD,KAAKoiD,WAAW7iB,KAAOyiB,EACvBhiD,KAAKoiD,WAAaJ,EAElBhiD,KAAKqiD,eAAet5C,QAMtB,SAASi7C,GAASzgD,GACjB,OAAOmT,GAAS,IAAIyqC,GAAO59C,GAAW,KAQvC,IAAI0gD,GAAY,WACf,IAEC,OADApxC,SAASqxC,WAAWh5C,IAAI,OAAQ,iCACzB,SAAUpG,GAChB,OAAO+N,SAAS8D,cAAc,SAAW7R,EAAO,mBAEhD,MAAOgE,GACR,OAAO,SAAUhE,GAChB,OAAO+N,SAAS8D,cAAc,IAAM7R,EAAO,0DAR9B,GAuBZq/C,GAAW,CAEd7/B,eAAgB,WACftkB,KAAK4sB,WAAatR,GAAS,MAAO,0BAGnC6a,QAAS,WACJn2B,KAAKk0B,KAAKhB,iBACdqtB,GAASx/C,UAAUo1B,QAAQ90B,KAAKrB,MAChCA,KAAKkI,KAAK,YAGX8hC,UAAW,SAAUjhC,GACpB,IAAIyS,EAAYzS,EAAM6jB,WAAaq3B,GAAU,SAE7CznC,GAAShB,EAAW,sBAAwBxb,KAAKuD,QAAQgY,WAAa,KAEtEC,EAAU4oC,UAAY,MAEtBr7C,EAAM0hC,MAAQwZ,GAAU,QACxBzoC,EAAUC,YAAY1S,EAAM0hC,OAE5BzqC,KAAKsqC,aAAavhC,GAClB/I,KAAKmkB,QAAQ1iB,EAAMsH,IAAUA,GAG9BmhC,SAAU,SAAUnhC,GACnB,IAAIyS,EAAYzS,EAAM6jB,WACtB5sB,KAAK4sB,WAAWnR,YAAYD,GAExBzS,EAAMxF,QAAQ0jC,aACjBl+B,EAAMi5B,qBAAqBxmB,IAI7B2uB,YAAa,SAAUphC,GACtB,IAAIyS,EAAYzS,EAAM6jB,WACtBlR,GAAOF,GACPzS,EAAMm5B,wBAAwB1mB,UACvBxb,KAAKmkB,QAAQ1iB,EAAMsH,KAG3BuhC,aAAc,SAAUvhC,GACvB,IAAIqgC,EAASrgC,EAAMs7C,QACf1a,EAAO5gC,EAAMu7C,MACb/gD,EAAUwF,EAAMxF,QAChBiY,EAAYzS,EAAM6jB,WAEtBpR,EAAU+oC,UAAYhhD,EAAQ6lC,OAC9B5tB,EAAUgpC,SAAWjhD,EAAQomC,KAEzBpmC,EAAQ6lC,QACNA,IACJA,EAASrgC,EAAMs7C,QAAUJ,GAAU,WAEpCzoC,EAAUC,YAAY2tB,GACtBA,EAAOE,OAAS/lC,EAAQ+lC,OAAS,KACjCF,EAAOC,MAAQ9lC,EAAQ8lC,MACvBD,EAAOrsB,QAAUxZ,EAAQwZ,QAErBxZ,EAAQkmC,UACXL,EAAOqb,UAAYjgD,EAAQjB,EAAQkmC,WAC/BlmC,EAAQkmC,UAAUxlC,KAAK,KACvBV,EAAQkmC,UAAUtmC,QAAQ,WAAY,KAE1CimC,EAAOqb,UAAY,GAEpBrb,EAAOsb,OAASnhD,EAAQgmC,QAAQpmC,QAAQ,OAAQ,QAChDimC,EAAOub,UAAYphD,EAAQimC,UAEjBJ,IACV5tB,EAAUK,YAAYutB,GACtBrgC,EAAMs7C,QAAU,MAGb9gD,EAAQomC,MACNA,IACJA,EAAO5gC,EAAMu7C,MAAQL,GAAU,SAEhCzoC,EAAUC,YAAYkuB,GACtBA,EAAKN,MAAQ9lC,EAAQqmC,WAAarmC,EAAQ8lC,MAC1CM,EAAK5sB,QAAUxZ,EAAQsmC,aAEbF,IACVnuB,EAAUK,YAAY8tB,GACtB5gC,EAAMu7C,MAAQ,OAIhBlZ,cAAe,SAAUriC,GACxB,IAAIoK,EAAIpK,EAAMiiC,OAAOhoC,QACjB4lB,EAAI9lB,KAAKE,MAAM+F,EAAMwoB,SACrB0Z,EAAKnoC,KAAKE,MAAM+F,EAAMmiC,UAAYtiB,GAEtC5oB,KAAK4kD,SAAS77C,EAAOA,EAAMsiC,SAAW,OACrC,MAAQl4B,EAAEhR,EAAI,IAAMgR,EAAE1J,EAAI,IAAMmf,EAAI,IAAMqiB,EAAK,gBAGjD2Z,SAAU,SAAU77C,EAAOk8B,GAC1Bl8B,EAAM0hC,MAAM9gC,EAAIs7B,GAGjBsD,cAAe,SAAUx/B,GACxBgT,GAAQhT,EAAM6jB,aAGf4d,aAAc,SAAUzhC,GACvBkT,GAAOlT,EAAM6jB,cAIXi4B,GAAW/tC,GAAMmtC,GAAYrxC,EAsC7BkyC,GAAMvE,GAASpgD,OAAO,CAEzBiiC,UAAW,WACV,IAAI5gB,EAAS++B,GAASx/C,UAAUqhC,UAAU/gC,KAAKrB,MAE/C,OADAwhB,EAAOujC,UAAY/kD,KAAKglD,aACjBxjC,GAGR8C,eAAgB,WACftkB,KAAK4sB,WAAai4B,GAAS,OAG3B7kD,KAAK4sB,WAAWoK,aAAa,iBAAkB,QAE/Ch3B,KAAKilD,WAAaJ,GAAS,KAC3B7kD,KAAK4sB,WAAWnR,YAAYzb,KAAKilD,aAGlCxE,kBAAmB,WAClB/kC,GAAO1b,KAAK4sB,YACZplB,GAAIxH,KAAK4sB,mBACF5sB,KAAK4sB,kBACL5sB,KAAKilD,kBACLjlD,KAAKklD,UAGbF,aAAc,WAIbhlD,KAAKm2B,WAGNA,QAAS,WACR,IAAIn2B,KAAKk0B,KAAKhB,iBAAkBlzB,KAAKsrC,QAArC,CAEAiV,GAASx/C,UAAUo1B,QAAQ90B,KAAKrB,MAEhC,IAAIiK,EAAIjK,KAAKsrC,QACTjjB,EAAOpe,EAAE0C,UACT6O,EAAYxb,KAAK4sB,WAGhB5sB,KAAKklD,UAAallD,KAAKklD,SAAS/4C,OAAOkc,KAC3CroB,KAAKklD,SAAW78B,EAChB7M,EAAUwb,aAAa,QAAS3O,EAAKlmB,GACrCqZ,EAAUwb,aAAa,SAAU3O,EAAK5e,IAIvCiU,GAAYlC,EAAWvR,EAAE1H,KACzBiZ,EAAUwb,aAAa,UAAW,CAAC/sB,EAAE1H,IAAIJ,EAAG8H,EAAE1H,IAAIkH,EAAG4e,EAAKlmB,EAAGkmB,EAAK5e,GAAGxF,KAAK,MAE1EjE,KAAKkI,KAAK,YAKX8hC,UAAW,SAAUjhC,GACpB,IAAIk8B,EAAOl8B,EAAM0hC,MAAQoa,GAAS,QAK9B97C,EAAMxF,QAAQgY,WACjBiB,GAASyoB,EAAMl8B,EAAMxF,QAAQgY,WAG1BxS,EAAMxF,QAAQ0jC,aACjBzqB,GAASyoB,EAAM,uBAGhBjlC,KAAKsqC,aAAavhC,GAClB/I,KAAKmkB,QAAQ1iB,EAAMsH,IAAUA,GAG9BmhC,SAAU,SAAUnhC,GACd/I,KAAKilD,YAAcjlD,KAAKskB,iBAC7BtkB,KAAKilD,WAAWxpC,YAAY1S,EAAM0hC,OAClC1hC,EAAMi5B,qBAAqBj5B,EAAM0hC,QAGlCN,YAAa,SAAUphC,GACtB2S,GAAO3S,EAAM0hC,OACb1hC,EAAMm5B,wBAAwBn5B,EAAM0hC,cAC7BzqC,KAAKmkB,QAAQ1iB,EAAMsH,KAG3BshC,YAAa,SAAUthC,GACtBA,EAAM2hC,WACN3hC,EAAMotB,WAGPmU,aAAc,SAAUvhC,GACvB,IAAIk8B,EAAOl8B,EAAM0hC,MACblnC,EAAUwF,EAAMxF,QAEf0hC,IAED1hC,EAAQ6lC,QACXnE,EAAKjO,aAAa,SAAUzzB,EAAQ8lC,OACpCpE,EAAKjO,aAAa,iBAAkBzzB,EAAQwZ,SAC5CkoB,EAAKjO,aAAa,eAAgBzzB,EAAQ+lC,QAC1CrE,EAAKjO,aAAa,iBAAkBzzB,EAAQgmC,SAC5CtE,EAAKjO,aAAa,kBAAmBzzB,EAAQimC,UAEzCjmC,EAAQkmC,UACXxE,EAAKjO,aAAa,mBAAoBzzB,EAAQkmC,WAE9CxE,EAAKkgB,gBAAgB,oBAGlB5hD,EAAQmmC,WACXzE,EAAKjO,aAAa,oBAAqBzzB,EAAQmmC,YAE/CzE,EAAKkgB,gBAAgB,sBAGtBlgB,EAAKjO,aAAa,SAAU,QAGzBzzB,EAAQomC,MACX1E,EAAKjO,aAAa,OAAQzzB,EAAQqmC,WAAarmC,EAAQ8lC,OACvDpE,EAAKjO,aAAa,eAAgBzzB,EAAQsmC,aAC1C5E,EAAKjO,aAAa,YAAazzB,EAAQumC,UAAY,YAEnD7E,EAAKjO,aAAa,OAAQ,UAI5B+W,YAAa,SAAUhlC,EAAOkK,GAC7BjT,KAAK4kD,SAAS77C,EAAOgK,EAAahK,EAAM8jC,OAAQ55B,KAGjDm4B,cAAe,SAAUriC,GACxB,IAAIoK,EAAIpK,EAAMiiC,OACVpiB,EAAI9lB,KAAKR,IAAIQ,KAAKE,MAAM+F,EAAMwoB,SAAU,GAExC4xB,EAAM,IAAMv6B,EAAI,KADX9lB,KAAKR,IAAIQ,KAAKE,MAAM+F,EAAMmiC,UAAW,IAAMtiB,GACrB,UAG3BpmB,EAAIuG,EAAMsiC,SAAW,OACxB,KAAOl4B,EAAEhR,EAAIymB,GAAK,IAAMzV,EAAE1J,EAC1B05C,EAAW,EAAJv6B,EAAS,MAChBu6B,EAAY,GAAJv6B,EAAS,MAElB5oB,KAAK4kD,SAAS77C,EAAOvG,IAGtBoiD,SAAU,SAAU77C,EAAOk8B,GAC1Bl8B,EAAM0hC,MAAMzT,aAAa,IAAKiO,IAI/BsD,cAAe,SAAUx/B,GACxBgT,GAAQhT,EAAM0hC,QAGfD,aAAc,SAAUzhC,GACvBkT,GAAOlT,EAAM0hC,UAWf,SAAS2a,GAAM7hD,GACd,OAAO6P,IAAO0D,GAAM,IAAIguC,GAAIvhD,GAAW,KARpCuT,IACHguC,GAAI99C,QAAQm9C,IAUbhhC,GAAInc,QAAQ,CAKX+iC,YAAa,SAAUhhC,GAItB,IAAI0a,EAAW1a,EAAMxF,QAAQkgB,UAAYzjB,KAAKqlD,iBAAiBt8C,EAAMxF,QAAQ4pB,OAASntB,KAAKuD,QAAQkgB,UAAYzjB,KAAKitB,UASpH,OAPKxJ,IACJA,EAAWzjB,KAAKitB,UAAYjtB,KAAKslD,mBAG7BtlD,KAAKy4B,SAAShV,IAClBzjB,KAAKi5B,SAASxV,GAERA,GAGR4hC,iBAAkB,SAAUvgD,GAC3B,GAAa,gBAATA,QAAmC/B,IAAT+B,EAC7B,OAAO,EAGR,IAAI2e,EAAWzjB,KAAK6vB,eAAe/qB,GAKnC,YAJiB/B,IAAb0gB,IACHA,EAAWzjB,KAAKslD,gBAAgB,CAACn4B,KAAMroB,IACvC9E,KAAK6vB,eAAe/qB,GAAQ2e,GAEtBA,GAGR6hC,gBAAiB,SAAU/hD,GAI1B,OAAQvD,KAAKuD,QAAQgiD,cAAgBvB,GAASzgD,IAAa6hD,GAAM7hD,MA+BnE,IAAIiiD,GAAYvX,GAAQ9tC,OAAO,CAC9B8F,WAAY,SAAUksB,EAAc5uB,GACnC0qC,GAAQltC,UAAUkF,WAAW5E,KAAKrB,KAAMA,KAAKylD,iBAAiBtzB,GAAe5uB,IAK9E6tC,UAAW,SAAUjf,GACpB,OAAOnyB,KAAKssC,WAAWtsC,KAAKylD,iBAAiBtzB,KAG9CszB,iBAAkB,SAAUtzB,GAE3B,MAAO,EADPA,EAAe3nB,EAAe2nB,IAEhBnkB,eACbmkB,EAAajkB,eACbikB,EAAalkB,eACbkkB,EAAa9jB,mBAWhBy2C,GAAIlkD,OAASikD,GACbC,GAAI/xC,aAAeA,EAEnBu7B,GAAQQ,gBAAkBA,GAC1BR,GAAQgB,eAAiBA,GACzBhB,GAAQkB,gBAAkBA,GAC1BlB,GAAQuB,eAAiBA,GACzBvB,GAAQwB,gBAAkBA,GAC1BxB,GAAQyB,WAAaA,GACrBzB,GAAQS,UAAYA,GASpB5rB,GAAIlc,aAAa,CAIhB2qB,SAAS,IAGV,IAAI8zB,GAAUppB,GAAQn8B,OAAO,CAC5B8F,WAAY,SAAUguB,GACrBj0B,KAAKk0B,KAAOD,EACZj0B,KAAK4sB,WAAaqH,EAAIrH,WACtB5sB,KAAK2lD,MAAQ1xB,EAAIjH,OAAO44B,YACxB5lD,KAAK6lD,mBAAqB,EAC1B5xB,EAAI7sB,GAAG,SAAUpH,KAAK8lD,SAAU9lD,OAGjCw8B,SAAU,WACTp1B,GAAGpH,KAAK4sB,WAAY,YAAa5sB,KAAK+lD,aAAc/lD,OAGrDy8B,YAAa,WACZj1B,GAAIxH,KAAK4sB,WAAY,YAAa5sB,KAAK+lD,aAAc/lD,OAGtD2xB,MAAO,WACN,OAAO3xB,KAAKqtB,QAGby4B,SAAU,WACTpqC,GAAO1b,KAAK2lD,cACL3lD,KAAK2lD,OAGbK,YAAa,WACZhmD,KAAK6lD,mBAAqB,EAC1B7lD,KAAKqtB,QAAS,GAGf44B,yBAA0B,WACO,IAA5BjmD,KAAK6lD,qBACRpgD,aAAazF,KAAK6lD,oBAClB7lD,KAAK6lD,mBAAqB,IAI5BE,aAAc,SAAUj9C,GACvB,IAAKA,EAAEoxB,UAA0B,IAAZpxB,EAAE60B,OAA8B,IAAb70B,EAAEmR,OAAkB,OAAO,EAInEja,KAAKimD,2BACLjmD,KAAKgmD,cAELzrC,KACAyD,KAEAhe,KAAK+9B,YAAc/9B,KAAKk0B,KAAK9E,2BAA2BtmB,GAExD1B,GAAGyL,SAAU,CACZqzC,YAAarmC,GACb43B,UAAWz3C,KAAKuhD,aAChB4E,QAASnmD,KAAKomD,WACdC,QAASrmD,KAAKsmD,YACZtmD,OAGJuhD,aAAc,SAAUz4C,GAClB9I,KAAKqtB,SACTrtB,KAAKqtB,QAAS,EAEdrtB,KAAKumD,KAAOjrC,GAAS,MAAO,mBAAoBtb,KAAK4sB,YACrDpQ,GAASxc,KAAK4sB,WAAY,qBAE1B5sB,KAAKk0B,KAAKhsB,KAAK,iBAGhBlI,KAAKgrC,OAAShrC,KAAKk0B,KAAK9E,2BAA2BtmB,GAEnD,IAAI+D,EAAS,IAAI9C,EAAO/J,KAAKgrC,OAAQhrC,KAAK+9B,aACtC1V,EAAOxb,EAAOF,UAElB+Q,GAAY1d,KAAKumD,KAAM15C,EAAOtK,KAE9BvC,KAAKumD,KAAKhzC,MAAMuL,MAASuJ,EAAKlmB,EAAI,KAClCnC,KAAKumD,KAAKhzC,MAAMwL,OAASsJ,EAAK5e,EAAI,MAGnC+8C,QAAS,WACJxmD,KAAKqtB,SACR3R,GAAO1b,KAAKumD,MACZ5pC,GAAY3c,KAAK4sB,WAAY,sBAG9BpS,KACAyD,KAEAzW,GAAIqL,SAAU,CACbqzC,YAAarmC,GACb43B,UAAWz3C,KAAKuhD,aAChB4E,QAASnmD,KAAKomD,WACdC,QAASrmD,KAAKsmD,YACZtmD,OAGJomD,WAAY,SAAUt9C,GACrB,IAAiB,IAAZA,EAAE60B,OAA8B,IAAb70B,EAAEmR,UAE1Bja,KAAKwmD,UAEAxmD,KAAKqtB,QAAV,CAGArtB,KAAKimD,2BACLjmD,KAAK6lD,mBAAqB5jD,WAAWjB,EAAKhB,KAAKgmD,YAAahmD,MAAO,GAEnE,IAAI6M,EAAS,IAAIzC,EACTpK,KAAKk0B,KAAK7N,uBAAuBrmB,KAAK+9B,aACtC/9B,KAAKk0B,KAAK7N,uBAAuBrmB,KAAKgrC,SAE9ChrC,KAAKk0B,KACHhN,UAAUra,GACV3E,KAAK,aAAc,CAACu+C,cAAe55C,MAGtCy5C,WAAY,SAAUx9C,GACH,KAAdA,EAAEwtC,SACLt2C,KAAKwmD,aAQRrjC,GAAIjc,YAAY,aAAc,UAAWw+C,IASzCviC,GAAIlc,aAAa,CAMhBy/C,iBAAiB,IAGlB,IAAIC,GAAkBrqB,GAAQn8B,OAAO,CACpCq8B,SAAU,WACTx8B,KAAKk0B,KAAK9sB,GAAG,WAAYpH,KAAK4mD,eAAgB5mD,OAG/Cy8B,YAAa,WACZz8B,KAAKk0B,KAAK1sB,IAAI,WAAYxH,KAAK4mD,eAAgB5mD,OAGhD4mD,eAAgB,SAAU99C,GACzB,IAAImrB,EAAMj0B,KAAKk0B,KACXjK,EAAUgK,EAAI3M,UACd1N,EAAQqa,EAAI1wB,QAAQygB,UACpB/U,EAAOnG,EAAE0W,cAAc0a,SAAWjQ,EAAUrQ,EAAQqQ,EAAUrQ,EAE9B,WAAhCqa,EAAI1wB,QAAQmjD,gBACfzyB,EAAIpO,QAAQ5W,GAEZglB,EAAIjO,cAAcld,EAAE0oB,eAAgBviB,MAiBvCkU,GAAIjc,YAAY,aAAc,kBAAmBy/C,IAQjDxjC,GAAIlc,aAAa,CAGhB+pB,UAAU,EAQV61B,SAAU9yC,GAIV+yC,oBAAqB,KAIrBC,gBAAiBjgC,EAAAA,EAGjB3E,cAAe,GAOf6kC,eAAe,EAQfC,mBAAoB,IAGrB,IAAIC,GAAO5qB,GAAQn8B,OAAO,CACzBq8B,SAAU,WACT,IAAKx8B,KAAKulC,WAAY,CACrB,IAAItR,EAAMj0B,KAAKk0B,KAEfl0B,KAAKulC,WAAa,IAAItI,GAAUhJ,EAAIpM,SAAUoM,EAAIrH,YAElD5sB,KAAKulC,WAAWn+B,GAAG,CAClBo+B,UAAWxlC,KAAKylC,aAChBG,KAAM5lC,KAAK6lC,QACXC,QAAS9lC,KAAK+lC,YACZ/lC,MAEHA,KAAKulC,WAAWn+B,GAAG,UAAWpH,KAAKmnD,gBAAiBnnD,MAChDi0B,EAAI1wB,QAAQyjD,gBACfhnD,KAAKulC,WAAWn+B,GAAG,UAAWpH,KAAKonD,eAAgBpnD,MACnDi0B,EAAI7sB,GAAG,UAAWpH,KAAK4gD,WAAY5gD,MAEnCi0B,EAAInC,UAAU9xB,KAAK4gD,WAAY5gD,OAGjCwc,GAASxc,KAAKk0B,KAAKtH,WAAY,mCAC/B5sB,KAAKulC,WAAW7Y,SAChB1sB,KAAKqnD,WAAa,GAClBrnD,KAAKsnD,OAAS,IAGf7qB,YAAa,WACZ9f,GAAY3c,KAAKk0B,KAAKtH,WAAY,gBAClCjQ,GAAY3c,KAAKk0B,KAAKtH,WAAY,sBAClC5sB,KAAKulC,WAAW1T,WAGjBF,MAAO,WACN,OAAO3xB,KAAKulC,YAAcvlC,KAAKulC,WAAWlY,QAG3Cs2B,OAAQ,WACP,OAAO3jD,KAAKulC,YAAcvlC,KAAKulC,WAAW3H,SAG3C6H,aAAc,WACb,IAAIxR,EAAMj0B,KAAKk0B,KAGf,GADAD,EAAI5O,QACArlB,KAAKk0B,KAAK3wB,QAAQigB,WAAaxjB,KAAKk0B,KAAK3wB,QAAQ0jD,mBAAoB,CACxE,IAAIp6C,EAASrC,EAAexK,KAAKk0B,KAAK3wB,QAAQigB,WAE9CxjB,KAAKunD,aAAep9C,EACnBnK,KAAKk0B,KAAK9N,uBAAuBvZ,EAAOqB,gBAAgBzC,YAAY,GACpEzL,KAAKk0B,KAAK9N,uBAAuBvZ,EAAOwB,gBAAgB5C,YAAY,GAClEP,IAAIlL,KAAKk0B,KAAKvnB,YAEjB3M,KAAKwnD,WAAa1kD,KAAKP,IAAI,EAAKO,KAAKR,IAAI,EAAKtC,KAAKk0B,KAAK3wB,QAAQ0jD,0BAEhEjnD,KAAKunD,aAAe,KAGrBtzB,EACK/rB,KAAK,aACLA,KAAK,aAEN+rB,EAAI1wB,QAAQsjD,UACf7mD,KAAKqnD,WAAa,GAClBrnD,KAAKsnD,OAAS,KAIhBzhB,QAAS,SAAU/8B,GAClB,GAAI9I,KAAKk0B,KAAK3wB,QAAQsjD,QAAS,CAC9B,IAAIjlD,EAAO5B,KAAKynD,WAAa,IAAIviD,KAC7BuY,EAAMzd,KAAK0nD,SAAW1nD,KAAKulC,WAAWoiB,SAAW3nD,KAAKulC,WAAWjH,QAErEt+B,KAAKqnD,WAAWxjD,KAAK4Z,GACrBzd,KAAKsnD,OAAOzjD,KAAKjC,GAEjB5B,KAAK4nD,gBAAgBhmD,GAGtB5B,KAAKk0B,KACAhsB,KAAK,OAAQY,GACbZ,KAAK,OAAQY,IAGnB8+C,gBAAiB,SAAUhmD,GAC1B,KAAgC,EAAzB5B,KAAKqnD,WAAW3mD,QAAsC,GAAxBkB,EAAO5B,KAAKsnD,OAAO,IACvDtnD,KAAKqnD,WAAWQ,QAChB7nD,KAAKsnD,OAAOO,SAIdjH,WAAY,WACX,IAAIkH,EAAW9nD,KAAKk0B,KAAKvnB,UAAUpB,SAAS,GACxCw8C,EAAgB/nD,KAAKk0B,KAAKlF,mBAAmB,CAAC,EAAG,IAErDhvB,KAAKgoD,oBAAsBD,EAAc18C,SAASy8C,GAAU3lD,EAC5DnC,KAAKioD,YAAcjoD,KAAKk0B,KAAKxF,sBAAsB/hB,UAAUxK,GAG9D+lD,cAAe,SAAU5jD,EAAO6jD,GAC/B,OAAO7jD,GAASA,EAAQ6jD,GAAanoD,KAAKwnD,YAG3CL,gBAAiB,WAChB,GAAKnnD,KAAKwnD,YAAexnD,KAAKunD,aAA9B,CAEA,IAAI/pC,EAASxd,KAAKulC,WAAWjH,QAAQjzB,SAASrL,KAAKulC,WAAW/iB,WAE1D4lC,EAAQpoD,KAAKunD,aACb/pC,EAAOrb,EAAIimD,EAAM7lD,IAAIJ,IAAKqb,EAAOrb,EAAInC,KAAKkoD,cAAc1qC,EAAOrb,EAAGimD,EAAM7lD,IAAIJ,IAC5Eqb,EAAO/T,EAAI2+C,EAAM7lD,IAAIkH,IAAK+T,EAAO/T,EAAIzJ,KAAKkoD,cAAc1qC,EAAO/T,EAAG2+C,EAAM7lD,IAAIkH,IAC5E+T,EAAOrb,EAAIimD,EAAM9lD,IAAIH,IAAKqb,EAAOrb,EAAInC,KAAKkoD,cAAc1qC,EAAOrb,EAAGimD,EAAM9lD,IAAIH,IAC5Eqb,EAAO/T,EAAI2+C,EAAM9lD,IAAImH,IAAK+T,EAAO/T,EAAIzJ,KAAKkoD,cAAc1qC,EAAO/T,EAAG2+C,EAAM9lD,IAAImH,IAEhFzJ,KAAKulC,WAAWjH,QAAUt+B,KAAKulC,WAAW/iB,UAAUtX,IAAIsS,KAGzD4pC,eAAgB,WAEf,IAAIiB,EAAaroD,KAAKioD,YAClBK,EAAYxlD,KAAKE,MAAMqlD,EAAa,GACpC3oB,EAAK1/B,KAAKgoD,oBACV7lD,EAAInC,KAAKulC,WAAWjH,QAAQn8B,EAC5BomD,GAASpmD,EAAImmD,EAAY5oB,GAAM2oB,EAAaC,EAAY5oB,EACxD8oB,GAASrmD,EAAImmD,EAAY5oB,GAAM2oB,EAAaC,EAAY5oB,EACxD+oB,EAAO3lD,KAAKuJ,IAAIk8C,EAAQ7oB,GAAM58B,KAAKuJ,IAAIm8C,EAAQ9oB,GAAM6oB,EAAQC,EAEjExoD,KAAKulC,WAAWoiB,QAAU3nD,KAAKulC,WAAWjH,QAAQrzB,QAClDjL,KAAKulC,WAAWjH,QAAQn8B,EAAIsmD,GAG7B1iB,WAAY,SAAUj9B,GACrB,IAAImrB,EAAMj0B,KAAKk0B,KACX3wB,EAAU0wB,EAAI1wB,QAEdmlD,GAAanlD,EAAQsjD,SAAW7mD,KAAKsnD,OAAO5mD,OAAS,EAIzD,GAFAuzB,EAAI/rB,KAAK,UAAWY,GAEhB4/C,EACHz0B,EAAI/rB,KAAK,eAEH,CACNlI,KAAK4nD,iBAAiB,IAAI1iD,MAE1B,IAAIsxC,EAAYx2C,KAAK0nD,SAASr8C,SAASrL,KAAKqnD,WAAW,IACnDnlC,GAAYliB,KAAKynD,UAAYznD,KAAKsnD,OAAO,IAAM,IAC/CqB,EAAOplD,EAAQ4e,cAEfymC,EAAcpS,EAAU/qC,WAAWk9C,EAAOzmC,GAC1C+jB,EAAQ2iB,EAAY38C,WAAW,CAAC,EAAG,IAEnC48C,EAAe/lD,KAAKP,IAAIgB,EAAQwjD,gBAAiB9gB,GACjD6iB,EAAqBF,EAAYn9C,WAAWo9C,EAAe5iB,GAE3D8iB,EAAuBF,GAAgBtlD,EAAQujD,oBAAsB6B,GACrEnrC,EAASsrC,EAAmBr9C,YAAYs9C,EAAuB,GAAG/lD,QAEjEwa,EAAOrb,GAAMqb,EAAO/T,GAIxB+T,EAASyW,EAAIzB,aAAahV,EAAQyW,EAAI1wB,QAAQigB,WAE9C9d,EAAiB,WAChBuuB,EAAI5M,MAAM7J,EAAQ,CACjB0E,SAAU6mC,EACV5mC,cAAewmC,EACf/gC,aAAa,EACbrC,SAAS,OAVX0O,EAAI/rB,KAAK,eAqBbib,GAAIjc,YAAY,aAAc,WAAYggD,IAQ1C/jC,GAAIlc,aAAa,CAIhBigC,UAAU,EAIV8hB,iBAAkB,KAGnB,IAAIC,GAAW3sB,GAAQn8B,OAAO,CAE7B+oD,SAAU,CACTtrC,KAAS,CAAC,IACVmV,MAAS,CAAC,IACVo2B,KAAS,CAAC,IACVC,GAAS,CAAC,IACVtjC,OAAS,CAAC,IAAK,IAAK,GAAI,KACxBC,QAAS,CAAC,IAAK,IAAK,GAAI,MAGzB9f,WAAY,SAAUguB,GACrBj0B,KAAKk0B,KAAOD,EAEZj0B,KAAKqpD,aAAap1B,EAAI1wB,QAAQylD,kBAC9BhpD,KAAKspD,cAAcr1B,EAAI1wB,QAAQygB,YAGhCwY,SAAU,WACT,IAAIhhB,EAAYxb,KAAKk0B,KAAKtH,WAGtBpR,EAAU4C,UAAY,IACzB5C,EAAU4C,SAAW,KAGtBhX,GAAGoU,EAAW,CACbqZ,MAAO70B,KAAKupD,SACZC,KAAMxpD,KAAKypD,QACX5sB,UAAW78B,KAAK+lD,cACd/lD,MAEHA,KAAKk0B,KAAK9sB,GAAG,CACZytB,MAAO70B,KAAK0pD,UACZF,KAAMxpD,KAAK2pD,cACT3pD,OAGJy8B,YAAa,WACZz8B,KAAK2pD,eAELniD,GAAIxH,KAAKk0B,KAAKtH,WAAY,CACzBiI,MAAO70B,KAAKupD,SACZC,KAAMxpD,KAAKypD,QACX5sB,UAAW78B,KAAK+lD,cACd/lD,MAEHA,KAAKk0B,KAAK1sB,IAAI,CACbqtB,MAAO70B,KAAK0pD,UACZF,KAAMxpD,KAAK2pD,cACT3pD,OAGJ+lD,aAAc,WACb,IAAI/lD,KAAK4pD,SAAT,CAEA,IAAIlrC,EAAO7L,SAAS6L,KAChBmrC,EAAQh3C,SAASS,gBACjBuK,EAAMa,EAAKgS,WAAam5B,EAAMn5B,UAC9B9S,EAAOc,EAAKiS,YAAck5B,EAAMl5B,WAEpC3wB,KAAKk0B,KAAKtH,WAAWiI,QAErB9vB,OAAO+kD,SAASlsC,EAAMC,KAGvB0rC,SAAU,WACTvpD,KAAK4pD,UAAW,EAChB5pD,KAAKk0B,KAAKhsB,KAAK,UAGhBuhD,QAAS,WACRzpD,KAAK4pD,UAAW,EAChB5pD,KAAKk0B,KAAKhsB,KAAK,SAGhBmhD,aAAc,SAAUU,GACvB,IAEI1pD,EAAGE,EAFHypD,EAAOhqD,KAAKiqD,SAAW,GACvBC,EAAQlqD,KAAKkpD,SAGjB,IAAK7oD,EAAI,EAAGE,EAAM2pD,EAAMtsC,KAAKld,OAAQL,EAAIE,EAAKF,IAC7C2pD,EAAKE,EAAMtsC,KAAKvd,IAAM,EAAE,EAAI0pD,EAAU,GAEvC,IAAK1pD,EAAI,EAAGE,EAAM2pD,EAAMn3B,MAAMryB,OAAQL,EAAIE,EAAKF,IAC9C2pD,EAAKE,EAAMn3B,MAAM1yB,IAAM,CAAC0pD,EAAU,GAEnC,IAAK1pD,EAAI,EAAGE,EAAM2pD,EAAMf,KAAKzoD,OAAQL,EAAIE,EAAKF,IAC7C2pD,EAAKE,EAAMf,KAAK9oD,IAAM,CAAC,EAAG0pD,GAE3B,IAAK1pD,EAAI,EAAGE,EAAM2pD,EAAMd,GAAG1oD,OAAQL,EAAIE,EAAKF,IAC3C2pD,EAAKE,EAAMd,GAAG/oD,IAAM,CAAC,GAAI,EAAI0pD,IAI/BT,cAAe,SAAUtlC,GACxB,IAEI3jB,EAAGE,EAFHypD,EAAOhqD,KAAKmqD,UAAY,GACxBD,EAAQlqD,KAAKkpD,SAGjB,IAAK7oD,EAAI,EAAGE,EAAM2pD,EAAMpkC,OAAOplB,OAAQL,EAAIE,EAAKF,IAC/C2pD,EAAKE,EAAMpkC,OAAOzlB,IAAM2jB,EAEzB,IAAK3jB,EAAI,EAAGE,EAAM2pD,EAAMnkC,QAAQrlB,OAAQL,EAAIE,EAAKF,IAChD2pD,EAAKE,EAAMnkC,QAAQ1lB,KAAO2jB,GAI5B0lC,UAAW,WACVtiD,GAAGyL,SAAU,UAAW7S,KAAKsmD,WAAYtmD,OAG1C2pD,aAAc,WACbniD,GAAIqL,SAAU,UAAW7S,KAAKsmD,WAAYtmD,OAG3CsmD,WAAY,SAAUx9C,GACrB,KAAIA,EAAEshD,QAAUthD,EAAEuhD,SAAWvhD,EAAEwhD,SAA/B,CAEA,IAEI9sC,EAFAnZ,EAAMyE,EAAEwtC,QACRriB,EAAMj0B,KAAKk0B,KAGf,GAAI7vB,KAAOrE,KAAKiqD,SACVh2B,EAAI1M,UAAa0M,EAAI1M,SAASlF,cAClC7E,EAASxd,KAAKiqD,SAAS5lD,GACnByE,EAAEoxB,WACL1c,EAAS1T,EAAQ0T,GAAQ/R,WAAW,IAGrCwoB,EAAI5M,MAAM7J,GAENyW,EAAI1wB,QAAQigB,WACfyQ,EAAI9J,gBAAgB8J,EAAI1wB,QAAQigB,iBAG5B,GAAInf,KAAOrE,KAAKmqD,UACtBl2B,EAAIpO,QAAQoO,EAAI3M,WAAaxe,EAAEoxB,SAAW,EAAI,GAAKl6B,KAAKmqD,UAAU9lD,QAE5D,CAAA,GAAY,KAARA,IAAc4vB,EAAI+T,SAAU/T,EAAI+T,OAAOzkC,QAAQ6wC,iBAIzD,OAHAngB,EAAIyS,aAML7mB,GAAK/W,OAQPqa,GAAIjc,YAAY,aAAc,WAAY+hD,IAQ1C9lC,GAAIlc,aAAa,CAKhBsjD,iBAAiB,EAKjBC,kBAAmB,GAMnBC,oBAAqB,KAGtB,IAAIC,GAAkBpuB,GAAQn8B,OAAO,CACpCq8B,SAAU,WACTp1B,GAAGpH,KAAKk0B,KAAKtH,WAAY,aAAc5sB,KAAK2qD,eAAgB3qD,MAE5DA,KAAK4qD,OAAS,GAGfnuB,YAAa,WACZj1B,GAAIxH,KAAKk0B,KAAKtH,WAAY,aAAc5sB,KAAK2qD,eAAgB3qD,OAG9D2qD,eAAgB,SAAU7hD,GACzB,IAAI8Q,EAAQmH,GAAcjY,GAEtB+hD,EAAW7qD,KAAKk0B,KAAK3wB,QAAQinD,kBAEjCxqD,KAAK4qD,QAAUhxC,EACf5Z,KAAK8qD,cAAgB9qD,KAAKk0B,KAAK9E,2BAA2BtmB,GAErD9I,KAAK0iB,aACT1iB,KAAK0iB,YAAc,IAAIxd,MAGxB,IAAI0Y,EAAO9a,KAAKR,IAAIuoD,IAAa,IAAI3lD,KAASlF,KAAK0iB,YAAa,GAEhEjd,aAAazF,KAAK+qD,QAClB/qD,KAAK+qD,OAAS9oD,WAAWjB,EAAKhB,KAAKgrD,aAAchrD,MAAO4d,GAExDiC,GAAK/W,IAGNkiD,aAAc,WACb,IAAI/2B,EAAMj0B,KAAKk0B,KACXjlB,EAAOglB,EAAI3M,UACX0G,EAAOhuB,KAAKk0B,KAAK3wB,QAAQwgB,UAAY,EAEzCkQ,EAAI5O,QAGJ,IAAI4lC,EAAKjrD,KAAK4qD,QAAkD,EAAxC5qD,KAAKk0B,KAAK3wB,QAAQknD,qBACtCS,EAAK,EAAIpoD,KAAK8M,IAAI,GAAK,EAAI9M,KAAKoP,KAAKpP,KAAKuJ,IAAI4+C,MAASnoD,KAAK+M,IAC5Ds7C,EAAKn9B,EAAOlrB,KAAK+G,KAAKqhD,EAAKl9B,GAAQA,EAAOk9B,EAC1CtxC,EAAQqa,EAAIrP,WAAW3V,GAAsB,EAAdjP,KAAK4qD,OAAaO,GAAMA,IAAOl8C,EAElEjP,KAAK4qD,OAAS,EACd5qD,KAAK0iB,WAAa,KAEb9I,IAE+B,WAAhCqa,EAAI1wB,QAAQgnD,gBACft2B,EAAIpO,QAAQ5W,EAAO2K,GAEnBqa,EAAIjO,cAAchmB,KAAK8qD,cAAe77C,EAAO2K,OAQhDuJ,GAAIjc,YAAY,aAAc,kBAAmBwjD,IAQjDvnC,GAAIlc,aAAa,CAKhBmkD,KAAK,EAKLC,aAAc,KAGf,IAAIC,GAAMhvB,GAAQn8B,OAAO,CACxBq8B,SAAU,WACTp1B,GAAGpH,KAAKk0B,KAAKtH,WAAY,aAAc5sB,KAAKw9B,QAASx9B,OAGtDy8B,YAAa,WACZj1B,GAAIxH,KAAKk0B,KAAKtH,WAAY,aAAc5sB,KAAKw9B,QAASx9B,OAGvDw9B,QAAS,SAAU10B,GAClB,GAAKA,EAAEkQ,QAAP,CAOA,GALAZ,GAAetP,GAEf9I,KAAKurD,YAAa,EAGK,EAAnBziD,EAAEkQ,QAAQtY,OAGb,OAFAV,KAAKurD,YAAa,OAClB9lD,aAAazF,KAAKwrD,cAInB,IAAI3tB,EAAQ/0B,EAAEkQ,QAAQ,GAClBrU,EAAKk5B,EAAMv1B,OAEftI,KAAKwiB,UAAYxiB,KAAKs+B,QAAU,IAAI90B,EAAMq0B,EAAMnd,QAASmd,EAAMld,SAG3Dhc,EAAGwT,SAAwC,MAA7BxT,EAAGwT,QAAQd,eAC5BmF,GAAS7X,EAAI,kBAId3E,KAAKwrD,aAAevpD,WAAWjB,EAAK,WAC/BhB,KAAKyrD,gBACRzrD,KAAKurD,YAAa,EAClBvrD,KAAKk+B,QACLl+B,KAAK0rD,eAAe,cAAe7tB,KAElC79B,MAAO,KAEVA,KAAK0rD,eAAe,YAAa7tB,GAEjCz2B,GAAGyL,SAAU,CACZ84C,UAAW3rD,KAAKi+B,QAChB5jB,SAAUra,KAAKk+B,OACbl+B,QAGJk+B,MAAO,SAAUp1B,GAQhB,GAPArD,aAAazF,KAAKwrD,cAElBhkD,GAAIqL,SAAU,CACb84C,UAAW3rD,KAAKi+B,QAChB5jB,SAAUra,KAAKk+B,OACbl+B,MAECA,KAAKurD,YAAcziD,GAAKA,EAAEmQ,eAAgB,CAE7C,IAAI4kB,EAAQ/0B,EAAEmQ,eAAe,GACzBtU,EAAKk5B,EAAMv1B,OAEX3D,GAAMA,EAAGwT,SAAwC,MAA7BxT,EAAGwT,QAAQd,eAClCsF,GAAYhY,EAAI,kBAGjB3E,KAAK0rD,eAAe,UAAW7tB,GAG3B79B,KAAKyrD,eACRzrD,KAAK0rD,eAAe,QAAS7tB,KAKhC4tB,YAAa,WACZ,OAAOzrD,KAAKs+B,QAAQryB,WAAWjM,KAAKwiB,YAAcxiB,KAAKk0B,KAAK3wB,QAAQ8nD,cAGrEptB,QAAS,SAAUn1B,GAClB,IAAI+0B,EAAQ/0B,EAAEkQ,QAAQ,GACtBhZ,KAAKs+B,QAAU,IAAI90B,EAAMq0B,EAAMnd,QAASmd,EAAMld,SAC9C3gB,KAAK0rD,eAAe,YAAa7tB,IAGlC6tB,eAAgB,SAAUpkD,EAAMwB,GAC/B,IAAI8iD,EAAiB/4C,SAASg5C,YAAY,eAE1CD,EAAehsC,YAAa,EAC5B9W,EAAER,OAAOqX,iBAAkB,EAE3BisC,EAAeE,eACPxkD,GAAM,GAAM,EAAMvC,OAAQ,EAC1B+D,EAAE6rB,QAAS7rB,EAAE8rB,QACb9rB,EAAE4X,QAAS5X,EAAE6X,SACb,GAAO,GAAO,GAAO,EAAO,EAAG,MAEvC7X,EAAER,OAAOyjD,cAAcH,MAOrBj2C,KAAUD,IACbyN,GAAIjc,YAAY,aAAc,MAAOokD,IAStCnoC,GAAIlc,aAAa,CAOhB+kD,UAAWr2C,KAAU5B,GAKrBk4C,oBAAoB,IAGrB,IAAIC,GAAY5vB,GAAQn8B,OAAO,CAC9Bq8B,SAAU,WACThgB,GAASxc,KAAKk0B,KAAKtH,WAAY,sBAC/BxlB,GAAGpH,KAAKk0B,KAAKtH,WAAY,aAAc5sB,KAAKmsD,cAAensD,OAG5Dy8B,YAAa,WACZ9f,GAAY3c,KAAKk0B,KAAKtH,WAAY,sBAClCplB,GAAIxH,KAAKk0B,KAAKtH,WAAY,aAAc5sB,KAAKmsD,cAAensD,OAG7DmsD,cAAe,SAAUrjD,GACxB,IAAImrB,EAAMj0B,KAAKk0B,KACf,GAAKprB,EAAEkQ,SAAgC,IAArBlQ,EAAEkQ,QAAQtY,SAAgBuzB,EAAIf,iBAAkBlzB,KAAKosD,SAAvE,CAEA,IAAI5sB,EAAKvL,EAAI7E,2BAA2BtmB,EAAEkQ,QAAQ,IAC9CymB,EAAKxL,EAAI7E,2BAA2BtmB,EAAEkQ,QAAQ,IAElDhZ,KAAKqsD,aAAep4B,EAAItnB,UAAUnB,UAAU,GAC5CxL,KAAKssD,aAAer4B,EAAI5N,uBAAuBrmB,KAAKqsD,cACtB,WAA1Bp4B,EAAI1wB,QAAQyoD,YACfhsD,KAAKusD,kBAAoBt4B,EAAI5N,uBAAuBmZ,EAAGt0B,IAAIu0B,GAAIj0B,UAAU,KAG1ExL,KAAKwsD,WAAahtB,EAAGvzB,WAAWwzB,GAChCz/B,KAAKysD,WAAax4B,EAAI3M,UAEtBtnB,KAAKqtB,QAAS,EACdrtB,KAAKosD,UAAW,EAEhBn4B,EAAI5O,QAEJje,GAAGyL,SAAU,YAAa7S,KAAK0sD,aAAc1sD,MAC7CoH,GAAGyL,SAAU,WAAY7S,KAAK2sD,YAAa3sD,MAE3CoY,GAAetP,KAGhB4jD,aAAc,SAAU5jD,GACvB,GAAKA,EAAEkQ,SAAgC,IAArBlQ,EAAEkQ,QAAQtY,QAAiBV,KAAKosD,SAAlD,CAEA,IAAIn4B,EAAMj0B,KAAKk0B,KACXsL,EAAKvL,EAAI7E,2BAA2BtmB,EAAEkQ,QAAQ,IAC9CymB,EAAKxL,EAAI7E,2BAA2BtmB,EAAEkQ,QAAQ,IAC9C3J,EAAQmwB,EAAGvzB,WAAWwzB,GAAMz/B,KAAKwsD,WAUrC,GARAxsD,KAAK2kB,MAAQsP,EAAItK,aAAata,EAAOrP,KAAKysD,aAErCx4B,EAAI1wB,QAAQ0oD,qBACfjsD,KAAK2kB,MAAQsP,EAAIzG,cAAgBne,EAAQ,GACzCrP,KAAK2kB,MAAQsP,EAAIvG,cAAwB,EAARre,KAClCrP,KAAK2kB,MAAQsP,EAAIrP,WAAW5kB,KAAK2kB,QAGJ,WAA1BsP,EAAI1wB,QAAQyoD,WAEf,GADAhsD,KAAKihD,QAAUjhD,KAAKssD,aACN,GAAVj9C,EAAe,WACb,CAEN,IAAIuK,EAAQ4lB,EAAGp0B,KAAKq0B,GAAIj0B,UAAU,GAAGF,UAAUtL,KAAKqsD,cACpD,GAAc,GAAVh9C,GAA2B,IAAZuK,EAAMzX,GAAuB,IAAZyX,EAAMnQ,EAAW,OACrDzJ,KAAKihD,QAAUhtB,EAAItkB,UAAUskB,EAAI7kB,QAAQpP,KAAKusD,kBAAmBvsD,KAAK2kB,OAAOtZ,SAASuO,GAAQ5Z,KAAK2kB,OAG/F3kB,KAAKqtB,SACT4G,EAAI3K,YAAW,GAAM,GACrBtpB,KAAKqtB,QAAS,GAGfznB,EAAgB5F,KAAKu+B,cAErB,IAAIquB,EAAS5rD,EAAKizB,EAAIvK,MAAOuK,EAAKj0B,KAAKihD,QAASjhD,KAAK2kB,MAAO,CAACwL,OAAO,EAAMntB,OAAO,IACjFhD,KAAKu+B,aAAe74B,EAAiBknD,EAAQ5sD,MAAM,GAEnDoY,GAAetP,KAGhB6jD,YAAa,WACP3sD,KAAKqtB,QAAWrtB,KAAKosD,UAK1BpsD,KAAKosD,UAAW,EAChBxmD,EAAgB5F,KAAKu+B,cAErB/2B,GAAIqL,SAAU,YAAa7S,KAAK0sD,cAChCllD,GAAIqL,SAAU,WAAY7S,KAAK2sD,aAG3B3sD,KAAKk0B,KAAK3wB,QAAQmgB,cACrB1jB,KAAKk0B,KAAKR,aAAa1zB,KAAKihD,QAASjhD,KAAKk0B,KAAKtP,WAAW5kB,KAAK2kB,QAAQ,EAAM3kB,KAAKk0B,KAAK3wB,QAAQwgB,UAE/F/jB,KAAKk0B,KAAKtO,WAAW5lB,KAAKihD,QAASjhD,KAAKk0B,KAAKtP,WAAW5kB,KAAK2kB,SAd7D3kB,KAAKosD,UAAW,KAsBnBjpC,GAAIjc,YAAY,aAAc,YAAaglD,IAE3C/oC,GAAIuiC,QAAUA,GACdviC,GAAIwjC,gBAAkBA,GACtBxjC,GAAI+jC,KAAOA,GACX/jC,GAAI8lC,SAAWA,GACf9lC,GAAIunC,gBAAkBA,GACtBvnC,GAAImoC,IAAMA,GACVnoC,GAAI+oC,UAAYA,GAEhBhsD,OAAOD,OAASA,EAEhBN,EAAQigD,QA3pbM,qBA4pbdjgD,EAAQq0B,QAAUA,GAClBr0B,EAAQo0B,QAAUA,GAClBp0B,EAAQ2X,QAAUA,GAClB3X,EAAQ4J,QAAUA,EAClB5J,EAAQ6G,MAAQA,GAChB7G,EAAQkG,KAAOA,EACflG,EAAQmG,MAAQA,EAChBnG,EAAQ28B,QAAUA,GAClB38B,EAAQQ,OAASA,EACjBR,EAAQqB,KAAOA,EACfrB,EAAQ8B,MAAQA,EAChB9B,EAAQ2D,WAAaA,EACrB3D,EAAQiiB,SAAWA,GACnBjiB,EAAQsf,QAAUA,GAClBtf,EAAQoiB,aAAeA,GACvBpiB,EAAQs9B,UAAYA,GACpBt9B,EAAQ8gC,SAAWA,GACnB9gC,EAAQqhC,SAAWA,GACnBrhC,EAAQ6J,MAAQA,EAChB7J,EAAQwL,MAAQrB,EAChBnK,EAAQoK,OAASA,EACjBpK,EAAQkN,OAAS1C,EACjBxK,EAAQwS,eAAiBA,EACzBxS,EAAQ2P,eAAiBkD,EACzB7S,EAAQktD,WAAa7tB,GACrBr/B,EAAQ8K,OAASA,EACjB9K,EAAQmtD,OAAShiD,EACjBnL,EAAQyK,aAAeA,EACvBzK,EAAQwyB,aAAe3nB,EACvB7K,EAAQmP,IAAMA,EACdnP,EAAQ2uC,QAAUA,GAClB3uC,EAAQwwC,QAAUA,GAClBxwC,EAAQ+wC,QAAUA,GAClB/wC,EAAQkiC,MAAQA,GAChBliC,EAAQijC,WAAaA,GACrBjjC,EAAQotD,WAh7NS,SAAUxpC,EAAQhgB,GAClC,OAAO,IAAIq/B,GAAWrf,EAAQhgB,IAg7N/B5D,EAAQyjC,aAAeA,GACvBzjC,EAAQqtD,aAt1NW,SAAUzpC,GAC5B,OAAO,IAAI6f,GAAa7f,IAs1NzB5jB,EAAQgxC,aAAeA,GACvBhxC,EAAQstD,aArmJW,SAAUnc,EAAKjkC,EAAQtJ,GACzC,OAAO,IAAIotC,GAAaG,EAAKjkC,EAAQtJ,IAqmJtC5D,EAAQmyC,aAAeA,GACvBnyC,EAAQutD,aA7gJR,SAAsBC,EAAOtgD,EAAQtJ,GACpC,OAAO,IAAIuuC,GAAaqb,EAAOtgD,EAAQtJ,IA6gJxC5D,EAAQ6yC,WAAaA,GACrB7yC,EAAQytD,WAh+IR,SAAoBzoD,EAAIkI,EAAQtJ,GAC/B,OAAO,IAAIivC,GAAW7tC,EAAIkI,EAAQtJ,IAg+InC5D,EAAQ8yC,WAAaA,GACrB9yC,EAAQi0C,MAAQA,GAChBj0C,EAAQ40C,MA59HI,SAAUhxC,EAASgvC,GAC9B,OAAO,IAAIqB,GAAMrwC,EAASgvC,IA49H3B5yC,EAAQ42C,QAAUA,GAClB52C,EAAQg3C,QA3kHM,SAAUpzC,EAASgvC,GAChC,OAAO,IAAIgE,GAAQhzC,EAASgvC,IA2kH7B5yC,EAAQ6jC,KAAOA,GACf7jC,EAAQ0lC,KA5sNR,SAAc9hC,GACb,OAAO,IAAIigC,GAAKjgC,IA4sNjB5D,EAAQm4C,QAAUA,GAClBn4C,EAAQ0tD,QAh0GR,SAAiB9pD,GAChB,OAAO,IAAIu0C,GAAQv0C,IAg0GpB5D,EAAQqnC,OAASA,GACjBrnC,EAAQwlC,OAloMR,SAAgBn2B,EAAQzL,GACvB,OAAO,IAAIyjC,GAAOh4B,EAAQzL,IAkoM3B5D,EAAQs+C,UAAYA,GACpBt+C,EAAQy/C,UAAYA,GACpBz/C,EAAQw4C,UAAYA,GACpBx4C,EAAQ2tD,UAj7ER,SAAmB/pD,GAClB,OAAO,IAAI40C,GAAU50C,IAi7EtB5D,EAAQmlD,IAAMA,GACdnlD,EAAQyT,IAAMgyC,GACdzlD,EAAQ4gD,SAAWA,GACnB5gD,EAAQwhD,OAASA,GACjBxhD,EAAQ+W,OAASstC,GACjBrkD,EAAQwpC,KAAOA,GACfxpC,EAAQirC,aAAeA,GACvBjrC,EAAQ4tD,aAr5LR,SAAsBv+C,EAAQzL,GAC7B,OAAO,IAAIqnC,GAAa57B,EAAQzL,IAq5LjC5D,EAAQ6rC,OAASA,GACjB7rC,EAAQ6tD,OA7yLR,SAAgBx+C,EAAQzL,EAASkoC,GAChC,OAAO,IAAID,GAAOx8B,EAAQzL,EAASkoC,IA6yLpC9rC,EAAQqsC,SAAWA,GACnBrsC,EAAQ8tD,SA5+KR,SAAkBljD,EAAShH,GAC1B,OAAO,IAAIyoC,GAASzhC,EAAShH,IA4+K9B5D,EAAQsuC,QAAUA,GAClBtuC,EAAQ+tD,QAzzKR,SAAiBnjD,EAAShH,GACzB,OAAO,IAAI0qC,GAAQ1jC,EAAShH,IAyzK7B5D,EAAQ6lD,UAAYA,GACpB7lD,EAAQguD,UA5gCR,SAAmBx7B,EAAc5uB,GAChC,OAAO,IAAIiiD,GAAUrzB,EAAc5uB,IA4gCpC5D,EAAQwjB,IAAMA,GACdxjB,EAAQs0B,IAjnSR,SAAmBzuB,EAAIjC,GACtB,OAAO,IAAI4f,GAAI3d,EAAIjC,IAknSpB,IAAIqqD,GAAO7oD,OAAOhF,EAClBJ,EAAQkuD,WAAa,WAEpB,OADA9oD,OAAOhF,EAAI6tD,GACJ5tD,MAIR+E,OAAOhF,EAAIJ","file":"dist/leaflet.js.map"}
\ No newline at end of file
diff --git a/viewer/leaflet-1.6.0/images/layers-2x.png b/viewer/leaflet-1.9.4/images/layers-2x.png
similarity index 100%
rename from viewer/leaflet-1.6.0/images/layers-2x.png
rename to viewer/leaflet-1.9.4/images/layers-2x.png
diff --git a/viewer/leaflet-1.6.0/images/layers.png b/viewer/leaflet-1.9.4/images/layers.png
similarity index 100%
rename from viewer/leaflet-1.6.0/images/layers.png
rename to viewer/leaflet-1.9.4/images/layers.png
diff --git a/viewer/leaflet-1.6.0/images/marker-icon-2x.png b/viewer/leaflet-1.9.4/images/marker-icon-2x.png
similarity index 100%
rename from viewer/leaflet-1.6.0/images/marker-icon-2x.png
rename to viewer/leaflet-1.9.4/images/marker-icon-2x.png
diff --git a/viewer/leaflet-1.6.0/images/marker-icon.png b/viewer/leaflet-1.9.4/images/marker-icon.png
similarity index 100%
rename from viewer/leaflet-1.6.0/images/marker-icon.png
rename to viewer/leaflet-1.9.4/images/marker-icon.png
diff --git a/viewer/leaflet-1.6.0/images/marker-shadow.png b/viewer/leaflet-1.9.4/images/marker-shadow.png
similarity index 100%
rename from viewer/leaflet-1.6.0/images/marker-shadow.png
rename to viewer/leaflet-1.9.4/images/marker-shadow.png
diff --git a/viewer/leaflet-1.6.0/leaflet.css b/viewer/leaflet-1.9.4/leaflet.css
similarity index 84%
rename from viewer/leaflet-1.6.0/leaflet.css
rename to viewer/leaflet-1.9.4/leaflet.css
index 983d605..2961b76 100644
--- a/viewer/leaflet-1.6.0/leaflet.css
+++ b/viewer/leaflet-1.9.4/leaflet.css
@@ -45,7 +45,10 @@
 	}
 /* .leaflet-container svg: reset svg max-width decleration shipped in Joomla! (joomla.org) 3.x */
 /* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */
-.leaflet-container .leaflet-overlay-pane svg,
+.leaflet-container .leaflet-overlay-pane svg {
+	max-width: none !important;
+	max-height: none !important;
+	}
 .leaflet-container .leaflet-marker-pane img,
 .leaflet-container .leaflet-shadow-pane img,
 .leaflet-container .leaflet-tile-pane img,
@@ -53,8 +56,15 @@
 .leaflet-container .leaflet-tile {
 	max-width: none !important;
 	max-height: none !important;
+	width: auto;
+	padding: 0;
 	}
 
+.leaflet-container img.leaflet-tile {
+	/* See: https://bugs.chromium.org/p/chromium/issues/detail?id=600120 */
+	mix-blend-mode: plus-lighter;
+}
+
 .leaflet-container.leaflet-touch-zoom {
 	-ms-touch-action: pan-x pan-y;
 	touch-action: pan-x pan-y;
@@ -166,9 +176,6 @@
 
 /* zoom and fade animations */
 
-.leaflet-fade-anim .leaflet-tile {
-	will-change: opacity;
-	}
 .leaflet-fade-anim .leaflet-popup {
 	opacity: 0;
 	-webkit-transition: opacity 0.2s linear;
@@ -183,9 +190,10 @@
 	    -ms-transform-origin: 0 0;
 	        transform-origin: 0 0;
 	}
-.leaflet-zoom-anim .leaflet-zoom-animated {
+svg.leaflet-zoom-animated {
 	will-change: transform;
-	}
+}
+
 .leaflet-zoom-anim .leaflet-zoom-animated {
 	-webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
 	   -moz-transition:    -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
@@ -251,14 +259,11 @@ svg.leaflet-image-layer.leaflet-interactive path {
 
 .leaflet-container {
 	background: #ddd;
-	outline: 0;
+	outline-offset: 1px;
 	}
 .leaflet-container a {
 	color: #0078A8;
 	}
-.leaflet-container a.leaflet-active {
-	outline: 2px solid orange;
-	}
 .leaflet-zoom-box {
 	border: 2px dotted #38f;
 	background: rgba(255,255,255,0.5);
@@ -267,7 +272,10 @@ svg.leaflet-image-layer.leaflet-interactive path {
 
 /* general typography */
 .leaflet-container {
-	font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
+	font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	font-size: 0.75rem;
+	line-height: 1.5;
 	}
 
 
@@ -277,8 +285,7 @@ svg.leaflet-image-layer.leaflet-interactive path {
 	box-shadow: 0 1px 5px rgba(0,0,0,0.65);
 	border-radius: 4px;
 	}
-.leaflet-bar a,
-.leaflet-bar a:hover {
+.leaflet-bar a {
 	background-color: #fff;
 	border-bottom: 1px solid #ccc;
 	width: 26px;
@@ -295,7 +302,8 @@ svg.leaflet-image-layer.leaflet-interactive path {
 	background-repeat: no-repeat;
 	display: block;
 	}
-.leaflet-bar a:hover {
+.leaflet-bar a:hover,
+.leaflet-bar a:focus {
 	background-color: #f4f4f4;
 	}
 .leaflet-bar a:first-child {
@@ -385,6 +393,8 @@ svg.leaflet-image-layer.leaflet-interactive path {
 	}
 .leaflet-control-layers label {
 	display: block;
+	font-size: 13px;
+	font-size: 1.08333em;
 	}
 .leaflet-control-layers-separator {
 	height: 0;
@@ -393,7 +403,7 @@ svg.leaflet-image-layer.leaflet-interactive path {
 	}
 
 /* Default icon URLs */
-.leaflet-default-icon-path {
+.leaflet-default-icon-path { /* used only in path-guessing heuristic, see L.Icon.Default */
 	background-image: url(images/marker-icon.png);
 	}
 
@@ -402,23 +412,27 @@ svg.leaflet-image-layer.leaflet-interactive path {
 
 .leaflet-container .leaflet-control-attribution {
 	background: #fff;
-	background: rgba(255, 255, 255, 0.7);
+	background: rgba(255, 255, 255, 0.8);
 	margin: 0;
 	}
 .leaflet-control-attribution,
 .leaflet-control-scale-line {
 	padding: 0 5px;
 	color: #333;
+	line-height: 1.4;
 	}
 .leaflet-control-attribution a {
 	text-decoration: none;
 	}
-.leaflet-control-attribution a:hover {
+.leaflet-control-attribution a:hover,
+.leaflet-control-attribution a:focus {
 	text-decoration: underline;
 	}
-.leaflet-container .leaflet-control-attribution,
-.leaflet-container .leaflet-control-scale {
-	font-size: 11px;
+.leaflet-attribution-flag {
+	display: inline !important;
+	vertical-align: baseline !important;
+	width: 1em;
+	height: 0.6669em;
 	}
 .leaflet-left .leaflet-control-scale {
 	margin-left: 5px;
@@ -431,14 +445,11 @@ svg.leaflet-image-layer.leaflet-interactive path {
 	border-top: none;
 	line-height: 1.1;
 	padding: 2px 5px 1px;
-	font-size: 11px;
 	white-space: nowrap;
-	overflow: hidden;
 	-moz-box-sizing: border-box;
 	     box-sizing: border-box;
-
-	background: #fff;
-	background: rgba(255, 255, 255, 0.5);
+	background: rgba(255, 255, 255, 0.8);
+	text-shadow: 1px 1px #fff;
 	}
 .leaflet-control-scale-line:not(:first-child) {
 	border-top: 2px solid #777;
@@ -474,17 +485,22 @@ svg.leaflet-image-layer.leaflet-interactive path {
 	border-radius: 12px;
 	}
 .leaflet-popup-content {
-	margin: 13px 19px;
-	line-height: 1.4;
+	margin: 13px 24px 13px 20px;
+	line-height: 1.3;
+	font-size: 13px;
+	font-size: 1.08333em;
+	min-height: 1px;
 	}
 .leaflet-popup-content p {
-	margin: 18px 0;
+	margin: 17px 0;
+	margin: 1.3em 0;
 	}
 .leaflet-popup-tip-container {
 	width: 40px;
 	height: 20px;
 	position: absolute;
 	left: 50%;
+	margin-top: -1px;
 	margin-left: -20px;
 	overflow: hidden;
 	pointer-events: none;
@@ -495,6 +511,7 @@ svg.leaflet-image-layer.leaflet-interactive path {
 	padding: 1px;
 
 	margin: -10px auto 0;
+	pointer-events: auto;
 
 	-webkit-transform: rotate(45deg);
 	   -moz-transform: rotate(45deg);
@@ -511,28 +528,25 @@ svg.leaflet-image-layer.leaflet-interactive path {
 	position: absolute;
 	top: 0;
 	right: 0;
-	padding: 4px 4px 0 0;
 	border: none;
 	text-align: center;
-	width: 18px;
-	height: 14px;
-	font: 16px/14px Tahoma, Verdana, sans-serif;
-	color: #c3c3c3;
+	width: 24px;
+	height: 24px;
+	font: 16px/24px Tahoma, Verdana, sans-serif;
+	color: #757575;
 	text-decoration: none;
-	font-weight: bold;
 	background: transparent;
 	}
-.leaflet-container a.leaflet-popup-close-button:hover {
-	color: #999;
+.leaflet-container a.leaflet-popup-close-button:hover,
+.leaflet-container a.leaflet-popup-close-button:focus {
+	color: #585858;
 	}
 .leaflet-popup-scrolled {
 	overflow: auto;
-	border-bottom: 1px solid #ddd;
-	border-top: 1px solid #ddd;
 	}
 
 .leaflet-oldie .leaflet-popup-content-wrapper {
-	zoom: 1;
+	-ms-zoom: 1;
 	}
 .leaflet-oldie .leaflet-popup-tip {
 	width: 24px;
@@ -541,9 +555,6 @@ svg.leaflet-image-layer.leaflet-interactive path {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";
 	filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);
 	}
-.leaflet-oldie .leaflet-popup-tip-container {
-	margin-top: -1px;
-	}
 
 .leaflet-oldie .leaflet-control-zoom,
 .leaflet-oldie .leaflet-control-layers,
@@ -578,7 +589,7 @@ svg.leaflet-image-layer.leaflet-interactive path {
 	pointer-events: none;
 	box-shadow: 0 1px 3px rgba(0,0,0,0.4);
 	}
-.leaflet-tooltip.leaflet-clickable {
+.leaflet-tooltip.leaflet-interactive {
 	cursor: pointer;
 	pointer-events: auto;
 	}
@@ -638,3 +649,13 @@ svg.leaflet-image-layer.leaflet-interactive path {
 	margin-left: -12px;
 	border-right-color: #fff;
 	}
+
+/* Printing */
+
+@media print {
+	/* Prevent printers from removing background-images of controls. */
+	.leaflet-control {
+		-webkit-print-color-adjust: exact;
+		print-color-adjust: exact;
+		}
+	}
diff --git a/viewer/leaflet-1.9.4/leaflet.js b/viewer/leaflet-1.9.4/leaflet.js
new file mode 100644
index 0000000..a3bf693
--- /dev/null
+++ b/viewer/leaflet-1.9.4/leaflet.js
@@ -0,0 +1,6 @@
+/* @preserve
+ * Leaflet 1.9.4, a JS library for interactive maps. https://leafletjs.com
+ * (c) 2010-2023 Vladimir Agafonkin, (c) 2010-2011 CloudMade
+ */
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e((t="undefined"!=typeof globalThis?globalThis:t||self).leaflet={})}(this,function(t){"use strict";function l(t){for(var e,i,n=1,o=arguments.length;n<o;n++)for(e in i=arguments[n])t[e]=i[e];return t}var R=Object.create||function(t){return N.prototype=t,new N};function N(){}function a(t,e){var i,n=Array.prototype.slice;return t.bind?t.bind.apply(t,n.call(arguments,1)):(i=n.call(arguments,2),function(){return t.apply(e,i.length?i.concat(n.call(arguments)):arguments)})}var D=0;function h(t){return"_leaflet_id"in t||(t._leaflet_id=++D),t._leaflet_id}function j(t,e,i){var n,o,s=function(){n=!1,o&&(r.apply(i,o),o=!1)},r=function(){n?o=arguments:(t.apply(i,arguments),setTimeout(s,e),n=!0)};return r}function H(t,e,i){var n=e[1],e=e[0],o=n-e;return t===n&&i?t:((t-e)%o+o)%o+e}function u(){return!1}function i(t,e){return!1===e?t:(e=Math.pow(10,void 0===e?6:e),Math.round(t*e)/e)}function W(t){return t.trim?t.trim():t.replace(/^\s+|\s+$/g,"")}function F(t){return W(t).split(/\s+/)}function c(t,e){for(var i in Object.prototype.hasOwnProperty.call(t,"options")||(t.options=t.options?R(t.options):{}),e)t.options[i]=e[i];return t.options}function U(t,e,i){var n,o=[];for(n in t)o.push(encodeURIComponent(i?n.toUpperCase():n)+"="+encodeURIComponent(t[n]));return(e&&-1!==e.indexOf("?")?"&":"?")+o.join("&")}var V=/\{ *([\w_ -]+) *\}/g;function q(t,i){return t.replace(V,function(t,e){e=i[e];if(void 0===e)throw new Error("No value provided for variable "+t);return e="function"==typeof e?e(i):e})}var d=Array.isArray||function(t){return"[object Array]"===Object.prototype.toString.call(t)};function G(t,e){for(var i=0;i<t.length;i++)if(t[i]===e)return i;return-1}var K="data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs=";function Y(t){return window["webkit"+t]||window["moz"+t]||window["ms"+t]}var X=0;function J(t){var e=+new Date,i=Math.max(0,16-(e-X));return X=e+i,window.setTimeout(t,i)}var $=window.requestAnimationFrame||Y("RequestAnimationFrame")||J,Q=window.cancelAnimationFrame||Y("CancelAnimationFrame")||Y("CancelRequestAnimationFrame")||function(t){window.clearTimeout(t)};function x(t,e,i){if(!i||$!==J)return $.call(window,a(t,e));t.call(e)}function r(t){t&&Q.call(window,t)}var tt={__proto__:null,extend:l,create:R,bind:a,get lastId(){return D},stamp:h,throttle:j,wrapNum:H,falseFn:u,formatNum:i,trim:W,splitWords:F,setOptions:c,getParamString:U,template:q,isArray:d,indexOf:G,emptyImageUrl:K,requestFn:$,cancelFn:Q,requestAnimFrame:x,cancelAnimFrame:r};function et(){}et.extend=function(t){function e(){c(this),this.initialize&&this.initialize.apply(this,arguments),this.callInitHooks()}var i,n=e.__super__=this.prototype,o=R(n);for(i in(o.constructor=e).prototype=o,this)Object.prototype.hasOwnProperty.call(this,i)&&"prototype"!==i&&"__super__"!==i&&(e[i]=this[i]);if(t.statics&&l(e,t.statics),t.includes){var s=t.includes;if("undefined"!=typeof L&&L&&L.Mixin){s=d(s)?s:[s];for(var r=0;r<s.length;r++)s[r]===L.Mixin.Events&&console.warn("Deprecated include of L.Mixin.Events: this property will be removed in future releases, please inherit from L.Evented instead.",(new Error).stack)}l.apply(null,[o].concat(t.includes))}return l(o,t),delete o.statics,delete o.includes,o.options&&(o.options=n.options?R(n.options):{},l(o.options,t.options)),o._initHooks=[],o.callInitHooks=function(){if(!this._initHooksCalled){n.callInitHooks&&n.callInitHooks.call(this),this._initHooksCalled=!0;for(var t=0,e=o._initHooks.length;t<e;t++)o._initHooks[t].call(this)}},e},et.include=function(t){var e=this.prototype.options;return l(this.prototype,t),t.options&&(this.prototype.options=e,this.mergeOptions(t.options)),this},et.mergeOptions=function(t){return l(this.prototype.options,t),this},et.addInitHook=function(t){var e=Array.prototype.slice.call(arguments,1),i="function"==typeof t?t:function(){this[t].apply(this,e)};return this.prototype._initHooks=this.prototype._initHooks||[],this.prototype._initHooks.push(i),this};var e={on:function(t,e,i){if("object"==typeof t)for(var n in t)this._on(n,t[n],e);else for(var o=0,s=(t=F(t)).length;o<s;o++)this._on(t[o],e,i);return this},off:function(t,e,i){if(arguments.length)if("object"==typeof t)for(var n in t)this._off(n,t[n],e);else{t=F(t);for(var o=1===arguments.length,s=0,r=t.length;s<r;s++)o?this._off(t[s]):this._off(t[s],e,i)}else delete this._events;return this},_on:function(t,e,i,n){"function"!=typeof e?console.warn("wrong listener type: "+typeof e):!1===this._listens(t,e,i)&&(e={fn:e,ctx:i=i===this?void 0:i},n&&(e.once=!0),this._events=this._events||{},this._events[t]=this._events[t]||[],this._events[t].push(e))},_off:function(t,e,i){var n,o,s;if(this._events&&(n=this._events[t]))if(1===arguments.length){if(this._firingCount)for(o=0,s=n.length;o<s;o++)n[o].fn=u;delete this._events[t]}else"function"!=typeof e?console.warn("wrong listener type: "+typeof e):!1!==(e=this._listens(t,e,i))&&(i=n[e],this._firingCount&&(i.fn=u,this._events[t]=n=n.slice()),n.splice(e,1))},fire:function(t,e,i){if(this.listens(t,i)){var n=l({},e,{type:t,target:this,sourceTarget:e&&e.sourceTarget||this});if(this._events){var o=this._events[t];if(o){this._firingCount=this._firingCount+1||1;for(var s=0,r=o.length;s<r;s++){var a=o[s],h=a.fn;a.once&&this.off(t,h,a.ctx),h.call(a.ctx||this,n)}this._firingCount--}}i&&this._propagateEvent(n)}return this},listens:function(t,e,i,n){"string"!=typeof t&&console.warn('"string" type argument expected');var o=e,s=("function"!=typeof e&&(n=!!e,i=o=void 0),this._events&&this._events[t]);if(s&&s.length&&!1!==this._listens(t,o,i))return!0;if(n)for(var r in this._eventParents)if(this._eventParents[r].listens(t,e,i,n))return!0;return!1},_listens:function(t,e,i){if(this._events){var n=this._events[t]||[];if(!e)return!!n.length;i===this&&(i=void 0);for(var o=0,s=n.length;o<s;o++)if(n[o].fn===e&&n[o].ctx===i)return o}return!1},once:function(t,e,i){if("object"==typeof t)for(var n in t)this._on(n,t[n],e,!0);else for(var o=0,s=(t=F(t)).length;o<s;o++)this._on(t[o],e,i,!0);return this},addEventParent:function(t){return this._eventParents=this._eventParents||{},this._eventParents[h(t)]=t,this},removeEventParent:function(t){return this._eventParents&&delete this._eventParents[h(t)],this},_propagateEvent:function(t){for(var e in this._eventParents)this._eventParents[e].fire(t.type,l({layer:t.target,propagatedFrom:t.target},t),!0)}},it=(e.addEventListener=e.on,e.removeEventListener=e.clearAllEventListeners=e.off,e.addOneTimeEventListener=e.once,e.fireEvent=e.fire,e.hasEventListeners=e.listens,et.extend(e));function p(t,e,i){this.x=i?Math.round(t):t,this.y=i?Math.round(e):e}var nt=Math.trunc||function(t){return 0<t?Math.floor(t):Math.ceil(t)};function m(t,e,i){return t instanceof p?t:d(t)?new p(t[0],t[1]):null==t?t:"object"==typeof t&&"x"in t&&"y"in t?new p(t.x,t.y):new p(t,e,i)}function f(t,e){if(t)for(var i=e?[t,e]:t,n=0,o=i.length;n<o;n++)this.extend(i[n])}function _(t,e){return!t||t instanceof f?t:new f(t,e)}function s(t,e){if(t)for(var i=e?[t,e]:t,n=0,o=i.length;n<o;n++)this.extend(i[n])}function g(t,e){return t instanceof s?t:new s(t,e)}function v(t,e,i){if(isNaN(t)||isNaN(e))throw new Error("Invalid LatLng object: ("+t+", "+e+")");this.lat=+t,this.lng=+e,void 0!==i&&(this.alt=+i)}function w(t,e,i){return t instanceof v?t:d(t)&&"object"!=typeof t[0]?3===t.length?new v(t[0],t[1],t[2]):2===t.length?new v(t[0],t[1]):null:null==t?t:"object"==typeof t&&"lat"in t?new v(t.lat,"lng"in t?t.lng:t.lon,t.alt):void 0===e?null:new v(t,e,i)}p.prototype={clone:function(){return new p(this.x,this.y)},add:function(t){return this.clone()._add(m(t))},_add:function(t){return this.x+=t.x,this.y+=t.y,this},subtract:function(t){return this.clone()._subtract(m(t))},_subtract:function(t){return this.x-=t.x,this.y-=t.y,this},divideBy:function(t){return this.clone()._divideBy(t)},_divideBy:function(t){return this.x/=t,this.y/=t,this},multiplyBy:function(t){return this.clone()._multiplyBy(t)},_multiplyBy:function(t){return this.x*=t,this.y*=t,this},scaleBy:function(t){return new p(this.x*t.x,this.y*t.y)},unscaleBy:function(t){return new p(this.x/t.x,this.y/t.y)},round:function(){return this.clone()._round()},_round:function(){return this.x=Math.round(this.x),this.y=Math.round(this.y),this},floor:function(){return this.clone()._floor()},_floor:function(){return this.x=Math.floor(this.x),this.y=Math.floor(this.y),this},ceil:function(){return this.clone()._ceil()},_ceil:function(){return this.x=Math.ceil(this.x),this.y=Math.ceil(this.y),this},trunc:function(){return this.clone()._trunc()},_trunc:function(){return this.x=nt(this.x),this.y=nt(this.y),this},distanceTo:function(t){var e=(t=m(t)).x-this.x,t=t.y-this.y;return Math.sqrt(e*e+t*t)},equals:function(t){return(t=m(t)).x===this.x&&t.y===this.y},contains:function(t){return t=m(t),Math.abs(t.x)<=Math.abs(this.x)&&Math.abs(t.y)<=Math.abs(this.y)},toString:function(){return"Point("+i(this.x)+", "+i(this.y)+")"}},f.prototype={extend:function(t){var e,i;if(t){if(t instanceof p||"number"==typeof t[0]||"x"in t)e=i=m(t);else if(e=(t=_(t)).min,i=t.max,!e||!i)return this;this.min||this.max?(this.min.x=Math.min(e.x,this.min.x),this.max.x=Math.max(i.x,this.max.x),this.min.y=Math.min(e.y,this.min.y),this.max.y=Math.max(i.y,this.max.y)):(this.min=e.clone(),this.max=i.clone())}return this},getCenter:function(t){return m((this.min.x+this.max.x)/2,(this.min.y+this.max.y)/2,t)},getBottomLeft:function(){return m(this.min.x,this.max.y)},getTopRight:function(){return m(this.max.x,this.min.y)},getTopLeft:function(){return this.min},getBottomRight:function(){return this.max},getSize:function(){return this.max.subtract(this.min)},contains:function(t){var e,i;return(t=("number"==typeof t[0]||t instanceof p?m:_)(t))instanceof f?(e=t.min,i=t.max):e=i=t,e.x>=this.min.x&&i.x<=this.max.x&&e.y>=this.min.y&&i.y<=this.max.y},intersects:function(t){t=_(t);var e=this.min,i=this.max,n=t.min,t=t.max,o=t.x>=e.x&&n.x<=i.x,t=t.y>=e.y&&n.y<=i.y;return o&&t},overlaps:function(t){t=_(t);var e=this.min,i=this.max,n=t.min,t=t.max,o=t.x>e.x&&n.x<i.x,t=t.y>e.y&&n.y<i.y;return o&&t},isValid:function(){return!(!this.min||!this.max)},pad:function(t){var e=this.min,i=this.max,n=Math.abs(e.x-i.x)*t,t=Math.abs(e.y-i.y)*t;return _(m(e.x-n,e.y-t),m(i.x+n,i.y+t))},equals:function(t){return!!t&&(t=_(t),this.min.equals(t.getTopLeft())&&this.max.equals(t.getBottomRight()))}},s.prototype={extend:function(t){var e,i,n=this._southWest,o=this._northEast;if(t instanceof v)i=e=t;else{if(!(t instanceof s))return t?this.extend(w(t)||g(t)):this;if(e=t._southWest,i=t._northEast,!e||!i)return this}return n||o?(n.lat=Math.min(e.lat,n.lat),n.lng=Math.min(e.lng,n.lng),o.lat=Math.max(i.lat,o.lat),o.lng=Math.max(i.lng,o.lng)):(this._southWest=new v(e.lat,e.lng),this._northEast=new v(i.lat,i.lng)),this},pad:function(t){var e=this._southWest,i=this._northEast,n=Math.abs(e.lat-i.lat)*t,t=Math.abs(e.lng-i.lng)*t;return new s(new v(e.lat-n,e.lng-t),new v(i.lat+n,i.lng+t))},getCenter:function(){return new v((this._southWest.lat+this._northEast.lat)/2,(this._southWest.lng+this._northEast.lng)/2)},getSouthWest:function(){return this._southWest},getNorthEast:function(){return this._northEast},getNorthWest:function(){return new v(this.getNorth(),this.getWest())},getSouthEast:function(){return new v(this.getSouth(),this.getEast())},getWest:function(){return this._southWest.lng},getSouth:function(){return this._southWest.lat},getEast:function(){return this._northEast.lng},getNorth:function(){return this._northEast.lat},contains:function(t){t=("number"==typeof t[0]||t instanceof v||"lat"in t?w:g)(t);var e,i,n=this._southWest,o=this._northEast;return t instanceof s?(e=t.getSouthWest(),i=t.getNorthEast()):e=i=t,e.lat>=n.lat&&i.lat<=o.lat&&e.lng>=n.lng&&i.lng<=o.lng},intersects:function(t){t=g(t);var e=this._southWest,i=this._northEast,n=t.getSouthWest(),t=t.getNorthEast(),o=t.lat>=e.lat&&n.lat<=i.lat,t=t.lng>=e.lng&&n.lng<=i.lng;return o&&t},overlaps:function(t){t=g(t);var e=this._southWest,i=this._northEast,n=t.getSouthWest(),t=t.getNorthEast(),o=t.lat>e.lat&&n.lat<i.lat,t=t.lng>e.lng&&n.lng<i.lng;return o&&t},toBBoxString:function(){return[this.getWest(),this.getSouth(),this.getEast(),this.getNorth()].join(",")},equals:function(t,e){return!!t&&(t=g(t),this._southWest.equals(t.getSouthWest(),e)&&this._northEast.equals(t.getNorthEast(),e))},isValid:function(){return!(!this._southWest||!this._northEast)}};var ot={latLngToPoint:function(t,e){t=this.projection.project(t),e=this.scale(e);return this.transformation._transform(t,e)},pointToLatLng:function(t,e){e=this.scale(e),t=this.transformation.untransform(t,e);return this.projection.unproject(t)},project:function(t){return this.projection.project(t)},unproject:function(t){return this.projection.unproject(t)},scale:function(t){return 256*Math.pow(2,t)},zoom:function(t){return Math.log(t/256)/Math.LN2},getProjectedBounds:function(t){var e;return this.infinite?null:(e=this.projection.bounds,t=this.scale(t),new f(this.transformation.transform(e.min,t),this.transformation.transform(e.max,t)))},infinite:!(v.prototype={equals:function(t,e){return!!t&&(t=w(t),Math.max(Math.abs(this.lat-t.lat),Math.abs(this.lng-t.lng))<=(void 0===e?1e-9:e))},toString:function(t){return"LatLng("+i(this.lat,t)+", "+i(this.lng,t)+")"},distanceTo:function(t){return st.distance(this,w(t))},wrap:function(){return st.wrapLatLng(this)},toBounds:function(t){var t=180*t/40075017,e=t/Math.cos(Math.PI/180*this.lat);return g([this.lat-t,this.lng-e],[this.lat+t,this.lng+e])},clone:function(){return new v(this.lat,this.lng,this.alt)}}),wrapLatLng:function(t){var e=this.wrapLng?H(t.lng,this.wrapLng,!0):t.lng;return new v(this.wrapLat?H(t.lat,this.wrapLat,!0):t.lat,e,t.alt)},wrapLatLngBounds:function(t){var e=t.getCenter(),i=this.wrapLatLng(e),n=e.lat-i.lat,e=e.lng-i.lng;return 0==n&&0==e?t:(i=t.getSouthWest(),t=t.getNorthEast(),new s(new v(i.lat-n,i.lng-e),new v(t.lat-n,t.lng-e)))}},st=l({},ot,{wrapLng:[-180,180],R:6371e3,distance:function(t,e){var i=Math.PI/180,n=t.lat*i,o=e.lat*i,s=Math.sin((e.lat-t.lat)*i/2),e=Math.sin((e.lng-t.lng)*i/2),t=s*s+Math.cos(n)*Math.cos(o)*e*e,i=2*Math.atan2(Math.sqrt(t),Math.sqrt(1-t));return this.R*i}}),rt=6378137,rt={R:rt,MAX_LATITUDE:85.0511287798,project:function(t){var e=Math.PI/180,i=this.MAX_LATITUDE,i=Math.max(Math.min(i,t.lat),-i),i=Math.sin(i*e);return new p(this.R*t.lng*e,this.R*Math.log((1+i)/(1-i))/2)},unproject:function(t){var e=180/Math.PI;return new v((2*Math.atan(Math.exp(t.y/this.R))-Math.PI/2)*e,t.x*e/this.R)},bounds:new f([-(rt=rt*Math.PI),-rt],[rt,rt])};function at(t,e,i,n){d(t)?(this._a=t[0],this._b=t[1],this._c=t[2],this._d=t[3]):(this._a=t,this._b=e,this._c=i,this._d=n)}function ht(t,e,i,n){return new at(t,e,i,n)}at.prototype={transform:function(t,e){return this._transform(t.clone(),e)},_transform:function(t,e){return t.x=(e=e||1)*(this._a*t.x+this._b),t.y=e*(this._c*t.y+this._d),t},untransform:function(t,e){return new p((t.x/(e=e||1)-this._b)/this._a,(t.y/e-this._d)/this._c)}};var lt=l({},st,{code:"EPSG:3857",projection:rt,transformation:ht(lt=.5/(Math.PI*rt.R),.5,-lt,.5)}),ut=l({},lt,{code:"EPSG:900913"});function ct(t){return document.createElementNS("http://www.w3.org/2000/svg",t)}function dt(t,e){for(var i,n,o,s,r="",a=0,h=t.length;a<h;a++){for(i=0,n=(o=t[a]).length;i<n;i++)r+=(i?"L":"M")+(s=o[i]).x+" "+s.y;r+=e?b.svg?"z":"x":""}return r||"M0 0"}var _t=document.documentElement.style,pt="ActiveXObject"in window,mt=pt&&!document.addEventListener,n="msLaunchUri"in navigator&&!("documentMode"in document),ft=y("webkit"),gt=y("android"),vt=y("android 2")||y("android 3"),yt=parseInt(/WebKit\/([0-9]+)|$/.exec(navigator.userAgent)[1],10),yt=gt&&y("Google")&&yt<537&&!("AudioNode"in window),xt=!!window.opera,wt=!n&&y("chrome"),bt=y("gecko")&&!ft&&!xt&&!pt,Pt=!wt&&y("safari"),Lt=y("phantom"),o="OTransition"in _t,Tt=0===navigator.platform.indexOf("Win"),Mt=pt&&"transition"in _t,zt="WebKitCSSMatrix"in window&&"m11"in new window.WebKitCSSMatrix&&!vt,_t="MozPerspective"in _t,Ct=!window.L_DISABLE_3D&&(Mt||zt||_t)&&!o&&!Lt,Zt="undefined"!=typeof orientation||y("mobile"),St=Zt&&ft,Et=Zt&&zt,kt=!window.PointerEvent&&window.MSPointerEvent,Ot=!(!window.PointerEvent&&!kt),At="ontouchstart"in window||!!window.TouchEvent,Bt=!window.L_NO_TOUCH&&(At||Ot),It=Zt&&xt,Rt=Zt&&bt,Nt=1<(window.devicePixelRatio||window.screen.deviceXDPI/window.screen.logicalXDPI),Dt=function(){var t=!1;try{var e=Object.defineProperty({},"passive",{get:function(){t=!0}});window.addEventListener("testPassiveEventSupport",u,e),window.removeEventListener("testPassiveEventSupport",u,e)}catch(t){}return t}(),jt=!!document.createElement("canvas").getContext,Ht=!(!document.createElementNS||!ct("svg").createSVGRect),Wt=!!Ht&&((Wt=document.createElement("div")).innerHTML="<svg/>","http://www.w3.org/2000/svg"===(Wt.firstChild&&Wt.firstChild.namespaceURI));function y(t){return 0<=navigator.userAgent.toLowerCase().indexOf(t)}var b={ie:pt,ielt9:mt,edge:n,webkit:ft,android:gt,android23:vt,androidStock:yt,opera:xt,chrome:wt,gecko:bt,safari:Pt,phantom:Lt,opera12:o,win:Tt,ie3d:Mt,webkit3d:zt,gecko3d:_t,any3d:Ct,mobile:Zt,mobileWebkit:St,mobileWebkit3d:Et,msPointer:kt,pointer:Ot,touch:Bt,touchNative:At,mobileOpera:It,mobileGecko:Rt,retina:Nt,passiveEvents:Dt,canvas:jt,svg:Ht,vml:!Ht&&function(){try{var t=document.createElement("div"),e=(t.innerHTML='<v:shape adj="1"/>',t.firstChild);return e.style.behavior="url(#default#VML)",e&&"object"==typeof e.adj}catch(t){return!1}}(),inlineSvg:Wt,mac:0===navigator.platform.indexOf("Mac"),linux:0===navigator.platform.indexOf("Linux")},Ft=b.msPointer?"MSPointerDown":"pointerdown",Ut=b.msPointer?"MSPointerMove":"pointermove",Vt=b.msPointer?"MSPointerUp":"pointerup",qt=b.msPointer?"MSPointerCancel":"pointercancel",Gt={touchstart:Ft,touchmove:Ut,touchend:Vt,touchcancel:qt},Kt={touchstart:function(t,e){e.MSPOINTER_TYPE_TOUCH&&e.pointerType===e.MSPOINTER_TYPE_TOUCH&&O(e);ee(t,e)},touchmove:ee,touchend:ee,touchcancel:ee},Yt={},Xt=!1;function Jt(t,e,i){return"touchstart"!==e||Xt||(document.addEventListener(Ft,$t,!0),document.addEventListener(Ut,Qt,!0),document.addEventListener(Vt,te,!0),document.addEventListener(qt,te,!0),Xt=!0),Kt[e]?(i=Kt[e].bind(this,i),t.addEventListener(Gt[e],i,!1),i):(console.warn("wrong event specified:",e),u)}function $t(t){Yt[t.pointerId]=t}function Qt(t){Yt[t.pointerId]&&(Yt[t.pointerId]=t)}function te(t){delete Yt[t.pointerId]}function ee(t,e){if(e.pointerType!==(e.MSPOINTER_TYPE_MOUSE||"mouse")){for(var i in e.touches=[],Yt)e.touches.push(Yt[i]);e.changedTouches=[e],t(e)}}var ie=200;function ne(t,i){t.addEventListener("dblclick",i);var n,o=0;function e(t){var e;1!==t.detail?n=t.detail:"mouse"===t.pointerType||t.sourceCapabilities&&!t.sourceCapabilities.firesTouchEvents||((e=Ne(t)).some(function(t){return t instanceof HTMLLabelElement&&t.attributes.for})&&!e.some(function(t){return t instanceof HTMLInputElement||t instanceof HTMLSelectElement})||((e=Date.now())-o<=ie?2===++n&&i(function(t){var e,i,n={};for(i in t)e=t[i],n[i]=e&&e.bind?e.bind(t):e;return(t=n).type="dblclick",n.detail=2,n.isTrusted=!1,n._simulated=!0,n}(t)):n=1,o=e))}return t.addEventListener("click",e),{dblclick:i,simDblclick:e}}var oe,se,re,ae,he,le,ue=we(["transform","webkitTransform","OTransform","MozTransform","msTransform"]),ce=we(["webkitTransition","transition","OTransition","MozTransition","msTransition"]),de="webkitTransition"===ce||"OTransition"===ce?ce+"End":"transitionend";function _e(t){return"string"==typeof t?document.getElementById(t):t}function pe(t,e){var i=t.style[e]||t.currentStyle&&t.currentStyle[e];return"auto"===(i=i&&"auto"!==i||!document.defaultView?i:(t=document.defaultView.getComputedStyle(t,null))?t[e]:null)?null:i}function P(t,e,i){t=document.createElement(t);return t.className=e||"",i&&i.appendChild(t),t}function T(t){var e=t.parentNode;e&&e.removeChild(t)}function me(t){for(;t.firstChild;)t.removeChild(t.firstChild)}function fe(t){var e=t.parentNode;e&&e.lastChild!==t&&e.appendChild(t)}function ge(t){var e=t.parentNode;e&&e.firstChild!==t&&e.insertBefore(t,e.firstChild)}function ve(t,e){return void 0!==t.classList?t.classList.contains(e):0<(t=xe(t)).length&&new RegExp("(^|\\s)"+e+"(\\s|$)").test(t)}function M(t,e){var i;if(void 0!==t.classList)for(var n=F(e),o=0,s=n.length;o<s;o++)t.classList.add(n[o]);else ve(t,e)||ye(t,((i=xe(t))?i+" ":"")+e)}function z(t,e){void 0!==t.classList?t.classList.remove(e):ye(t,W((" "+xe(t)+" ").replace(" "+e+" "," ")))}function ye(t,e){void 0===t.className.baseVal?t.className=e:t.className.baseVal=e}function xe(t){return void 0===(t=t.correspondingElement?t.correspondingElement:t).className.baseVal?t.className:t.className.baseVal}function C(t,e){if("opacity"in t.style)t.style.opacity=e;else if("filter"in t.style){var i=!1,n="DXImageTransform.Microsoft.Alpha";try{i=t.filters.item(n)}catch(t){if(1===e)return}e=Math.round(100*e),i?(i.Enabled=100!==e,i.Opacity=e):t.style.filter+=" progid:"+n+"(opacity="+e+")"}}function we(t){for(var e=document.documentElement.style,i=0;i<t.length;i++)if(t[i]in e)return t[i];return!1}function be(t,e,i){e=e||new p(0,0);t.style[ue]=(b.ie3d?"translate("+e.x+"px,"+e.y+"px)":"translate3d("+e.x+"px,"+e.y+"px,0)")+(i?" scale("+i+")":"")}function Z(t,e){t._leaflet_pos=e,b.any3d?be(t,e):(t.style.left=e.x+"px",t.style.top=e.y+"px")}function Pe(t){return t._leaflet_pos||new p(0,0)}function Le(){S(window,"dragstart",O)}function Te(){k(window,"dragstart",O)}function Me(t){for(;-1===t.tabIndex;)t=t.parentNode;t.style&&(ze(),le=(he=t).style.outlineStyle,t.style.outlineStyle="none",S(window,"keydown",ze))}function ze(){he&&(he.style.outlineStyle=le,le=he=void 0,k(window,"keydown",ze))}function Ce(t){for(;!((t=t.parentNode).offsetWidth&&t.offsetHeight||t===document.body););return t}function Ze(t){var e=t.getBoundingClientRect();return{x:e.width/t.offsetWidth||1,y:e.height/t.offsetHeight||1,boundingClientRect:e}}ae="onselectstart"in document?(re=function(){S(window,"selectstart",O)},function(){k(window,"selectstart",O)}):(se=we(["userSelect","WebkitUserSelect","OUserSelect","MozUserSelect","msUserSelect"]),re=function(){var t;se&&(t=document.documentElement.style,oe=t[se],t[se]="none")},function(){se&&(document.documentElement.style[se]=oe,oe=void 0)});pt={__proto__:null,TRANSFORM:ue,TRANSITION:ce,TRANSITION_END:de,get:_e,getStyle:pe,create:P,remove:T,empty:me,toFront:fe,toBack:ge,hasClass:ve,addClass:M,removeClass:z,setClass:ye,getClass:xe,setOpacity:C,testProp:we,setTransform:be,setPosition:Z,getPosition:Pe,get disableTextSelection(){return re},get enableTextSelection(){return ae},disableImageDrag:Le,enableImageDrag:Te,preventOutline:Me,restoreOutline:ze,getSizedParentNode:Ce,getScale:Ze};function S(t,e,i,n){if(e&&"object"==typeof e)for(var o in e)ke(t,o,e[o],i);else for(var s=0,r=(e=F(e)).length;s<r;s++)ke(t,e[s],i,n);return this}var E="_leaflet_events";function k(t,e,i,n){if(1===arguments.length)Se(t),delete t[E];else if(e&&"object"==typeof e)for(var o in e)Oe(t,o,e[o],i);else if(e=F(e),2===arguments.length)Se(t,function(t){return-1!==G(e,t)});else for(var s=0,r=e.length;s<r;s++)Oe(t,e[s],i,n);return this}function Se(t,e){for(var i in t[E]){var n=i.split(/\d/)[0];e&&!e(n)||Oe(t,n,null,null,i)}}var Ee={mouseenter:"mouseover",mouseleave:"mouseout",wheel:!("onwheel"in window)&&"mousewheel"};function ke(e,t,i,n){var o,s,r=t+h(i)+(n?"_"+h(n):"");e[E]&&e[E][r]||(s=o=function(t){return i.call(n||e,t||window.event)},!b.touchNative&&b.pointer&&0===t.indexOf("touch")?o=Jt(e,t,o):b.touch&&"dblclick"===t?o=ne(e,o):"addEventListener"in e?"touchstart"===t||"touchmove"===t||"wheel"===t||"mousewheel"===t?e.addEventListener(Ee[t]||t,o,!!b.passiveEvents&&{passive:!1}):"mouseenter"===t||"mouseleave"===t?e.addEventListener(Ee[t],o=function(t){t=t||window.event,We(e,t)&&s(t)},!1):e.addEventListener(t,s,!1):e.attachEvent("on"+t,o),e[E]=e[E]||{},e[E][r]=o)}function Oe(t,e,i,n,o){o=o||e+h(i)+(n?"_"+h(n):"");var s,r,i=t[E]&&t[E][o];i&&(!b.touchNative&&b.pointer&&0===e.indexOf("touch")?(n=t,r=i,Gt[s=e]?n.removeEventListener(Gt[s],r,!1):console.warn("wrong event specified:",s)):b.touch&&"dblclick"===e?(n=i,(r=t).removeEventListener("dblclick",n.dblclick),r.removeEventListener("click",n.simDblclick)):"removeEventListener"in t?t.removeEventListener(Ee[e]||e,i,!1):t.detachEvent("on"+e,i),t[E][o]=null)}function Ae(t){return t.stopPropagation?t.stopPropagation():t.originalEvent?t.originalEvent._stopped=!0:t.cancelBubble=!0,this}function Be(t){return ke(t,"wheel",Ae),this}function Ie(t){return S(t,"mousedown touchstart dblclick contextmenu",Ae),t._leaflet_disable_click=!0,this}function O(t){return t.preventDefault?t.preventDefault():t.returnValue=!1,this}function Re(t){return O(t),Ae(t),this}function Ne(t){if(t.composedPath)return t.composedPath();for(var e=[],i=t.target;i;)e.push(i),i=i.parentNode;return e}function De(t,e){var i,n;return e?(n=(i=Ze(e)).boundingClientRect,new p((t.clientX-n.left)/i.x-e.clientLeft,(t.clientY-n.top)/i.y-e.clientTop)):new p(t.clientX,t.clientY)}var je=b.linux&&b.chrome?window.devicePixelRatio:b.mac?3*window.devicePixelRatio:0<window.devicePixelRatio?2*window.devicePixelRatio:1;function He(t){return b.edge?t.wheelDeltaY/2:t.deltaY&&0===t.deltaMode?-t.deltaY/je:t.deltaY&&1===t.deltaMode?20*-t.deltaY:t.deltaY&&2===t.deltaMode?60*-t.deltaY:t.deltaX||t.deltaZ?0:t.wheelDelta?(t.wheelDeltaY||t.wheelDelta)/2:t.detail&&Math.abs(t.detail)<32765?20*-t.detail:t.detail?t.detail/-32765*60:0}function We(t,e){var i=e.relatedTarget;if(!i)return!0;try{for(;i&&i!==t;)i=i.parentNode}catch(t){return!1}return i!==t}var mt={__proto__:null,on:S,off:k,stopPropagation:Ae,disableScrollPropagation:Be,disableClickPropagation:Ie,preventDefault:O,stop:Re,getPropagationPath:Ne,getMousePosition:De,getWheelDelta:He,isExternalTarget:We,addListener:S,removeListener:k},Fe=it.extend({run:function(t,e,i,n){this.stop(),this._el=t,this._inProgress=!0,this._duration=i||.25,this._easeOutPower=1/Math.max(n||.5,.2),this._startPos=Pe(t),this._offset=e.subtract(this._startPos),this._startTime=+new Date,this.fire("start"),this._animate()},stop:function(){this._inProgress&&(this._step(!0),this._complete())},_animate:function(){this._animId=x(this._animate,this),this._step()},_step:function(t){var e=+new Date-this._startTime,i=1e3*this._duration;e<i?this._runFrame(this._easeOut(e/i),t):(this._runFrame(1),this._complete())},_runFrame:function(t,e){t=this._startPos.add(this._offset.multiplyBy(t));e&&t._round(),Z(this._el,t),this.fire("step")},_complete:function(){r(this._animId),this._inProgress=!1,this.fire("end")},_easeOut:function(t){return 1-Math.pow(1-t,this._easeOutPower)}}),A=it.extend({options:{crs:lt,center:void 0,zoom:void 0,minZoom:void 0,maxZoom:void 0,layers:[],maxBounds:void 0,renderer:void 0,zoomAnimation:!0,zoomAnimationThreshold:4,fadeAnimation:!0,markerZoomAnimation:!0,transform3DLimit:8388608,zoomSnap:1,zoomDelta:1,trackResize:!0},initialize:function(t,e){e=c(this,e),this._handlers=[],this._layers={},this._zoomBoundLayers={},this._sizeChanged=!0,this._initContainer(t),this._initLayout(),this._onResize=a(this._onResize,this),this._initEvents(),e.maxBounds&&this.setMaxBounds(e.maxBounds),void 0!==e.zoom&&(this._zoom=this._limitZoom(e.zoom)),e.center&&void 0!==e.zoom&&this.setView(w(e.center),e.zoom,{reset:!0}),this.callInitHooks(),this._zoomAnimated=ce&&b.any3d&&!b.mobileOpera&&this.options.zoomAnimation,this._zoomAnimated&&(this._createAnimProxy(),S(this._proxy,de,this._catchTransitionEnd,this)),this._addLayers(this.options.layers)},setView:function(t,e,i){if((e=void 0===e?this._zoom:this._limitZoom(e),t=this._limitCenter(w(t),e,this.options.maxBounds),i=i||{},this._stop(),this._loaded&&!i.reset&&!0!==i)&&(void 0!==i.animate&&(i.zoom=l({animate:i.animate},i.zoom),i.pan=l({animate:i.animate,duration:i.duration},i.pan)),this._zoom!==e?this._tryAnimatedZoom&&this._tryAnimatedZoom(t,e,i.zoom):this._tryAnimatedPan(t,i.pan)))return clearTimeout(this._sizeTimer),this;return this._resetView(t,e,i.pan&&i.pan.noMoveStart),this},setZoom:function(t,e){return this._loaded?this.setView(this.getCenter(),t,{zoom:e}):(this._zoom=t,this)},zoomIn:function(t,e){return t=t||(b.any3d?this.options.zoomDelta:1),this.setZoom(this._zoom+t,e)},zoomOut:function(t,e){return t=t||(b.any3d?this.options.zoomDelta:1),this.setZoom(this._zoom-t,e)},setZoomAround:function(t,e,i){var n=this.getZoomScale(e),o=this.getSize().divideBy(2),t=(t instanceof p?t:this.latLngToContainerPoint(t)).subtract(o).multiplyBy(1-1/n),n=this.containerPointToLatLng(o.add(t));return this.setView(n,e,{zoom:i})},_getBoundsCenterZoom:function(t,e){e=e||{},t=t.getBounds?t.getBounds():g(t);var i=m(e.paddingTopLeft||e.padding||[0,0]),n=m(e.paddingBottomRight||e.padding||[0,0]),o=this.getBoundsZoom(t,!1,i.add(n));return(o="number"==typeof e.maxZoom?Math.min(e.maxZoom,o):o)===1/0?{center:t.getCenter(),zoom:o}:(e=n.subtract(i).divideBy(2),n=this.project(t.getSouthWest(),o),i=this.project(t.getNorthEast(),o),{center:this.unproject(n.add(i).divideBy(2).add(e),o),zoom:o})},fitBounds:function(t,e){if((t=g(t)).isValid())return t=this._getBoundsCenterZoom(t,e),this.setView(t.center,t.zoom,e);throw new Error("Bounds are not valid.")},fitWorld:function(t){return this.fitBounds([[-90,-180],[90,180]],t)},panTo:function(t,e){return this.setView(t,this._zoom,{pan:e})},panBy:function(t,e){var i;return e=e||{},(t=m(t).round()).x||t.y?(!0===e.animate||this.getSize().contains(t)?(this._panAnim||(this._panAnim=new Fe,this._panAnim.on({step:this._onPanTransitionStep,end:this._onPanTransitionEnd},this)),e.noMoveStart||this.fire("movestart"),!1!==e.animate?(M(this._mapPane,"leaflet-pan-anim"),i=this._getMapPanePos().subtract(t).round(),this._panAnim.run(this._mapPane,i,e.duration||.25,e.easeLinearity)):(this._rawPanBy(t),this.fire("move").fire("moveend"))):this._resetView(this.unproject(this.project(this.getCenter()).add(t)),this.getZoom()),this):this.fire("moveend")},flyTo:function(n,o,t){if(!1===(t=t||{}).animate||!b.any3d)return this.setView(n,o,t);this._stop();var s=this.project(this.getCenter()),r=this.project(n),e=this.getSize(),a=this._zoom,h=(n=w(n),o=void 0===o?a:o,Math.max(e.x,e.y)),i=h*this.getZoomScale(a,o),l=r.distanceTo(s)||1,u=1.42,c=u*u;function d(t){t=(i*i-h*h+(t?-1:1)*c*c*l*l)/(2*(t?i:h)*c*l),t=Math.sqrt(t*t+1)-t;return t<1e-9?-18:Math.log(t)}function _(t){return(Math.exp(t)-Math.exp(-t))/2}function p(t){return(Math.exp(t)+Math.exp(-t))/2}var m=d(0);function f(t){return h*(p(m)*(_(t=m+u*t)/p(t))-_(m))/c}var g=Date.now(),v=(d(1)-m)/u,y=t.duration?1e3*t.duration:1e3*v*.8;return this._moveStart(!0,t.noMoveStart),function t(){var e=(Date.now()-g)/y,i=(1-Math.pow(1-e,1.5))*v;e<=1?(this._flyToFrame=x(t,this),this._move(this.unproject(s.add(r.subtract(s).multiplyBy(f(i)/l)),a),this.getScaleZoom(h/(e=i,h*(p(m)/p(m+u*e))),a),{flyTo:!0})):this._move(n,o)._moveEnd(!0)}.call(this),this},flyToBounds:function(t,e){t=this._getBoundsCenterZoom(t,e);return this.flyTo(t.center,t.zoom,e)},setMaxBounds:function(t){return t=g(t),this.listens("moveend",this._panInsideMaxBounds)&&this.off("moveend",this._panInsideMaxBounds),t.isValid()?(this.options.maxBounds=t,this._loaded&&this._panInsideMaxBounds(),this.on("moveend",this._panInsideMaxBounds)):(this.options.maxBounds=null,this)},setMinZoom:function(t){var e=this.options.minZoom;return this.options.minZoom=t,this._loaded&&e!==t&&(this.fire("zoomlevelschange"),this.getZoom()<this.options.minZoom)?this.setZoom(t):this},setMaxZoom:function(t){var e=this.options.maxZoom;return this.options.maxZoom=t,this._loaded&&e!==t&&(this.fire("zoomlevelschange"),this.getZoom()>this.options.maxZoom)?this.setZoom(t):this},panInsideBounds:function(t,e){this._enforcingBounds=!0;var i=this.getCenter(),t=this._limitCenter(i,this._zoom,g(t));return i.equals(t)||this.panTo(t,e),this._enforcingBounds=!1,this},panInside:function(t,e){var i=m((e=e||{}).paddingTopLeft||e.padding||[0,0]),n=m(e.paddingBottomRight||e.padding||[0,0]),o=this.project(this.getCenter()),t=this.project(t),s=this.getPixelBounds(),i=_([s.min.add(i),s.max.subtract(n)]),s=i.getSize();return i.contains(t)||(this._enforcingBounds=!0,n=t.subtract(i.getCenter()),i=i.extend(t).getSize().subtract(s),o.x+=n.x<0?-i.x:i.x,o.y+=n.y<0?-i.y:i.y,this.panTo(this.unproject(o),e),this._enforcingBounds=!1),this},invalidateSize:function(t){if(!this._loaded)return this;t=l({animate:!1,pan:!0},!0===t?{animate:!0}:t);var e=this.getSize(),i=(this._sizeChanged=!0,this._lastCenter=null,this.getSize()),n=e.divideBy(2).round(),o=i.divideBy(2).round(),n=n.subtract(o);return n.x||n.y?(t.animate&&t.pan?this.panBy(n):(t.pan&&this._rawPanBy(n),this.fire("move"),t.debounceMoveend?(clearTimeout(this._sizeTimer),this._sizeTimer=setTimeout(a(this.fire,this,"moveend"),200)):this.fire("moveend")),this.fire("resize",{oldSize:e,newSize:i})):this},stop:function(){return this.setZoom(this._limitZoom(this._zoom)),this.options.zoomSnap||this.fire("viewreset"),this._stop()},locate:function(t){var e,i;return t=this._locateOptions=l({timeout:1e4,watch:!1},t),"geolocation"in navigator?(e=a(this._handleGeolocationResponse,this),i=a(this._handleGeolocationError,this),t.watch?this._locationWatchId=navigator.geolocation.watchPosition(e,i,t):navigator.geolocation.getCurrentPosition(e,i,t)):this._handleGeolocationError({code:0,message:"Geolocation not supported."}),this},stopLocate:function(){return navigator.geolocation&&navigator.geolocation.clearWatch&&navigator.geolocation.clearWatch(this._locationWatchId),this._locateOptions&&(this._locateOptions.setView=!1),this},_handleGeolocationError:function(t){var e;this._container._leaflet_id&&(e=t.code,t=t.message||(1===e?"permission denied":2===e?"position unavailable":"timeout"),this._locateOptions.setView&&!this._loaded&&this.fitWorld(),this.fire("locationerror",{code:e,message:"Geolocation error: "+t+"."}))},_handleGeolocationResponse:function(t){if(this._container._leaflet_id){var e,i,n=new v(t.coords.latitude,t.coords.longitude),o=n.toBounds(2*t.coords.accuracy),s=this._locateOptions,r=(s.setView&&(e=this.getBoundsZoom(o),this.setView(n,s.maxZoom?Math.min(e,s.maxZoom):e)),{latlng:n,bounds:o,timestamp:t.timestamp});for(i in t.coords)"number"==typeof t.coords[i]&&(r[i]=t.coords[i]);this.fire("locationfound",r)}},addHandler:function(t,e){return e&&(e=this[t]=new e(this),this._handlers.push(e),this.options[t]&&e.enable()),this},remove:function(){if(this._initEvents(!0),this.options.maxBounds&&this.off("moveend",this._panInsideMaxBounds),this._containerId!==this._container._leaflet_id)throw new Error("Map container is being reused by another instance");try{delete this._container._leaflet_id,delete this._containerId}catch(t){this._container._leaflet_id=void 0,this._containerId=void 0}for(var t in void 0!==this._locationWatchId&&this.stopLocate(),this._stop(),T(this._mapPane),this._clearControlPos&&this._clearControlPos(),this._resizeRequest&&(r(this._resizeRequest),this._resizeRequest=null),this._clearHandlers(),this._loaded&&this.fire("unload"),this._layers)this._layers[t].remove();for(t in this._panes)T(this._panes[t]);return this._layers=[],this._panes=[],delete this._mapPane,delete this._renderer,this},createPane:function(t,e){e=P("div","leaflet-pane"+(t?" leaflet-"+t.replace("Pane","")+"-pane":""),e||this._mapPane);return t&&(this._panes[t]=e),e},getCenter:function(){return this._checkIfLoaded(),this._lastCenter&&!this._moved()?this._lastCenter.clone():this.layerPointToLatLng(this._getCenterLayerPoint())},getZoom:function(){return this._zoom},getBounds:function(){var t=this.getPixelBounds();return new s(this.unproject(t.getBottomLeft()),this.unproject(t.getTopRight()))},getMinZoom:function(){return void 0===this.options.minZoom?this._layersMinZoom||0:this.options.minZoom},getMaxZoom:function(){return void 0===this.options.maxZoom?void 0===this._layersMaxZoom?1/0:this._layersMaxZoom:this.options.maxZoom},getBoundsZoom:function(t,e,i){t=g(t),i=m(i||[0,0]);var n=this.getZoom()||0,o=this.getMinZoom(),s=this.getMaxZoom(),r=t.getNorthWest(),t=t.getSouthEast(),i=this.getSize().subtract(i),t=_(this.project(t,n),this.project(r,n)).getSize(),r=b.any3d?this.options.zoomSnap:1,a=i.x/t.x,i=i.y/t.y,t=e?Math.max(a,i):Math.min(a,i),n=this.getScaleZoom(t,n);return r&&(n=Math.round(n/(r/100))*(r/100),n=e?Math.ceil(n/r)*r:Math.floor(n/r)*r),Math.max(o,Math.min(s,n))},getSize:function(){return this._size&&!this._sizeChanged||(this._size=new p(this._container.clientWidth||0,this._container.clientHeight||0),this._sizeChanged=!1),this._size.clone()},getPixelBounds:function(t,e){t=this._getTopLeftPoint(t,e);return new f(t,t.add(this.getSize()))},getPixelOrigin:function(){return this._checkIfLoaded(),this._pixelOrigin},getPixelWorldBounds:function(t){return this.options.crs.getProjectedBounds(void 0===t?this.getZoom():t)},getPane:function(t){return"string"==typeof t?this._panes[t]:t},getPanes:function(){return this._panes},getContainer:function(){return this._container},getZoomScale:function(t,e){var i=this.options.crs;return e=void 0===e?this._zoom:e,i.scale(t)/i.scale(e)},getScaleZoom:function(t,e){var i=this.options.crs,t=(e=void 0===e?this._zoom:e,i.zoom(t*i.scale(e)));return isNaN(t)?1/0:t},project:function(t,e){return e=void 0===e?this._zoom:e,this.options.crs.latLngToPoint(w(t),e)},unproject:function(t,e){return e=void 0===e?this._zoom:e,this.options.crs.pointToLatLng(m(t),e)},layerPointToLatLng:function(t){t=m(t).add(this.getPixelOrigin());return this.unproject(t)},latLngToLayerPoint:function(t){return this.project(w(t))._round()._subtract(this.getPixelOrigin())},wrapLatLng:function(t){return this.options.crs.wrapLatLng(w(t))},wrapLatLngBounds:function(t){return this.options.crs.wrapLatLngBounds(g(t))},distance:function(t,e){return this.options.crs.distance(w(t),w(e))},containerPointToLayerPoint:function(t){return m(t).subtract(this._getMapPanePos())},layerPointToContainerPoint:function(t){return m(t).add(this._getMapPanePos())},containerPointToLatLng:function(t){t=this.containerPointToLayerPoint(m(t));return this.layerPointToLatLng(t)},latLngToContainerPoint:function(t){return this.layerPointToContainerPoint(this.latLngToLayerPoint(w(t)))},mouseEventToContainerPoint:function(t){return De(t,this._container)},mouseEventToLayerPoint:function(t){return this.containerPointToLayerPoint(this.mouseEventToContainerPoint(t))},mouseEventToLatLng:function(t){return this.layerPointToLatLng(this.mouseEventToLayerPoint(t))},_initContainer:function(t){t=this._container=_e(t);if(!t)throw new Error("Map container not found.");if(t._leaflet_id)throw new Error("Map container is already initialized.");S(t,"scroll",this._onScroll,this),this._containerId=h(t)},_initLayout:function(){var t=this._container,e=(this._fadeAnimated=this.options.fadeAnimation&&b.any3d,M(t,"leaflet-container"+(b.touch?" leaflet-touch":"")+(b.retina?" leaflet-retina":"")+(b.ielt9?" leaflet-oldie":"")+(b.safari?" leaflet-safari":"")+(this._fadeAnimated?" leaflet-fade-anim":"")),pe(t,"position"));"absolute"!==e&&"relative"!==e&&"fixed"!==e&&"sticky"!==e&&(t.style.position="relative"),this._initPanes(),this._initControlPos&&this._initControlPos()},_initPanes:function(){var t=this._panes={};this._paneRenderers={},this._mapPane=this.createPane("mapPane",this._container),Z(this._mapPane,new p(0,0)),this.createPane("tilePane"),this.createPane("overlayPane"),this.createPane("shadowPane"),this.createPane("markerPane"),this.createPane("tooltipPane"),this.createPane("popupPane"),this.options.markerZoomAnimation||(M(t.markerPane,"leaflet-zoom-hide"),M(t.shadowPane,"leaflet-zoom-hide"))},_resetView:function(t,e,i){Z(this._mapPane,new p(0,0));var n=!this._loaded,o=(this._loaded=!0,e=this._limitZoom(e),this.fire("viewprereset"),this._zoom!==e);this._moveStart(o,i)._move(t,e)._moveEnd(o),this.fire("viewreset"),n&&this.fire("load")},_moveStart:function(t,e){return t&&this.fire("zoomstart"),e||this.fire("movestart"),this},_move:function(t,e,i,n){void 0===e&&(e=this._zoom);var o=this._zoom!==e;return this._zoom=e,this._lastCenter=t,this._pixelOrigin=this._getNewPixelOrigin(t),n?i&&i.pinch&&this.fire("zoom",i):((o||i&&i.pinch)&&this.fire("zoom",i),this.fire("move",i)),this},_moveEnd:function(t){return t&&this.fire("zoomend"),this.fire("moveend")},_stop:function(){return r(this._flyToFrame),this._panAnim&&this._panAnim.stop(),this},_rawPanBy:function(t){Z(this._mapPane,this._getMapPanePos().subtract(t))},_getZoomSpan:function(){return this.getMaxZoom()-this.getMinZoom()},_panInsideMaxBounds:function(){this._enforcingBounds||this.panInsideBounds(this.options.maxBounds)},_checkIfLoaded:function(){if(!this._loaded)throw new Error("Set map center and zoom first.")},_initEvents:function(t){this._targets={};var e=t?k:S;e((this._targets[h(this._container)]=this)._container,"click dblclick mousedown mouseup mouseover mouseout mousemove contextmenu keypress keydown keyup",this._handleDOMEvent,this),this.options.trackResize&&e(window,"resize",this._onResize,this),b.any3d&&this.options.transform3DLimit&&(t?this.off:this.on).call(this,"moveend",this._onMoveEnd)},_onResize:function(){r(this._resizeRequest),this._resizeRequest=x(function(){this.invalidateSize({debounceMoveend:!0})},this)},_onScroll:function(){this._container.scrollTop=0,this._container.scrollLeft=0},_onMoveEnd:function(){var t=this._getMapPanePos();Math.max(Math.abs(t.x),Math.abs(t.y))>=this.options.transform3DLimit&&this._resetView(this.getCenter(),this.getZoom())},_findEventTargets:function(t,e){for(var i,n=[],o="mouseout"===e||"mouseover"===e,s=t.target||t.srcElement,r=!1;s;){if((i=this._targets[h(s)])&&("click"===e||"preclick"===e)&&this._draggableMoved(i)){r=!0;break}if(i&&i.listens(e,!0)){if(o&&!We(s,t))break;if(n.push(i),o)break}if(s===this._container)break;s=s.parentNode}return n=n.length||r||o||!this.listens(e,!0)?n:[this]},_isClickDisabled:function(t){for(;t&&t!==this._container;){if(t._leaflet_disable_click)return!0;t=t.parentNode}},_handleDOMEvent:function(t){var e,i=t.target||t.srcElement;!this._loaded||i._leaflet_disable_events||"click"===t.type&&this._isClickDisabled(i)||("mousedown"===(e=t.type)&&Me(i),this._fireDOMEvent(t,e))},_mouseEvents:["click","dblclick","mouseover","mouseout","contextmenu"],_fireDOMEvent:function(t,e,i){"click"===t.type&&((a=l({},t)).type="preclick",this._fireDOMEvent(a,a.type,i));var n=this._findEventTargets(t,e);if(i){for(var o=[],s=0;s<i.length;s++)i[s].listens(e,!0)&&o.push(i[s]);n=o.concat(n)}if(n.length){"contextmenu"===e&&O(t);var r,a=n[0],h={originalEvent:t};for("keypress"!==t.type&&"keydown"!==t.type&&"keyup"!==t.type&&(r=a.getLatLng&&(!a._radius||a._radius<=10),h.containerPoint=r?this.latLngToContainerPoint(a.getLatLng()):this.mouseEventToContainerPoint(t),h.layerPoint=this.containerPointToLayerPoint(h.containerPoint),h.latlng=r?a.getLatLng():this.layerPointToLatLng(h.layerPoint)),s=0;s<n.length;s++)if(n[s].fire(e,h,!0),h.originalEvent._stopped||!1===n[s].options.bubblingMouseEvents&&-1!==G(this._mouseEvents,e))return}},_draggableMoved:function(t){return(t=t.dragging&&t.dragging.enabled()?t:this).dragging&&t.dragging.moved()||this.boxZoom&&this.boxZoom.moved()},_clearHandlers:function(){for(var t=0,e=this._handlers.length;t<e;t++)this._handlers[t].disable()},whenReady:function(t,e){return this._loaded?t.call(e||this,{target:this}):this.on("load",t,e),this},_getMapPanePos:function(){return Pe(this._mapPane)||new p(0,0)},_moved:function(){var t=this._getMapPanePos();return t&&!t.equals([0,0])},_getTopLeftPoint:function(t,e){return(t&&void 0!==e?this._getNewPixelOrigin(t,e):this.getPixelOrigin()).subtract(this._getMapPanePos())},_getNewPixelOrigin:function(t,e){var i=this.getSize()._divideBy(2);return this.project(t,e)._subtract(i)._add(this._getMapPanePos())._round()},_latLngToNewLayerPoint:function(t,e,i){i=this._getNewPixelOrigin(i,e);return this.project(t,e)._subtract(i)},_latLngBoundsToNewLayerBounds:function(t,e,i){i=this._getNewPixelOrigin(i,e);return _([this.project(t.getSouthWest(),e)._subtract(i),this.project(t.getNorthWest(),e)._subtract(i),this.project(t.getSouthEast(),e)._subtract(i),this.project(t.getNorthEast(),e)._subtract(i)])},_getCenterLayerPoint:function(){return this.containerPointToLayerPoint(this.getSize()._divideBy(2))},_getCenterOffset:function(t){return this.latLngToLayerPoint(t).subtract(this._getCenterLayerPoint())},_limitCenter:function(t,e,i){var n,o;return!i||(n=this.project(t,e),o=this.getSize().divideBy(2),o=new f(n.subtract(o),n.add(o)),o=this._getBoundsOffset(o,i,e),Math.abs(o.x)<=1&&Math.abs(o.y)<=1)?t:this.unproject(n.add(o),e)},_limitOffset:function(t,e){var i;return e?(i=new f((i=this.getPixelBounds()).min.add(t),i.max.add(t)),t.add(this._getBoundsOffset(i,e))):t},_getBoundsOffset:function(t,e,i){e=_(this.project(e.getNorthEast(),i),this.project(e.getSouthWest(),i)),i=e.min.subtract(t.min),e=e.max.subtract(t.max);return new p(this._rebound(i.x,-e.x),this._rebound(i.y,-e.y))},_rebound:function(t,e){return 0<t+e?Math.round(t-e)/2:Math.max(0,Math.ceil(t))-Math.max(0,Math.floor(e))},_limitZoom:function(t){var e=this.getMinZoom(),i=this.getMaxZoom(),n=b.any3d?this.options.zoomSnap:1;return n&&(t=Math.round(t/n)*n),Math.max(e,Math.min(i,t))},_onPanTransitionStep:function(){this.fire("move")},_onPanTransitionEnd:function(){z(this._mapPane,"leaflet-pan-anim"),this.fire("moveend")},_tryAnimatedPan:function(t,e){t=this._getCenterOffset(t)._trunc();return!(!0!==(e&&e.animate)&&!this.getSize().contains(t))&&(this.panBy(t,e),!0)},_createAnimProxy:function(){var t=this._proxy=P("div","leaflet-proxy leaflet-zoom-animated");this._panes.mapPane.appendChild(t),this.on("zoomanim",function(t){var e=ue,i=this._proxy.style[e];be(this._proxy,this.project(t.center,t.zoom),this.getZoomScale(t.zoom,1)),i===this._proxy.style[e]&&this._animatingZoom&&this._onZoomTransitionEnd()},this),this.on("load moveend",this._animMoveEnd,this),this._on("unload",this._destroyAnimProxy,this)},_destroyAnimProxy:function(){T(this._proxy),this.off("load moveend",this._animMoveEnd,this),delete this._proxy},_animMoveEnd:function(){var t=this.getCenter(),e=this.getZoom();be(this._proxy,this.project(t,e),this.getZoomScale(e,1))},_catchTransitionEnd:function(t){this._animatingZoom&&0<=t.propertyName.indexOf("transform")&&this._onZoomTransitionEnd()},_nothingToAnimate:function(){return!this._container.getElementsByClassName("leaflet-zoom-animated").length},_tryAnimatedZoom:function(t,e,i){if(!this._animatingZoom){if(i=i||{},!this._zoomAnimated||!1===i.animate||this._nothingToAnimate()||Math.abs(e-this._zoom)>this.options.zoomAnimationThreshold)return!1;var n=this.getZoomScale(e),n=this._getCenterOffset(t)._divideBy(1-1/n);if(!0!==i.animate&&!this.getSize().contains(n))return!1;x(function(){this._moveStart(!0,i.noMoveStart||!1)._animateZoom(t,e,!0)},this)}return!0},_animateZoom:function(t,e,i,n){this._mapPane&&(i&&(this._animatingZoom=!0,this._animateToCenter=t,this._animateToZoom=e,M(this._mapPane,"leaflet-zoom-anim")),this.fire("zoomanim",{center:t,zoom:e,noUpdate:n}),this._tempFireZoomEvent||(this._tempFireZoomEvent=this._zoom!==this._animateToZoom),this._move(this._animateToCenter,this._animateToZoom,void 0,!0),setTimeout(a(this._onZoomTransitionEnd,this),250))},_onZoomTransitionEnd:function(){this._animatingZoom&&(this._mapPane&&z(this._mapPane,"leaflet-zoom-anim"),this._animatingZoom=!1,this._move(this._animateToCenter,this._animateToZoom,void 0,!0),this._tempFireZoomEvent&&this.fire("zoom"),delete this._tempFireZoomEvent,this.fire("move"),this._moveEnd(!0))}});function Ue(t){return new B(t)}var B=et.extend({options:{position:"topright"},initialize:function(t){c(this,t)},getPosition:function(){return this.options.position},setPosition:function(t){var e=this._map;return e&&e.removeControl(this),this.options.position=t,e&&e.addControl(this),this},getContainer:function(){return this._container},addTo:function(t){this.remove(),this._map=t;var e=this._container=this.onAdd(t),i=this.getPosition(),t=t._controlCorners[i];return M(e,"leaflet-control"),-1!==i.indexOf("bottom")?t.insertBefore(e,t.firstChild):t.appendChild(e),this._map.on("unload",this.remove,this),this},remove:function(){return this._map&&(T(this._container),this.onRemove&&this.onRemove(this._map),this._map.off("unload",this.remove,this),this._map=null),this},_refocusOnMap:function(t){this._map&&t&&0<t.screenX&&0<t.screenY&&this._map.getContainer().focus()}}),Ve=(A.include({addControl:function(t){return t.addTo(this),this},removeControl:function(t){return t.remove(),this},_initControlPos:function(){var i=this._controlCorners={},n="leaflet-",o=this._controlContainer=P("div",n+"control-container",this._container);function t(t,e){i[t+e]=P("div",n+t+" "+n+e,o)}t("top","left"),t("top","right"),t("bottom","left"),t("bottom","right")},_clearControlPos:function(){for(var t in this._controlCorners)T(this._controlCorners[t]);T(this._controlContainer),delete this._controlCorners,delete this._controlContainer}}),B.extend({options:{collapsed:!0,position:"topright",autoZIndex:!0,hideSingleBase:!1,sortLayers:!1,sortFunction:function(t,e,i,n){return i<n?-1:n<i?1:0}},initialize:function(t,e,i){for(var n in c(this,i),this._layerControlInputs=[],this._layers=[],this._lastZIndex=0,this._handlingClick=!1,this._preventClick=!1,t)this._addLayer(t[n],n);for(n in e)this._addLayer(e[n],n,!0)},onAdd:function(t){this._initLayout(),this._update(),(this._map=t).on("zoomend",this._checkDisabledLayers,this);for(var e=0;e<this._layers.length;e++)this._layers[e].layer.on("add remove",this._onLayerChange,this);return this._container},addTo:function(t){return B.prototype.addTo.call(this,t),this._expandIfNotCollapsed()},onRemove:function(){this._map.off("zoomend",this._checkDisabledLayers,this);for(var t=0;t<this._layers.length;t++)this._layers[t].layer.off("add remove",this._onLayerChange,this)},addBaseLayer:function(t,e){return this._addLayer(t,e),this._map?this._update():this},addOverlay:function(t,e){return this._addLayer(t,e,!0),this._map?this._update():this},removeLayer:function(t){t.off("add remove",this._onLayerChange,this);t=this._getLayer(h(t));return t&&this._layers.splice(this._layers.indexOf(t),1),this._map?this._update():this},expand:function(){M(this._container,"leaflet-control-layers-expanded"),this._section.style.height=null;var t=this._map.getSize().y-(this._container.offsetTop+50);return t<this._section.clientHeight?(M(this._section,"leaflet-control-layers-scrollbar"),this._section.style.height=t+"px"):z(this._section,"leaflet-control-layers-scrollbar"),this._checkDisabledLayers(),this},collapse:function(){return z(this._container,"leaflet-control-layers-expanded"),this},_initLayout:function(){var t="leaflet-control-layers",e=this._container=P("div",t),i=this.options.collapsed,n=(e.setAttribute("aria-haspopup",!0),Ie(e),Be(e),this._section=P("section",t+"-list")),o=(i&&(this._map.on("click",this.collapse,this),S(e,{mouseenter:this._expandSafely,mouseleave:this.collapse},this)),this._layersLink=P("a",t+"-toggle",e));o.href="#",o.title="Layers",o.setAttribute("role","button"),S(o,{keydown:function(t){13===t.keyCode&&this._expandSafely()},click:function(t){O(t),this._expandSafely()}},this),i||this.expand(),this._baseLayersList=P("div",t+"-base",n),this._separator=P("div",t+"-separator",n),this._overlaysList=P("div",t+"-overlays",n),e.appendChild(n)},_getLayer:function(t){for(var e=0;e<this._layers.length;e++)if(this._layers[e]&&h(this._layers[e].layer)===t)return this._layers[e]},_addLayer:function(t,e,i){this._map&&t.on("add remove",this._onLayerChange,this),this._layers.push({layer:t,name:e,overlay:i}),this.options.sortLayers&&this._layers.sort(a(function(t,e){return this.options.sortFunction(t.layer,e.layer,t.name,e.name)},this)),this.options.autoZIndex&&t.setZIndex&&(this._lastZIndex++,t.setZIndex(this._lastZIndex)),this._expandIfNotCollapsed()},_update:function(){if(this._container){me(this._baseLayersList),me(this._overlaysList),this._layerControlInputs=[];for(var t,e,i,n=0,o=0;o<this._layers.length;o++)i=this._layers[o],this._addItem(i),e=e||i.overlay,t=t||!i.overlay,n+=i.overlay?0:1;this.options.hideSingleBase&&(this._baseLayersList.style.display=(t=t&&1<n)?"":"none"),this._separator.style.display=e&&t?"":"none"}return this},_onLayerChange:function(t){this._handlingClick||this._update();var e=this._getLayer(h(t.target)),t=e.overlay?"add"===t.type?"overlayadd":"overlayremove":"add"===t.type?"baselayerchange":null;t&&this._map.fire(t,e)},_createRadioElement:function(t,e){t='<input type="radio" class="leaflet-control-layers-selector" name="'+t+'"'+(e?' checked="checked"':"")+"/>",e=document.createElement("div");return e.innerHTML=t,e.firstChild},_addItem:function(t){var e,i=document.createElement("label"),n=this._map.hasLayer(t.layer),n=(t.overlay?((e=document.createElement("input")).type="checkbox",e.className="leaflet-control-layers-selector",e.defaultChecked=n):e=this._createRadioElement("leaflet-base-layers_"+h(this),n),this._layerControlInputs.push(e),e.layerId=h(t.layer),S(e,"click",this._onInputClick,this),document.createElement("span")),o=(n.innerHTML=" "+t.name,document.createElement("span"));return i.appendChild(o),o.appendChild(e),o.appendChild(n),(t.overlay?this._overlaysList:this._baseLayersList).appendChild(i),this._checkDisabledLayers(),i},_onInputClick:function(){if(!this._preventClick){var t,e,i=this._layerControlInputs,n=[],o=[];this._handlingClick=!0;for(var s=i.length-1;0<=s;s--)t=i[s],e=this._getLayer(t.layerId).layer,t.checked?n.push(e):t.checked||o.push(e);for(s=0;s<o.length;s++)this._map.hasLayer(o[s])&&this._map.removeLayer(o[s]);for(s=0;s<n.length;s++)this._map.hasLayer(n[s])||this._map.addLayer(n[s]);this._handlingClick=!1,this._refocusOnMap()}},_checkDisabledLayers:function(){for(var t,e,i=this._layerControlInputs,n=this._map.getZoom(),o=i.length-1;0<=o;o--)t=i[o],e=this._getLayer(t.layerId).layer,t.disabled=void 0!==e.options.minZoom&&n<e.options.minZoom||void 0!==e.options.maxZoom&&n>e.options.maxZoom},_expandIfNotCollapsed:function(){return this._map&&!this.options.collapsed&&this.expand(),this},_expandSafely:function(){var t=this._section,e=(this._preventClick=!0,S(t,"click",O),this.expand(),this);setTimeout(function(){k(t,"click",O),e._preventClick=!1})}})),qe=B.extend({options:{position:"topleft",zoomInText:'<span aria-hidden="true">+</span>',zoomInTitle:"Zoom in",zoomOutText:'<span aria-hidden="true">&#x2212;</span>',zoomOutTitle:"Zoom out"},onAdd:function(t){var e="leaflet-control-zoom",i=P("div",e+" leaflet-bar"),n=this.options;return this._zoomInButton=this._createButton(n.zoomInText,n.zoomInTitle,e+"-in",i,this._zoomIn),this._zoomOutButton=this._createButton(n.zoomOutText,n.zoomOutTitle,e+"-out",i,this._zoomOut),this._updateDisabled(),t.on("zoomend zoomlevelschange",this._updateDisabled,this),i},onRemove:function(t){t.off("zoomend zoomlevelschange",this._updateDisabled,this)},disable:function(){return this._disabled=!0,this._updateDisabled(),this},enable:function(){return this._disabled=!1,this._updateDisabled(),this},_zoomIn:function(t){!this._disabled&&this._map._zoom<this._map.getMaxZoom()&&this._map.zoomIn(this._map.options.zoomDelta*(t.shiftKey?3:1))},_zoomOut:function(t){!this._disabled&&this._map._zoom>this._map.getMinZoom()&&this._map.zoomOut(this._map.options.zoomDelta*(t.shiftKey?3:1))},_createButton:function(t,e,i,n,o){i=P("a",i,n);return i.innerHTML=t,i.href="#",i.title=e,i.setAttribute("role","button"),i.setAttribute("aria-label",e),Ie(i),S(i,"click",Re),S(i,"click",o,this),S(i,"click",this._refocusOnMap,this),i},_updateDisabled:function(){var t=this._map,e="leaflet-disabled";z(this._zoomInButton,e),z(this._zoomOutButton,e),this._zoomInButton.setAttribute("aria-disabled","false"),this._zoomOutButton.setAttribute("aria-disabled","false"),!this._disabled&&t._zoom!==t.getMinZoom()||(M(this._zoomOutButton,e),this._zoomOutButton.setAttribute("aria-disabled","true")),!this._disabled&&t._zoom!==t.getMaxZoom()||(M(this._zoomInButton,e),this._zoomInButton.setAttribute("aria-disabled","true"))}}),Ge=(A.mergeOptions({zoomControl:!0}),A.addInitHook(function(){this.options.zoomControl&&(this.zoomControl=new qe,this.addControl(this.zoomControl))}),B.extend({options:{position:"bottomleft",maxWidth:100,metric:!0,imperial:!0},onAdd:function(t){var e="leaflet-control-scale",i=P("div",e),n=this.options;return this._addScales(n,e+"-line",i),t.on(n.updateWhenIdle?"moveend":"move",this._update,this),t.whenReady(this._update,this),i},onRemove:function(t){t.off(this.options.updateWhenIdle?"moveend":"move",this._update,this)},_addScales:function(t,e,i){t.metric&&(this._mScale=P("div",e,i)),t.imperial&&(this._iScale=P("div",e,i))},_update:function(){var t=this._map,e=t.getSize().y/2,t=t.distance(t.containerPointToLatLng([0,e]),t.containerPointToLatLng([this.options.maxWidth,e]));this._updateScales(t)},_updateScales:function(t){this.options.metric&&t&&this._updateMetric(t),this.options.imperial&&t&&this._updateImperial(t)},_updateMetric:function(t){var e=this._getRoundNum(t);this._updateScale(this._mScale,e<1e3?e+" m":e/1e3+" km",e/t)},_updateImperial:function(t){var e,i,t=3.2808399*t;5280<t?(i=this._getRoundNum(e=t/5280),this._updateScale(this._iScale,i+" mi",i/e)):(i=this._getRoundNum(t),this._updateScale(this._iScale,i+" ft",i/t))},_updateScale:function(t,e,i){t.style.width=Math.round(this.options.maxWidth*i)+"px",t.innerHTML=e},_getRoundNum:function(t){var e=Math.pow(10,(Math.floor(t)+"").length-1),t=t/e;return e*(t=10<=t?10:5<=t?5:3<=t?3:2<=t?2:1)}})),Ke=B.extend({options:{position:"bottomright",prefix:'<a href="https://leafletjs.com" title="A JavaScript library for interactive maps">'+(b.inlineSvg?'<svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="12" height="8" viewBox="0 0 12 8" class="leaflet-attribution-flag"><path fill="#4C7BE1" d="M0 0h12v4H0z"/><path fill="#FFD500" d="M0 4h12v3H0z"/><path fill="#E0BC00" d="M0 7h12v1H0z"/></svg> ':"")+"Leaflet</a>"},initialize:function(t){c(this,t),this._attributions={}},onAdd:function(t){for(var e in(t.attributionControl=this)._container=P("div","leaflet-control-attribution"),Ie(this._container),t._layers)t._layers[e].getAttribution&&this.addAttribution(t._layers[e].getAttribution());return this._update(),t.on("layeradd",this._addAttribution,this),this._container},onRemove:function(t){t.off("layeradd",this._addAttribution,this)},_addAttribution:function(t){t.layer.getAttribution&&(this.addAttribution(t.layer.getAttribution()),t.layer.once("remove",function(){this.removeAttribution(t.layer.getAttribution())},this))},setPrefix:function(t){return this.options.prefix=t,this._update(),this},addAttribution:function(t){return t&&(this._attributions[t]||(this._attributions[t]=0),this._attributions[t]++,this._update()),this},removeAttribution:function(t){return t&&this._attributions[t]&&(this._attributions[t]--,this._update()),this},_update:function(){if(this._map){var t,e=[];for(t in this._attributions)this._attributions[t]&&e.push(t);var i=[];this.options.prefix&&i.push(this.options.prefix),e.length&&i.push(e.join(", ")),this._container.innerHTML=i.join(' <span aria-hidden="true">|</span> ')}}}),n=(A.mergeOptions({attributionControl:!0}),A.addInitHook(function(){this.options.attributionControl&&(new Ke).addTo(this)}),B.Layers=Ve,B.Zoom=qe,B.Scale=Ge,B.Attribution=Ke,Ue.layers=function(t,e,i){return new Ve(t,e,i)},Ue.zoom=function(t){return new qe(t)},Ue.scale=function(t){return new Ge(t)},Ue.attribution=function(t){return new Ke(t)},et.extend({initialize:function(t){this._map=t},enable:function(){return this._enabled||(this._enabled=!0,this.addHooks()),this},disable:function(){return this._enabled&&(this._enabled=!1,this.removeHooks()),this},enabled:function(){return!!this._enabled}})),ft=(n.addTo=function(t,e){return t.addHandler(e,this),this},{Events:e}),Ye=b.touch?"touchstart mousedown":"mousedown",Xe=it.extend({options:{clickTolerance:3},initialize:function(t,e,i,n){c(this,n),this._element=t,this._dragStartTarget=e||t,this._preventOutline=i},enable:function(){this._enabled||(S(this._dragStartTarget,Ye,this._onDown,this),this._enabled=!0)},disable:function(){this._enabled&&(Xe._dragging===this&&this.finishDrag(!0),k(this._dragStartTarget,Ye,this._onDown,this),this._enabled=!1,this._moved=!1)},_onDown:function(t){var e,i;this._enabled&&(this._moved=!1,ve(this._element,"leaflet-zoom-anim")||(t.touches&&1!==t.touches.length?Xe._dragging===this&&this.finishDrag():Xe._dragging||t.shiftKey||1!==t.which&&1!==t.button&&!t.touches||((Xe._dragging=this)._preventOutline&&Me(this._element),Le(),re(),this._moving||(this.fire("down"),i=t.touches?t.touches[0]:t,e=Ce(this._element),this._startPoint=new p(i.clientX,i.clientY),this._startPos=Pe(this._element),this._parentScale=Ze(e),i="mousedown"===t.type,S(document,i?"mousemove":"touchmove",this._onMove,this),S(document,i?"mouseup":"touchend touchcancel",this._onUp,this)))))},_onMove:function(t){var e;this._enabled&&(t.touches&&1<t.touches.length?this._moved=!0:!(e=new p((e=t.touches&&1===t.touches.length?t.touches[0]:t).clientX,e.clientY)._subtract(this._startPoint)).x&&!e.y||Math.abs(e.x)+Math.abs(e.y)<this.options.clickTolerance||(e.x/=this._parentScale.x,e.y/=this._parentScale.y,O(t),this._moved||(this.fire("dragstart"),this._moved=!0,M(document.body,"leaflet-dragging"),this._lastTarget=t.target||t.srcElement,window.SVGElementInstance&&this._lastTarget instanceof window.SVGElementInstance&&(this._lastTarget=this._lastTarget.correspondingUseElement),M(this._lastTarget,"leaflet-drag-target")),this._newPos=this._startPos.add(e),this._moving=!0,this._lastEvent=t,this._updatePosition()))},_updatePosition:function(){var t={originalEvent:this._lastEvent};this.fire("predrag",t),Z(this._element,this._newPos),this.fire("drag",t)},_onUp:function(){this._enabled&&this.finishDrag()},finishDrag:function(t){z(document.body,"leaflet-dragging"),this._lastTarget&&(z(this._lastTarget,"leaflet-drag-target"),this._lastTarget=null),k(document,"mousemove touchmove",this._onMove,this),k(document,"mouseup touchend touchcancel",this._onUp,this),Te(),ae();var e=this._moved&&this._moving;this._moving=!1,Xe._dragging=!1,e&&this.fire("dragend",{noInertia:t,distance:this._newPos.distanceTo(this._startPos)})}});function Je(t,e,i){for(var n,o,s,r,a,h,l,u=[1,4,2,8],c=0,d=t.length;c<d;c++)t[c]._code=si(t[c],e);for(s=0;s<4;s++){for(h=u[s],n=[],c=0,o=(d=t.length)-1;c<d;o=c++)r=t[c],a=t[o],r._code&h?a._code&h||((l=oi(a,r,h,e,i))._code=si(l,e),n.push(l)):(a._code&h&&((l=oi(a,r,h,e,i))._code=si(l,e),n.push(l)),n.push(r));t=n}return t}function $e(t,e){var i,n,o,s,r,a,h;if(!t||0===t.length)throw new Error("latlngs not passed");I(t)||(console.warn("latlngs are not flat! Only the first ring will be used"),t=t[0]);for(var l=w([0,0]),u=g(t),c=(u.getNorthWest().distanceTo(u.getSouthWest())*u.getNorthEast().distanceTo(u.getNorthWest())<1700&&(l=Qe(t)),t.length),d=[],_=0;_<c;_++){var p=w(t[_]);d.push(e.project(w([p.lat-l.lat,p.lng-l.lng])))}for(_=r=a=h=0,i=c-1;_<c;i=_++)n=d[_],o=d[i],s=n.y*o.x-o.y*n.x,a+=(n.x+o.x)*s,h+=(n.y+o.y)*s,r+=3*s;u=0===r?d[0]:[a/r,h/r],u=e.unproject(m(u));return w([u.lat+l.lat,u.lng+l.lng])}function Qe(t){for(var e=0,i=0,n=0,o=0;o<t.length;o++){var s=w(t[o]);e+=s.lat,i+=s.lng,n++}return w([e/n,i/n])}var ti,gt={__proto__:null,clipPolygon:Je,polygonCenter:$e,centroid:Qe};function ei(t,e){if(e&&t.length){var i=t=function(t,e){for(var i=[t[0]],n=1,o=0,s=t.length;n<s;n++)(function(t,e){var i=e.x-t.x,e=e.y-t.y;return i*i+e*e})(t[n],t[o])>e&&(i.push(t[n]),o=n);o<s-1&&i.push(t[s-1]);return i}(t,e=e*e),n=i.length,o=new(typeof Uint8Array!=void 0+""?Uint8Array:Array)(n);o[0]=o[n-1]=1,function t(e,i,n,o,s){var r,a,h,l=0;for(a=o+1;a<=s-1;a++)h=ri(e[a],e[o],e[s],!0),l<h&&(r=a,l=h);n<l&&(i[r]=1,t(e,i,n,o,r),t(e,i,n,r,s))}(i,o,e,0,n-1);var s,r=[];for(s=0;s<n;s++)o[s]&&r.push(i[s]);return r}return t.slice()}function ii(t,e,i){return Math.sqrt(ri(t,e,i,!0))}function ni(t,e,i,n,o){var s,r,a,h=n?ti:si(t,i),l=si(e,i);for(ti=l;;){if(!(h|l))return[t,e];if(h&l)return!1;a=si(r=oi(t,e,s=h||l,i,o),i),s===h?(t=r,h=a):(e=r,l=a)}}function oi(t,e,i,n,o){var s,r,a=e.x-t.x,e=e.y-t.y,h=n.min,n=n.max;return 8&i?(s=t.x+a*(n.y-t.y)/e,r=n.y):4&i?(s=t.x+a*(h.y-t.y)/e,r=h.y):2&i?(s=n.x,r=t.y+e*(n.x-t.x)/a):1&i&&(s=h.x,r=t.y+e*(h.x-t.x)/a),new p(s,r,o)}function si(t,e){var i=0;return t.x<e.min.x?i|=1:t.x>e.max.x&&(i|=2),t.y<e.min.y?i|=4:t.y>e.max.y&&(i|=8),i}function ri(t,e,i,n){var o=e.x,e=e.y,s=i.x-o,r=i.y-e,a=s*s+r*r;return 0<a&&(1<(a=((t.x-o)*s+(t.y-e)*r)/a)?(o=i.x,e=i.y):0<a&&(o+=s*a,e+=r*a)),s=t.x-o,r=t.y-e,n?s*s+r*r:new p(o,e)}function I(t){return!d(t[0])||"object"!=typeof t[0][0]&&void 0!==t[0][0]}function ai(t){return console.warn("Deprecated use of _flat, please use L.LineUtil.isFlat instead."),I(t)}function hi(t,e){var i,n,o,s,r,a;if(!t||0===t.length)throw new Error("latlngs not passed");I(t)||(console.warn("latlngs are not flat! Only the first ring will be used"),t=t[0]);for(var h=w([0,0]),l=g(t),u=(l.getNorthWest().distanceTo(l.getSouthWest())*l.getNorthEast().distanceTo(l.getNorthWest())<1700&&(h=Qe(t)),t.length),c=[],d=0;d<u;d++){var _=w(t[d]);c.push(e.project(w([_.lat-h.lat,_.lng-h.lng])))}for(i=d=0;d<u-1;d++)i+=c[d].distanceTo(c[d+1])/2;if(0===i)a=c[0];else for(n=d=0;d<u-1;d++)if(o=c[d],s=c[d+1],i<(n+=r=o.distanceTo(s))){a=[s.x-(r=(n-i)/r)*(s.x-o.x),s.y-r*(s.y-o.y)];break}l=e.unproject(m(a));return w([l.lat+h.lat,l.lng+h.lng])}var vt={__proto__:null,simplify:ei,pointToSegmentDistance:ii,closestPointOnSegment:function(t,e,i){return ri(t,e,i)},clipSegment:ni,_getEdgeIntersection:oi,_getBitCode:si,_sqClosestPointOnSegment:ri,isFlat:I,_flat:ai,polylineCenter:hi},yt={project:function(t){return new p(t.lng,t.lat)},unproject:function(t){return new v(t.y,t.x)},bounds:new f([-180,-90],[180,90])},xt={R:6378137,R_MINOR:6356752.314245179,bounds:new f([-20037508.34279,-15496570.73972],[20037508.34279,18764656.23138]),project:function(t){var e=Math.PI/180,i=this.R,n=t.lat*e,o=this.R_MINOR/i,o=Math.sqrt(1-o*o),s=o*Math.sin(n),s=Math.tan(Math.PI/4-n/2)/Math.pow((1-s)/(1+s),o/2),n=-i*Math.log(Math.max(s,1e-10));return new p(t.lng*e*i,n)},unproject:function(t){for(var e,i=180/Math.PI,n=this.R,o=this.R_MINOR/n,s=Math.sqrt(1-o*o),r=Math.exp(-t.y/n),a=Math.PI/2-2*Math.atan(r),h=0,l=.1;h<15&&1e-7<Math.abs(l);h++)e=s*Math.sin(a),e=Math.pow((1-e)/(1+e),s/2),a+=l=Math.PI/2-2*Math.atan(r*e)-a;return new v(a*i,t.x*i/n)}},wt={__proto__:null,LonLat:yt,Mercator:xt,SphericalMercator:rt},Pt=l({},st,{code:"EPSG:3395",projection:xt,transformation:ht(bt=.5/(Math.PI*xt.R),.5,-bt,.5)}),li=l({},st,{code:"EPSG:4326",projection:yt,transformation:ht(1/180,1,-1/180,.5)}),Lt=l({},ot,{projection:yt,transformation:ht(1,0,-1,0),scale:function(t){return Math.pow(2,t)},zoom:function(t){return Math.log(t)/Math.LN2},distance:function(t,e){var i=e.lng-t.lng,e=e.lat-t.lat;return Math.sqrt(i*i+e*e)},infinite:!0}),o=(ot.Earth=st,ot.EPSG3395=Pt,ot.EPSG3857=lt,ot.EPSG900913=ut,ot.EPSG4326=li,ot.Simple=Lt,it.extend({options:{pane:"overlayPane",attribution:null,bubblingMouseEvents:!0},addTo:function(t){return t.addLayer(this),this},remove:function(){return this.removeFrom(this._map||this._mapToAdd)},removeFrom:function(t){return t&&t.removeLayer(this),this},getPane:function(t){return this._map.getPane(t?this.options[t]||t:this.options.pane)},addInteractiveTarget:function(t){return this._map._targets[h(t)]=this},removeInteractiveTarget:function(t){return delete this._map._targets[h(t)],this},getAttribution:function(){return this.options.attribution},_layerAdd:function(t){var e,i=t.target;i.hasLayer(this)&&(this._map=i,this._zoomAnimated=i._zoomAnimated,this.getEvents&&(e=this.getEvents(),i.on(e,this),this.once("remove",function(){i.off(e,this)},this)),this.onAdd(i),this.fire("add"),i.fire("layeradd",{layer:this}))}})),ui=(A.include({addLayer:function(t){var e;if(t._layerAdd)return e=h(t),this._layers[e]||((this._layers[e]=t)._mapToAdd=this,t.beforeAdd&&t.beforeAdd(this),this.whenReady(t._layerAdd,t)),this;throw new Error("The provided object is not a Layer.")},removeLayer:function(t){var e=h(t);return this._layers[e]&&(this._loaded&&t.onRemove(this),delete this._layers[e],this._loaded&&(this.fire("layerremove",{layer:t}),t.fire("remove")),t._map=t._mapToAdd=null),this},hasLayer:function(t){return h(t)in this._layers},eachLayer:function(t,e){for(var i in this._layers)t.call(e,this._layers[i]);return this},_addLayers:function(t){for(var e=0,i=(t=t?d(t)?t:[t]:[]).length;e<i;e++)this.addLayer(t[e])},_addZoomLimit:function(t){isNaN(t.options.maxZoom)&&isNaN(t.options.minZoom)||(this._zoomBoundLayers[h(t)]=t,this._updateZoomLevels())},_removeZoomLimit:function(t){t=h(t);this._zoomBoundLayers[t]&&(delete this._zoomBoundLayers[t],this._updateZoomLevels())},_updateZoomLevels:function(){var t,e=1/0,i=-1/0,n=this._getZoomSpan();for(t in this._zoomBoundLayers)var o=this._zoomBoundLayers[t].options,e=void 0===o.minZoom?e:Math.min(e,o.minZoom),i=void 0===o.maxZoom?i:Math.max(i,o.maxZoom);this._layersMaxZoom=i===-1/0?void 0:i,this._layersMinZoom=e===1/0?void 0:e,n!==this._getZoomSpan()&&this.fire("zoomlevelschange"),void 0===this.options.maxZoom&&this._layersMaxZoom&&this.getZoom()>this._layersMaxZoom&&this.setZoom(this._layersMaxZoom),void 0===this.options.minZoom&&this._layersMinZoom&&this.getZoom()<this._layersMinZoom&&this.setZoom(this._layersMinZoom)}}),o.extend({initialize:function(t,e){var i,n;if(c(this,e),this._layers={},t)for(i=0,n=t.length;i<n;i++)this.addLayer(t[i])},addLayer:function(t){var e=this.getLayerId(t);return this._layers[e]=t,this._map&&this._map.addLayer(t),this},removeLayer:function(t){t=t in this._layers?t:this.getLayerId(t);return this._map&&this._layers[t]&&this._map.removeLayer(this._layers[t]),delete this._layers[t],this},hasLayer:function(t){return("number"==typeof t?t:this.getLayerId(t))in this._layers},clearLayers:function(){return this.eachLayer(this.removeLayer,this)},invoke:function(t){var e,i,n=Array.prototype.slice.call(arguments,1);for(e in this._layers)(i=this._layers[e])[t]&&i[t].apply(i,n);return this},onAdd:function(t){this.eachLayer(t.addLayer,t)},onRemove:function(t){this.eachLayer(t.removeLayer,t)},eachLayer:function(t,e){for(var i in this._layers)t.call(e,this._layers[i]);return this},getLayer:function(t){return this._layers[t]},getLayers:function(){var t=[];return this.eachLayer(t.push,t),t},setZIndex:function(t){return this.invoke("setZIndex",t)},getLayerId:h})),ci=ui.extend({addLayer:function(t){return this.hasLayer(t)?this:(t.addEventParent(this),ui.prototype.addLayer.call(this,t),this.fire("layeradd",{layer:t}))},removeLayer:function(t){return this.hasLayer(t)?((t=t in this._layers?this._layers[t]:t).removeEventParent(this),ui.prototype.removeLayer.call(this,t),this.fire("layerremove",{layer:t})):this},setStyle:function(t){return this.invoke("setStyle",t)},bringToFront:function(){return this.invoke("bringToFront")},bringToBack:function(){return this.invoke("bringToBack")},getBounds:function(){var t,e=new s;for(t in this._layers){var i=this._layers[t];e.extend(i.getBounds?i.getBounds():i.getLatLng())}return e}}),di=et.extend({options:{popupAnchor:[0,0],tooltipAnchor:[0,0],crossOrigin:!1},initialize:function(t){c(this,t)},createIcon:function(t){return this._createIcon("icon",t)},createShadow:function(t){return this._createIcon("shadow",t)},_createIcon:function(t,e){var i=this._getIconUrl(t);if(i)return i=this._createImg(i,e&&"IMG"===e.tagName?e:null),this._setIconStyles(i,t),!this.options.crossOrigin&&""!==this.options.crossOrigin||(i.crossOrigin=!0===this.options.crossOrigin?"":this.options.crossOrigin),i;if("icon"===t)throw new Error("iconUrl not set in Icon options (see the docs).");return null},_setIconStyles:function(t,e){var i=this.options,n=i[e+"Size"],n=m(n="number"==typeof n?[n,n]:n),o=m("shadow"===e&&i.shadowAnchor||i.iconAnchor||n&&n.divideBy(2,!0));t.className="leaflet-marker-"+e+" "+(i.className||""),o&&(t.style.marginLeft=-o.x+"px",t.style.marginTop=-o.y+"px"),n&&(t.style.width=n.x+"px",t.style.height=n.y+"px")},_createImg:function(t,e){return(e=e||document.createElement("img")).src=t,e},_getIconUrl:function(t){return b.retina&&this.options[t+"RetinaUrl"]||this.options[t+"Url"]}});var _i=di.extend({options:{iconUrl:"marker-icon.png",iconRetinaUrl:"marker-icon-2x.png",shadowUrl:"marker-shadow.png",iconSize:[25,41],iconAnchor:[12,41],popupAnchor:[1,-34],tooltipAnchor:[16,-28],shadowSize:[41,41]},_getIconUrl:function(t){return"string"!=typeof _i.imagePath&&(_i.imagePath=this._detectIconPath()),(this.options.imagePath||_i.imagePath)+di.prototype._getIconUrl.call(this,t)},_stripUrl:function(t){function e(t,e,i){return(e=e.exec(t))&&e[i]}return(t=e(t,/^url\((['"])?(.+)\1\)$/,2))&&e(t,/^(.*)marker-icon\.png$/,1)},_detectIconPath:function(){var t=P("div","leaflet-default-icon-path",document.body),e=pe(t,"background-image")||pe(t,"backgroundImage");return document.body.removeChild(t),(e=this._stripUrl(e))?e:(t=document.querySelector('link[href$="leaflet.css"]'))?t.href.substring(0,t.href.length-"leaflet.css".length-1):""}}),pi=n.extend({initialize:function(t){this._marker=t},addHooks:function(){var t=this._marker._icon;this._draggable||(this._draggable=new Xe(t,t,!0)),this._draggable.on({dragstart:this._onDragStart,predrag:this._onPreDrag,drag:this._onDrag,dragend:this._onDragEnd},this).enable(),M(t,"leaflet-marker-draggable")},removeHooks:function(){this._draggable.off({dragstart:this._onDragStart,predrag:this._onPreDrag,drag:this._onDrag,dragend:this._onDragEnd},this).disable(),this._marker._icon&&z(this._marker._icon,"leaflet-marker-draggable")},moved:function(){return this._draggable&&this._draggable._moved},_adjustPan:function(t){var e=this._marker,i=e._map,n=this._marker.options.autoPanSpeed,o=this._marker.options.autoPanPadding,s=Pe(e._icon),r=i.getPixelBounds(),a=i.getPixelOrigin(),a=_(r.min._subtract(a).add(o),r.max._subtract(a).subtract(o));a.contains(s)||(o=m((Math.max(a.max.x,s.x)-a.max.x)/(r.max.x-a.max.x)-(Math.min(a.min.x,s.x)-a.min.x)/(r.min.x-a.min.x),(Math.max(a.max.y,s.y)-a.max.y)/(r.max.y-a.max.y)-(Math.min(a.min.y,s.y)-a.min.y)/(r.min.y-a.min.y)).multiplyBy(n),i.panBy(o,{animate:!1}),this._draggable._newPos._add(o),this._draggable._startPos._add(o),Z(e._icon,this._draggable._newPos),this._onDrag(t),this._panRequest=x(this._adjustPan.bind(this,t)))},_onDragStart:function(){this._oldLatLng=this._marker.getLatLng(),this._marker.closePopup&&this._marker.closePopup(),this._marker.fire("movestart").fire("dragstart")},_onPreDrag:function(t){this._marker.options.autoPan&&(r(this._panRequest),this._panRequest=x(this._adjustPan.bind(this,t)))},_onDrag:function(t){var e=this._marker,i=e._shadow,n=Pe(e._icon),o=e._map.layerPointToLatLng(n);i&&Z(i,n),e._latlng=o,t.latlng=o,t.oldLatLng=this._oldLatLng,e.fire("move",t).fire("drag",t)},_onDragEnd:function(t){r(this._panRequest),delete this._oldLatLng,this._marker.fire("moveend").fire("dragend",t)}}),mi=o.extend({options:{icon:new _i,interactive:!0,keyboard:!0,title:"",alt:"Marker",zIndexOffset:0,opacity:1,riseOnHover:!1,riseOffset:250,pane:"markerPane",shadowPane:"shadowPane",bubblingMouseEvents:!1,autoPanOnFocus:!0,draggable:!1,autoPan:!1,autoPanPadding:[50,50],autoPanSpeed:10},initialize:function(t,e){c(this,e),this._latlng=w(t)},onAdd:function(t){this._zoomAnimated=this._zoomAnimated&&t.options.markerZoomAnimation,this._zoomAnimated&&t.on("zoomanim",this._animateZoom,this),this._initIcon(),this.update()},onRemove:function(t){this.dragging&&this.dragging.enabled()&&(this.options.draggable=!0,this.dragging.removeHooks()),delete this.dragging,this._zoomAnimated&&t.off("zoomanim",this._animateZoom,this),this._removeIcon(),this._removeShadow()},getEvents:function(){return{zoom:this.update,viewreset:this.update}},getLatLng:function(){return this._latlng},setLatLng:function(t){var e=this._latlng;return this._latlng=w(t),this.update(),this.fire("move",{oldLatLng:e,latlng:this._latlng})},setZIndexOffset:function(t){return this.options.zIndexOffset=t,this.update()},getIcon:function(){return this.options.icon},setIcon:function(t){return this.options.icon=t,this._map&&(this._initIcon(),this.update()),this._popup&&this.bindPopup(this._popup,this._popup.options),this},getElement:function(){return this._icon},update:function(){var t;return this._icon&&this._map&&(t=this._map.latLngToLayerPoint(this._latlng).round(),this._setPos(t)),this},_initIcon:function(){var t=this.options,e="leaflet-zoom-"+(this._zoomAnimated?"animated":"hide"),i=t.icon.createIcon(this._icon),n=!1,i=(i!==this._icon&&(this._icon&&this._removeIcon(),n=!0,t.title&&(i.title=t.title),"IMG"===i.tagName&&(i.alt=t.alt||"")),M(i,e),t.keyboard&&(i.tabIndex="0",i.setAttribute("role","button")),this._icon=i,t.riseOnHover&&this.on({mouseover:this._bringToFront,mouseout:this._resetZIndex}),this.options.autoPanOnFocus&&S(i,"focus",this._panOnFocus,this),t.icon.createShadow(this._shadow)),o=!1;i!==this._shadow&&(this._removeShadow(),o=!0),i&&(M(i,e),i.alt=""),this._shadow=i,t.opacity<1&&this._updateOpacity(),n&&this.getPane().appendChild(this._icon),this._initInteraction(),i&&o&&this.getPane(t.shadowPane).appendChild(this._shadow)},_removeIcon:function(){this.options.riseOnHover&&this.off({mouseover:this._bringToFront,mouseout:this._resetZIndex}),this.options.autoPanOnFocus&&k(this._icon,"focus",this._panOnFocus,this),T(this._icon),this.removeInteractiveTarget(this._icon),this._icon=null},_removeShadow:function(){this._shadow&&T(this._shadow),this._shadow=null},_setPos:function(t){this._icon&&Z(this._icon,t),this._shadow&&Z(this._shadow,t),this._zIndex=t.y+this.options.zIndexOffset,this._resetZIndex()},_updateZIndex:function(t){this._icon&&(this._icon.style.zIndex=this._zIndex+t)},_animateZoom:function(t){t=this._map._latLngToNewLayerPoint(this._latlng,t.zoom,t.center).round();this._setPos(t)},_initInteraction:function(){var t;this.options.interactive&&(M(this._icon,"leaflet-interactive"),this.addInteractiveTarget(this._icon),pi&&(t=this.options.draggable,this.dragging&&(t=this.dragging.enabled(),this.dragging.disable()),this.dragging=new pi(this),t&&this.dragging.enable()))},setOpacity:function(t){return this.options.opacity=t,this._map&&this._updateOpacity(),this},_updateOpacity:function(){var t=this.options.opacity;this._icon&&C(this._icon,t),this._shadow&&C(this._shadow,t)},_bringToFront:function(){this._updateZIndex(this.options.riseOffset)},_resetZIndex:function(){this._updateZIndex(0)},_panOnFocus:function(){var t,e,i=this._map;i&&(t=(e=this.options.icon.options).iconSize?m(e.iconSize):m(0,0),e=e.iconAnchor?m(e.iconAnchor):m(0,0),i.panInside(this._latlng,{paddingTopLeft:e,paddingBottomRight:t.subtract(e)}))},_getPopupAnchor:function(){return this.options.icon.options.popupAnchor},_getTooltipAnchor:function(){return this.options.icon.options.tooltipAnchor}});var fi=o.extend({options:{stroke:!0,color:"#3388ff",weight:3,opacity:1,lineCap:"round",lineJoin:"round",dashArray:null,dashOffset:null,fill:!1,fillColor:null,fillOpacity:.2,fillRule:"evenodd",interactive:!0,bubblingMouseEvents:!0},beforeAdd:function(t){this._renderer=t.getRenderer(this)},onAdd:function(){this._renderer._initPath(this),this._reset(),this._renderer._addPath(this)},onRemove:function(){this._renderer._removePath(this)},redraw:function(){return this._map&&this._renderer._updatePath(this),this},setStyle:function(t){return c(this,t),this._renderer&&(this._renderer._updateStyle(this),this.options.stroke&&t&&Object.prototype.hasOwnProperty.call(t,"weight")&&this._updateBounds()),this},bringToFront:function(){return this._renderer&&this._renderer._bringToFront(this),this},bringToBack:function(){return this._renderer&&this._renderer._bringToBack(this),this},getElement:function(){return this._path},_reset:function(){this._project(),this._update()},_clickTolerance:function(){return(this.options.stroke?this.options.weight/2:0)+(this._renderer.options.tolerance||0)}}),gi=fi.extend({options:{fill:!0,radius:10},initialize:function(t,e){c(this,e),this._latlng=w(t),this._radius=this.options.radius},setLatLng:function(t){var e=this._latlng;return this._latlng=w(t),this.redraw(),this.fire("move",{oldLatLng:e,latlng:this._latlng})},getLatLng:function(){return this._latlng},setRadius:function(t){return this.options.radius=this._radius=t,this.redraw()},getRadius:function(){return this._radius},setStyle:function(t){var e=t&&t.radius||this._radius;return fi.prototype.setStyle.call(this,t),this.setRadius(e),this},_project:function(){this._point=this._map.latLngToLayerPoint(this._latlng),this._updateBounds()},_updateBounds:function(){var t=this._radius,e=this._radiusY||t,i=this._clickTolerance(),t=[t+i,e+i];this._pxBounds=new f(this._point.subtract(t),this._point.add(t))},_update:function(){this._map&&this._updatePath()},_updatePath:function(){this._renderer._updateCircle(this)},_empty:function(){return this._radius&&!this._renderer._bounds.intersects(this._pxBounds)},_containsPoint:function(t){return t.distanceTo(this._point)<=this._radius+this._clickTolerance()}});var vi=gi.extend({initialize:function(t,e,i){if(c(this,e="number"==typeof e?l({},i,{radius:e}):e),this._latlng=w(t),isNaN(this.options.radius))throw new Error("Circle radius cannot be NaN");this._mRadius=this.options.radius},setRadius:function(t){return this._mRadius=t,this.redraw()},getRadius:function(){return this._mRadius},getBounds:function(){var t=[this._radius,this._radiusY||this._radius];return new s(this._map.layerPointToLatLng(this._point.subtract(t)),this._map.layerPointToLatLng(this._point.add(t)))},setStyle:fi.prototype.setStyle,_project:function(){var t,e,i,n,o,s=this._latlng.lng,r=this._latlng.lat,a=this._map,h=a.options.crs;h.distance===st.distance?(n=Math.PI/180,o=this._mRadius/st.R/n,t=a.project([r+o,s]),e=a.project([r-o,s]),e=t.add(e).divideBy(2),i=a.unproject(e).lat,n=Math.acos((Math.cos(o*n)-Math.sin(r*n)*Math.sin(i*n))/(Math.cos(r*n)*Math.cos(i*n)))/n,!isNaN(n)&&0!==n||(n=o/Math.cos(Math.PI/180*r)),this._point=e.subtract(a.getPixelOrigin()),this._radius=isNaN(n)?0:e.x-a.project([i,s-n]).x,this._radiusY=e.y-t.y):(o=h.unproject(h.project(this._latlng).subtract([this._mRadius,0])),this._point=a.latLngToLayerPoint(this._latlng),this._radius=this._point.x-a.latLngToLayerPoint(o).x),this._updateBounds()}});var yi=fi.extend({options:{smoothFactor:1,noClip:!1},initialize:function(t,e){c(this,e),this._setLatLngs(t)},getLatLngs:function(){return this._latlngs},setLatLngs:function(t){return this._setLatLngs(t),this.redraw()},isEmpty:function(){return!this._latlngs.length},closestLayerPoint:function(t){for(var e=1/0,i=null,n=ri,o=0,s=this._parts.length;o<s;o++)for(var r=this._parts[o],a=1,h=r.length;a<h;a++){var l,u,c=n(t,l=r[a-1],u=r[a],!0);c<e&&(e=c,i=n(t,l,u))}return i&&(i.distance=Math.sqrt(e)),i},getCenter:function(){if(this._map)return hi(this._defaultShape(),this._map.options.crs);throw new Error("Must add layer to map before using getCenter()")},getBounds:function(){return this._bounds},addLatLng:function(t,e){return e=e||this._defaultShape(),t=w(t),e.push(t),this._bounds.extend(t),this.redraw()},_setLatLngs:function(t){this._bounds=new s,this._latlngs=this._convertLatLngs(t)},_defaultShape:function(){return I(this._latlngs)?this._latlngs:this._latlngs[0]},_convertLatLngs:function(t){for(var e=[],i=I(t),n=0,o=t.length;n<o;n++)i?(e[n]=w(t[n]),this._bounds.extend(e[n])):e[n]=this._convertLatLngs(t[n]);return e},_project:function(){var t=new f;this._rings=[],this._projectLatlngs(this._latlngs,this._rings,t),this._bounds.isValid()&&t.isValid()&&(this._rawPxBounds=t,this._updateBounds())},_updateBounds:function(){var t=this._clickTolerance(),t=new p(t,t);this._rawPxBounds&&(this._pxBounds=new f([this._rawPxBounds.min.subtract(t),this._rawPxBounds.max.add(t)]))},_projectLatlngs:function(t,e,i){var n,o,s=t[0]instanceof v,r=t.length;if(s){for(o=[],n=0;n<r;n++)o[n]=this._map.latLngToLayerPoint(t[n]),i.extend(o[n]);e.push(o)}else for(n=0;n<r;n++)this._projectLatlngs(t[n],e,i)},_clipPoints:function(){var t=this._renderer._bounds;if(this._parts=[],this._pxBounds&&this._pxBounds.intersects(t))if(this.options.noClip)this._parts=this._rings;else for(var e,i,n,o,s=this._parts,r=0,a=0,h=this._rings.length;r<h;r++)for(e=0,i=(o=this._rings[r]).length;e<i-1;e++)(n=ni(o[e],o[e+1],t,e,!0))&&(s[a]=s[a]||[],s[a].push(n[0]),n[1]===o[e+1]&&e!==i-2||(s[a].push(n[1]),a++))},_simplifyPoints:function(){for(var t=this._parts,e=this.options.smoothFactor,i=0,n=t.length;i<n;i++)t[i]=ei(t[i],e)},_update:function(){this._map&&(this._clipPoints(),this._simplifyPoints(),this._updatePath())},_updatePath:function(){this._renderer._updatePoly(this)},_containsPoint:function(t,e){var i,n,o,s,r,a,h=this._clickTolerance();if(this._pxBounds&&this._pxBounds.contains(t))for(i=0,s=this._parts.length;i<s;i++)for(n=0,o=(r=(a=this._parts[i]).length)-1;n<r;o=n++)if((e||0!==n)&&ii(t,a[o],a[n])<=h)return!0;return!1}});yi._flat=ai;var xi=yi.extend({options:{fill:!0},isEmpty:function(){return!this._latlngs.length||!this._latlngs[0].length},getCenter:function(){if(this._map)return $e(this._defaultShape(),this._map.options.crs);throw new Error("Must add layer to map before using getCenter()")},_convertLatLngs:function(t){var t=yi.prototype._convertLatLngs.call(this,t),e=t.length;return 2<=e&&t[0]instanceof v&&t[0].equals(t[e-1])&&t.pop(),t},_setLatLngs:function(t){yi.prototype._setLatLngs.call(this,t),I(this._latlngs)&&(this._latlngs=[this._latlngs])},_defaultShape:function(){return(I(this._latlngs[0])?this._latlngs:this._latlngs[0])[0]},_clipPoints:function(){var t=this._renderer._bounds,e=this.options.weight,e=new p(e,e),t=new f(t.min.subtract(e),t.max.add(e));if(this._parts=[],this._pxBounds&&this._pxBounds.intersects(t))if(this.options.noClip)this._parts=this._rings;else for(var i,n=0,o=this._rings.length;n<o;n++)(i=Je(this._rings[n],t,!0)).length&&this._parts.push(i)},_updatePath:function(){this._renderer._updatePoly(this,!0)},_containsPoint:function(t){var e,i,n,o,s,r,a,h,l=!1;if(!this._pxBounds||!this._pxBounds.contains(t))return!1;for(o=0,a=this._parts.length;o<a;o++)for(s=0,r=(h=(e=this._parts[o]).length)-1;s<h;r=s++)i=e[s],n=e[r],i.y>t.y!=n.y>t.y&&t.x<(n.x-i.x)*(t.y-i.y)/(n.y-i.y)+i.x&&(l=!l);return l||yi.prototype._containsPoint.call(this,t,!0)}});var wi=ci.extend({initialize:function(t,e){c(this,e),this._layers={},t&&this.addData(t)},addData:function(t){var e,i,n,o=d(t)?t:t.features;if(o){for(e=0,i=o.length;e<i;e++)((n=o[e]).geometries||n.geometry||n.features||n.coordinates)&&this.addData(n);return this}var s,r=this.options;return(!r.filter||r.filter(t))&&(s=bi(t,r))?(s.feature=Zi(t),s.defaultOptions=s.options,this.resetStyle(s),r.onEachFeature&&r.onEachFeature(t,s),this.addLayer(s)):this},resetStyle:function(t){return void 0===t?this.eachLayer(this.resetStyle,this):(t.options=l({},t.defaultOptions),this._setLayerStyle(t,this.options.style),this)},setStyle:function(e){return this.eachLayer(function(t){this._setLayerStyle(t,e)},this)},_setLayerStyle:function(t,e){t.setStyle&&("function"==typeof e&&(e=e(t.feature)),t.setStyle(e))}});function bi(t,e){var i,n,o,s,r="Feature"===t.type?t.geometry:t,a=r?r.coordinates:null,h=[],l=e&&e.pointToLayer,u=e&&e.coordsToLatLng||Li;if(!a&&!r)return null;switch(r.type){case"Point":return Pi(l,t,i=u(a),e);case"MultiPoint":for(o=0,s=a.length;o<s;o++)i=u(a[o]),h.push(Pi(l,t,i,e));return new ci(h);case"LineString":case"MultiLineString":return n=Ti(a,"LineString"===r.type?0:1,u),new yi(n,e);case"Polygon":case"MultiPolygon":return n=Ti(a,"Polygon"===r.type?1:2,u),new xi(n,e);case"GeometryCollection":for(o=0,s=r.geometries.length;o<s;o++){var c=bi({geometry:r.geometries[o],type:"Feature",properties:t.properties},e);c&&h.push(c)}return new ci(h);case"FeatureCollection":for(o=0,s=r.features.length;o<s;o++){var d=bi(r.features[o],e);d&&h.push(d)}return new ci(h);default:throw new Error("Invalid GeoJSON object.")}}function Pi(t,e,i,n){return t?t(e,i):new mi(i,n&&n.markersInheritOptions&&n)}function Li(t){return new v(t[1],t[0],t[2])}function Ti(t,e,i){for(var n,o=[],s=0,r=t.length;s<r;s++)n=e?Ti(t[s],e-1,i):(i||Li)(t[s]),o.push(n);return o}function Mi(t,e){return void 0!==(t=w(t)).alt?[i(t.lng,e),i(t.lat,e),i(t.alt,e)]:[i(t.lng,e),i(t.lat,e)]}function zi(t,e,i,n){for(var o=[],s=0,r=t.length;s<r;s++)o.push(e?zi(t[s],I(t[s])?0:e-1,i,n):Mi(t[s],n));return!e&&i&&0<o.length&&o.push(o[0].slice()),o}function Ci(t,e){return t.feature?l({},t.feature,{geometry:e}):Zi(e)}function Zi(t){return"Feature"===t.type||"FeatureCollection"===t.type?t:{type:"Feature",properties:{},geometry:t}}Tt={toGeoJSON:function(t){return Ci(this,{type:"Point",coordinates:Mi(this.getLatLng(),t)})}};function Si(t,e){return new wi(t,e)}mi.include(Tt),vi.include(Tt),gi.include(Tt),yi.include({toGeoJSON:function(t){var e=!I(this._latlngs);return Ci(this,{type:(e?"Multi":"")+"LineString",coordinates:zi(this._latlngs,e?1:0,!1,t)})}}),xi.include({toGeoJSON:function(t){var e=!I(this._latlngs),i=e&&!I(this._latlngs[0]),t=zi(this._latlngs,i?2:e?1:0,!0,t);return Ci(this,{type:(i?"Multi":"")+"Polygon",coordinates:t=e?t:[t]})}}),ui.include({toMultiPoint:function(e){var i=[];return this.eachLayer(function(t){i.push(t.toGeoJSON(e).geometry.coordinates)}),Ci(this,{type:"MultiPoint",coordinates:i})},toGeoJSON:function(e){var i,n,t=this.feature&&this.feature.geometry&&this.feature.geometry.type;return"MultiPoint"===t?this.toMultiPoint(e):(i="GeometryCollection"===t,n=[],this.eachLayer(function(t){t.toGeoJSON&&(t=t.toGeoJSON(e),i?n.push(t.geometry):"FeatureCollection"===(t=Zi(t)).type?n.push.apply(n,t.features):n.push(t))}),i?Ci(this,{geometries:n,type:"GeometryCollection"}):{type:"FeatureCollection",features:n})}});var Mt=Si,Ei=o.extend({options:{opacity:1,alt:"",interactive:!1,crossOrigin:!1,errorOverlayUrl:"",zIndex:1,className:""},initialize:function(t,e,i){this._url=t,this._bounds=g(e),c(this,i)},onAdd:function(){this._image||(this._initImage(),this.options.opacity<1&&this._updateOpacity()),this.options.interactive&&(M(this._image,"leaflet-interactive"),this.addInteractiveTarget(this._image)),this.getPane().appendChild(this._image),this._reset()},onRemove:function(){T(this._image),this.options.interactive&&this.removeInteractiveTarget(this._image)},setOpacity:function(t){return this.options.opacity=t,this._image&&this._updateOpacity(),this},setStyle:function(t){return t.opacity&&this.setOpacity(t.opacity),this},bringToFront:function(){return this._map&&fe(this._image),this},bringToBack:function(){return this._map&&ge(this._image),this},setUrl:function(t){return this._url=t,this._image&&(this._image.src=t),this},setBounds:function(t){return this._bounds=g(t),this._map&&this._reset(),this},getEvents:function(){var t={zoom:this._reset,viewreset:this._reset};return this._zoomAnimated&&(t.zoomanim=this._animateZoom),t},setZIndex:function(t){return this.options.zIndex=t,this._updateZIndex(),this},getBounds:function(){return this._bounds},getElement:function(){return this._image},_initImage:function(){var t="IMG"===this._url.tagName,e=this._image=t?this._url:P("img");M(e,"leaflet-image-layer"),this._zoomAnimated&&M(e,"leaflet-zoom-animated"),this.options.className&&M(e,this.options.className),e.onselectstart=u,e.onmousemove=u,e.onload=a(this.fire,this,"load"),e.onerror=a(this._overlayOnError,this,"error"),!this.options.crossOrigin&&""!==this.options.crossOrigin||(e.crossOrigin=!0===this.options.crossOrigin?"":this.options.crossOrigin),this.options.zIndex&&this._updateZIndex(),t?this._url=e.src:(e.src=this._url,e.alt=this.options.alt)},_animateZoom:function(t){var e=this._map.getZoomScale(t.zoom),t=this._map._latLngBoundsToNewLayerBounds(this._bounds,t.zoom,t.center).min;be(this._image,t,e)},_reset:function(){var t=this._image,e=new f(this._map.latLngToLayerPoint(this._bounds.getNorthWest()),this._map.latLngToLayerPoint(this._bounds.getSouthEast())),i=e.getSize();Z(t,e.min),t.style.width=i.x+"px",t.style.height=i.y+"px"},_updateOpacity:function(){C(this._image,this.options.opacity)},_updateZIndex:function(){this._image&&void 0!==this.options.zIndex&&null!==this.options.zIndex&&(this._image.style.zIndex=this.options.zIndex)},_overlayOnError:function(){this.fire("error");var t=this.options.errorOverlayUrl;t&&this._url!==t&&(this._url=t,this._image.src=t)},getCenter:function(){return this._bounds.getCenter()}}),ki=Ei.extend({options:{autoplay:!0,loop:!0,keepAspectRatio:!0,muted:!1,playsInline:!0},_initImage:function(){var t="VIDEO"===this._url.tagName,e=this._image=t?this._url:P("video");if(M(e,"leaflet-image-layer"),this._zoomAnimated&&M(e,"leaflet-zoom-animated"),this.options.className&&M(e,this.options.className),e.onselectstart=u,e.onmousemove=u,e.onloadeddata=a(this.fire,this,"load"),t){for(var i=e.getElementsByTagName("source"),n=[],o=0;o<i.length;o++)n.push(i[o].src);this._url=0<i.length?n:[e.src]}else{d(this._url)||(this._url=[this._url]),!this.options.keepAspectRatio&&Object.prototype.hasOwnProperty.call(e.style,"objectFit")&&(e.style.objectFit="fill"),e.autoplay=!!this.options.autoplay,e.loop=!!this.options.loop,e.muted=!!this.options.muted,e.playsInline=!!this.options.playsInline;for(var s=0;s<this._url.length;s++){var r=P("source");r.src=this._url[s],e.appendChild(r)}}}});var Oi=Ei.extend({_initImage:function(){var t=this._image=this._url;M(t,"leaflet-image-layer"),this._zoomAnimated&&M(t,"leaflet-zoom-animated"),this.options.className&&M(t,this.options.className),t.onselectstart=u,t.onmousemove=u}});var Ai=o.extend({options:{interactive:!1,offset:[0,0],className:"",pane:void 0,content:""},initialize:function(t,e){t&&(t instanceof v||d(t))?(this._latlng=w(t),c(this,e)):(c(this,t),this._source=e),this.options.content&&(this._content=this.options.content)},openOn:function(t){return(t=arguments.length?t:this._source._map).hasLayer(this)||t.addLayer(this),this},close:function(){return this._map&&this._map.removeLayer(this),this},toggle:function(t){return this._map?this.close():(arguments.length?this._source=t:t=this._source,this._prepareOpen(),this.openOn(t._map)),this},onAdd:function(t){this._zoomAnimated=t._zoomAnimated,this._container||this._initLayout(),t._fadeAnimated&&C(this._container,0),clearTimeout(this._removeTimeout),this.getPane().appendChild(this._container),this.update(),t._fadeAnimated&&C(this._container,1),this.bringToFront(),this.options.interactive&&(M(this._container,"leaflet-interactive"),this.addInteractiveTarget(this._container))},onRemove:function(t){t._fadeAnimated?(C(this._container,0),this._removeTimeout=setTimeout(a(T,void 0,this._container),200)):T(this._container),this.options.interactive&&(z(this._container,"leaflet-interactive"),this.removeInteractiveTarget(this._container))},getLatLng:function(){return this._latlng},setLatLng:function(t){return this._latlng=w(t),this._map&&(this._updatePosition(),this._adjustPan()),this},getContent:function(){return this._content},setContent:function(t){return this._content=t,this.update(),this},getElement:function(){return this._container},update:function(){this._map&&(this._container.style.visibility="hidden",this._updateContent(),this._updateLayout(),this._updatePosition(),this._container.style.visibility="",this._adjustPan())},getEvents:function(){var t={zoom:this._updatePosition,viewreset:this._updatePosition};return this._zoomAnimated&&(t.zoomanim=this._animateZoom),t},isOpen:function(){return!!this._map&&this._map.hasLayer(this)},bringToFront:function(){return this._map&&fe(this._container),this},bringToBack:function(){return this._map&&ge(this._container),this},_prepareOpen:function(t){if(!(i=this._source)._map)return!1;if(i instanceof ci){var e,i=null,n=this._source._layers;for(e in n)if(n[e]._map){i=n[e];break}if(!i)return!1;this._source=i}if(!t)if(i.getCenter)t=i.getCenter();else if(i.getLatLng)t=i.getLatLng();else{if(!i.getBounds)throw new Error("Unable to get source layer LatLng.");t=i.getBounds().getCenter()}return this.setLatLng(t),this._map&&this.update(),!0},_updateContent:function(){if(this._content){var t=this._contentNode,e="function"==typeof this._content?this._content(this._source||this):this._content;if("string"==typeof e)t.innerHTML=e;else{for(;t.hasChildNodes();)t.removeChild(t.firstChild);t.appendChild(e)}this.fire("contentupdate")}},_updatePosition:function(){var t,e,i;this._map&&(e=this._map.latLngToLayerPoint(this._latlng),t=m(this.options.offset),i=this._getAnchor(),this._zoomAnimated?Z(this._container,e.add(i)):t=t.add(e).add(i),e=this._containerBottom=-t.y,i=this._containerLeft=-Math.round(this._containerWidth/2)+t.x,this._container.style.bottom=e+"px",this._container.style.left=i+"px")},_getAnchor:function(){return[0,0]}}),Bi=(A.include({_initOverlay:function(t,e,i,n){var o=e;return o instanceof t||(o=new t(n).setContent(e)),i&&o.setLatLng(i),o}}),o.include({_initOverlay:function(t,e,i,n){var o=i;return o instanceof t?(c(o,n),o._source=this):(o=e&&!n?e:new t(n,this)).setContent(i),o}}),Ai.extend({options:{pane:"popupPane",offset:[0,7],maxWidth:300,minWidth:50,maxHeight:null,autoPan:!0,autoPanPaddingTopLeft:null,autoPanPaddingBottomRight:null,autoPanPadding:[5,5],keepInView:!1,closeButton:!0,autoClose:!0,closeOnEscapeKey:!0,className:""},openOn:function(t){return!(t=arguments.length?t:this._source._map).hasLayer(this)&&t._popup&&t._popup.options.autoClose&&t.removeLayer(t._popup),t._popup=this,Ai.prototype.openOn.call(this,t)},onAdd:function(t){Ai.prototype.onAdd.call(this,t),t.fire("popupopen",{popup:this}),this._source&&(this._source.fire("popupopen",{popup:this},!0),this._source instanceof fi||this._source.on("preclick",Ae))},onRemove:function(t){Ai.prototype.onRemove.call(this,t),t.fire("popupclose",{popup:this}),this._source&&(this._source.fire("popupclose",{popup:this},!0),this._source instanceof fi||this._source.off("preclick",Ae))},getEvents:function(){var t=Ai.prototype.getEvents.call(this);return(void 0!==this.options.closeOnClick?this.options.closeOnClick:this._map.options.closePopupOnClick)&&(t.preclick=this.close),this.options.keepInView&&(t.moveend=this._adjustPan),t},_initLayout:function(){var t="leaflet-popup",e=this._container=P("div",t+" "+(this.options.className||"")+" leaflet-zoom-animated"),i=this._wrapper=P("div",t+"-content-wrapper",e);this._contentNode=P("div",t+"-content",i),Ie(e),Be(this._contentNode),S(e,"contextmenu",Ae),this._tipContainer=P("div",t+"-tip-container",e),this._tip=P("div",t+"-tip",this._tipContainer),this.options.closeButton&&((i=this._closeButton=P("a",t+"-close-button",e)).setAttribute("role","button"),i.setAttribute("aria-label","Close popup"),i.href="#close",i.innerHTML='<span aria-hidden="true">&#215;</span>',S(i,"click",function(t){O(t),this.close()},this))},_updateLayout:function(){var t=this._contentNode,e=t.style,i=(e.width="",e.whiteSpace="nowrap",t.offsetWidth),i=Math.min(i,this.options.maxWidth),i=(i=Math.max(i,this.options.minWidth),e.width=i+1+"px",e.whiteSpace="",e.height="",t.offsetHeight),n=this.options.maxHeight,o="leaflet-popup-scrolled";(n&&n<i?(e.height=n+"px",M):z)(t,o),this._containerWidth=this._container.offsetWidth},_animateZoom:function(t){var t=this._map._latLngToNewLayerPoint(this._latlng,t.zoom,t.center),e=this._getAnchor();Z(this._container,t.add(e))},_adjustPan:function(){var t,e,i,n,o,s,r,a;this.options.autoPan&&(this._map._panAnim&&this._map._panAnim.stop(),this._autopanning?this._autopanning=!1:(t=this._map,e=parseInt(pe(this._container,"marginBottom"),10)||0,e=this._container.offsetHeight+e,a=this._containerWidth,(i=new p(this._containerLeft,-e-this._containerBottom))._add(Pe(this._container)),i=t.layerPointToContainerPoint(i),o=m(this.options.autoPanPadding),n=m(this.options.autoPanPaddingTopLeft||o),o=m(this.options.autoPanPaddingBottomRight||o),s=t.getSize(),r=0,i.x+a+o.x>s.x&&(r=i.x+a-s.x+o.x),i.x-r-n.x<(a=0)&&(r=i.x-n.x),i.y+e+o.y>s.y&&(a=i.y+e-s.y+o.y),i.y-a-n.y<0&&(a=i.y-n.y),(r||a)&&(this.options.keepInView&&(this._autopanning=!0),t.fire("autopanstart").panBy([r,a]))))},_getAnchor:function(){return m(this._source&&this._source._getPopupAnchor?this._source._getPopupAnchor():[0,0])}})),Ii=(A.mergeOptions({closePopupOnClick:!0}),A.include({openPopup:function(t,e,i){return this._initOverlay(Bi,t,e,i).openOn(this),this},closePopup:function(t){return(t=arguments.length?t:this._popup)&&t.close(),this}}),o.include({bindPopup:function(t,e){return this._popup=this._initOverlay(Bi,this._popup,t,e),this._popupHandlersAdded||(this.on({click:this._openPopup,keypress:this._onKeyPress,remove:this.closePopup,move:this._movePopup}),this._popupHandlersAdded=!0),this},unbindPopup:function(){return this._popup&&(this.off({click:this._openPopup,keypress:this._onKeyPress,remove:this.closePopup,move:this._movePopup}),this._popupHandlersAdded=!1,this._popup=null),this},openPopup:function(t){return this._popup&&(this instanceof ci||(this._popup._source=this),this._popup._prepareOpen(t||this._latlng)&&this._popup.openOn(this._map)),this},closePopup:function(){return this._popup&&this._popup.close(),this},togglePopup:function(){return this._popup&&this._popup.toggle(this),this},isPopupOpen:function(){return!!this._popup&&this._popup.isOpen()},setPopupContent:function(t){return this._popup&&this._popup.setContent(t),this},getPopup:function(){return this._popup},_openPopup:function(t){var e;this._popup&&this._map&&(Re(t),e=t.layer||t.target,this._popup._source!==e||e instanceof fi?(this._popup._source=e,this.openPopup(t.latlng)):this._map.hasLayer(this._popup)?this.closePopup():this.openPopup(t.latlng))},_movePopup:function(t){this._popup.setLatLng(t.latlng)},_onKeyPress:function(t){13===t.originalEvent.keyCode&&this._openPopup(t)}}),Ai.extend({options:{pane:"tooltipPane",offset:[0,0],direction:"auto",permanent:!1,sticky:!1,opacity:.9},onAdd:function(t){Ai.prototype.onAdd.call(this,t),this.setOpacity(this.options.opacity),t.fire("tooltipopen",{tooltip:this}),this._source&&(this.addEventParent(this._source),this._source.fire("tooltipopen",{tooltip:this},!0))},onRemove:function(t){Ai.prototype.onRemove.call(this,t),t.fire("tooltipclose",{tooltip:this}),this._source&&(this.removeEventParent(this._source),this._source.fire("tooltipclose",{tooltip:this},!0))},getEvents:function(){var t=Ai.prototype.getEvents.call(this);return this.options.permanent||(t.preclick=this.close),t},_initLayout:function(){var t="leaflet-tooltip "+(this.options.className||"")+" leaflet-zoom-"+(this._zoomAnimated?"animated":"hide");this._contentNode=this._container=P("div",t),this._container.setAttribute("role","tooltip"),this._container.setAttribute("id","leaflet-tooltip-"+h(this))},_updateLayout:function(){},_adjustPan:function(){},_setPosition:function(t){var e,i=this._map,n=this._container,o=i.latLngToContainerPoint(i.getCenter()),i=i.layerPointToContainerPoint(t),s=this.options.direction,r=n.offsetWidth,a=n.offsetHeight,h=m(this.options.offset),l=this._getAnchor(),i="top"===s?(e=r/2,a):"bottom"===s?(e=r/2,0):(e="center"===s?r/2:"right"===s?0:"left"===s?r:i.x<o.x?(s="right",0):(s="left",r+2*(h.x+l.x)),a/2);t=t.subtract(m(e,i,!0)).add(h).add(l),z(n,"leaflet-tooltip-right"),z(n,"leaflet-tooltip-left"),z(n,"leaflet-tooltip-top"),z(n,"leaflet-tooltip-bottom"),M(n,"leaflet-tooltip-"+s),Z(n,t)},_updatePosition:function(){var t=this._map.latLngToLayerPoint(this._latlng);this._setPosition(t)},setOpacity:function(t){this.options.opacity=t,this._container&&C(this._container,t)},_animateZoom:function(t){t=this._map._latLngToNewLayerPoint(this._latlng,t.zoom,t.center);this._setPosition(t)},_getAnchor:function(){return m(this._source&&this._source._getTooltipAnchor&&!this.options.sticky?this._source._getTooltipAnchor():[0,0])}})),Ri=(A.include({openTooltip:function(t,e,i){return this._initOverlay(Ii,t,e,i).openOn(this),this},closeTooltip:function(t){return t.close(),this}}),o.include({bindTooltip:function(t,e){return this._tooltip&&this.isTooltipOpen()&&this.unbindTooltip(),this._tooltip=this._initOverlay(Ii,this._tooltip,t,e),this._initTooltipInteractions(),this._tooltip.options.permanent&&this._map&&this._map.hasLayer(this)&&this.openTooltip(),this},unbindTooltip:function(){return this._tooltip&&(this._initTooltipInteractions(!0),this.closeTooltip(),this._tooltip=null),this},_initTooltipInteractions:function(t){var e,i;!t&&this._tooltipHandlersAdded||(e=t?"off":"on",i={remove:this.closeTooltip,move:this._moveTooltip},this._tooltip.options.permanent?i.add=this._openTooltip:(i.mouseover=this._openTooltip,i.mouseout=this.closeTooltip,i.click=this._openTooltip,this._map?this._addFocusListeners():i.add=this._addFocusListeners),this._tooltip.options.sticky&&(i.mousemove=this._moveTooltip),this[e](i),this._tooltipHandlersAdded=!t)},openTooltip:function(t){return this._tooltip&&(this instanceof ci||(this._tooltip._source=this),this._tooltip._prepareOpen(t)&&(this._tooltip.openOn(this._map),this.getElement?this._setAriaDescribedByOnLayer(this):this.eachLayer&&this.eachLayer(this._setAriaDescribedByOnLayer,this))),this},closeTooltip:function(){if(this._tooltip)return this._tooltip.close()},toggleTooltip:function(){return this._tooltip&&this._tooltip.toggle(this),this},isTooltipOpen:function(){return this._tooltip.isOpen()},setTooltipContent:function(t){return this._tooltip&&this._tooltip.setContent(t),this},getTooltip:function(){return this._tooltip},_addFocusListeners:function(){this.getElement?this._addFocusListenersOnLayer(this):this.eachLayer&&this.eachLayer(this._addFocusListenersOnLayer,this)},_addFocusListenersOnLayer:function(t){var e="function"==typeof t.getElement&&t.getElement();e&&(S(e,"focus",function(){this._tooltip._source=t,this.openTooltip()},this),S(e,"blur",this.closeTooltip,this))},_setAriaDescribedByOnLayer:function(t){t="function"==typeof t.getElement&&t.getElement();t&&t.setAttribute("aria-describedby",this._tooltip._container.id)},_openTooltip:function(t){var e;this._tooltip&&this._map&&(this._map.dragging&&this._map.dragging.moving()&&!this._openOnceFlag?(this._openOnceFlag=!0,(e=this)._map.once("moveend",function(){e._openOnceFlag=!1,e._openTooltip(t)})):(this._tooltip._source=t.layer||t.target,this.openTooltip(this._tooltip.options.sticky?t.latlng:void 0)))},_moveTooltip:function(t){var e=t.latlng;this._tooltip.options.sticky&&t.originalEvent&&(t=this._map.mouseEventToContainerPoint(t.originalEvent),t=this._map.containerPointToLayerPoint(t),e=this._map.layerPointToLatLng(t)),this._tooltip.setLatLng(e)}}),di.extend({options:{iconSize:[12,12],html:!1,bgPos:null,className:"leaflet-div-icon"},createIcon:function(t){var t=t&&"DIV"===t.tagName?t:document.createElement("div"),e=this.options;return e.html instanceof Element?(me(t),t.appendChild(e.html)):t.innerHTML=!1!==e.html?e.html:"",e.bgPos&&(e=m(e.bgPos),t.style.backgroundPosition=-e.x+"px "+-e.y+"px"),this._setIconStyles(t,"icon"),t},createShadow:function(){return null}}));di.Default=_i;var Ni=o.extend({options:{tileSize:256,opacity:1,updateWhenIdle:b.mobile,updateWhenZooming:!0,updateInterval:200,zIndex:1,bounds:null,minZoom:0,maxZoom:void 0,maxNativeZoom:void 0,minNativeZoom:void 0,noWrap:!1,pane:"tilePane",className:"",keepBuffer:2},initialize:function(t){c(this,t)},onAdd:function(){this._initContainer(),this._levels={},this._tiles={},this._resetView()},beforeAdd:function(t){t._addZoomLimit(this)},onRemove:function(t){this._removeAllTiles(),T(this._container),t._removeZoomLimit(this),this._container=null,this._tileZoom=void 0},bringToFront:function(){return this._map&&(fe(this._container),this._setAutoZIndex(Math.max)),this},bringToBack:function(){return this._map&&(ge(this._container),this._setAutoZIndex(Math.min)),this},getContainer:function(){return this._container},setOpacity:function(t){return this.options.opacity=t,this._updateOpacity(),this},setZIndex:function(t){return this.options.zIndex=t,this._updateZIndex(),this},isLoading:function(){return this._loading},redraw:function(){var t;return this._map&&(this._removeAllTiles(),(t=this._clampZoom(this._map.getZoom()))!==this._tileZoom&&(this._tileZoom=t,this._updateLevels()),this._update()),this},getEvents:function(){var t={viewprereset:this._invalidateAll,viewreset:this._resetView,zoom:this._resetView,moveend:this._onMoveEnd};return this.options.updateWhenIdle||(this._onMove||(this._onMove=j(this._onMoveEnd,this.options.updateInterval,this)),t.move=this._onMove),this._zoomAnimated&&(t.zoomanim=this._animateZoom),t},createTile:function(){return document.createElement("div")},getTileSize:function(){var t=this.options.tileSize;return t instanceof p?t:new p(t,t)},_updateZIndex:function(){this._container&&void 0!==this.options.zIndex&&null!==this.options.zIndex&&(this._container.style.zIndex=this.options.zIndex)},_setAutoZIndex:function(t){for(var e,i=this.getPane().children,n=-t(-1/0,1/0),o=0,s=i.length;o<s;o++)e=i[o].style.zIndex,i[o]!==this._container&&e&&(n=t(n,+e));isFinite(n)&&(this.options.zIndex=n+t(-1,1),this._updateZIndex())},_updateOpacity:function(){if(this._map&&!b.ielt9){C(this._container,this.options.opacity);var t,e=+new Date,i=!1,n=!1;for(t in this._tiles){var o,s=this._tiles[t];s.current&&s.loaded&&(o=Math.min(1,(e-s.loaded)/200),C(s.el,o),o<1?i=!0:(s.active?n=!0:this._onOpaqueTile(s),s.active=!0))}n&&!this._noPrune&&this._pruneTiles(),i&&(r(this._fadeFrame),this._fadeFrame=x(this._updateOpacity,this))}},_onOpaqueTile:u,_initContainer:function(){this._container||(this._container=P("div","leaflet-layer "+(this.options.className||"")),this._updateZIndex(),this.options.opacity<1&&this._updateOpacity(),this.getPane().appendChild(this._container))},_updateLevels:function(){var t=this._tileZoom,e=this.options.maxZoom;if(void 0!==t){for(var i in this._levels)i=Number(i),this._levels[i].el.children.length||i===t?(this._levels[i].el.style.zIndex=e-Math.abs(t-i),this._onUpdateLevel(i)):(T(this._levels[i].el),this._removeTilesAtZoom(i),this._onRemoveLevel(i),delete this._levels[i]);var n=this._levels[t],o=this._map;return n||((n=this._levels[t]={}).el=P("div","leaflet-tile-container leaflet-zoom-animated",this._container),n.el.style.zIndex=e,n.origin=o.project(o.unproject(o.getPixelOrigin()),t).round(),n.zoom=t,this._setZoomTransform(n,o.getCenter(),o.getZoom()),u(n.el.offsetWidth),this._onCreateLevel(n)),this._level=n}},_onUpdateLevel:u,_onRemoveLevel:u,_onCreateLevel:u,_pruneTiles:function(){if(this._map){var t,e,i,n=this._map.getZoom();if(n>this.options.maxZoom||n<this.options.minZoom)this._removeAllTiles();else{for(t in this._tiles)(i=this._tiles[t]).retain=i.current;for(t in this._tiles)(i=this._tiles[t]).current&&!i.active&&(e=i.coords,this._retainParent(e.x,e.y,e.z,e.z-5)||this._retainChildren(e.x,e.y,e.z,e.z+2));for(t in this._tiles)this._tiles[t].retain||this._removeTile(t)}}},_removeTilesAtZoom:function(t){for(var e in this._tiles)this._tiles[e].coords.z===t&&this._removeTile(e)},_removeAllTiles:function(){for(var t in this._tiles)this._removeTile(t)},_invalidateAll:function(){for(var t in this._levels)T(this._levels[t].el),this._onRemoveLevel(Number(t)),delete this._levels[t];this._removeAllTiles(),this._tileZoom=void 0},_retainParent:function(t,e,i,n){var t=Math.floor(t/2),e=Math.floor(e/2),i=i-1,o=new p(+t,+e),o=(o.z=i,this._tileCoordsToKey(o)),o=this._tiles[o];return o&&o.active?o.retain=!0:(o&&o.loaded&&(o.retain=!0),n<i&&this._retainParent(t,e,i,n))},_retainChildren:function(t,e,i,n){for(var o=2*t;o<2*t+2;o++)for(var s=2*e;s<2*e+2;s++){var r=new p(o,s),r=(r.z=i+1,this._tileCoordsToKey(r)),r=this._tiles[r];r&&r.active?r.retain=!0:(r&&r.loaded&&(r.retain=!0),i+1<n&&this._retainChildren(o,s,i+1,n))}},_resetView:function(t){t=t&&(t.pinch||t.flyTo);this._setView(this._map.getCenter(),this._map.getZoom(),t,t)},_animateZoom:function(t){this._setView(t.center,t.zoom,!0,t.noUpdate)},_clampZoom:function(t){var e=this.options;return void 0!==e.minNativeZoom&&t<e.minNativeZoom?e.minNativeZoom:void 0!==e.maxNativeZoom&&e.maxNativeZoom<t?e.maxNativeZoom:t},_setView:function(t,e,i,n){var o=Math.round(e),o=void 0!==this.options.maxZoom&&o>this.options.maxZoom||void 0!==this.options.minZoom&&o<this.options.minZoom?void 0:this._clampZoom(o),s=this.options.updateWhenZooming&&o!==this._tileZoom;n&&!s||(this._tileZoom=o,this._abortLoading&&this._abortLoading(),this._updateLevels(),this._resetGrid(),void 0!==o&&this._update(t),i||this._pruneTiles(),this._noPrune=!!i),this._setZoomTransforms(t,e)},_setZoomTransforms:function(t,e){for(var i in this._levels)this._setZoomTransform(this._levels[i],t,e)},_setZoomTransform:function(t,e,i){var n=this._map.getZoomScale(i,t.zoom),e=t.origin.multiplyBy(n).subtract(this._map._getNewPixelOrigin(e,i)).round();b.any3d?be(t.el,e,n):Z(t.el,e)},_resetGrid:function(){var t=this._map,e=t.options.crs,i=this._tileSize=this.getTileSize(),n=this._tileZoom,o=this._map.getPixelWorldBounds(this._tileZoom);o&&(this._globalTileRange=this._pxBoundsToTileRange(o)),this._wrapX=e.wrapLng&&!this.options.noWrap&&[Math.floor(t.project([0,e.wrapLng[0]],n).x/i.x),Math.ceil(t.project([0,e.wrapLng[1]],n).x/i.y)],this._wrapY=e.wrapLat&&!this.options.noWrap&&[Math.floor(t.project([e.wrapLat[0],0],n).y/i.x),Math.ceil(t.project([e.wrapLat[1],0],n).y/i.y)]},_onMoveEnd:function(){this._map&&!this._map._animatingZoom&&this._update()},_getTiledPixelBounds:function(t){var e=this._map,i=e._animatingZoom?Math.max(e._animateToZoom,e.getZoom()):e.getZoom(),i=e.getZoomScale(i,this._tileZoom),t=e.project(t,this._tileZoom).floor(),e=e.getSize().divideBy(2*i);return new f(t.subtract(e),t.add(e))},_update:function(t){var e=this._map;if(e){var i=this._clampZoom(e.getZoom());if(void 0===t&&(t=e.getCenter()),void 0!==this._tileZoom){var n,e=this._getTiledPixelBounds(t),o=this._pxBoundsToTileRange(e),s=o.getCenter(),r=[],e=this.options.keepBuffer,a=new f(o.getBottomLeft().subtract([e,-e]),o.getTopRight().add([e,-e]));if(!(isFinite(o.min.x)&&isFinite(o.min.y)&&isFinite(o.max.x)&&isFinite(o.max.y)))throw new Error("Attempted to load an infinite number of tiles");for(n in this._tiles){var h=this._tiles[n].coords;h.z===this._tileZoom&&a.contains(new p(h.x,h.y))||(this._tiles[n].current=!1)}if(1<Math.abs(i-this._tileZoom))this._setView(t,i);else{for(var l=o.min.y;l<=o.max.y;l++)for(var u=o.min.x;u<=o.max.x;u++){var c,d=new p(u,l);d.z=this._tileZoom,this._isValidTile(d)&&((c=this._tiles[this._tileCoordsToKey(d)])?c.current=!0:r.push(d))}if(r.sort(function(t,e){return t.distanceTo(s)-e.distanceTo(s)}),0!==r.length){this._loading||(this._loading=!0,this.fire("loading"));for(var _=document.createDocumentFragment(),u=0;u<r.length;u++)this._addTile(r[u],_);this._level.el.appendChild(_)}}}}},_isValidTile:function(t){var e=this._map.options.crs;if(!e.infinite){var i=this._globalTileRange;if(!e.wrapLng&&(t.x<i.min.x||t.x>i.max.x)||!e.wrapLat&&(t.y<i.min.y||t.y>i.max.y))return!1}return!this.options.bounds||(e=this._tileCoordsToBounds(t),g(this.options.bounds).overlaps(e))},_keyToBounds:function(t){return this._tileCoordsToBounds(this._keyToTileCoords(t))},_tileCoordsToNwSe:function(t){var e=this._map,i=this.getTileSize(),n=t.scaleBy(i),i=n.add(i);return[e.unproject(n,t.z),e.unproject(i,t.z)]},_tileCoordsToBounds:function(t){t=this._tileCoordsToNwSe(t),t=new s(t[0],t[1]);return t=this.options.noWrap?t:this._map.wrapLatLngBounds(t)},_tileCoordsToKey:function(t){return t.x+":"+t.y+":"+t.z},_keyToTileCoords:function(t){var t=t.split(":"),e=new p(+t[0],+t[1]);return e.z=+t[2],e},_removeTile:function(t){var e=this._tiles[t];e&&(T(e.el),delete this._tiles[t],this.fire("tileunload",{tile:e.el,coords:this._keyToTileCoords(t)}))},_initTile:function(t){M(t,"leaflet-tile");var e=this.getTileSize();t.style.width=e.x+"px",t.style.height=e.y+"px",t.onselectstart=u,t.onmousemove=u,b.ielt9&&this.options.opacity<1&&C(t,this.options.opacity)},_addTile:function(t,e){var i=this._getTilePos(t),n=this._tileCoordsToKey(t),o=this.createTile(this._wrapCoords(t),a(this._tileReady,this,t));this._initTile(o),this.createTile.length<2&&x(a(this._tileReady,this,t,null,o)),Z(o,i),this._tiles[n]={el:o,coords:t,current:!0},e.appendChild(o),this.fire("tileloadstart",{tile:o,coords:t})},_tileReady:function(t,e,i){e&&this.fire("tileerror",{error:e,tile:i,coords:t});var n=this._tileCoordsToKey(t);(i=this._tiles[n])&&(i.loaded=+new Date,this._map._fadeAnimated?(C(i.el,0),r(this._fadeFrame),this._fadeFrame=x(this._updateOpacity,this)):(i.active=!0,this._pruneTiles()),e||(M(i.el,"leaflet-tile-loaded"),this.fire("tileload",{tile:i.el,coords:t})),this._noTilesToLoad()&&(this._loading=!1,this.fire("load"),b.ielt9||!this._map._fadeAnimated?x(this._pruneTiles,this):setTimeout(a(this._pruneTiles,this),250)))},_getTilePos:function(t){return t.scaleBy(this.getTileSize()).subtract(this._level.origin)},_wrapCoords:function(t){var e=new p(this._wrapX?H(t.x,this._wrapX):t.x,this._wrapY?H(t.y,this._wrapY):t.y);return e.z=t.z,e},_pxBoundsToTileRange:function(t){var e=this.getTileSize();return new f(t.min.unscaleBy(e).floor(),t.max.unscaleBy(e).ceil().subtract([1,1]))},_noTilesToLoad:function(){for(var t in this._tiles)if(!this._tiles[t].loaded)return!1;return!0}});var Di=Ni.extend({options:{minZoom:0,maxZoom:18,subdomains:"abc",errorTileUrl:"",zoomOffset:0,tms:!1,zoomReverse:!1,detectRetina:!1,crossOrigin:!1,referrerPolicy:!1},initialize:function(t,e){this._url=t,(e=c(this,e)).detectRetina&&b.retina&&0<e.maxZoom?(e.tileSize=Math.floor(e.tileSize/2),e.zoomReverse?(e.zoomOffset--,e.minZoom=Math.min(e.maxZoom,e.minZoom+1)):(e.zoomOffset++,e.maxZoom=Math.max(e.minZoom,e.maxZoom-1)),e.minZoom=Math.max(0,e.minZoom)):e.zoomReverse?e.minZoom=Math.min(e.maxZoom,e.minZoom):e.maxZoom=Math.max(e.minZoom,e.maxZoom),"string"==typeof e.subdomains&&(e.subdomains=e.subdomains.split("")),this.on("tileunload",this._onTileRemove)},setUrl:function(t,e){return this._url===t&&void 0===e&&(e=!0),this._url=t,e||this.redraw(),this},createTile:function(t,e){var i=document.createElement("img");return S(i,"load",a(this._tileOnLoad,this,e,i)),S(i,"error",a(this._tileOnError,this,e,i)),!this.options.crossOrigin&&""!==this.options.crossOrigin||(i.crossOrigin=!0===this.options.crossOrigin?"":this.options.crossOrigin),"string"==typeof this.options.referrerPolicy&&(i.referrerPolicy=this.options.referrerPolicy),i.alt="",i.src=this.getTileUrl(t),i},getTileUrl:function(t){var e={r:b.retina?"@2x":"",s:this._getSubdomain(t),x:t.x,y:t.y,z:this._getZoomForUrl()};return this._map&&!this._map.options.crs.infinite&&(t=this._globalTileRange.max.y-t.y,this.options.tms&&(e.y=t),e["-y"]=t),q(this._url,l(e,this.options))},_tileOnLoad:function(t,e){b.ielt9?setTimeout(a(t,this,null,e),0):t(null,e)},_tileOnError:function(t,e,i){var n=this.options.errorTileUrl;n&&e.getAttribute("src")!==n&&(e.src=n),t(i,e)},_onTileRemove:function(t){t.tile.onload=null},_getZoomForUrl:function(){var t=this._tileZoom,e=this.options.maxZoom;return(t=this.options.zoomReverse?e-t:t)+this.options.zoomOffset},_getSubdomain:function(t){t=Math.abs(t.x+t.y)%this.options.subdomains.length;return this.options.subdomains[t]},_abortLoading:function(){var t,e,i;for(t in this._tiles)this._tiles[t].coords.z!==this._tileZoom&&((i=this._tiles[t].el).onload=u,i.onerror=u,i.complete||(i.src=K,e=this._tiles[t].coords,T(i),delete this._tiles[t],this.fire("tileabort",{tile:i,coords:e})))},_removeTile:function(t){var e=this._tiles[t];if(e)return e.el.setAttribute("src",K),Ni.prototype._removeTile.call(this,t)},_tileReady:function(t,e,i){if(this._map&&(!i||i.getAttribute("src")!==K))return Ni.prototype._tileReady.call(this,t,e,i)}});function ji(t,e){return new Di(t,e)}var Hi=Di.extend({defaultWmsParams:{service:"WMS",request:"GetMap",layers:"",styles:"",format:"image/jpeg",transparent:!1,version:"1.1.1"},options:{crs:null,uppercase:!1},initialize:function(t,e){this._url=t;var i,n=l({},this.defaultWmsParams);for(i in e)i in this.options||(n[i]=e[i]);var t=(e=c(this,e)).detectRetina&&b.retina?2:1,o=this.getTileSize();n.width=o.x*t,n.height=o.y*t,this.wmsParams=n},onAdd:function(t){this._crs=this.options.crs||t.options.crs,this._wmsVersion=parseFloat(this.wmsParams.version);var e=1.3<=this._wmsVersion?"crs":"srs";this.wmsParams[e]=this._crs.code,Di.prototype.onAdd.call(this,t)},getTileUrl:function(t){var e=this._tileCoordsToNwSe(t),i=this._crs,i=_(i.project(e[0]),i.project(e[1])),e=i.min,i=i.max,e=(1.3<=this._wmsVersion&&this._crs===li?[e.y,e.x,i.y,i.x]:[e.x,e.y,i.x,i.y]).join(","),i=Di.prototype.getTileUrl.call(this,t);return i+U(this.wmsParams,i,this.options.uppercase)+(this.options.uppercase?"&BBOX=":"&bbox=")+e},setParams:function(t,e){return l(this.wmsParams,t),e||this.redraw(),this}});Di.WMS=Hi,ji.wms=function(t,e){return new Hi(t,e)};var Wi=o.extend({options:{padding:.1},initialize:function(t){c(this,t),h(this),this._layers=this._layers||{}},onAdd:function(){this._container||(this._initContainer(),M(this._container,"leaflet-zoom-animated")),this.getPane().appendChild(this._container),this._update(),this.on("update",this._updatePaths,this)},onRemove:function(){this.off("update",this._updatePaths,this),this._destroyContainer()},getEvents:function(){var t={viewreset:this._reset,zoom:this._onZoom,moveend:this._update,zoomend:this._onZoomEnd};return this._zoomAnimated&&(t.zoomanim=this._onAnimZoom),t},_onAnimZoom:function(t){this._updateTransform(t.center,t.zoom)},_onZoom:function(){this._updateTransform(this._map.getCenter(),this._map.getZoom())},_updateTransform:function(t,e){var i=this._map.getZoomScale(e,this._zoom),n=this._map.getSize().multiplyBy(.5+this.options.padding),o=this._map.project(this._center,e),n=n.multiplyBy(-i).add(o).subtract(this._map._getNewPixelOrigin(t,e));b.any3d?be(this._container,n,i):Z(this._container,n)},_reset:function(){for(var t in this._update(),this._updateTransform(this._center,this._zoom),this._layers)this._layers[t]._reset()},_onZoomEnd:function(){for(var t in this._layers)this._layers[t]._project()},_updatePaths:function(){for(var t in this._layers)this._layers[t]._update()},_update:function(){var t=this.options.padding,e=this._map.getSize(),i=this._map.containerPointToLayerPoint(e.multiplyBy(-t)).round();this._bounds=new f(i,i.add(e.multiplyBy(1+2*t)).round()),this._center=this._map.getCenter(),this._zoom=this._map.getZoom()}}),Fi=Wi.extend({options:{tolerance:0},getEvents:function(){var t=Wi.prototype.getEvents.call(this);return t.viewprereset=this._onViewPreReset,t},_onViewPreReset:function(){this._postponeUpdatePaths=!0},onAdd:function(){Wi.prototype.onAdd.call(this),this._draw()},_initContainer:function(){var t=this._container=document.createElement("canvas");S(t,"mousemove",this._onMouseMove,this),S(t,"click dblclick mousedown mouseup contextmenu",this._onClick,this),S(t,"mouseout",this._handleMouseOut,this),t._leaflet_disable_events=!0,this._ctx=t.getContext("2d")},_destroyContainer:function(){r(this._redrawRequest),delete this._ctx,T(this._container),k(this._container),delete this._container},_updatePaths:function(){if(!this._postponeUpdatePaths){for(var t in this._redrawBounds=null,this._layers)this._layers[t]._update();this._redraw()}},_update:function(){var t,e,i,n;this._map._animatingZoom&&this._bounds||(Wi.prototype._update.call(this),t=this._bounds,e=this._container,i=t.getSize(),n=b.retina?2:1,Z(e,t.min),e.width=n*i.x,e.height=n*i.y,e.style.width=i.x+"px",e.style.height=i.y+"px",b.retina&&this._ctx.scale(2,2),this._ctx.translate(-t.min.x,-t.min.y),this.fire("update"))},_reset:function(){Wi.prototype._reset.call(this),this._postponeUpdatePaths&&(this._postponeUpdatePaths=!1,this._updatePaths())},_initPath:function(t){this._updateDashArray(t);t=(this._layers[h(t)]=t)._order={layer:t,prev:this._drawLast,next:null};this._drawLast&&(this._drawLast.next=t),this._drawLast=t,this._drawFirst=this._drawFirst||this._drawLast},_addPath:function(t){this._requestRedraw(t)},_removePath:function(t){var e=t._order,i=e.next,e=e.prev;i?i.prev=e:this._drawLast=e,e?e.next=i:this._drawFirst=i,delete t._order,delete this._layers[h(t)],this._requestRedraw(t)},_updatePath:function(t){this._extendRedrawBounds(t),t._project(),t._update(),this._requestRedraw(t)},_updateStyle:function(t){this._updateDashArray(t),this._requestRedraw(t)},_updateDashArray:function(t){if("string"==typeof t.options.dashArray){for(var e,i=t.options.dashArray.split(/[, ]+/),n=[],o=0;o<i.length;o++){if(e=Number(i[o]),isNaN(e))return;n.push(e)}t.options._dashArray=n}else t.options._dashArray=t.options.dashArray},_requestRedraw:function(t){this._map&&(this._extendRedrawBounds(t),this._redrawRequest=this._redrawRequest||x(this._redraw,this))},_extendRedrawBounds:function(t){var e;t._pxBounds&&(e=(t.options.weight||0)+1,this._redrawBounds=this._redrawBounds||new f,this._redrawBounds.extend(t._pxBounds.min.subtract([e,e])),this._redrawBounds.extend(t._pxBounds.max.add([e,e])))},_redraw:function(){this._redrawRequest=null,this._redrawBounds&&(this._redrawBounds.min._floor(),this._redrawBounds.max._ceil()),this._clear(),this._draw(),this._redrawBounds=null},_clear:function(){var t,e=this._redrawBounds;e?(t=e.getSize(),this._ctx.clearRect(e.min.x,e.min.y,t.x,t.y)):(this._ctx.save(),this._ctx.setTransform(1,0,0,1,0,0),this._ctx.clearRect(0,0,this._container.width,this._container.height),this._ctx.restore())},_draw:function(){var t,e,i=this._redrawBounds;this._ctx.save(),i&&(e=i.getSize(),this._ctx.beginPath(),this._ctx.rect(i.min.x,i.min.y,e.x,e.y),this._ctx.clip()),this._drawing=!0;for(var n=this._drawFirst;n;n=n.next)t=n.layer,(!i||t._pxBounds&&t._pxBounds.intersects(i))&&t._updatePath();this._drawing=!1,this._ctx.restore()},_updatePoly:function(t,e){if(this._drawing){var i,n,o,s,r=t._parts,a=r.length,h=this._ctx;if(a){for(h.beginPath(),i=0;i<a;i++){for(n=0,o=r[i].length;n<o;n++)s=r[i][n],h[n?"lineTo":"moveTo"](s.x,s.y);e&&h.closePath()}this._fillStroke(h,t)}}},_updateCircle:function(t){var e,i,n,o;this._drawing&&!t._empty()&&(e=t._point,i=this._ctx,n=Math.max(Math.round(t._radius),1),1!=(o=(Math.max(Math.round(t._radiusY),1)||n)/n)&&(i.save(),i.scale(1,o)),i.beginPath(),i.arc(e.x,e.y/o,n,0,2*Math.PI,!1),1!=o&&i.restore(),this._fillStroke(i,t))},_fillStroke:function(t,e){var i=e.options;i.fill&&(t.globalAlpha=i.fillOpacity,t.fillStyle=i.fillColor||i.color,t.fill(i.fillRule||"evenodd")),i.stroke&&0!==i.weight&&(t.setLineDash&&t.setLineDash(e.options&&e.options._dashArray||[]),t.globalAlpha=i.opacity,t.lineWidth=i.weight,t.strokeStyle=i.color,t.lineCap=i.lineCap,t.lineJoin=i.lineJoin,t.stroke())},_onClick:function(t){for(var e,i,n=this._map.mouseEventToLayerPoint(t),o=this._drawFirst;o;o=o.next)(e=o.layer).options.interactive&&e._containsPoint(n)&&(("click"===t.type||"preclick"===t.type)&&this._map._draggableMoved(e)||(i=e));this._fireEvent(!!i&&[i],t)},_onMouseMove:function(t){var e;!this._map||this._map.dragging.moving()||this._map._animatingZoom||(e=this._map.mouseEventToLayerPoint(t),this._handleMouseHover(t,e))},_handleMouseOut:function(t){var e=this._hoveredLayer;e&&(z(this._container,"leaflet-interactive"),this._fireEvent([e],t,"mouseout"),this._hoveredLayer=null,this._mouseHoverThrottled=!1)},_handleMouseHover:function(t,e){if(!this._mouseHoverThrottled){for(var i,n,o=this._drawFirst;o;o=o.next)(i=o.layer).options.interactive&&i._containsPoint(e)&&(n=i);n!==this._hoveredLayer&&(this._handleMouseOut(t),n&&(M(this._container,"leaflet-interactive"),this._fireEvent([n],t,"mouseover"),this._hoveredLayer=n)),this._fireEvent(!!this._hoveredLayer&&[this._hoveredLayer],t),this._mouseHoverThrottled=!0,setTimeout(a(function(){this._mouseHoverThrottled=!1},this),32)}},_fireEvent:function(t,e,i){this._map._fireDOMEvent(e,i||e.type,t)},_bringToFront:function(t){var e,i,n=t._order;n&&(e=n.next,i=n.prev,e&&((e.prev=i)?i.next=e:e&&(this._drawFirst=e),n.prev=this._drawLast,(this._drawLast.next=n).next=null,this._drawLast=n,this._requestRedraw(t)))},_bringToBack:function(t){var e,i,n=t._order;n&&(e=n.next,(i=n.prev)&&((i.next=e)?e.prev=i:i&&(this._drawLast=i),n.prev=null,n.next=this._drawFirst,this._drawFirst.prev=n,this._drawFirst=n,this._requestRedraw(t)))}});function Ui(t){return b.canvas?new Fi(t):null}var Vi=function(){try{return document.namespaces.add("lvml","urn:schemas-microsoft-com:vml"),function(t){return document.createElement("<lvml:"+t+' class="lvml">')}}catch(t){}return function(t){return document.createElement("<"+t+' xmlns="urn:schemas-microsoft.com:vml" class="lvml">')}}(),zt={_initContainer:function(){this._container=P("div","leaflet-vml-container")},_update:function(){this._map._animatingZoom||(Wi.prototype._update.call(this),this.fire("update"))},_initPath:function(t){var e=t._container=Vi("shape");M(e,"leaflet-vml-shape "+(this.options.className||"")),e.coordsize="1 1",t._path=Vi("path"),e.appendChild(t._path),this._updateStyle(t),this._layers[h(t)]=t},_addPath:function(t){var e=t._container;this._container.appendChild(e),t.options.interactive&&t.addInteractiveTarget(e)},_removePath:function(t){var e=t._container;T(e),t.removeInteractiveTarget(e),delete this._layers[h(t)]},_updateStyle:function(t){var e=t._stroke,i=t._fill,n=t.options,o=t._container;o.stroked=!!n.stroke,o.filled=!!n.fill,n.stroke?(e=e||(t._stroke=Vi("stroke")),o.appendChild(e),e.weight=n.weight+"px",e.color=n.color,e.opacity=n.opacity,n.dashArray?e.dashStyle=d(n.dashArray)?n.dashArray.join(" "):n.dashArray.replace(/( *, *)/g," "):e.dashStyle="",e.endcap=n.lineCap.replace("butt","flat"),e.joinstyle=n.lineJoin):e&&(o.removeChild(e),t._stroke=null),n.fill?(i=i||(t._fill=Vi("fill")),o.appendChild(i),i.color=n.fillColor||n.color,i.opacity=n.fillOpacity):i&&(o.removeChild(i),t._fill=null)},_updateCircle:function(t){var e=t._point.round(),i=Math.round(t._radius),n=Math.round(t._radiusY||i);this._setPath(t,t._empty()?"M0 0":"AL "+e.x+","+e.y+" "+i+","+n+" 0,23592600")},_setPath:function(t,e){t._path.v=e},_bringToFront:function(t){fe(t._container)},_bringToBack:function(t){ge(t._container)}},qi=b.vml?Vi:ct,Gi=Wi.extend({_initContainer:function(){this._container=qi("svg"),this._container.setAttribute("pointer-events","none"),this._rootGroup=qi("g"),this._container.appendChild(this._rootGroup)},_destroyContainer:function(){T(this._container),k(this._container),delete this._container,delete this._rootGroup,delete this._svgSize},_update:function(){var t,e,i;this._map._animatingZoom&&this._bounds||(Wi.prototype._update.call(this),e=(t=this._bounds).getSize(),i=this._container,this._svgSize&&this._svgSize.equals(e)||(this._svgSize=e,i.setAttribute("width",e.x),i.setAttribute("height",e.y)),Z(i,t.min),i.setAttribute("viewBox",[t.min.x,t.min.y,e.x,e.y].join(" ")),this.fire("update"))},_initPath:function(t){var e=t._path=qi("path");t.options.className&&M(e,t.options.className),t.options.interactive&&M(e,"leaflet-interactive"),this._updateStyle(t),this._layers[h(t)]=t},_addPath:function(t){this._rootGroup||this._initContainer(),this._rootGroup.appendChild(t._path),t.addInteractiveTarget(t._path)},_removePath:function(t){T(t._path),t.removeInteractiveTarget(t._path),delete this._layers[h(t)]},_updatePath:function(t){t._project(),t._update()},_updateStyle:function(t){var e=t._path,t=t.options;e&&(t.stroke?(e.setAttribute("stroke",t.color),e.setAttribute("stroke-opacity",t.opacity),e.setAttribute("stroke-width",t.weight),e.setAttribute("stroke-linecap",t.lineCap),e.setAttribute("stroke-linejoin",t.lineJoin),t.dashArray?e.setAttribute("stroke-dasharray",t.dashArray):e.removeAttribute("stroke-dasharray"),t.dashOffset?e.setAttribute("stroke-dashoffset",t.dashOffset):e.removeAttribute("stroke-dashoffset")):e.setAttribute("stroke","none"),t.fill?(e.setAttribute("fill",t.fillColor||t.color),e.setAttribute("fill-opacity",t.fillOpacity),e.setAttribute("fill-rule",t.fillRule||"evenodd")):e.setAttribute("fill","none"))},_updatePoly:function(t,e){this._setPath(t,dt(t._parts,e))},_updateCircle:function(t){var e=t._point,i=Math.max(Math.round(t._radius),1),n="a"+i+","+(Math.max(Math.round(t._radiusY),1)||i)+" 0 1,0 ",e=t._empty()?"M0 0":"M"+(e.x-i)+","+e.y+n+2*i+",0 "+n+2*-i+",0 ";this._setPath(t,e)},_setPath:function(t,e){t._path.setAttribute("d",e)},_bringToFront:function(t){fe(t._path)},_bringToBack:function(t){ge(t._path)}});function Ki(t){return b.svg||b.vml?new Gi(t):null}b.vml&&Gi.include(zt),A.include({getRenderer:function(t){t=(t=t.options.renderer||this._getPaneRenderer(t.options.pane)||this.options.renderer||this._renderer)||(this._renderer=this._createRenderer());return this.hasLayer(t)||this.addLayer(t),t},_getPaneRenderer:function(t){var e;return"overlayPane"!==t&&void 0!==t&&(void 0===(e=this._paneRenderers[t])&&(e=this._createRenderer({pane:t}),this._paneRenderers[t]=e),e)},_createRenderer:function(t){return this.options.preferCanvas&&Ui(t)||Ki(t)}});var Yi=xi.extend({initialize:function(t,e){xi.prototype.initialize.call(this,this._boundsToLatLngs(t),e)},setBounds:function(t){return this.setLatLngs(this._boundsToLatLngs(t))},_boundsToLatLngs:function(t){return[(t=g(t)).getSouthWest(),t.getNorthWest(),t.getNorthEast(),t.getSouthEast()]}});Gi.create=qi,Gi.pointsToPath=dt,wi.geometryToLayer=bi,wi.coordsToLatLng=Li,wi.coordsToLatLngs=Ti,wi.latLngToCoords=Mi,wi.latLngsToCoords=zi,wi.getFeature=Ci,wi.asFeature=Zi,A.mergeOptions({boxZoom:!0});var _t=n.extend({initialize:function(t){this._map=t,this._container=t._container,this._pane=t._panes.overlayPane,this._resetStateTimeout=0,t.on("unload",this._destroy,this)},addHooks:function(){S(this._container,"mousedown",this._onMouseDown,this)},removeHooks:function(){k(this._container,"mousedown",this._onMouseDown,this)},moved:function(){return this._moved},_destroy:function(){T(this._pane),delete this._pane},_resetState:function(){this._resetStateTimeout=0,this._moved=!1},_clearDeferredResetState:function(){0!==this._resetStateTimeout&&(clearTimeout(this._resetStateTimeout),this._resetStateTimeout=0)},_onMouseDown:function(t){if(!t.shiftKey||1!==t.which&&1!==t.button)return!1;this._clearDeferredResetState(),this._resetState(),re(),Le(),this._startPoint=this._map.mouseEventToContainerPoint(t),S(document,{contextmenu:Re,mousemove:this._onMouseMove,mouseup:this._onMouseUp,keydown:this._onKeyDown},this)},_onMouseMove:function(t){this._moved||(this._moved=!0,this._box=P("div","leaflet-zoom-box",this._container),M(this._container,"leaflet-crosshair"),this._map.fire("boxzoomstart")),this._point=this._map.mouseEventToContainerPoint(t);var t=new f(this._point,this._startPoint),e=t.getSize();Z(this._box,t.min),this._box.style.width=e.x+"px",this._box.style.height=e.y+"px"},_finish:function(){this._moved&&(T(this._box),z(this._container,"leaflet-crosshair")),ae(),Te(),k(document,{contextmenu:Re,mousemove:this._onMouseMove,mouseup:this._onMouseUp,keydown:this._onKeyDown},this)},_onMouseUp:function(t){1!==t.which&&1!==t.button||(this._finish(),this._moved&&(this._clearDeferredResetState(),this._resetStateTimeout=setTimeout(a(this._resetState,this),0),t=new s(this._map.containerPointToLatLng(this._startPoint),this._map.containerPointToLatLng(this._point)),this._map.fitBounds(t).fire("boxzoomend",{boxZoomBounds:t})))},_onKeyDown:function(t){27===t.keyCode&&(this._finish(),this._clearDeferredResetState(),this._resetState())}}),Ct=(A.addInitHook("addHandler","boxZoom",_t),A.mergeOptions({doubleClickZoom:!0}),n.extend({addHooks:function(){this._map.on("dblclick",this._onDoubleClick,this)},removeHooks:function(){this._map.off("dblclick",this._onDoubleClick,this)},_onDoubleClick:function(t){var e=this._map,i=e.getZoom(),n=e.options.zoomDelta,i=t.originalEvent.shiftKey?i-n:i+n;"center"===e.options.doubleClickZoom?e.setZoom(i):e.setZoomAround(t.containerPoint,i)}})),Zt=(A.addInitHook("addHandler","doubleClickZoom",Ct),A.mergeOptions({dragging:!0,inertia:!0,inertiaDeceleration:3400,inertiaMaxSpeed:1/0,easeLinearity:.2,worldCopyJump:!1,maxBoundsViscosity:0}),n.extend({addHooks:function(){var t;this._draggable||(t=this._map,this._draggable=new Xe(t._mapPane,t._container),this._draggable.on({dragstart:this._onDragStart,drag:this._onDrag,dragend:this._onDragEnd},this),this._draggable.on("predrag",this._onPreDragLimit,this),t.options.worldCopyJump&&(this._draggable.on("predrag",this._onPreDragWrap,this),t.on("zoomend",this._onZoomEnd,this),t.whenReady(this._onZoomEnd,this))),M(this._map._container,"leaflet-grab leaflet-touch-drag"),this._draggable.enable(),this._positions=[],this._times=[]},removeHooks:function(){z(this._map._container,"leaflet-grab"),z(this._map._container,"leaflet-touch-drag"),this._draggable.disable()},moved:function(){return this._draggable&&this._draggable._moved},moving:function(){return this._draggable&&this._draggable._moving},_onDragStart:function(){var t,e=this._map;e._stop(),this._map.options.maxBounds&&this._map.options.maxBoundsViscosity?(t=g(this._map.options.maxBounds),this._offsetLimit=_(this._map.latLngToContainerPoint(t.getNorthWest()).multiplyBy(-1),this._map.latLngToContainerPoint(t.getSouthEast()).multiplyBy(-1).add(this._map.getSize())),this._viscosity=Math.min(1,Math.max(0,this._map.options.maxBoundsViscosity))):this._offsetLimit=null,e.fire("movestart").fire("dragstart"),e.options.inertia&&(this._positions=[],this._times=[])},_onDrag:function(t){var e,i;this._map.options.inertia&&(e=this._lastTime=+new Date,i=this._lastPos=this._draggable._absPos||this._draggable._newPos,this._positions.push(i),this._times.push(e),this._prunePositions(e)),this._map.fire("move",t).fire("drag",t)},_prunePositions:function(t){for(;1<this._positions.length&&50<t-this._times[0];)this._positions.shift(),this._times.shift()},_onZoomEnd:function(){var t=this._map.getSize().divideBy(2),e=this._map.latLngToLayerPoint([0,0]);this._initialWorldOffset=e.subtract(t).x,this._worldWidth=this._map.getPixelWorldBounds().getSize().x},_viscousLimit:function(t,e){return t-(t-e)*this._viscosity},_onPreDragLimit:function(){var t,e;this._viscosity&&this._offsetLimit&&(t=this._draggable._newPos.subtract(this._draggable._startPos),e=this._offsetLimit,t.x<e.min.x&&(t.x=this._viscousLimit(t.x,e.min.x)),t.y<e.min.y&&(t.y=this._viscousLimit(t.y,e.min.y)),t.x>e.max.x&&(t.x=this._viscousLimit(t.x,e.max.x)),t.y>e.max.y&&(t.y=this._viscousLimit(t.y,e.max.y)),this._draggable._newPos=this._draggable._startPos.add(t))},_onPreDragWrap:function(){var t=this._worldWidth,e=Math.round(t/2),i=this._initialWorldOffset,n=this._draggable._newPos.x,o=(n-e+i)%t+e-i,n=(n+e+i)%t-e-i,t=Math.abs(o+i)<Math.abs(n+i)?o:n;this._draggable._absPos=this._draggable._newPos.clone(),this._draggable._newPos.x=t},_onDragEnd:function(t){var e,i,n,o,s=this._map,r=s.options,a=!r.inertia||t.noInertia||this._times.length<2;s.fire("dragend",t),!a&&(this._prunePositions(+new Date),t=this._lastPos.subtract(this._positions[0]),a=(this._lastTime-this._times[0])/1e3,e=r.easeLinearity,a=(t=t.multiplyBy(e/a)).distanceTo([0,0]),i=Math.min(r.inertiaMaxSpeed,a),t=t.multiplyBy(i/a),n=i/(r.inertiaDeceleration*e),(o=t.multiplyBy(-n/2).round()).x||o.y)?(o=s._limitOffset(o,s.options.maxBounds),x(function(){s.panBy(o,{duration:n,easeLinearity:e,noMoveStart:!0,animate:!0})})):s.fire("moveend")}})),St=(A.addInitHook("addHandler","dragging",Zt),A.mergeOptions({keyboard:!0,keyboardPanDelta:80}),n.extend({keyCodes:{left:[37],right:[39],down:[40],up:[38],zoomIn:[187,107,61,171],zoomOut:[189,109,54,173]},initialize:function(t){this._map=t,this._setPanDelta(t.options.keyboardPanDelta),this._setZoomDelta(t.options.zoomDelta)},addHooks:function(){var t=this._map._container;t.tabIndex<=0&&(t.tabIndex="0"),S(t,{focus:this._onFocus,blur:this._onBlur,mousedown:this._onMouseDown},this),this._map.on({focus:this._addHooks,blur:this._removeHooks},this)},removeHooks:function(){this._removeHooks(),k(this._map._container,{focus:this._onFocus,blur:this._onBlur,mousedown:this._onMouseDown},this),this._map.off({focus:this._addHooks,blur:this._removeHooks},this)},_onMouseDown:function(){var t,e,i;this._focused||(i=document.body,t=document.documentElement,e=i.scrollTop||t.scrollTop,i=i.scrollLeft||t.scrollLeft,this._map._container.focus(),window.scrollTo(i,e))},_onFocus:function(){this._focused=!0,this._map.fire("focus")},_onBlur:function(){this._focused=!1,this._map.fire("blur")},_setPanDelta:function(t){for(var e=this._panKeys={},i=this.keyCodes,n=0,o=i.left.length;n<o;n++)e[i.left[n]]=[-1*t,0];for(n=0,o=i.right.length;n<o;n++)e[i.right[n]]=[t,0];for(n=0,o=i.down.length;n<o;n++)e[i.down[n]]=[0,t];for(n=0,o=i.up.length;n<o;n++)e[i.up[n]]=[0,-1*t]},_setZoomDelta:function(t){for(var e=this._zoomKeys={},i=this.keyCodes,n=0,o=i.zoomIn.length;n<o;n++)e[i.zoomIn[n]]=t;for(n=0,o=i.zoomOut.length;n<o;n++)e[i.zoomOut[n]]=-t},_addHooks:function(){S(document,"keydown",this._onKeyDown,this)},_removeHooks:function(){k(document,"keydown",this._onKeyDown,this)},_onKeyDown:function(t){if(!(t.altKey||t.ctrlKey||t.metaKey)){var e,i,n=t.keyCode,o=this._map;if(n in this._panKeys)o._panAnim&&o._panAnim._inProgress||(i=this._panKeys[n],t.shiftKey&&(i=m(i).multiplyBy(3)),o.options.maxBounds&&(i=o._limitOffset(m(i),o.options.maxBounds)),o.options.worldCopyJump?(e=o.wrapLatLng(o.unproject(o.project(o.getCenter()).add(i))),o.panTo(e)):o.panBy(i));else if(n in this._zoomKeys)o.setZoom(o.getZoom()+(t.shiftKey?3:1)*this._zoomKeys[n]);else{if(27!==n||!o._popup||!o._popup.options.closeOnEscapeKey)return;o.closePopup()}Re(t)}}})),Et=(A.addInitHook("addHandler","keyboard",St),A.mergeOptions({scrollWheelZoom:!0,wheelDebounceTime:40,wheelPxPerZoomLevel:60}),n.extend({addHooks:function(){S(this._map._container,"wheel",this._onWheelScroll,this),this._delta=0},removeHooks:function(){k(this._map._container,"wheel",this._onWheelScroll,this)},_onWheelScroll:function(t){var e=He(t),i=this._map.options.wheelDebounceTime,e=(this._delta+=e,this._lastMousePos=this._map.mouseEventToContainerPoint(t),this._startTime||(this._startTime=+new Date),Math.max(i-(+new Date-this._startTime),0));clearTimeout(this._timer),this._timer=setTimeout(a(this._performZoom,this),e),Re(t)},_performZoom:function(){var t=this._map,e=t.getZoom(),i=this._map.options.zoomSnap||0,n=(t._stop(),this._delta/(4*this._map.options.wheelPxPerZoomLevel)),n=4*Math.log(2/(1+Math.exp(-Math.abs(n))))/Math.LN2,i=i?Math.ceil(n/i)*i:n,n=t._limitZoom(e+(0<this._delta?i:-i))-e;this._delta=0,this._startTime=null,n&&("center"===t.options.scrollWheelZoom?t.setZoom(e+n):t.setZoomAround(this._lastMousePos,e+n))}})),kt=(A.addInitHook("addHandler","scrollWheelZoom",Et),A.mergeOptions({tapHold:b.touchNative&&b.safari&&b.mobile,tapTolerance:15}),n.extend({addHooks:function(){S(this._map._container,"touchstart",this._onDown,this)},removeHooks:function(){k(this._map._container,"touchstart",this._onDown,this)},_onDown:function(t){var e;clearTimeout(this._holdTimeout),1===t.touches.length&&(e=t.touches[0],this._startPos=this._newPos=new p(e.clientX,e.clientY),this._holdTimeout=setTimeout(a(function(){this._cancel(),this._isTapValid()&&(S(document,"touchend",O),S(document,"touchend touchcancel",this._cancelClickPrevent),this._simulateEvent("contextmenu",e))},this),600),S(document,"touchend touchcancel contextmenu",this._cancel,this),S(document,"touchmove",this._onMove,this))},_cancelClickPrevent:function t(){k(document,"touchend",O),k(document,"touchend touchcancel",t)},_cancel:function(){clearTimeout(this._holdTimeout),k(document,"touchend touchcancel contextmenu",this._cancel,this),k(document,"touchmove",this._onMove,this)},_onMove:function(t){t=t.touches[0];this._newPos=new p(t.clientX,t.clientY)},_isTapValid:function(){return this._newPos.distanceTo(this._startPos)<=this._map.options.tapTolerance},_simulateEvent:function(t,e){t=new MouseEvent(t,{bubbles:!0,cancelable:!0,view:window,screenX:e.screenX,screenY:e.screenY,clientX:e.clientX,clientY:e.clientY});t._simulated=!0,e.target.dispatchEvent(t)}})),Ot=(A.addInitHook("addHandler","tapHold",kt),A.mergeOptions({touchZoom:b.touch,bounceAtZoomLimits:!0}),n.extend({addHooks:function(){M(this._map._container,"leaflet-touch-zoom"),S(this._map._container,"touchstart",this._onTouchStart,this)},removeHooks:function(){z(this._map._container,"leaflet-touch-zoom"),k(this._map._container,"touchstart",this._onTouchStart,this)},_onTouchStart:function(t){var e,i,n=this._map;!t.touches||2!==t.touches.length||n._animatingZoom||this._zooming||(e=n.mouseEventToContainerPoint(t.touches[0]),i=n.mouseEventToContainerPoint(t.touches[1]),this._centerPoint=n.getSize()._divideBy(2),this._startLatLng=n.containerPointToLatLng(this._centerPoint),"center"!==n.options.touchZoom&&(this._pinchStartLatLng=n.containerPointToLatLng(e.add(i)._divideBy(2))),this._startDist=e.distanceTo(i),this._startZoom=n.getZoom(),this._moved=!1,this._zooming=!0,n._stop(),S(document,"touchmove",this._onTouchMove,this),S(document,"touchend touchcancel",this._onTouchEnd,this),O(t))},_onTouchMove:function(t){if(t.touches&&2===t.touches.length&&this._zooming){var e=this._map,i=e.mouseEventToContainerPoint(t.touches[0]),n=e.mouseEventToContainerPoint(t.touches[1]),o=i.distanceTo(n)/this._startDist;if(this._zoom=e.getScaleZoom(o,this._startZoom),!e.options.bounceAtZoomLimits&&(this._zoom<e.getMinZoom()&&o<1||this._zoom>e.getMaxZoom()&&1<o)&&(this._zoom=e._limitZoom(this._zoom)),"center"===e.options.touchZoom){if(this._center=this._startLatLng,1==o)return}else{i=i._add(n)._divideBy(2)._subtract(this._centerPoint);if(1==o&&0===i.x&&0===i.y)return;this._center=e.unproject(e.project(this._pinchStartLatLng,this._zoom).subtract(i),this._zoom)}this._moved||(e._moveStart(!0,!1),this._moved=!0),r(this._animRequest);n=a(e._move,e,this._center,this._zoom,{pinch:!0,round:!1},void 0);this._animRequest=x(n,this,!0),O(t)}},_onTouchEnd:function(){this._moved&&this._zooming?(this._zooming=!1,r(this._animRequest),k(document,"touchmove",this._onTouchMove,this),k(document,"touchend touchcancel",this._onTouchEnd,this),this._map.options.zoomAnimation?this._map._animateZoom(this._center,this._map._limitZoom(this._zoom),!0,this._map.options.zoomSnap):this._map._resetView(this._center,this._map._limitZoom(this._zoom))):this._zooming=!1}})),Xi=(A.addInitHook("addHandler","touchZoom",Ot),A.BoxZoom=_t,A.DoubleClickZoom=Ct,A.Drag=Zt,A.Keyboard=St,A.ScrollWheelZoom=Et,A.TapHold=kt,A.TouchZoom=Ot,t.Bounds=f,t.Browser=b,t.CRS=ot,t.Canvas=Fi,t.Circle=vi,t.CircleMarker=gi,t.Class=et,t.Control=B,t.DivIcon=Ri,t.DivOverlay=Ai,t.DomEvent=mt,t.DomUtil=pt,t.Draggable=Xe,t.Evented=it,t.FeatureGroup=ci,t.GeoJSON=wi,t.GridLayer=Ni,t.Handler=n,t.Icon=di,t.ImageOverlay=Ei,t.LatLng=v,t.LatLngBounds=s,t.Layer=o,t.LayerGroup=ui,t.LineUtil=vt,t.Map=A,t.Marker=mi,t.Mixin=ft,t.Path=fi,t.Point=p,t.PolyUtil=gt,t.Polygon=xi,t.Polyline=yi,t.Popup=Bi,t.PosAnimation=Fe,t.Projection=wt,t.Rectangle=Yi,t.Renderer=Wi,t.SVG=Gi,t.SVGOverlay=Oi,t.TileLayer=Di,t.Tooltip=Ii,t.Transformation=at,t.Util=tt,t.VideoOverlay=ki,t.bind=a,t.bounds=_,t.canvas=Ui,t.circle=function(t,e,i){return new vi(t,e,i)},t.circleMarker=function(t,e){return new gi(t,e)},t.control=Ue,t.divIcon=function(t){return new Ri(t)},t.extend=l,t.featureGroup=function(t,e){return new ci(t,e)},t.geoJSON=Si,t.geoJson=Mt,t.gridLayer=function(t){return new Ni(t)},t.icon=function(t){return new di(t)},t.imageOverlay=function(t,e,i){return new Ei(t,e,i)},t.latLng=w,t.latLngBounds=g,t.layerGroup=function(t,e){return new ui(t,e)},t.map=function(t,e){return new A(t,e)},t.marker=function(t,e){return new mi(t,e)},t.point=m,t.polygon=function(t,e){return new xi(t,e)},t.polyline=function(t,e){return new yi(t,e)},t.popup=function(t,e){return new Bi(t,e)},t.rectangle=function(t,e){return new Yi(t,e)},t.setOptions=c,t.stamp=h,t.svg=Ki,t.svgOverlay=function(t,e,i){return new Oi(t,e,i)},t.tileLayer=ji,t.tooltip=function(t,e){return new Ii(t,e)},t.transformation=ht,t.version="1.9.4",t.videoOverlay=function(t,e,i){return new ki(t,e,i)},window.L);t.noConflict=function(){return window.L=Xi,this},window.L=t});
+//# sourceMappingURL=leaflet.js.map
\ No newline at end of file
diff --git a/viewer/leaflet-1.9.4/leaflet.js.map b/viewer/leaflet-1.9.4/leaflet.js.map
new file mode 100644
index 0000000..a3b1707
--- /dev/null
+++ b/viewer/leaflet-1.9.4/leaflet.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"dist/leaflet.js.map","sources":["../src/core/Util.js","../src/core/Class.js","../src/core/Events.js","../src/geometry/Point.js","../src/geometry/Bounds.js","../src/geo/LatLngBounds.js","../src/geo/LatLng.js","../src/geo/crs/CRS.js","../src/geo/crs/CRS.Earth.js","../src/geo/projection/Projection.SphericalMercator.js","../src/geometry/Transformation.js","../src/geo/crs/CRS.EPSG3857.js","../src/layer/vector/SVG.Util.js","../src/core/Browser.js","../src/dom/DomEvent.Pointer.js","../src/dom/DomEvent.DoubleTap.js","../src/dom/DomUtil.js","../src/dom/DomEvent.js","../src/dom/PosAnimation.js","../src/map/Map.js","../src/control/Control.js","../src/control/Control.Layers.js","../src/control/Control.Zoom.js","../src/control/Control.Scale.js","../src/control/Control.Attribution.js","../src/core/Handler.js","../src/control/index.js","../src/core/index.js","../src/dom/Draggable.js","../src/geometry/PolyUtil.js","../src/geometry/LineUtil.js","../src/geo/projection/Projection.LonLat.js","../src/geo/projection/Projection.Mercator.js","../src/geo/crs/CRS.EPSG3395.js","../src/geo/crs/CRS.EPSG4326.js","../src/geo/crs/CRS.Simple.js","../src/layer/Layer.js","../src/geo/crs/index.js","../src/layer/LayerGroup.js","../src/layer/FeatureGroup.js","../src/layer/marker/Icon.js","../src/layer/marker/Icon.Default.js","../src/layer/marker/Marker.Drag.js","../src/layer/marker/Marker.js","../src/layer/vector/Path.js","../src/layer/vector/CircleMarker.js","../src/layer/vector/Circle.js","../src/layer/vector/Polyline.js","../src/layer/vector/Polygon.js","../src/layer/GeoJSON.js","../src/layer/ImageOverlay.js","../src/layer/VideoOverlay.js","../src/layer/SVGOverlay.js","../src/layer/DivOverlay.js","../src/layer/Popup.js","../src/layer/Tooltip.js","../src/layer/marker/DivIcon.js","../src/layer/marker/index.js","../src/layer/tile/GridLayer.js","../src/layer/tile/TileLayer.js","../src/layer/tile/TileLayer.WMS.js","../src/layer/tile/index.js","../src/layer/vector/Renderer.js","../src/layer/vector/Canvas.js","../src/layer/vector/SVG.VML.js","../src/layer/vector/SVG.js","../src/layer/vector/Renderer.getRenderer.js","../src/layer/vector/Rectangle.js","../src/layer/vector/index.js","../src/layer/index.js","../src/map/handler/Map.BoxZoom.js","../src/map/handler/Map.DoubleClickZoom.js","../src/map/handler/Map.Drag.js","../src/map/handler/Map.Keyboard.js","../src/map/handler/Map.ScrollWheelZoom.js","../src/map/handler/Map.TapHold.js","../src/map/handler/Map.TouchZoom.js","../src/map/index.js"],"names":["extend","dest","i","src","j","len","arguments","length","create","Object","proto","F","prototype","bind","fn","obj","args","slice","Array","apply","call","concat","lastId","stamp","_leaflet_id","throttle","time","context","lock","later","wrapperFn","setTimeout","wrapNum","x","range","includeMax","max","min","d","falseFn","formatNum","num","precision","pow","Math","undefined","round","trim","str","replace","splitWords","split","setOptions","options","hasOwnProperty","getParamString","existingUrl","uppercase","params","push","encodeURIComponent","toUpperCase","indexOf","join","templateRe","template","data","key","value","Error","isArray","toString","array","el","emptyImageUrl","getPrefixed","name","window","lastTime","timeoutDefer","Date","timeToCall","requestFn","requestAnimationFrame","cancelFn","cancelAnimationFrame","id","clearTimeout","requestAnimFrame","immediate","cancelAnimFrame","Class","props","NewClass","Util.setOptions","this","initialize","callInitHooks","parentProto","__super__","Util.create","constructor","statics","Util.extend","includes","checkDeprecatedMixinEvents","L","Mixin","Util.isArray","Events","console","warn","stack","_initHooks","_initHooksCalled","include","parentOptions","mergeOptions","addInitHook","init","on","types","type","_on","Util.splitWords","off","_off","removeAll","_events","_once","_listens","newListener","ctx","once","listeners","_firingCount","Util.falseFn","index","listener","splice","fire","propagate","listens","event","target","sourceTarget","l","_propagateEvent","_fn","_eventParents","addEventParent","Util.stamp","removeEventParent","e","layer","propagatedFrom","Evented","addEventListener","removeEventListener","clearAllEventListeners","addOneTimeEventListener","fireEvent","hasEventListeners","Point","y","trunc","v","floor","ceil","toPoint","Bounds","a","b","points","toBounds","LatLngBounds","corner1","corner2","latlngs","toLatLngBounds","LatLng","lat","lng","alt","isNaN","toLatLng","c","lon","clone","add","point","_add","subtract","_subtract","divideBy","_divideBy","multiplyBy","_multiplyBy","scaleBy","unscaleBy","_round","_floor","_ceil","_trunc","distanceTo","sqrt","equals","contains","abs","min2","max2","getCenter","getBottomLeft","getTopRight","getTopLeft","getBottomRight","getSize","intersects","bounds","xIntersects","yIntersects","overlaps","xOverlaps","yOverlaps","isValid","pad","bufferRatio","heightBuffer","widthBuffer","sw2","ne2","sw","_southWest","ne","_northEast","getSouthWest","getNorthEast","getNorthWest","getNorth","getWest","getSouthEast","getSouth","getEast","latIntersects","lngIntersects","latOverlaps","lngOverlaps","toBBoxString","maxMargin","CRS","latLngToPoint","latlng","zoom","projectedPoint","projection","project","scale","transformation","_transform","pointToLatLng","untransformedPoint","untransform","unproject","log","LN2","getProjectedBounds","infinite","s","transform","Util.formatNum","other","Earth","distance","wrap","wrapLatLng","sizeInMeters","latAccuracy","lngAccuracy","cos","PI","wrapLng","Util.wrapNum","wrapLat","wrapLatLngBounds","center","newCenter","latShift","lngShift","R","latlng1","latlng2","rad","lat1","lat2","sinDLat","sin","sinDLon","atan2","earthRadius","SphericalMercator","MAX_LATITUDE","atan","exp","Transformation","_a","_b","_c","_d","toTransformation","EPSG3857","code","EPSG900913","svgCreate","document","createElementNS","pointsToPath","rings","closed","len2","p","Browser","svg","style","documentElement","ie","ielt9","edge","navigator","webkit","userAgentContains","android","android23","webkitVer","parseInt","exec","userAgent","androidStock","opera","chrome","gecko","safari","phantom","opera12","win","platform","ie3d","webkit3d","WebKitCSSMatrix","gecko3d","any3d","L_DISABLE_3D","mobile","orientation","mobileWebkit","mobileWebkit3d","msPointer","PointerEvent","MSPointerEvent","pointer","touchNative","TouchEvent","touch","L_NO_TOUCH","mobileOpera","mobileGecko","retina","devicePixelRatio","screen","deviceXDPI","logicalXDPI","passiveEvents","supportsPassiveOption","opts","defineProperty","get","canvas","createElement","getContext","createSVGRect","inlineSvg","div","innerHTML","firstChild","namespaceURI","toLowerCase","vml","shape","behavior","adj","mac","linux","POINTER_DOWN","POINTER_MOVE","POINTER_UP","POINTER_CANCEL","pEvent","touchstart","touchmove","touchend","touchcancel","handle","handler","MSPOINTER_TYPE_TOUCH","pointerType","DomEvent.preventDefault","_handlePointer","_pointers","_pointerDocListener","addPointerListener","_globalPointerDown","_globalPointerMove","_globalPointerUp","pointerId","MSPOINTER_TYPE_MOUSE","touches","changedTouches","delay","addDoubleTapListener","detail","last","simDblclick","now","sourceCapabilities","firesTouchEvents","path","DomEvent.getPropagationPath","some","HTMLLabelElement","attributes","for","HTMLInputElement","HTMLSelectElement","prop","newEvent","isTrusted","_simulated","dblclick","_userSelect","userSelectProperty","disableTextSelection","enableTextSelection","_outlineElement","_outlineStyle","TRANSFORM","testProp","TRANSITION","TRANSITION_END","getElementById","getStyle","currentStyle","defaultView","css","getComputedStyle","tagName","className","container","appendChild","remove","parent","parentNode","removeChild","empty","toFront","lastChild","toBack","insertBefore","hasClass","classList","getClass","RegExp","test","addClass","classes","setClass","removeClass","Util.trim","baseVal","correspondingElement","setOpacity","opacity","_setOpacityIE","filter","filterName","filters","item","Enabled","Opacity","setTransform","offset","pos","setPosition","_leaflet_pos","left","top","getPosition","disableImageDrag","DomEvent.on","enableImageDrag","DomEvent.off","preventOutline","element","tabIndex","restoreOutline","outlineStyle","getSizedParentNode","offsetWidth","offsetHeight","body","getScale","rect","getBoundingClientRect","width","height","boundingClientRect","addOne","eventsKey","batchRemove","removeOne","Util.indexOf","filterFn","mouseSubst","mouseenter","mouseleave","wheel","originalHandler","passive","isExternalTarget","attachEvent","handlers","detachEvent","stopPropagation","originalEvent","_stopped","cancelBubble","disableScrollPropagation","disableClickPropagation","preventDefault","returnValue","stop","getPropagationPath","ev","composedPath","getMousePosition","clientX","clientLeft","clientY","clientTop","wheelPxFactor","getWheelDelta","wheelDeltaY","deltaY","deltaMode","deltaX","deltaZ","wheelDelta","related","relatedTarget","err","PosAnimation","run","newPos","duration","easeLinearity","_el","_inProgress","_duration","_easeOutPower","_startPos","DomUtil.getPosition","_offset","_startTime","_animate","_step","_complete","_animId","Util.requestAnimFrame","elapsed","_runFrame","_easeOut","progress","DomUtil.setPosition","Util.cancelAnimFrame","t","Map","crs","minZoom","maxZoom","layers","maxBounds","renderer","zoomAnimation","zoomAnimationThreshold","fadeAnimation","markerZoomAnimation","transform3DLimit","zoomSnap","zoomDelta","trackResize","_handlers","_layers","_zoomBoundLayers","_sizeChanged","_initContainer","_initLayout","_onResize","Util.bind","_initEvents","setMaxBounds","_zoom","_limitZoom","setView","reset","_zoomAnimated","DomUtil.TRANSITION","_createAnimProxy","_proxy","DomUtil.TRANSITION_END","_catchTransitionEnd","_addLayers","_limitCenter","_stop","_loaded","animate","pan","_tryAnimatedZoom","_tryAnimatedPan","_sizeTimer","_resetView","noMoveStart","setZoom","zoomIn","delta","zoomOut","setZoomAround","getZoomScale","viewHalf","centerOffset","latLngToContainerPoint","containerPointToLatLng","_getBoundsCenterZoom","getBounds","paddingTL","paddingTopLeft","padding","paddingBR","paddingBottomRight","getBoundsZoom","Infinity","paddingOffset","swPoint","nePoint","fitBounds","fitWorld","panTo","panBy","_panAnim","step","_onPanTransitionStep","end","_onPanTransitionEnd","DomUtil.addClass","_mapPane","_getMapPanePos","_rawPanBy","getZoom","flyTo","targetCenter","targetZoom","from","to","size","startZoom","w0","w1","u1","rho","rho2","r","sq","sinh","n","cosh","r0","u","start","S","_moveStart","frame","_flyToFrame","_move","getScaleZoom","_moveEnd","flyToBounds","_panInsideMaxBounds","setMinZoom","oldZoom","setMaxZoom","panInsideBounds","_enforcingBounds","panInside","pixelCenter","pixelPoint","pixelBounds","getPixelBounds","paddedBounds","paddedSize","invalidateSize","oldSize","newSize","_lastCenter","oldCenter","debounceMoveend","locate","onResponse","onError","_locateOptions","timeout","watch","_handleGeolocationResponse","_handleGeolocationError","_locationWatchId","geolocation","watchPosition","getCurrentPosition","message","stopLocate","clearWatch","error","_container","coords","latitude","longitude","accuracy","timestamp","addHandler","HandlerClass","enable","_containerId","DomUtil.remove","_clearControlPos","_resizeRequest","_clearHandlers","_panes","_renderer","createPane","pane","DomUtil.create","_checkIfLoaded","_moved","layerPointToLatLng","_getCenterLayerPoint","getMinZoom","_layersMinZoom","getMaxZoom","_layersMaxZoom","inside","nw","se","boundsSize","snap","scalex","scaley","_size","clientWidth","clientHeight","topLeftPoint","_getTopLeftPoint","getPixelOrigin","_pixelOrigin","getPixelWorldBounds","getPane","getPanes","getContainer","toZoom","fromZoom","latLngToLayerPoint","containerPointToLayerPoint","layerPointToContainerPoint","layerPoint","mouseEventToContainerPoint","DomEvent.getMousePosition","mouseEventToLayerPoint","mouseEventToLatLng","DomUtil.get","_onScroll","position","_fadeAnimated","DomUtil.getStyle","_initPanes","_initControlPos","panes","_paneRenderers","markerPane","shadowPane","loading","zoomChanged","supressEvent","_getNewPixelOrigin","pinch","_getZoomSpan","_targets","onOff","_handleDOMEvent","_onMoveEnd","scrollTop","scrollLeft","_findEventTargets","targets","isHover","srcElement","dragging","_draggableMoved","DomEvent.isExternalTarget","_isClickDisabled","DomUtil.preventOutline","_fireDOMEvent","_mouseEvents","canvasTargets","synth","filtered","isMarker","getLatLng","_radius","containerPoint","bubblingMouseEvents","enabled","moved","boxZoom","disable","whenReady","callback","_latLngToNewLayerPoint","topLeft","_latLngBoundsToNewLayerBounds","latLngBounds","_getCenterOffset","centerPoint","viewBounds","_getBoundsOffset","_limitOffset","newBounds","pxBounds","projectedMaxBounds","minOffset","maxOffset","_rebound","right","DomUtil.removeClass","proxy","mapPane","DomUtil.TRANSFORM","DomUtil.setTransform","_animatingZoom","_onZoomTransitionEnd","_animMoveEnd","_destroyAnimProxy","z","propertyName","_nothingToAnimate","getElementsByClassName","_animateZoom","startAnim","noUpdate","_animateToCenter","_animateToZoom","_tempFireZoomEvent","control","Control","map","_map","removeControl","addControl","addTo","onAdd","corner","_controlCorners","onRemove","_refocusOnMap","screenX","screenY","focus","Layers","corners","_controlContainer","createCorner","vSide","hSide","collapsed","autoZIndex","hideSingleBase","sortLayers","sortFunction","layerA","layerB","nameA","nameB","baseLayers","overlays","_layerControlInputs","_lastZIndex","_handlingClick","_preventClick","_addLayer","_update","_checkDisabledLayers","_onLayerChange","_expandIfNotCollapsed","addBaseLayer","addOverlay","removeLayer","_getLayer","expand","_section","acceptableHeight","offsetTop","collapse","section","setAttribute","DomEvent.disableClickPropagation","DomEvent.disableScrollPropagation","link","_expandSafely","_layersLink","href","title","keydown","keyCode","click","_baseLayersList","_separator","_overlaysList","overlay","sort","setZIndex","DomUtil.empty","baseLayersPresent","overlaysPresent","baseLayersCount","_addItem","display","_createRadioElement","checked","radioHtml","radioFragment","input","label","hasLayer","defaultChecked","layerId","_onInputClick","holder","inputs","addedLayers","removedLayers","addLayer","disabled","that","Zoom","zoomInText","zoomInTitle","zoomOutText","zoomOutTitle","zoomName","_zoomInButton","_createButton","_zoomIn","_zoomOutButton","_zoomOut","_updateDisabled","_disabled","shiftKey","html","DomEvent.stop","Scale","zoomControl","maxWidth","metric","imperial","_addScales","updateWhenIdle","_mScale","_iScale","maxMeters","_updateScales","_updateMetric","_updateImperial","meters","_getRoundNum","_updateScale","maxMiles","feet","maxFeet","miles","text","ratio","pow10","Attribution","prefix","ukrainianFlag","_attributions","attributionControl","getAttribution","addAttribution","_addAttribution","removeAttribution","setPrefix","attribs","prefixAndAttribs","Handler","attribution","_enabled","addHooks","removeHooks","START","Draggable","clickTolerance","dragStartTarget","_element","_dragStartTarget","_preventOutline","_onDown","_dragging","finishDrag","sizedParent","mouseevent","DomUtil.hasClass","which","button","DomUtil.disableImageDrag","DomUtil.disableTextSelection","_moving","first","DomUtil.getSizedParentNode","_startPoint","_parentScale","DomUtil.getScale","_onMove","_onUp","_lastTarget","SVGElementInstance","correspondingUseElement","_newPos","_lastEvent","_updatePosition","noInertia","DomUtil.enableImageDrag","DomUtil.enableTextSelection","fireDragend","clipPolygon","clippedPoints","k","edges","_code","LineUtil._getBitCode","LineUtil._getEdgeIntersection","polygonCenter","p1","p2","f","area","LineUtil.isFlat","centroidLatLng","centroid","latlngCenter","latSum","lngSum","_lastCode","simplify","tolerance","_simplifyDP","sqTolerance","reducedPoints","prev","dx","dy","markers","Uint8Array","_simplifyDPStep","sqDist","maxSqDist","_sqClosestPointOnSegment","newPoints","pointToSegmentDistance","clipSegment","useLastCode","codeOut","newCode","codeA","_getBitCode","codeB","_getEdgeIntersection","dot","isFlat","_flat","polylineCenter","halfDist","dist","segDist","LonLat","Mercator","R_MINOR","tmp","con","ts","tan","phi","dphi","EPSG3395","EPSG4326","Simple","Layer","removeFrom","_mapToAdd","addInteractiveTarget","targetEl","removeInteractiveTarget","_layerAdd","events","getEvents","LayerGroup","beforeAdd","eachLayer","method","_addZoomLimit","_updateZoomLevels","_removeZoomLimit","oldZoomSpan","getLayerId","clearLayers","invoke","methodName","getLayer","getLayers","zIndex","FeatureGroup","setStyle","bringToFront","bringToBack","Icon","popupAnchor","tooltipAnchor","crossOrigin","createIcon","oldIcon","_createIcon","createShadow","_getIconUrl","img","_createImg","_setIconStyles","sizeOption","anchor","shadowAnchor","iconAnchor","marginLeft","marginTop","IconDefault","iconUrl","iconRetinaUrl","shadowUrl","iconSize","shadowSize","imagePath","_detectIconPath","_stripUrl","strip","re","idx","match","querySelector","substring","MarkerDrag","marker","_marker","icon","_icon","_draggable","dragstart","_onDragStart","predrag","_onPreDrag","drag","_onDrag","dragend","_onDragEnd","_adjustPan","speed","autoPanSpeed","autoPanPadding","iconPos","origin","panBounds","movement","_panRequest","_oldLatLng","closePopup","autoPan","shadow","_shadow","_latlng","oldLatLng","Marker","interactive","keyboard","zIndexOffset","riseOnHover","riseOffset","autoPanOnFocus","draggable","latLng","_initIcon","update","_removeIcon","_removeShadow","viewreset","setLatLng","setZIndexOffset","getIcon","setIcon","_popup","bindPopup","getElement","_setPos","classToAdd","addIcon","newShadow","mouseover","_bringToFront","mouseout","_resetZIndex","_panOnFocus","addShadow","_updateOpacity","_initInteraction","_zIndex","_updateZIndex","opt","DomUtil.setOpacity","iconOpts","_getPopupAnchor","_getTooltipAnchor","Path","stroke","color","weight","lineCap","lineJoin","dashArray","dashOffset","fill","fillColor","fillOpacity","fillRule","getRenderer","_initPath","_reset","_addPath","_removePath","redraw","_updatePath","_updateStyle","_updateBounds","_bringToBack","_path","_project","_clickTolerance","CircleMarker","radius","setRadius","getRadius","_point","r2","_radiusY","w","_pxBounds","_updateCircle","_empty","_bounds","_containsPoint","Circle","legacyOptions","_mRadius","half","lngR","latR","bottom","acos","Polyline","smoothFactor","noClip","_setLatLngs","getLatLngs","_latlngs","setLatLngs","isEmpty","closestLayerPoint","minDistance","minPoint","closest","LineUtil._sqClosestPointOnSegment","jLen","_parts","LineUtil.polylineCenter","_defaultShape","addLatLng","_convertLatLngs","result","flat","_rings","_projectLatlngs","_rawPxBounds","projectedBounds","ring","_clipPoints","segment","parts","LineUtil.clipSegment","_simplifyPoints","LineUtil.simplify","_updatePoly","part","LineUtil.pointToSegmentDistance","LineUtil._flat","Polygon","PolyUtil.polygonCenter","pop","clipped","PolyUtil.clipPolygon","GeoJSON","geojson","addData","feature","features","geometries","geometry","coordinates","geometryToLayer","asFeature","defaultOptions","resetStyle","onEachFeature","_setLayerStyle","pointToLayer","_coordsToLatLng","coordsToLatLng","_pointToLayer","coordsToLatLngs","geoLayer","properties","featureLayer","pointToLayerFn","markersInheritOptions","levelsDeep","latLngToCoords","latLngsToCoords","getFeature","newGeometry","PointToGeoJSON","toGeoJSON","geoJSON","multi","holes","toMultiPoint","isGeometryCollection","jsons","json","geoJson","ImageOverlay","errorOverlayUrl","url","_url","_image","_initImage","styleOpts","DomUtil.toFront","DomUtil.toBack","setUrl","setBounds","zoomanim","wasElementSupplied","onselectstart","onmousemove","onload","onerror","_overlayOnError","image","errorUrl","VideoOverlay","autoplay","loop","keepAspectRatio","muted","playsInline","vid","onloadeddata","sourceElements","getElementsByTagName","sources","source","SVGOverlay","DivOverlay","content","_source","_content","openOn","close","toggle","_prepareOpen","_removeTimeout","getContent","setContent","visibility","_updateContent","_updateLayout","isOpen","node","_contentNode","hasChildNodes","_getAnchor","_containerBottom","_containerLeft","_containerWidth","Popup","_initOverlay","OverlayClass","old","minWidth","maxHeight","autoPanPaddingTopLeft","autoPanPaddingBottomRight","keepInView","closeButton","autoClose","closeOnEscapeKey","popup","DomEvent.stopPropagation","closeOnClick","closePopupOnClick","preclick","moveend","wrapper","_wrapper","_tipContainer","_tip","_closeButton","whiteSpace","scrolledClass","containerHeight","containerPos","_autopanning","marginBottom","containerWidth","layerPos","Tooltip","openPopup","_popupHandlersAdded","_openPopup","keypress","_onKeyPress","move","_movePopup","unbindPopup","togglePopup","isPopupOpen","setPopupContent","getPopup","direction","permanent","sticky","tooltip","_setPosition","subX","tooltipPoint","tooltipWidth","tooltipHeight","subY","DivIcon","openTooltip","closeTooltip","bindTooltip","_tooltip","isTooltipOpen","unbindTooltip","_initTooltipInteractions","_tooltipHandlersAdded","_moveTooltip","_openTooltip","_addFocusListeners","mousemove","_setAriaDescribedByOnLayer","toggleTooltip","setTooltipContent","getTooltip","_addFocusListenersOnLayer","moving","_openOnceFlag","bgPos","Element","backgroundPosition","Default","GridLayer","tileSize","updateWhenZooming","updateInterval","maxNativeZoom","minNativeZoom","noWrap","keepBuffer","_levels","_tiles","_removeAllTiles","_tileZoom","_setAutoZIndex","isLoading","_loading","tileZoom","_clampZoom","_updateLevels","viewprereset","_invalidateAll","Util.throttle","createTile","getTileSize","compare","children","edgeZIndex","isFinite","nextFrame","willPrune","fade","tile","current","loaded","active","_onOpaqueTile","_noPrune","_pruneTiles","_fadeFrame","Number","_onUpdateLevel","_removeTilesAtZoom","_onRemoveLevel","level","_setZoomTransform","_onCreateLevel","_level","retain","_retainParent","_retainChildren","_removeTile","x2","y2","z2","coords2","_tileCoordsToKey","animating","_setView","noPrune","tileZoomChanged","_abortLoading","_resetGrid","_setZoomTransforms","translate","_tileSize","_globalTileRange","_pxBoundsToTileRange","_wrapX","_wrapY","_getTiledPixelBounds","mapZoom","halfSize","tileRange","tileCenter","queue","margin","noPruneRange","_isValidTile","fragment","createDocumentFragment","_addTile","tileBounds","_tileCoordsToBounds","_keyToBounds","_keyToTileCoords","_tileCoordsToNwSe","nwPoint","sePoint","bp","_initTile","tilePos","_getTilePos","_wrapCoords","_tileReady","_noTilesToLoad","newCoords","TileLayer","subdomains","errorTileUrl","zoomOffset","tms","zoomReverse","detectRetina","referrerPolicy","_onTileRemove","noRedraw","done","_tileOnLoad","_tileOnError","getTileUrl","_getSubdomain","_getZoomForUrl","invertedY","Util.template","getAttribute","tilePoint","complete","Util.emptyImageUrl","tileLayer","TileLayerWMS","defaultWmsParams","service","request","styles","format","transparent","version","wmsParams","realRetina","_crs","_wmsVersion","parseFloat","projectionKey","bbox","setParams","WMS","wms","Renderer","_updatePaths","_destroyContainer","_onZoom","zoomend","_onZoomEnd","_onAnimZoom","_updateTransform","currentCenterPoint","_center","topLeftOffset","Canvas","_onViewPreReset","_postponeUpdatePaths","_draw","_onMouseMove","_onClick","_handleMouseOut","_ctx","_redrawRequest","_redrawBounds","_redraw","m","_updateDashArray","order","_order","_drawLast","next","_drawFirst","_requestRedraw","_extendRedrawBounds","dashValue","_dashArray","_clear","clearRect","save","restore","beginPath","clip","_drawing","closePath","_fillStroke","arc","globalAlpha","fillStyle","setLineDash","lineWidth","strokeStyle","clickedLayer","_fireEvent","_handleMouseHover","_hoveredLayer","_mouseHoverThrottled","candidateHoveredLayer","vmlCreate","namespaces","vmlMixin","coordsize","_stroke","_fill","stroked","filled","dashStyle","endcap","joinstyle","_setPath","SVG","_rootGroup","_svgSize","removeAttribute","_getPaneRenderer","_createRenderer","preferCanvas","Rectangle","_boundsToLatLngs","BoxZoom","_pane","overlayPane","_resetStateTimeout","_destroy","_onMouseDown","_resetState","_clearDeferredResetState","contextmenu","mouseup","_onMouseUp","_onKeyDown","_box","_finish","boxZoomBounds","DoubleClickZoom","doubleClickZoom","_onDoubleClick","Drag","inertia","inertiaDeceleration","inertiaMaxSpeed","worldCopyJump","maxBoundsViscosity","_onPreDragLimit","_onPreDragWrap","_positions","_times","_offsetLimit","_viscosity","_lastTime","_lastPos","_absPos","_prunePositions","shift","pxCenter","pxWorldCenter","_initialWorldOffset","_worldWidth","_viscousLimit","threshold","limit","worldWidth","halfWidth","newX1","newX2","newX","ease","limitedSpeed","decelerationDuration","speedVector","limitedSpeedVector","Keyboard","keyboardPanDelta","keyCodes","down","up","_setPanDelta","_setZoomDelta","_onFocus","blur","_onBlur","mousedown","_addHooks","_removeHooks","docEl","_focused","scrollTo","panDelta","keys","_panKeys","codes","_zoomKeys","altKey","ctrlKey","metaKey","newLatLng","ScrollWheelZoom","scrollWheelZoom","wheelDebounceTime","wheelPxPerZoomLevel","_onWheelScroll","_delta","DomEvent.getWheelDelta","debounce","_lastMousePos","_timer","_performZoom","d2","d3","d4","TapHold","tapHold","tapTolerance","_holdTimeout","_cancel","_isTapValid","_cancelClickPrevent","_simulateEvent","cancelClickPrevent","simulatedEvent","MouseEvent","bubbles","cancelable","view","dispatchEvent","TouchZoom","touchZoom","bounceAtZoomLimits","_onTouchStart","_zooming","_centerPoint","_startLatLng","_pinchStartLatLng","_startDist","_startZoom","_onTouchMove","_onTouchEnd","_animRequest","moveFn","video"],"mappings":"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"}
\ No newline at end of file

From e5b7838ac51cdd070716a4873e367aafa7feec04 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 4 Jan 2024 14:22:24 +0100
Subject: [PATCH 301/460] Update dependencies

---
 Cargo.lock | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f681a43..83c2c99 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "ahash"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
+checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -85,9 +85,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.77"
+version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9d19de80eff169429ac1e9f48fffb163916b448a44e8e046186232046d9e1f9"
+checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
 
 [[package]]
 name = "autocfg"
@@ -161,9 +161,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.4.12"
+version = "4.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcfab8ba68f3668e89f6ff60f5b205cea56aa7b769451a59f34b8682f51c056d"
+checksum = "52bdc885e4cacc7f7c9eedc1ef6da641603180c783c41a15c264944deeaab642"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -713,18 +713,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.71"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8"
+checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -784,27 +784,27 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "serde"
-version = "1.0.193"
+version = "1.0.194"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
+checksum = "0b114498256798c94a0689e1a15fec6005dee8ac1f41de56404b67afc2a4b773"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_bytes"
-version = "0.11.13"
+version = "0.11.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bb1879ea93538b78549031e2d54da3e901fd7e75f2e4dc758d760937b123d10"
+checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.193"
+version = "1.0.194"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
+checksum = "a3385e45322e8f9931410f01b3031ec534c3947d0e94c18049af4d9f9907d4e0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -813,9 +813,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.108"
+version = "1.0.111"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4"
 dependencies = [
  "itoa",
  "ryu",
@@ -860,9 +860,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "syn"
-version = "2.0.43"
+version = "2.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53"
+checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
 dependencies = [
  "proc-macro2",
  "quote",

From 997d807dc740fc0ae93cc664c8120d6881fac00a Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 5 Jan 2024 21:52:30 +0100
Subject: [PATCH 302/460] resource: add short_grass block type

Besides adding a number of experimental block types for the 1.21 preview,
Minecraft 1.20.3 also renamed the "grass" block to "short grass"
internally. Add the new block name to avoid warnings during generation.
---
 crates/resource/src/block_types.rs | 7 +++++++
 resource/blocks.json               | 1 +
 2 files changed, 8 insertions(+)

diff --git a/crates/resource/src/block_types.rs b/crates/resource/src/block_types.rs
index 68a08c0..a70106c 100644
--- a/crates/resource/src/block_types.rs
+++ b/crates/resource/src/block_types.rs
@@ -5694,6 +5694,13 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 			color: Color([0, 0, 0]),
 		},
 	),
+	(
+		"short_grass",
+		BlockType {
+			flags: make_bitflags!(BlockFlag::{}),
+			color: Color([0, 0, 0]),
+		},
+	),
 	(
 		"shroomlight",
 		BlockType {
diff --git a/resource/blocks.json b/resource/blocks.json
index 8e87750..6f4f5e7 100644
--- a/resource/blocks.json
+++ b/resource/blocks.json
@@ -1558,6 +1558,7 @@
 	"sea_lantern": {},
 	"sea_pickle": {},
 	"seagrass": null,
+	"short_grass": null,
 	"shroomlight": {},
 	"shulker_box": {},
 	"sign": {

From fbb99bb467d325082b2391e28276fc7db9aa15c4 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 7 Jan 2024 22:08:55 +0100
Subject: [PATCH 303/460] Update remaining repository URLs

---
 CHANGELOG.md | 2 +-
 Cargo.toml   | 2 +-
 README.md    | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c638d6e..b06b4a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,4 +49,4 @@ intermediate data.
 <!-- next-url -->
 [Unreleased]: https://github.com/neocturne/MinedMap/compare/v2.0.1...HEAD
 [2.0.1]: https://github.com/neocturne/MinedMap/compare/v2.0.0...v2.0.1
-[2.0.0]: https://github.com/NeoRaider/MinedMap/compare/v1.19.1...v2.0.0
+[2.0.0]: https://github.com/neocturne/MinedMap/compare/v1.19.1...v2.0.0
diff --git a/Cargo.toml b/Cargo.toml
index 47c13c7..93c38b3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,7 +5,7 @@ members = ["crates/*"]
 edition = "2021"
 license = "MIT"
 readme = "README.md"
-repository = "https://github.com/NeoRaider/MinedMap"
+repository = "https://github.com/neocturne/MinedMap"
 
 [workspace.metadata.release]
 consolidate-commits = false
diff --git a/README.md b/README.md
index 9a8755e..9191910 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
 * Typically uses less than 100MB of RAM in single-threaded operation (may be higher when `-j` is passed)
 * Cross-platform: runs on Linux, Windows, and likely other systems like MacOS as well
 
-![Screenshot](https://raw.githubusercontent.com/NeoRaider/MinedMap/main/docs/images/MinedMap.png)
+![Screenshot](https://raw.githubusercontent.com/neocturne/MinedMap/main/docs/images/MinedMap.png)
 
 ## How to use
 
@@ -51,7 +51,7 @@ the generated map files to public webspace to make the map available to others.
 Building the MinedMap map generator from source requires a recent Rust toolchain (1.72.0
 or newer). The following command can be used to build the current development version:
 ```shell
-cargo install --git 'https://github.com/NeoRaider/MinedMap.git'
+cargo install --git 'https://github.com/neocturne/MinedMap.git'
 ```
 
 In addition, CMake is needed to build the zlib-ng library. If you do not have
@@ -60,5 +60,5 @@ to cargo. A pure-Rust zlib implementation will be used, which is more portable,
 but slower than zlib-ng.
 
 If you are looking for the older C++ implementation of the MinedMap tile renderer,
-see the [v1.19.1](https://github.com/NeoRaider/MinedMap/tree/v1.19.1) tag.
+see the [v1.19.1](https://github.com/neocturne/MinedMap/tree/v1.19.1) tag.
 

From 5602d3d499f83e1f41cb025a8eb1e4b4f8921a1e Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 7 Jan 2024 22:14:35 +0100
Subject: [PATCH 304/460] CHANGELOG.md: update

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b06b4a3..15721f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 ## [Unreleased] - ReleaseDate
 
+### Updated
+
+- Added support for Minecraft 1.20.3+
+
+  Minecraft 1.20.3 renamed the `grass` block type to `short_grass`.
+- Updated [Leaflet](https://leafletjs.com/) to 1.9.4
+- Updated attribution URL to https://github.com/neocturne/MinedMap
+
 ## [2.0.1] - 2023-11-18
 
 ### Fixed

From e856800c3dffd6e686272dfe54160c53c9043018 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 7 Jan 2024 22:21:33 +0100
Subject: [PATCH 305/460] minedmap-resource 0.2.0

---
 Cargo.lock                 | 2 +-
 Cargo.toml                 | 2 +-
 crates/resource/Cargo.toml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 83c2c99..a558028 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -561,7 +561,7 @@ dependencies = [
 
 [[package]]
 name = "minedmap-resource"
-version = "0.1.0"
+version = "0.2.0"
 dependencies = [
  "enumflags2",
  "glam",
diff --git a/Cargo.toml b/Cargo.toml
index 93c38b3..edd570e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -47,7 +47,7 @@ image = { version = "0.24.5", default-features = false, features = ["png"] }
 indexmap = { version = "2.0.0", features = ["serde"] }
 lru = "0.12.0"
 minedmap-nbt = { version = "0.1.0", path = "crates/nbt", default-features = false }
-minedmap-resource = { version = "0.1.0", path = "crates/resource" }
+minedmap-resource = { version = "0.2.0", path = "crates/resource" }
 minedmap-types = { version = "0.1.0", path = "crates/types" }
 num-integer = "0.1.45"
 num_cpus = "1.16.0"
diff --git a/crates/resource/Cargo.toml b/crates/resource/Cargo.toml
index b1bc005..5bed687 100644
--- a/crates/resource/Cargo.toml
+++ b/crates/resource/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "minedmap-resource"
-version = "0.1.0"
+version = "0.2.0"
 description = "Data describing Minecraft biomes and block types"
 edition.workspace = true
 license.workspace = true

From b48cde7ba8e6ba110658e93a03eb5e91d86c2c62 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 7 Jan 2024 22:23:42 +0100
Subject: [PATCH 306/460] minedmap-types 0.1.2

---
 Cargo.lock              | 2 +-
 Cargo.toml              | 2 +-
 crates/nbt/Cargo.toml   | 2 +-
 crates/types/Cargo.toml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a558028..4c4cb58 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -570,7 +570,7 @@ dependencies = [
 
 [[package]]
 name = "minedmap-types"
-version = "0.1.1"
+version = "0.1.2"
 dependencies = [
  "itertools",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index edd570e..6dd14ed 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -48,7 +48,7 @@ indexmap = { version = "2.0.0", features = ["serde"] }
 lru = "0.12.0"
 minedmap-nbt = { version = "0.1.0", path = "crates/nbt", default-features = false }
 minedmap-resource = { version = "0.2.0", path = "crates/resource" }
-minedmap-types = { version = "0.1.0", path = "crates/types" }
+minedmap-types = { version = "0.1.2", path = "crates/types" }
 num-integer = "0.1.45"
 num_cpus = "1.16.0"
 rayon = "1.7.0"
diff --git a/crates/nbt/Cargo.toml b/crates/nbt/Cargo.toml
index 70802ec..f61e03f 100644
--- a/crates/nbt/Cargo.toml
+++ b/crates/nbt/Cargo.toml
@@ -12,7 +12,7 @@ anyhow = "1.0.75"
 bytemuck = "1.13.1"
 fastnbt = "2.4.4"
 flate2 = "1.0.27"
-minedmap-types = { version = "0.1.0", path = "../types" }
+minedmap-types = { version = "0.1.2", path = "../types" }
 serde = "1.0.183"
 
 [features]
diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml
index 41e36cf..e67d824 100644
--- a/crates/types/Cargo.toml
+++ b/crates/types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "minedmap-types"
-version = "0.1.1"
+version = "0.1.2"
 description = "Common types used by several MinedMap crates"
 edition.workspace = true
 license.workspace = true

From 96c60b048eac9424c22b4495dacb3d37b5b0058b Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 7 Jan 2024 22:26:10 +0100
Subject: [PATCH 307/460] minedmap-nbt 0.1.1

---
 Cargo.lock            | 2 +-
 Cargo.toml            | 2 +-
 crates/nbt/Cargo.toml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4c4cb58..e83be60 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -548,7 +548,7 @@ dependencies = [
 
 [[package]]
 name = "minedmap-nbt"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "anyhow",
  "bytemuck",
diff --git a/Cargo.toml b/Cargo.toml
index 6dd14ed..5fc36e5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -46,7 +46,7 @@ git-version = "0.3.5"
 image = { version = "0.24.5", default-features = false, features = ["png"] }
 indexmap = { version = "2.0.0", features = ["serde"] }
 lru = "0.12.0"
-minedmap-nbt = { version = "0.1.0", path = "crates/nbt", default-features = false }
+minedmap-nbt = { version = "0.1.1", path = "crates/nbt", default-features = false }
 minedmap-resource = { version = "0.2.0", path = "crates/resource" }
 minedmap-types = { version = "0.1.2", path = "crates/types" }
 num-integer = "0.1.45"
diff --git a/crates/nbt/Cargo.toml b/crates/nbt/Cargo.toml
index f61e03f..2c817c6 100644
--- a/crates/nbt/Cargo.toml
+++ b/crates/nbt/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "minedmap-nbt"
-version = "0.1.0"
+version = "0.1.1"
 description = "MinedMap's handling of Minecraft NBT data and region files"
 edition.workspace = true
 license.workspace = true

From 7ea09a46f999eb1f0a47b3859dc8ab2a2cae01ed Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 7 Jan 2024 22:28:53 +0100
Subject: [PATCH 308/460] minedmap 2.0.2

---
 CHANGELOG.md | 5 ++++-
 Cargo.lock   | 2 +-
 Cargo.toml   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15721f1..8f45c64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased] - ReleaseDate
 
+## [2.0.2] - 2024-01-07
+
 ### Updated
 
 - Added support for Minecraft 1.20.3+
@@ -55,6 +57,7 @@ intermediate data.
   Full support for custom biomes datapacks might be added in a future release.
 
 <!-- next-url -->
-[Unreleased]: https://github.com/neocturne/MinedMap/compare/v2.0.1...HEAD
+[Unreleased]: https://github.com/neocturne/MinedMap/compare/v2.0.2...HEAD
+[2.0.2]: https://github.com/neocturne/MinedMap/compare/v2.0.1...v2.0.2
 [2.0.1]: https://github.com/neocturne/MinedMap/compare/v2.0.0...v2.0.1
 [2.0.0]: https://github.com/neocturne/MinedMap/compare/v1.19.1...v2.0.0
diff --git a/Cargo.lock b/Cargo.lock
index e83be60..a7b6072 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -520,7 +520,7 @@ checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
 
 [[package]]
 name = "minedmap"
-version = "2.0.1"
+version = "2.0.2"
 dependencies = [
  "anyhow",
  "bincode",
diff --git a/Cargo.toml b/Cargo.toml
index 5fc36e5..f1b3094 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@ consolidate-commits = false
 
 [package]
 name = "minedmap"
-version = "2.0.1"
+version = "2.0.2"
 description = "Generate browsable maps from Minecraft save data"
 edition.workspace = true
 license.workspace = true

From 3a796325ba5c03f43aeebcf9f185f2d892084aec Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 10 Jan 2024 12:53:05 +0100
Subject: [PATCH 309/460] Update dependencies

---
 Cargo.lock | 46 ++++++++++++++++++++--------------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a7b6072..ab7a97a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -161,9 +161,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.4.13"
+version = "4.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52bdc885e4cacc7f7c9eedc1ef6da641603180c783c41a15c264944deeaab642"
+checksum = "33e92c5c1a78c62968ec57dbc2440366a2d6e5a23faf829970ff1585dc6b18e2"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -171,9 +171,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.12"
+version = "4.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb7fb5e4e979aec3be7791562fcba452f94ad85e954da024396433e0e25a79e9"
+checksum = "f4323769dc8a61e2c39ad7dc26f6f2800524691a44d74fe3d1071a5c24db6370"
 dependencies = [
  "anstream",
  "anstyle",
@@ -231,34 +231,28 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fca89a0e215bab21874660c67903c5f143333cab1da83d041c7ded6053774751"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
 dependencies = [
- "cfg-if",
  "crossbeam-epoch",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.17"
+version = "0.9.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e3681d554572a651dda4186cd47240627c3d0114d45a95f6ad27f2f22e7548d"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
 dependencies = [
- "autocfg",
- "cfg-if",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.18"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c"
-dependencies = [
- "cfg-if",
-]
+checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
 
 [[package]]
 name = "either"
@@ -473,15 +467,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.151"
+version = "0.2.152"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
+checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
 
 [[package]]
 name = "libz-ng-sys"
-version = "1.1.12"
+version = "1.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dd9f43e75536a46ee0f92b758f6b63846e594e86638c61a9251338a65baea63"
+checksum = "81157dde2fd4ad2b45ea3a4bb47b8193b52a6346b678840d91d80d3c2cd166c5"
 dependencies = [
  "cmake",
  "libc",
@@ -713,9 +707,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.75"
+version = "1.0.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "907a61bd0f64c2f29cd1cf1dc34d05176426a3f504a78010f08416ddb7b13708"
+checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c"
 dependencies = [
  "unicode-ident",
 ]
@@ -784,9 +778,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "serde"
-version = "1.0.194"
+version = "1.0.195"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b114498256798c94a0689e1a15fec6005dee8ac1f41de56404b67afc2a4b773"
+checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02"
 dependencies = [
  "serde_derive",
 ]
@@ -802,9 +796,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.194"
+version = "1.0.195"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3385e45322e8f9931410f01b3031ec534c3947d0e94c18049af4d9f9907d4e0"
+checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c"
 dependencies = [
  "proc-macro2",
  "quote",

From 5273e4b36656db49e86b9cba8563650a4ecfe224 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 10 Jan 2024 12:59:37 +0100
Subject: [PATCH 310/460] CHANGELOG.md: reformat previous release changes

Use the "Added" and "Changed" headings like in previous releases.
---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f45c64..2546290 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,11 +4,14 @@
 
 ## [2.0.2] - 2024-01-07
 
-### Updated
+### Added
 
 - Added support for Minecraft 1.20.3+
 
   Minecraft 1.20.3 renamed the `grass` block type to `short_grass`.
+
+### Changed
+
 - Updated [Leaflet](https://leafletjs.com/) to 1.9.4
 - Updated attribution URL to https://github.com/neocturne/MinedMap
 

From 1e41e1bc6a89bd0ad9c83224e5d52f34c86060db Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 10 Jan 2024 12:16:12 +0100
Subject: [PATCH 311/460] world/chunk: move SectionIter structs to impl

---
 src/world/chunk.rs | 66 +++++++++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/world/chunk.rs b/src/world/chunk.rs
index 77a543c..e52c27b 100644
--- a/src/world/chunk.rs
+++ b/src/world/chunk.rs
@@ -50,39 +50,6 @@ pub enum Chunk<'a> {
 	Empty,
 }
 
-/// Inner data structure of [SectionIter]
-#[derive(Debug, Clone)]
-enum SectionIterInner<'a> {
-	/// Iterator over sections of [Chunk::V1_18]
-	V1_18 {
-		/// Inner iterator into section map
-		iter: btree_map::Iter<'a, SectionY, (SectionV1_13<'a>, BiomesV1_18<'a>, BlockLight<'a>)>,
-	},
-	/// Iterator over sections of [Chunk::V1_13]
-	V1_13 {
-		/// Inner iterator into section map
-		iter: btree_map::Iter<'a, SectionY, (SectionV1_13<'a>, BlockLight<'a>)>,
-		/// Chunk biome data
-		biomes: &'a BiomesV0<'a>,
-	},
-	/// Iterator over sections of [Chunk::V0]
-	V0 {
-		/// Inner iterator into section map
-		iter: btree_map::Iter<'a, SectionY, (SectionV0<'a>, BlockLight<'a>)>,
-		/// Chunk biome data
-		biomes: &'a BiomesV0<'a>,
-	},
-	/// Empty iterator over an unpopulated chunk ([Chunk::Empty])
-	Empty,
-}
-
-/// Iterator over the sections of a [Chunk]
-#[derive(Debug, Clone)]
-pub struct SectionIter<'a> {
-	/// Inner iterator enum
-	inner: SectionIterInner<'a>,
-}
-
 impl<'a> Chunk<'a> {
 	/// Creates a new [Chunk] from a deserialized [de::Chunk]
 	pub fn new(
@@ -283,6 +250,39 @@ impl<'a, T> SectionIterTrait<'a> for T where
 {
 }
 
+/// Inner data structure of [SectionIter]
+#[derive(Debug, Clone)]
+enum SectionIterInner<'a> {
+	/// Iterator over sections of [Chunk::V1_18]
+	V1_18 {
+		/// Inner iterator into section map
+		iter: btree_map::Iter<'a, SectionY, (SectionV1_13<'a>, BiomesV1_18<'a>, BlockLight<'a>)>,
+	},
+	/// Iterator over sections of [Chunk::V1_13]
+	V1_13 {
+		/// Inner iterator into section map
+		iter: btree_map::Iter<'a, SectionY, (SectionV1_13<'a>, BlockLight<'a>)>,
+		/// Chunk biome data
+		biomes: &'a BiomesV0<'a>,
+	},
+	/// Iterator over sections of [Chunk::V0]
+	V0 {
+		/// Inner iterator into section map
+		iter: btree_map::Iter<'a, SectionY, (SectionV0<'a>, BlockLight<'a>)>,
+		/// Chunk biome data
+		biomes: &'a BiomesV0<'a>,
+	},
+	/// Empty iterator over an unpopulated chunk ([Chunk::Empty])
+	Empty,
+}
+
+/// Iterator over the sections of a [Chunk]
+#[derive(Debug, Clone)]
+pub struct SectionIter<'a> {
+	/// Inner iterator enum
+	inner: SectionIterInner<'a>,
+}
+
 impl<'a> SectionIter<'a> {
 	/// Helper to run a closure on the inner section iterator
 	fn with_iter<F, T>(&mut self, f: F) -> T

From e8165aa47d4c3523ff4c95d8664ba6642ac0284e Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 10 Jan 2024 12:48:34 +0100
Subject: [PATCH 312/460] world: hide unknown block/biome type warnings by
 default

While using MinedMap with modded Minecraft version is not officially
supported, it should still work reasonably well if you're okay with
custom block types being invisible and custom biomes using default
grass/color/foliage colors.

Avoid spamming the log with messages for each section in this case
without --verbose, and instead just print a single warning at the end of
processing.
---
 CHANGELOG.md                 |  6 +++
 src/core/region_processor.rs | 43 ++++++++++++++--
 src/world/chunk.rs           | 95 ++++++++++++++++++------------------
 src/world/section.rs         | 44 +++++++++++------
 4 files changed, 120 insertions(+), 68 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2546290..fccf759 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## [Unreleased] - ReleaseDate
 
+### Changed
+
+- Without `--verbose`, only a single warning is printed at the end of
+  processing for unknown block/biome types, rather than once for every
+  section where such a block/biome is encountered.
+
 ## [2.0.2] - 2024-01-07
 
 ### Added
diff --git a/src/core/region_processor.rs b/src/core/region_processor.rs
index 9e1bb65..0a8ad0e 100644
--- a/src/core/region_processor.rs
+++ b/src/core/region_processor.rs
@@ -1,6 +1,14 @@
 //! The [RegionProcessor] and related functions
 
-use std::{ffi::OsStr, path::PathBuf, sync::mpsc, time::SystemTime};
+use std::{
+	ffi::OsStr,
+	path::PathBuf,
+	sync::{
+		atomic::{AtomicBool, Ordering},
+		mpsc,
+	},
+	time::SystemTime,
+};
 
 use anyhow::{Context, Result};
 use rayon::prelude::*;
@@ -32,6 +40,8 @@ fn parse_region_filename(file_name: &OsStr) -> Option<TileCoords> {
 enum RegionProcessorStatus {
 	/// Region was processed
 	Ok,
+	/// Region was processed, unknown blocks or biomes were encountered
+	OkWithUnknown,
 	/// Region was unchanged and skipped
 	Skipped,
 	/// Reading the region failed, previous processed data is reused
@@ -68,6 +78,8 @@ struct SingleRegionProcessor<'a> {
 	processed_region: ProcessedRegion,
 	/// Lightmap intermediate data
 	lightmap: image::GrayAlphaImage,
+	/// True if any unknown block or biome types were encountered during processing
+	has_unknown: bool,
 }
 
 impl<'a> SingleRegionProcessor<'a> {
@@ -104,6 +116,7 @@ impl<'a> SingleRegionProcessor<'a> {
 			lightmap_needed,
 			processed_region,
 			lightmap,
+			has_unknown: false,
 		})
 	}
 
@@ -162,8 +175,10 @@ impl<'a> SingleRegionProcessor<'a> {
 
 	/// Processes a single chunk
 	fn process_chunk(&mut self, chunk_coords: ChunkCoords, data: world::de::Chunk) -> Result<()> {
-		let chunk = world::chunk::Chunk::new(&data, self.block_types, self.biome_types)
-			.with_context(|| format!("Failed to decode chunk {:?}", chunk_coords))?;
+		let (chunk, has_unknown) =
+			world::chunk::Chunk::new(&data, self.block_types, self.biome_types)
+				.with_context(|| format!("Failed to decode chunk {:?}", chunk_coords))?;
+		self.has_unknown |= has_unknown;
 		let Some(layer::LayerData {
 			blocks,
 			biomes,
@@ -231,7 +246,11 @@ impl<'a> SingleRegionProcessor<'a> {
 		self.save_region()?;
 		self.save_lightmap()?;
 
-		Ok(RegionProcessorStatus::Ok)
+		Ok(if self.has_unknown {
+			RegionProcessorStatus::OkWithUnknown
+		} else {
+			RegionProcessorStatus::Ok
+		})
 	}
 }
 
@@ -300,6 +319,8 @@ impl<'a> RegionProcessor<'a> {
 		let (processed_send, processed_recv) = mpsc::channel();
 		let (error_send, error_recv) = mpsc::channel();
 
+		let has_unknown = AtomicBool::new(false);
+
 		self.collect_regions()?.par_iter().try_for_each(|&coords| {
 			let ret = self
 				.process_region(coords)
@@ -311,6 +332,10 @@ impl<'a> RegionProcessor<'a> {
 
 			match ret {
 				RegionProcessorStatus::Ok => processed_send.send(()).unwrap(),
+				RegionProcessorStatus::OkWithUnknown => {
+					has_unknown.store(true, Ordering::Relaxed);
+					processed_send.send(()).unwrap();
+				}
 				RegionProcessorStatus::Skipped => {}
 				RegionProcessorStatus::ErrorOk | RegionProcessorStatus::ErrorMissing => {
 					error_send.send(()).unwrap()
@@ -335,6 +360,16 @@ impl<'a> RegionProcessor<'a> {
 			errors,
 		);
 
+		if has_unknown.into_inner() {
+			warn!("Unknown block or biome types found during processing");
+			eprint!(concat!(
+				"\n",
+				"  If you're encountering this issue with an unmodified Minecraft version supported by MinedMap,\n",
+				"  please file a bug report including the output with the --verbose flag.\n",
+				"\n",
+			));
+		}
+
 		// Sort regions in a zig-zag pattern to optimize cache usage
 		regions.sort_unstable_by_key(|&TileCoords { x, z }| (x, if x % 2 == 0 { z } else { -z }));
 
diff --git a/src/world/chunk.rs b/src/world/chunk.rs
index e52c27b..993a79e 100644
--- a/src/world/chunk.rs
+++ b/src/world/chunk.rs
@@ -56,7 +56,7 @@ impl<'a> Chunk<'a> {
 		data: &'a de::Chunk,
 		block_types: &'a BlockTypes,
 		biome_types: &'a BiomeTypes,
-	) -> Result<Self> {
+	) -> Result<(Self, bool)> {
 		let data_version = data.data_version.unwrap_or_default();
 
 		match &data.chunk {
@@ -75,8 +75,9 @@ impl<'a> Chunk<'a> {
 		sections: &'a Vec<de::SectionV1_18>,
 		block_types: &'a BlockTypes,
 		biome_types: &'a BiomeTypes,
-	) -> Result<Self> {
+	) -> Result<(Self, bool)> {
 		let mut section_map = BTreeMap::new();
+		let mut has_unknown = false;
 
 		for section in sections {
 			match &section.section {
@@ -85,22 +86,27 @@ impl<'a> Chunk<'a> {
 					biomes,
 					block_light,
 				} => {
+					let (loaded_section, unknown_blocks) = SectionV1_13::new(
+						data_version,
+						block_states.data.as_deref(),
+						&block_states.palette,
+						block_types,
+					)
+					.with_context(|| format!("Failed to load section at Y={}", section.y))?;
+					has_unknown |= unknown_blocks;
+
+					let (loaded_biomes, unknown_biomes) =
+						BiomesV1_18::new(biomes.data.as_deref(), &biomes.palette, biome_types)
+							.with_context(|| {
+								format!("Failed to load section biomes at Y={}", section.y)
+							})?;
+					has_unknown |= unknown_biomes;
+
 					section_map.insert(
 						SectionY(section.y),
 						(
-							SectionV1_13::new(
-								data_version,
-								block_states.data.as_deref(),
-								&block_states.palette,
-								block_types,
-							)
-							.with_context(|| {
-								format!("Failed to load section at Y={}", section.y)
-							})?,
-							BiomesV1_18::new(biomes.data.as_deref(), &biomes.palette, biome_types)
-								.with_context(|| {
-									format!("Failed to load section biomes at Y={}", section.y)
-								})?,
+							loaded_section,
+							loaded_biomes,
 							BlockLight::new(block_light.as_deref()).with_context(|| {
 								format!("Failed to load section block light at Y={}", section.y)
 							})?,
@@ -111,7 +117,8 @@ impl<'a> Chunk<'a> {
 			};
 		}
 
-		Ok(Chunk::V1_18 { section_map })
+		let chunk = Chunk::V1_18 { section_map };
+		Ok((chunk, has_unknown))
 	}
 
 	/// [Chunk::new] implementation for all pre-1.18 chunk variants
@@ -120,9 +127,10 @@ impl<'a> Chunk<'a> {
 		level: &'a de::LevelV0,
 		block_types: &'a BlockTypes,
 		biome_types: &'a BiomeTypes,
-	) -> Result<Self> {
+	) -> Result<(Self, bool)> {
 		let mut section_map_v1_13 = BTreeMap::new();
 		let mut section_map_v0 = BTreeMap::new();
+		let mut has_unknown = false;
 
 		for section in &level.sections {
 			let block_light =
@@ -134,21 +142,13 @@ impl<'a> Chunk<'a> {
 					block_states,
 					palette,
 				} => {
-					section_map_v1_13.insert(
-						SectionY(section.y.into()),
-						(
-							SectionV1_13::new(
-								data_version,
-								Some(block_states),
-								palette,
-								block_types,
-							)
-							.with_context(|| {
-								format!("Failed to load section at Y={}", section.y)
-							})?,
-							block_light,
-						),
-					);
+					let (loaded_section, unknown_blocks) =
+						SectionV1_13::new(data_version, Some(block_states), palette, block_types)
+							.with_context(|| format!("Failed to load section at Y={}", section.y))?;
+					has_unknown |= unknown_blocks;
+
+					section_map_v1_13
+						.insert(SectionY(section.y.into()), (loaded_section, block_light));
 				}
 				de::SectionV0Variant::V0 { blocks, data } => {
 					section_map_v0.insert(
@@ -166,23 +166,22 @@ impl<'a> Chunk<'a> {
 		}
 
 		let biomes = BiomesV0::new(level.biomes.as_ref(), biome_types);
-
-		Ok(
-			match (section_map_v1_13.is_empty(), section_map_v0.is_empty()) {
-				(true, true) => Chunk::Empty,
-				(false, true) => Chunk::V1_13 {
-					section_map: section_map_v1_13,
-					biomes: biomes?,
-				},
-				(true, false) => Chunk::V0 {
-					section_map: section_map_v0,
-					biomes: biomes?,
-				},
-				(false, false) => {
-					bail!("Mixed section versions");
-				}
+		let chunk = match (section_map_v1_13.is_empty(), section_map_v0.is_empty()) {
+			(true, true) => Chunk::Empty,
+			(false, true) => Chunk::V1_13 {
+				section_map: section_map_v1_13,
+				biomes: biomes?,
 			},
-		)
+			(true, false) => Chunk::V0 {
+				section_map: section_map_v0,
+				biomes: biomes?,
+			},
+			(false, false) => {
+				bail!("Mixed section versions");
+			}
+		};
+
+		Ok((chunk, has_unknown))
 	}
 
 	/// Returns true if the chunk does not contain any sections
diff --git a/src/world/section.rs b/src/world/section.rs
index 998d2f7..97e0061 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -7,7 +7,7 @@ use std::fmt::Debug;
 
 use anyhow::{bail, Context, Result};
 use num_integer::div_rem;
-use tracing::warn;
+use tracing::debug;
 
 use super::de;
 use crate::{
@@ -73,7 +73,7 @@ impl<'a> SectionV1_13<'a> {
 		block_states: Option<&'a [i64]>,
 		palette: &'a [de::BlockStatePaletteEntry],
 		block_types: &'a BlockTypes,
-	) -> Result<Self> {
+	) -> Result<(Self, bool)> {
 		let aligned_blocks = data_version >= 2529;
 
 		let bits = palette_bits(palette.len(), 4, 12).context("Unsupported block palette size")?;
@@ -90,23 +90,29 @@ impl<'a> SectionV1_13<'a> {
 			}
 		}
 
+		let mut has_unknown = false;
+
 		let palette_types = palette
 			.iter()
 			.map(|entry| {
 				let block_type = block_types.get(&entry.name);
 				if block_type.is_none() {
-					warn!("Unknown block type: {}", entry.name);
+					debug!("Unknown block type: {}", entry.name);
+					has_unknown = true;
 				}
 				block_type
 			})
 			.collect();
 
-		Ok(Self {
-			block_states,
-			palette: palette_types,
-			bits,
-			aligned_blocks,
-		})
+		Ok((
+			Self {
+				block_states,
+				palette: palette_types,
+				bits,
+				aligned_blocks,
+			},
+			has_unknown,
+		))
 	}
 
 	/// Looks up the block type palette index at the given coordinates
@@ -231,7 +237,7 @@ impl<'a> BiomesV1_18<'a> {
 		biomes: Option<&'a [i64]>,
 		palette: &'a [String],
 		biome_types: &'a BiomeTypes,
-	) -> Result<Self> {
+	) -> Result<(Self, bool)> {
 		let bits = palette_bits(palette.len(), 1, 6).context("Unsupported block palette size")?;
 
 		if let Some(biomes) = biomes {
@@ -242,22 +248,28 @@ impl<'a> BiomesV1_18<'a> {
 			}
 		}
 
+		let mut has_unknown = false;
+
 		let palette_types = palette
 			.iter()
 			.map(|entry| {
 				let biome_type = biome_types.get(entry);
 				if biome_type.is_none() {
-					warn!("Unknown biome type: {}", entry);
+					debug!("Unknown biome type: {}", entry);
+					has_unknown = true;
 				}
 				biome_type
 			})
 			.collect();
 
-		Ok(BiomesV1_18 {
-			biomes,
-			palette: palette_types,
-			bits,
-		})
+		Ok((
+			BiomesV1_18 {
+				biomes,
+				palette: palette_types,
+				bits,
+			},
+			has_unknown,
+		))
 	}
 
 	/// Looks up the block type palette index at the given coordinates

From 2e6a200c6c9936fd731abfae9b5d7de10092ee03 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 10 Jan 2024 22:07:20 +0100
Subject: [PATCH 313/460] README.md: reference screenshot by commit ID

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9191910..a2b98e0 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
 * Typically uses less than 100MB of RAM in single-threaded operation (may be higher when `-j` is passed)
 * Cross-platform: runs on Linux, Windows, and likely other systems like MacOS as well
 
-![Screenshot](https://raw.githubusercontent.com/neocturne/MinedMap/main/docs/images/MinedMap.png)
+![Screenshot](https://raw.githubusercontent.com/neocturne/MinedMap/997a4fb24e89d2cd3c671d77eafaa47084d14304/docs/images/MinedMap.png)
 
 ## How to use
 

From 7b12c4aea3260d89d3694e18fa68ebf14cb45223 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 10 Jan 2024 22:40:53 +0100
Subject: [PATCH 314/460] README.md: some improvements to the "How to use" and
 "Installation" sections

---
 README.md | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index a2b98e0..be09c47 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
 
 ![Screenshot](https://raw.githubusercontent.com/neocturne/MinedMap/997a4fb24e89d2cd3c671d77eafaa47084d14304/docs/images/MinedMap.png)
 
-## How to use
+## About
 
 MinedMap consists of two components: a map renderer generating map tiles from
 Minecraft save games, and a viewer for displaying and navigating maps in a browser
@@ -20,16 +20,16 @@ based on [Leaflet](https://leafletjs.com/). The map renderer is heavily inspired
 [MapRend](https://github.com/YSelfTool/MapRend), but has been reimplemented from scratch
 (first in C++, now in Rust) for highest performance.
 
-The viewer expects the the map data in a directory named `data`. To generate a new
-map, create this empty directory inside the viewer directory. Next, to generate the
-map files run MinedMap passing the source and the destination paths on the command
-line:
+## How to use
+
+Minecraft stores its save data in a directory `~/.minecraft/saves` on Linux,
+and `C:\Users\<username>\AppData\Roaming\.minecraft\saves`. To generate minedmap
+tile data from a save game called "World", use the a command like the following
+(replacing the first argument with the path to your save data; `viewer` refers
+to the directory where you unpacked the MinedMap viewer):
 ```shell
-minedmap /path/to/save/game /path/to/viewer/data
+minedmap ~/.minecraft/saves/World viewer/data
 ```
-The save game is stored in `saves` inside your Minecraft main directory
-(`~/.minecraft` on Linux, `C:\Users\<username>\AppData\Roaming\.minecraft` on Windows)
-in a subdirectory with the name of your world.
 
 The first map generation might take a while for big worlds, but subsequent calls will
 only rebuild tiles for region files that have changed, rarely taking more than a second
@@ -38,7 +38,8 @@ MinedMap as a Cron job every minute.
 
 Note that it is not possible to open the viewer *index.html* without a webserver, as
 it cannot load the generated map information from `file://` URIs. For testing purposes,
-you can use a minimal HTTP server, e.g. (if you have Python installed):
+you can use a minimal HTTP server, e.g. if you have Python installed just run the
+following in the viewer directory:
 ```shell
 python3 -m http.server
 ```
@@ -48,7 +49,10 @@ the generated map files to public webspace to make the map available to others.
 
 ## Installation
 
-Building the MinedMap map generator from source requires a recent Rust toolchain (1.72.0
+Binary builds of the map generator for Linux and Windows, as well as an archive
+containing the viewer can be found on the GitHub release page.
+
+Building the generator from source requires a recent Rust toolchain (1.72.0
 or newer). The following command can be used to build the current development version:
 ```shell
 cargo install --git 'https://github.com/neocturne/MinedMap.git'

From e5d9c813ba3118d04dc7e52e3dc6f48808a69120 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 10 Jan 2024 22:55:42 +0100
Subject: [PATCH 315/460] docs/images: add screenshot for sign marker
 documentation

---
 docs/images/signs.png | Bin 0 -> 92020 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 docs/images/signs.png

diff --git a/docs/images/signs.png b/docs/images/signs.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1d644d8be2ef6d53b07c6e67636b676f6fd8110
GIT binary patch
literal 92020
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
P|1O?4)h{`Vy8r(G7zJLC

literal 0
HcmV?d00001


From f79edb462c3d37b343f4be1a70b8f58a63d8dd07 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 8 Jan 2024 02:34:39 +0100
Subject: [PATCH 316/460] core/common: add better explanation to file meta
 version definitions

---
 src/core/common.rs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/core/common.rs b/src/core/common.rs
index 39c8e54..d17056f 100644
--- a/src/core/common.rs
+++ b/src/core/common.rs
@@ -14,12 +14,21 @@ use crate::{io::fs::FileMetaVersion, resource::Biome, types::*, world::layer};
 /// Increase to force regeneration of all output files
 
 /// MinedMap processed region data version number
+///
+/// Increase when the generation of processed regions from region data changes
+/// (usually because of updated resource data)
 pub const REGION_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
 
 /// MinedMap map tile data version number
+///
+/// Increase when the generation of map tiles from processed regions changes
+/// (because of code changes in tile generation)
 pub const MAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
 
 /// MinedMap lightmap data version number
+///
+/// Increase when the generation of lightmap tiles from region data changes
+/// (usually because of updated resource data)
 pub const LIGHTMAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
 
 /// Coordinate pair of a generated tile

From 0988ebe0951ddeee43c693099a41ab18985b57ce Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 8 Jan 2024 02:35:05 +0100
Subject: [PATCH 317/460] core/tile_mipmapper: fix file meta version for mipmap
 tiles

The meta version should only change when the outputs must be regenerated
even if the inputs stay the same. This should never be the case for
mipmap tiles, so we separate the meta version from map/lightmap tiles.
---
 src/core/common.rs         |  5 +++++
 src/core/tile_mipmapper.rs | 21 +++++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/core/common.rs b/src/core/common.rs
index d17056f..49c8301 100644
--- a/src/core/common.rs
+++ b/src/core/common.rs
@@ -31,6 +31,11 @@ pub const MAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
 /// (usually because of updated resource data)
 pub const LIGHTMAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
 
+/// MinedMap mipmap data version number
+///
+/// Increase when the mipmap generation changes (this should not happen)
+pub const MIPMAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
+
 /// Coordinate pair of a generated tile
 ///
 /// Each tile corresponds to one Minecraft region file
diff --git a/src/core/tile_mipmapper.rs b/src/core/tile_mipmapper.rs
index 355bd23..6ea8750 100644
--- a/src/core/tile_mipmapper.rs
+++ b/src/core/tile_mipmapper.rs
@@ -70,12 +70,8 @@ impl<'a> TileMipmapper<'a> {
 		/// Tile width/height
 		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
 
-		let version = match kind {
-			TileKind::Map => REGION_FILE_META_VERSION,
-			TileKind::Lightmap => LIGHTMAP_FILE_META_VERSION,
-		};
 		let output_path = self.config.tile_path(kind, level, coords);
-		let output_timestamp = fs::read_timestamp(&output_path, version);
+		let output_timestamp = fs::read_timestamp(&output_path, MIPMAP_FILE_META_VERSION);
 
 		let sources: Vec<_> = [(0, 0), (0, 1), (1, 0), (1, 1)]
 			.into_iter()
@@ -149,11 +145,16 @@ impl<'a> TileMipmapper<'a> {
 			);
 		}
 
-		fs::create_with_timestamp(&output_path, version, input_timestamp, |file| {
-			image
-				.write_to(file, image::ImageFormat::Png)
-				.context("Failed to save image")
-		})?;
+		fs::create_with_timestamp(
+			&output_path,
+			MIPMAP_FILE_META_VERSION,
+			input_timestamp,
+			|file| {
+				image
+					.write_to(file, image::ImageFormat::Png)
+					.context("Failed to save image")
+			},
+		)?;
 
 		count_processed.send(()).unwrap();
 		Ok(())

From f78dd795ca87d12c8299a876cebc7ee6c8079bb9 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 24 Nov 2023 19:30:45 +0100
Subject: [PATCH 318/460] world/de: add deserialization of sign block entities

---
 src/world/chunk.rs     |  7 ++--
 src/world/de.rs        | 79 ++++++++++++++++++++++++++++++++++++++++++
 src/world/json_text.rs |  7 ++++
 src/world/mod.rs       |  1 +
 4 files changed, 91 insertions(+), 3 deletions(-)
 create mode 100644 src/world/json_text.rs

diff --git a/src/world/chunk.rs b/src/world/chunk.rs
index 993a79e..cd3bf4f 100644
--- a/src/world/chunk.rs
+++ b/src/world/chunk.rs
@@ -60,9 +60,10 @@ impl<'a> Chunk<'a> {
 		let data_version = data.data_version.unwrap_or_default();
 
 		match &data.chunk {
-			de::ChunkVariant::V1_18 { sections } => {
-				Self::new_v1_18(data_version, sections, block_types, biome_types)
-			}
+			de::ChunkVariant::V1_18 {
+				sections,
+				block_entities: _,
+			} => Self::new_v1_18(data_version, sections, block_types, biome_types),
 			de::ChunkVariant::V0 { level } => {
 				Self::new_v0(data_version, level, block_types, biome_types)
 			}
diff --git a/src/world/de.rs b/src/world/de.rs
index cf1b6b5..7ab8ba7 100644
--- a/src/world/de.rs
+++ b/src/world/de.rs
@@ -2,6 +2,8 @@
 
 use serde::Deserialize;
 
+use super::json_text::JSONText;
+
 /// Element of the `palette` list of 1.18+ [block states](BlockStatesV1_18)
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "PascalCase")]
@@ -104,6 +106,77 @@ pub enum BiomesV0 {
 	ByteArray(fastnbt::ByteArray),
 }
 
+/// Front/back text of a Minecraft 1.20+ sign block entry
+#[derive(Debug, Deserialize)]
+pub struct BlockEntitySignV1_20Text {
+	/// Lines of sign text
+	pub messages: Vec<JSONText>,
+	/// Default text color
+	pub color: Option<String>,
+}
+
+/// A sign (standing or hanging) block entity
+#[derive(Debug, Deserialize)]
+#[serde(untagged)]
+pub enum BlockEntitySign {
+	/// Pre-1.20 sign block entity
+	///
+	/// Pre-1.20 signs only have front text.
+	#[serde(rename_all = "PascalCase")]
+	V0 {
+		/// Line 1 of the sign text
+		text1: JSONText,
+		/// Line 2 of the sign text
+		text2: JSONText,
+		/// Line 3 of the sign text
+		text3: JSONText,
+		/// Line 4 of the sign text
+		text4: JSONText,
+		/// Default text color
+		color: Option<String>,
+	},
+	/// 1.20+ sign block entity
+	V1_20 {
+		/// The sign's front text
+		front_text: BlockEntitySignV1_20Text,
+		/// The sign's back text
+		back_text: BlockEntitySignV1_20Text,
+	},
+}
+
+/// Data for different kinds of block entities
+#[derive(Debug, Deserialize)]
+#[serde(tag = "id")]
+pub enum BlockEntityData {
+	/// Regular sign
+	///
+	/// This includes standing signs and signs attached to the side of blocks
+	#[serde(rename = "minecraft:sign", alias = "minecraft:standing_sign")]
+	Sign(BlockEntitySign),
+	/// Hanging sign
+	#[serde(rename = "minecraft:hanging_sign")]
+	HangingSign(BlockEntitySign),
+	/// Other block entity types not handled by MinedMap
+	#[serde(other)]
+	Other,
+}
+
+/// A block entity
+///
+/// Block entities were called tile entities pre-1.18
+#[derive(Debug, Deserialize)]
+pub struct BlockEntity {
+	/// Entity global X coordinate
+	pub x: i32,
+	/// Entity global Y coordinate
+	pub y: i32,
+	/// Entity global Z coordinate
+	pub z: i32,
+	/// Kind-specific entity data
+	#[serde(flatten)]
+	pub data: BlockEntityData,
+}
+
 /// `Level` compound element found in pre-1.18 [chunks](Chunk)
 #[derive(Debug, Deserialize)]
 #[serde(rename_all = "PascalCase")]
@@ -113,6 +186,9 @@ pub struct LevelV0 {
 	pub sections: Vec<SectionV0>,
 	/// Biome data
 	pub biomes: Option<BiomesV0>,
+	/// List of block entities
+	#[serde(default)]
+	pub tile_entities: Vec<BlockEntity>,
 }
 
 /// Version-specific part of a [Chunk] compound
@@ -123,6 +199,9 @@ pub enum ChunkVariant {
 	V1_18 {
 		/// List of chunk sections
 		sections: Vec<SectionV1_18>,
+		/// List of block entities
+		#[serde(default)]
+		block_entities: Vec<BlockEntity>,
 	},
 	/// Pre-1.18 chunk data
 	#[serde(rename_all = "PascalCase")]
diff --git a/src/world/json_text.rs b/src/world/json_text.rs
new file mode 100644
index 0000000..561725f
--- /dev/null
+++ b/src/world/json_text.rs
@@ -0,0 +1,7 @@
+//! Newtype and helper methods for handling Minecraft Raw JSON Text
+
+use serde::Deserialize;
+
+/// Minecraft Raw JSON Text
+#[derive(Debug, Deserialize)]
+pub struct JSONText(String);
diff --git a/src/world/mod.rs b/src/world/mod.rs
index 57aa7ed..e3c52ba 100644
--- a/src/world/mod.rs
+++ b/src/world/mod.rs
@@ -2,5 +2,6 @@
 
 pub mod chunk;
 pub mod de;
+pub mod json_text;
 pub mod layer;
 pub mod section;

From 61d456846aee3beaad5a77fb0f9fbf5da351eeab Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 25 Nov 2023 12:08:52 +0100
Subject: [PATCH 319/460] world: implement decoding raw JSON text into a linear
 list of formatted strings

---
 src/world/json_text.rs | 150 ++++++++++++++++++++++++++++++++++++++++-
 src/world/mod.rs       |   1 +
 src/world/sign.rs      |  88 ++++++++++++++++++++++++
 3 files changed, 238 insertions(+), 1 deletion(-)
 create mode 100644 src/world/sign.rs

diff --git a/src/world/json_text.rs b/src/world/json_text.rs
index 561725f..8e53ead 100644
--- a/src/world/json_text.rs
+++ b/src/world/json_text.rs
@@ -1,7 +1,155 @@
 //! Newtype and helper methods for handling Minecraft Raw JSON Text
 
+use std::{collections::VecDeque, sync::Arc};
+
 use serde::Deserialize;
 
+/// A span of formatted text
+///
+/// A [JSONText] consists of a tree of [FormattedText] nodes (canonically
+/// represented as a [FormattedTextTree], but other kinds are possible with
+/// is handled by [DeserializedText].
+///
+/// Formatting that is not set in a node is inherited from the parent.
+#[derive(Debug, Deserialize, Default)]
+pub struct FormattedText {
+	#[serde(default)]
+	/// Text content
+	pub text: String,
+	/// Text color
+	pub color: Option<Arc<String>>,
+	/// Bold formatting
+	pub bold: Option<bool>,
+	/// Italic formatting
+	pub italic: Option<bool>,
+	/// Underlines formatting
+	pub underlined: Option<bool>,
+	/// Strikethrough formatting
+	pub strikethrough: Option<bool>,
+	/// Obfuscated formatting
+	pub obfuscated: Option<bool>,
+}
+
+impl FormattedText {
+	/// Fills in unset formatting fields from a parent node
+	pub fn inherit(self, parent: &Self) -> Self {
+		FormattedText {
+			text: self.text,
+			color: self.color.or_else(|| parent.color.clone()),
+			bold: self.bold.or(parent.bold),
+			italic: self.italic.or(parent.italic),
+			underlined: self.underlined.or(parent.underlined),
+			strikethrough: self.strikethrough.or(parent.strikethrough),
+			obfuscated: self.obfuscated.or(parent.obfuscated),
+		}
+	}
+}
+
+/// A tree of [FormattedText] nodes
+///
+/// Each node including the root has a `text` and a list of children (`extra`).
+#[derive(Debug, Deserialize, Default)]
+pub struct FormattedTextTree {
+	/// Root node content
+	#[serde(flatten)]
+	text: FormattedText,
+	/// List of child trees
+	#[serde(default)]
+	extra: VecDeque<DeserializedText>,
+}
+
+impl From<String> for FormattedTextTree {
+	fn from(value: String) -> Self {
+		FormattedTextTree {
+			text: FormattedText {
+				text: value,
+				..Default::default()
+			},
+			extra: VecDeque::new(),
+		}
+	}
+}
+
+/// List of [FormattedText]
+#[derive(Debug)]
+pub struct FormattedTextList(pub Vec<FormattedText>);
+
+impl FormattedTextList {
+	/// Returns `true` when [FormattedTextList] does not contain any text
+	pub fn is_empty(&self) -> bool {
+		self.0.iter().all(|text| text.text.is_empty())
+	}
+}
+
+/// Raw deserialized [JSONText]
+///
+/// A [JSONText] can contain various different JSON types.
+#[derive(Debug, Deserialize)]
+#[serde(untagged)]
+pub enum DeserializedText {
+	/// Unformatted string
+	String(String),
+	/// Unformatted number (will be converted to a string)
+	Number(f32),
+	/// Unformatted boolean (will be converted to a string)
+	Boolean(bool),
+	/// List of [DeserializedText]
+	///
+	/// The tail elements are appended as children of the head element.
+	List(VecDeque<DeserializedText>),
+	/// The canonical [FormattedTextTree] structure
+	Object(FormattedTextTree),
+}
+
+impl DeserializedText {
+	/// Converts a [DeserializedText] into the regular [FormattedTextTree] format
+	///
+	/// Most variants are simply converted to strings. A list is handled by
+	/// appending all tail elements to the `extra` field of the head.
+	pub fn canonicalize(self) -> FormattedTextTree {
+		match self {
+			DeserializedText::Object(obj) => obj,
+			DeserializedText::String(s) => FormattedTextTree::from(s),
+			DeserializedText::Number(n) => FormattedTextTree::from(n.to_string()),
+			DeserializedText::Boolean(b) => FormattedTextTree::from(b.to_string()),
+			DeserializedText::List(mut list) => {
+				let mut obj = list
+					.pop_front()
+					.map(|t| t.canonicalize())
+					.unwrap_or_default();
+				obj.extra.append(&mut list);
+				obj
+			}
+		}
+	}
+
+	/// Converts the tree of [FormattedText] nodes into a linear list by
+	/// copying formatting flags into each node.
+	pub fn linearize(self, parent: &FormattedText) -> FormattedTextList {
+		let obj = self.canonicalize();
+		let mut ret = vec![obj.text.inherit(parent)];
+
+		for extra in obj.extra {
+			ret.append(&mut extra.linearize(&ret[0]).0);
+		}
+
+		FormattedTextList(ret)
+	}
+}
+
+impl Default for DeserializedText {
+	fn default() -> Self {
+		DeserializedText::Object(FormattedTextTree::from(String::new()))
+	}
+}
+
 /// Minecraft Raw JSON Text
 #[derive(Debug, Deserialize)]
-pub struct JSONText(String);
+pub struct JSONText(pub String);
+
+impl JSONText {
+	/// Deserializes a [JSONText] into a [DeserializedText]
+	pub fn deserialize(&self) -> DeserializedText {
+		serde_json::from_str(&self.0).unwrap_or_default()
+	}
+}
diff --git a/src/world/mod.rs b/src/world/mod.rs
index e3c52ba..38d5174 100644
--- a/src/world/mod.rs
+++ b/src/world/mod.rs
@@ -5,3 +5,4 @@ pub mod de;
 pub mod json_text;
 pub mod layer;
 pub mod section;
+pub mod sign;
diff --git a/src/world/sign.rs b/src/world/sign.rs
new file mode 100644
index 0000000..c13eebe
--- /dev/null
+++ b/src/world/sign.rs
@@ -0,0 +1,88 @@
+//! Processing of sign text
+
+use std::sync::Arc;
+
+use super::{
+	de,
+	json_text::{FormattedText, FormattedTextList, JSONText},
+};
+
+/// Version-independent reference to (front or back) sign text
+#[derive(Debug, Default)]
+pub struct RawSignText<'a> {
+	/// Lines of sign text
+	///
+	/// A regular sign always has 4 lines of text. The back of pre-1.20
+	/// signs is represented as a [SignText] without any `messages`.
+	pub messages: Vec<&'a JSONText>,
+	/// Sign color
+	///
+	/// Defaults to "black".
+	pub color: Option<&'a str>,
+}
+
+impl<'a> RawSignText<'a> {
+	/// Decodes the [RawSignText] into a [SignText]
+	pub fn decode(&self) -> SignText {
+		let color = self.color.map(|c| Arc::new(c.to_owned()));
+		let parent = FormattedText {
+			color,
+			..Default::default()
+		};
+		SignText(
+			self.messages
+				.iter()
+				.map(|message| message.deserialize().linearize(&parent))
+				.collect(),
+		)
+	}
+}
+
+impl<'a> From<&'a de::BlockEntitySignV1_20Text> for RawSignText<'a> {
+	fn from(value: &'a de::BlockEntitySignV1_20Text) -> Self {
+		RawSignText {
+			messages: value.messages.iter().collect(),
+			color: value.color.as_deref(),
+		}
+	}
+}
+
+/// Helper methods for [de::BlockEntitySign]
+pub trait BlockEntitySignExt {
+	/// Returns the front and back text of a sign in a version-indepentent format
+	fn text(&self) -> (RawSignText, RawSignText);
+}
+
+impl BlockEntitySignExt for de::BlockEntitySign {
+	fn text(&self) -> (RawSignText, RawSignText) {
+		match self {
+			de::BlockEntitySign::V0 {
+				text1,
+				text2,
+				text3,
+				text4,
+				color,
+			} => (
+				RawSignText {
+					messages: vec![text1, text2, text3, text4],
+					color: color.as_deref(),
+				},
+				Default::default(),
+			),
+			de::BlockEntitySign::V1_20 {
+				front_text,
+				back_text,
+			} => (front_text.into(), back_text.into()),
+		}
+	}
+}
+
+/// Deserialized and linearized sign text
+pub struct SignText(pub Vec<FormattedTextList>);
+
+impl SignText {
+	/// Checks if all lines of the sign text are empty
+	pub fn is_empty(&self) -> bool {
+		self.0.iter().all(|line| line.is_empty())
+	}
+}

From 638d5046c989f4937c27e1d648b06be328f49242 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 25 Nov 2023 19:07:49 +0100
Subject: [PATCH 320/460] world/chunk: change Chunk into a struct

The version-specific part is extracted as an enum ChunkInner.
---
 src/world/chunk.rs | 63 ++++++++++++++++++++++++++--------------------
 1 file changed, 36 insertions(+), 27 deletions(-)

diff --git a/src/world/chunk.rs b/src/world/chunk.rs
index cd3bf4f..e3ba58a 100644
--- a/src/world/chunk.rs
+++ b/src/world/chunk.rs
@@ -16,10 +16,9 @@ use crate::{
 	types::*,
 };
 
-/// Chunk data structure wrapping a [de::Chunk] for convenient access to
-/// block and biome data
+/// Version-specific part of [Chunk]
 #[derive(Debug)]
-pub enum Chunk<'a> {
+pub enum ChunkInner<'a> {
 	/// Minecraft v1.18+ chunk with biome data moved into sections
 	V1_18 {
 		/// Section data
@@ -50,6 +49,14 @@ pub enum Chunk<'a> {
 	Empty,
 }
 
+/// Chunk data structure wrapping a [de::Chunk] for convenient access to
+/// block and biome data
+#[derive(Debug)]
+pub struct Chunk<'a> {
+	/// Version-specific data
+	inner: ChunkInner<'a>,
+}
+
 impl<'a> Chunk<'a> {
 	/// Creates a new [Chunk] from a deserialized [de::Chunk]
 	pub fn new(
@@ -59,15 +66,17 @@ impl<'a> Chunk<'a> {
 	) -> Result<(Self, bool)> {
 		let data_version = data.data_version.unwrap_or_default();
 
-		match &data.chunk {
+		let (inner, has_unknown) = match &data.chunk {
 			de::ChunkVariant::V1_18 {
 				sections,
 				block_entities: _,
-			} => Self::new_v1_18(data_version, sections, block_types, biome_types),
+			} => Self::new_v1_18(data_version, sections, block_types, biome_types)?,
 			de::ChunkVariant::V0 { level } => {
-				Self::new_v0(data_version, level, block_types, biome_types)
+				Self::new_v0(data_version, level, block_types, biome_types)?
 			}
-		}
+		};
+
+		Ok((Chunk { inner }, has_unknown))
 	}
 
 	/// [Chunk::new] implementation for Minecraft v1.18+ chunks
@@ -76,7 +85,7 @@ impl<'a> Chunk<'a> {
 		sections: &'a Vec<de::SectionV1_18>,
 		block_types: &'a BlockTypes,
 		biome_types: &'a BiomeTypes,
-	) -> Result<(Self, bool)> {
+	) -> Result<(ChunkInner<'a>, bool)> {
 		let mut section_map = BTreeMap::new();
 		let mut has_unknown = false;
 
@@ -118,7 +127,7 @@ impl<'a> Chunk<'a> {
 			};
 		}
 
-		let chunk = Chunk::V1_18 { section_map };
+		let chunk = ChunkInner::V1_18 { section_map };
 		Ok((chunk, has_unknown))
 	}
 
@@ -128,7 +137,7 @@ impl<'a> Chunk<'a> {
 		level: &'a de::LevelV0,
 		block_types: &'a BlockTypes,
 		biome_types: &'a BiomeTypes,
-	) -> Result<(Self, bool)> {
+	) -> Result<(ChunkInner<'a>, bool)> {
 		let mut section_map_v1_13 = BTreeMap::new();
 		let mut section_map_v0 = BTreeMap::new();
 		let mut has_unknown = false;
@@ -168,12 +177,12 @@ impl<'a> Chunk<'a> {
 
 		let biomes = BiomesV0::new(level.biomes.as_ref(), biome_types);
 		let chunk = match (section_map_v1_13.is_empty(), section_map_v0.is_empty()) {
-			(true, true) => Chunk::Empty,
-			(false, true) => Chunk::V1_13 {
+			(true, true) => ChunkInner::Empty,
+			(false, true) => ChunkInner::V1_13 {
 				section_map: section_map_v1_13,
 				biomes: biomes?,
 			},
-			(true, false) => Chunk::V0 {
+			(true, false) => ChunkInner::V0 {
 				section_map: section_map_v0,
 				biomes: biomes?,
 			},
@@ -187,11 +196,11 @@ impl<'a> Chunk<'a> {
 
 	/// Returns true if the chunk does not contain any sections
 	pub fn is_empty(&self) -> bool {
-		match self {
-			Chunk::V1_18 { section_map } => section_map.is_empty(),
-			Chunk::V1_13 { section_map, .. } => section_map.is_empty(),
-			Chunk::V0 { section_map, .. } => section_map.is_empty(),
-			Chunk::Empty => true,
+		match &self.inner {
+			ChunkInner::V1_18 { section_map } => section_map.is_empty(),
+			ChunkInner::V1_13 { section_map, .. } => section_map.is_empty(),
+			ChunkInner::V0 { section_map, .. } => section_map.is_empty(),
+			ChunkInner::Empty => true,
 		}
 	}
 
@@ -199,25 +208,25 @@ impl<'a> Chunk<'a> {
 	pub fn sections(&self) -> SectionIter {
 		use SectionIterInner::*;
 		SectionIter {
-			inner: match self {
-				Chunk::V1_18 { section_map } => V1_18 {
+			inner: match &self.inner {
+				ChunkInner::V1_18 { section_map } => V1_18 {
 					iter: section_map.iter(),
 				},
-				Chunk::V1_13 {
+				ChunkInner::V1_13 {
 					section_map,
 					biomes,
 				} => V1_13 {
 					iter: section_map.iter(),
 					biomes,
 				},
-				Chunk::V0 {
+				ChunkInner::V0 {
 					section_map,
 					biomes,
 				} => V0 {
 					iter: section_map.iter(),
 					biomes,
 				},
-				Chunk::Empty => Empty,
+				ChunkInner::Empty => Empty,
 			},
 		}
 	}
@@ -253,26 +262,26 @@ impl<'a, T> SectionIterTrait<'a> for T where
 /// Inner data structure of [SectionIter]
 #[derive(Debug, Clone)]
 enum SectionIterInner<'a> {
-	/// Iterator over sections of [Chunk::V1_18]
+	/// Iterator over sections of [ChunkInner::V1_18]
 	V1_18 {
 		/// Inner iterator into section map
 		iter: btree_map::Iter<'a, SectionY, (SectionV1_13<'a>, BiomesV1_18<'a>, BlockLight<'a>)>,
 	},
-	/// Iterator over sections of [Chunk::V1_13]
+	/// Iterator over sections of [ChunkInner::V1_13]
 	V1_13 {
 		/// Inner iterator into section map
 		iter: btree_map::Iter<'a, SectionY, (SectionV1_13<'a>, BlockLight<'a>)>,
 		/// Chunk biome data
 		biomes: &'a BiomesV0<'a>,
 	},
-	/// Iterator over sections of [Chunk::V0]
+	/// Iterator over sections of [ChunkInner::V0]
 	V0 {
 		/// Inner iterator into section map
 		iter: btree_map::Iter<'a, SectionY, (SectionV0<'a>, BlockLight<'a>)>,
 		/// Chunk biome data
 		biomes: &'a BiomesV0<'a>,
 	},
-	/// Empty iterator over an unpopulated chunk ([Chunk::Empty])
+	/// Empty iterator over an unpopulated chunk ([ChunkInner::Empty])
 	Empty,
 }
 

From f0e0db63d39fb5731483d6c5a93af950de4433e4 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 25 Nov 2023 20:34:50 +0100
Subject: [PATCH 321/460] world: process sign data, prepare for serialization

---
 src/world/block_entity.rs | 89 +++++++++++++++++++++++++++++++++++++++
 src/world/chunk.rs        | 36 ++++++++++++----
 src/world/json_text.rs    | 12 ++++--
 src/world/mod.rs          |  1 +
 src/world/sign.rs         |  3 ++
 5 files changed, 130 insertions(+), 11 deletions(-)
 create mode 100644 src/world/block_entity.rs

diff --git a/src/world/block_entity.rs b/src/world/block_entity.rs
new file mode 100644
index 0000000..65d95e4
--- /dev/null
+++ b/src/world/block_entity.rs
@@ -0,0 +1,89 @@
+//! Processing of block entity data
+
+use serde::{Deserialize, Serialize};
+
+use super::{
+	de,
+	sign::{BlockEntitySignExt, SignText},
+};
+
+/// Kind of sign block
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum SignKind {
+	/// Standing or attached sign
+	Sign,
+	/// Hanging sign
+	HangingSign,
+}
+
+/// Processed sign data
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Sign {
+	/// The kind of the sign
+	pub kind: SignKind,
+	/// The sign's front text
+	#[serde(skip_serializing_if = "SignText::is_empty", default)]
+	pub front_text: SignText,
+	/// The sign's back text
+	#[serde(skip_serializing_if = "SignText::is_empty", default)]
+	pub back_text: SignText,
+}
+
+impl Sign {
+	/// Processes a [de::BlockEntitySign] into a [Sign]
+	fn new(sign: &de::BlockEntitySign, kind: SignKind) -> Sign {
+		let (front_text, back_text) = sign.text();
+		let front_text = front_text.decode();
+		let back_text = back_text.decode();
+		Sign {
+			kind,
+			front_text,
+			back_text,
+		}
+	}
+}
+
+/// Data for different kinds of [BlockEntity]
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(tag = "type", rename_all = "snake_case")]
+pub enum BlockEntityData {
+	/// A sign block
+	Sign(Sign),
+}
+
+/// A processed block entity
+#[derive(Debug, Serialize, Deserialize)]
+pub struct BlockEntity {
+	/// Global X coordinate
+	pub x: i32,
+	/// Global Y coordinate
+	pub y: i32,
+	/// Global Z coordinate
+	pub z: i32,
+	/// Entity data
+	#[serde(flatten)]
+	pub data: BlockEntityData,
+}
+
+impl BlockEntity {
+	/// Processes a [de::BlockEntity] into a [BlockEntity]
+	pub fn new(entity: &de::BlockEntity) -> Option<Self> {
+		let data = match &entity.data {
+			de::BlockEntityData::Sign(sign) => {
+				BlockEntityData::Sign(Sign::new(sign, SignKind::Sign))
+			}
+			de::BlockEntityData::HangingSign(sign) => {
+				BlockEntityData::Sign(Sign::new(sign, SignKind::HangingSign))
+			}
+			de::BlockEntityData::Other => return None,
+		};
+
+		Some(BlockEntity {
+			x: entity.x,
+			y: entity.y,
+			z: entity.z,
+			data,
+		})
+	}
+}
diff --git a/src/world/chunk.rs b/src/world/chunk.rs
index e3ba58a..5a8937e 100644
--- a/src/world/chunk.rs
+++ b/src/world/chunk.rs
@@ -10,7 +10,7 @@ use std::{
 
 use anyhow::{bail, Context, Result};
 
-use super::{de, section::*};
+use super::{block_entity::BlockEntity, de, section::*};
 use crate::{
 	resource::{BiomeTypes, BlockTypes},
 	types::*,
@@ -55,6 +55,8 @@ pub enum ChunkInner<'a> {
 pub struct Chunk<'a> {
 	/// Version-specific data
 	inner: ChunkInner<'a>,
+	/// Unprocessed block entities
+	block_entities: &'a Vec<de::BlockEntity>,
 }
 
 impl<'a> Chunk<'a> {
@@ -66,17 +68,27 @@ impl<'a> Chunk<'a> {
 	) -> Result<(Self, bool)> {
 		let data_version = data.data_version.unwrap_or_default();
 
-		let (inner, has_unknown) = match &data.chunk {
+		let ((inner, has_unknown), block_entities) = match &data.chunk {
 			de::ChunkVariant::V1_18 {
 				sections,
-				block_entities: _,
-			} => Self::new_v1_18(data_version, sections, block_types, biome_types)?,
-			de::ChunkVariant::V0 { level } => {
-				Self::new_v0(data_version, level, block_types, biome_types)?
-			}
+				block_entities,
+			} => (
+				Self::new_v1_18(data_version, sections, block_types, biome_types)?,
+				block_entities,
+			),
+			de::ChunkVariant::V0 { level } => (
+				Self::new_v0(data_version, level, block_types, biome_types)?,
+				&level.tile_entities,
+			),
 		};
 
-		Ok((Chunk { inner }, has_unknown))
+		Ok((
+			Chunk {
+				inner,
+				block_entities,
+			},
+			has_unknown,
+		))
 	}
 
 	/// [Chunk::new] implementation for Minecraft v1.18+ chunks
@@ -230,6 +242,14 @@ impl<'a> Chunk<'a> {
 			},
 		}
 	}
+
+	/// Processes all of the chunk's block entities
+	pub fn block_entities(&self) -> Vec<BlockEntity> {
+		self.block_entities
+			.iter()
+			.filter_map(BlockEntity::new)
+			.collect()
+	}
 }
 
 /// Reference to block, biome and block light data of a section
diff --git a/src/world/json_text.rs b/src/world/json_text.rs
index 8e53ead..a9c1f13 100644
--- a/src/world/json_text.rs
+++ b/src/world/json_text.rs
@@ -2,7 +2,7 @@
 
 use std::{collections::VecDeque, sync::Arc};
 
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 
 /// A span of formatted text
 ///
@@ -11,22 +11,28 @@ use serde::Deserialize;
 /// is handled by [DeserializedText].
 ///
 /// Formatting that is not set in a node is inherited from the parent.
-#[derive(Debug, Deserialize, Default)]
+#[derive(Debug, Serialize, Deserialize, Default)]
 pub struct FormattedText {
 	#[serde(default)]
 	/// Text content
 	pub text: String,
 	/// Text color
+	#[serde(skip_serializing_if = "Option::is_none")]
 	pub color: Option<Arc<String>>,
 	/// Bold formatting
+	#[serde(skip_serializing_if = "Option::is_none")]
 	pub bold: Option<bool>,
 	/// Italic formatting
+	#[serde(skip_serializing_if = "Option::is_none")]
 	pub italic: Option<bool>,
 	/// Underlines formatting
+	#[serde(skip_serializing_if = "Option::is_none")]
 	pub underlined: Option<bool>,
 	/// Strikethrough formatting
+	#[serde(skip_serializing_if = "Option::is_none")]
 	pub strikethrough: Option<bool>,
 	/// Obfuscated formatting
+	#[serde(skip_serializing_if = "Option::is_none")]
 	pub obfuscated: Option<bool>,
 }
 
@@ -71,7 +77,7 @@ impl From<String> for FormattedTextTree {
 }
 
 /// List of [FormattedText]
-#[derive(Debug)]
+#[derive(Debug, Serialize, Deserialize)]
 pub struct FormattedTextList(pub Vec<FormattedText>);
 
 impl FormattedTextList {
diff --git a/src/world/mod.rs b/src/world/mod.rs
index 38d5174..6426c92 100644
--- a/src/world/mod.rs
+++ b/src/world/mod.rs
@@ -1,5 +1,6 @@
 //! Data structures describing Minecraft save data
 
+pub mod block_entity;
 pub mod chunk;
 pub mod de;
 pub mod json_text;
diff --git a/src/world/sign.rs b/src/world/sign.rs
index c13eebe..e53be87 100644
--- a/src/world/sign.rs
+++ b/src/world/sign.rs
@@ -2,6 +2,8 @@
 
 use std::sync::Arc;
 
+use serde::{Deserialize, Serialize};
+
 use super::{
 	de,
 	json_text::{FormattedText, FormattedTextList, JSONText},
@@ -77,6 +79,7 @@ impl BlockEntitySignExt for de::BlockEntitySign {
 	}
 }
 
+#[derive(Debug, Default, Serialize, Deserialize)]
 /// Deserialized and linearized sign text
 pub struct SignText(pub Vec<FormattedTextList>);
 

From 5d40d061a40daa8d799552915652744b988a6316 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 26 Nov 2023 12:47:31 +0100
Subject: [PATCH 322/460] io/storage: split out inner part of read/write

Allow reusing the read/write logic without requiring control over the file
open.
---
 src/core/region_processor.rs |  2 +-
 src/core/tile_renderer.rs    |  2 +-
 src/io/storage.rs            | 51 ++++++++++++++++++++----------------
 3 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/src/core/region_processor.rs b/src/core/region_processor.rs
index 0a8ad0e..04699d3 100644
--- a/src/core/region_processor.rs
+++ b/src/core/region_processor.rs
@@ -145,7 +145,7 @@ impl<'a> SingleRegionProcessor<'a> {
 			return Ok(());
 		}
 
-		storage::write(
+		storage::write_file(
 			&self.output_path,
 			&self.processed_region,
 			REGION_FILE_META_VERSION,
diff --git a/src/core/tile_renderer.rs b/src/core/tile_renderer.rs
index b341076..ce9fed3 100644
--- a/src/core/tile_renderer.rs
+++ b/src/core/tile_renderer.rs
@@ -105,7 +105,7 @@ impl<'a> TileRenderer<'a> {
 
 		region_loader
 			.get_or_try_init(|| async {
-				storage::read(&processed_path).context("Failed to load processed region data")
+				storage::read_file(&processed_path).context("Failed to load processed region data")
 			})
 			.await
 			.cloned()
diff --git a/src/io/storage.rs b/src/io/storage.rs
index 99a8d63..634f082 100644
--- a/src/io/storage.rs
+++ b/src/io/storage.rs
@@ -14,43 +14,50 @@ use serde::{de::DeserializeOwned, Serialize};
 
 use super::fs;
 
+/// Serializes data and writes it to a writer
+pub fn write<W: Write, T: Serialize>(writer: &mut W, value: &T) -> Result<()> {
+	let data = bincode::serialize(value)?;
+	let len = u32::try_from(data.len())?;
+	let compressed = zstd::bulk::compress(&data, 1)?;
+	drop(data);
+
+	writer.write_all(&len.to_be_bytes())?;
+	writer.write_all(&compressed)?;
+
+	Ok(())
+}
+
 /// Serializes data and stores it in a file
 ///
 /// A timestamp is stored in an assiciated metadata file.
-pub fn write<T: Serialize>(
+pub fn write_file<T: Serialize>(
 	path: &Path,
 	value: &T,
 	version: fs::FileMetaVersion,
 	timestamp: SystemTime,
 ) -> Result<()> {
-	fs::create_with_timestamp(path, version, timestamp, |file| {
-		let data = bincode::serialize(value)?;
-		let len = u32::try_from(data.len())?;
-		let compressed = zstd::bulk::compress(&data, 1)?;
-		drop(data);
+	fs::create_with_timestamp(path, version, timestamp, |file| write(file, value))
+}
 
-		file.write_all(&len.to_be_bytes())?;
-		file.write_all(&compressed)?;
+/// Reads data from a reader and deserializes it
+pub fn read<R: Read, T: DeserializeOwned>(reader: &mut R) -> Result<T> {
+	let mut len_buf = [0u8; 4];
+	reader.read_exact(&mut len_buf)?;
+	let len = usize::try_from(u32::from_be_bytes(len_buf))?;
 
-		Ok(())
-	})
+	let mut compressed = vec![];
+	reader.read_to_end(&mut compressed)?;
+	let data = zstd::bulk::decompress(&compressed, len)?;
+	drop(compressed);
+
+	Ok(bincode::deserialize(&data)?)
 }
 
 /// Reads data from a file and deserializes it
-pub fn read<T: DeserializeOwned>(path: &Path) -> Result<T> {
+pub fn read_file<T: DeserializeOwned>(path: &Path) -> Result<T> {
 	(|| -> Result<T> {
 		let mut file = File::open(path)?;
-
-		let mut len_buf = [0u8; 4];
-		file.read_exact(&mut len_buf)?;
-		let len = usize::try_from(u32::from_be_bytes(len_buf))?;
-
-		let mut compressed = vec![];
-		file.read_to_end(&mut compressed)?;
-		let data = zstd::bulk::decompress(&compressed, len)?;
-		drop(compressed);
-
-		Ok(bincode::deserialize(&data)?)
+		read(&mut file)
 	})()
 	.with_context(|| format!("Failed to read file {}", path.display()))
 }

From c44f6ab859bfcc8d10592097d4188db11a9a53a4 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 26 Nov 2023 14:12:51 +0100
Subject: [PATCH 323/460] io/storage: add JSON support

Bincode can't deal with a number of serde's features that would be
desirable if we're using the same Serialize impls for generating JSON
data for the viewer.
---
 src/core/region_processor.rs |  1 +
 src/core/tile_renderer.rs    |  3 ++-
 src/io/storage.rs            | 34 +++++++++++++++++++++++++++-------
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/core/region_processor.rs b/src/core/region_processor.rs
index 04699d3..52cb165 100644
--- a/src/core/region_processor.rs
+++ b/src/core/region_processor.rs
@@ -148,6 +148,7 @@ impl<'a> SingleRegionProcessor<'a> {
 		storage::write_file(
 			&self.output_path,
 			&self.processed_region,
+			storage::Format::Bincode,
 			REGION_FILE_META_VERSION,
 			self.input_timestamp,
 		)
diff --git a/src/core/tile_renderer.rs b/src/core/tile_renderer.rs
index ce9fed3..09ad8a1 100644
--- a/src/core/tile_renderer.rs
+++ b/src/core/tile_renderer.rs
@@ -105,7 +105,8 @@ impl<'a> TileRenderer<'a> {
 
 		region_loader
 			.get_or_try_init(|| async {
-				storage::read_file(&processed_path).context("Failed to load processed region data")
+				storage::read_file(&processed_path, storage::Format::Bincode)
+					.context("Failed to load processed region data")
 			})
 			.await
 			.cloned()
diff --git a/src/io/storage.rs b/src/io/storage.rs
index 634f082..9296166 100644
--- a/src/io/storage.rs
+++ b/src/io/storage.rs
@@ -14,9 +14,24 @@ use serde::{de::DeserializeOwned, Serialize};
 
 use super::fs;
 
+/// Storage format
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub enum Format {
+	/// Encode as Bincode
+	///
+	/// Bincode is more efficient than JSON, but cannot handle many of
+	/// serde's features like flatten, conditional skipping, ...
+	Bincode,
+	/// Encode as JSON
+	Json,
+}
+
 /// Serializes data and writes it to a writer
-pub fn write<W: Write, T: Serialize>(writer: &mut W, value: &T) -> Result<()> {
-	let data = bincode::serialize(value)?;
+pub fn write<W: Write, T: Serialize>(writer: &mut W, value: &T, format: Format) -> Result<()> {
+	let data = match format {
+		Format::Bincode => bincode::serialize(value)?,
+		Format::Json => serde_json::to_vec(value)?,
+	};
 	let len = u32::try_from(data.len())?;
 	let compressed = zstd::bulk::compress(&data, 1)?;
 	drop(data);
@@ -33,14 +48,15 @@ pub fn write<W: Write, T: Serialize>(writer: &mut W, value: &T) -> Result<()> {
 pub fn write_file<T: Serialize>(
 	path: &Path,
 	value: &T,
+	format: Format,
 	version: fs::FileMetaVersion,
 	timestamp: SystemTime,
 ) -> Result<()> {
-	fs::create_with_timestamp(path, version, timestamp, |file| write(file, value))
+	fs::create_with_timestamp(path, version, timestamp, |file| write(file, value, format))
 }
 
 /// Reads data from a reader and deserializes it
-pub fn read<R: Read, T: DeserializeOwned>(reader: &mut R) -> Result<T> {
+pub fn read<R: Read, T: DeserializeOwned>(reader: &mut R, format: Format) -> Result<T> {
 	let mut len_buf = [0u8; 4];
 	reader.read_exact(&mut len_buf)?;
 	let len = usize::try_from(u32::from_be_bytes(len_buf))?;
@@ -50,14 +66,18 @@ pub fn read<R: Read, T: DeserializeOwned>(reader: &mut R) -> Result<T> {
 	let data = zstd::bulk::decompress(&compressed, len)?;
 	drop(compressed);
 
-	Ok(bincode::deserialize(&data)?)
+	let value = match format {
+		Format::Bincode => bincode::deserialize(&data)?,
+		Format::Json => serde_json::from_slice(&data)?,
+	};
+	Ok(value)
 }
 
 /// Reads data from a file and deserializes it
-pub fn read_file<T: DeserializeOwned>(path: &Path) -> Result<T> {
+pub fn read_file<T: DeserializeOwned>(path: &Path, format: Format) -> Result<T> {
 	(|| -> Result<T> {
 		let mut file = File::open(path)?;
-		read(&mut file)
+		read(&mut file, format)
 	})()
 	.with_context(|| format!("Failed to read file {}", path.display()))
 }

From 7297c03567e7990520ce9acffe9cb19b517b6ab0 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 25 Nov 2023 21:46:55 +0100
Subject: [PATCH 324/460] core/region_processor: store processed block entities
 for each region

---
 src/core/common.rs           | 39 ++++++++++++++++-
 src/core/region_processor.rs | 82 ++++++++++++++++++++++++++++--------
 2 files changed, 101 insertions(+), 20 deletions(-)

diff --git a/src/core/common.rs b/src/core/common.rs
index 49c8301..cd8fd8f 100644
--- a/src/core/common.rs
+++ b/src/core/common.rs
@@ -9,7 +9,12 @@ use std::{
 use indexmap::IndexSet;
 use serde::{Deserialize, Serialize};
 
-use crate::{io::fs::FileMetaVersion, resource::Biome, types::*, world::layer};
+use crate::{
+	io::fs::FileMetaVersion,
+	resource::Biome,
+	types::*,
+	world::{block_entity::BlockEntity, layer},
+};
 
 /// Increase to force regeneration of all output files
 
@@ -36,6 +41,11 @@ pub const LIGHTMAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
 /// Increase when the mipmap generation changes (this should not happen)
 pub const MIPMAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
 
+/// MinedMap processed entity data version number
+///
+/// Increase when entity collection changes bacause of code changes.
+pub const ENTITIES_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
+
 /// Coordinate pair of a generated tile
 ///
 /// Each tile corresponds to one Minecraft region file
@@ -94,6 +104,13 @@ pub struct ProcessedRegion {
 	pub chunks: ChunkArray<Option<Box<ProcessedChunk>>>,
 }
 
+/// Data structure for storing entity data between processing and collection steps
+#[derive(Debug, Default, Serialize, Deserialize)]
+pub struct ProcessedEntities {
+	/// List of block entities
+	pub block_entities: Vec<BlockEntity>,
+}
+
 /// Derives a filename from region coordinates and a file extension
 ///
 /// Can be used for input regions, processed data or rendered tiles
@@ -122,6 +139,8 @@ pub struct Config {
 	pub output_dir: PathBuf,
 	/// Path for storage of intermediate processed data files
 	pub processed_dir: PathBuf,
+	/// Path for storage of processed entity data files
+	pub entities_dir: PathBuf,
 	/// Path of viewer metadata file
 	pub metadata_path: PathBuf,
 }
@@ -137,7 +156,8 @@ impl Config {
 
 		let region_dir = [&args.input_dir, Path::new("region")].iter().collect();
 		let level_dat_path = [&args.input_dir, Path::new("level.dat")].iter().collect();
-		let processed_dir = [&args.output_dir, Path::new("processed")].iter().collect();
+		let processed_dir: PathBuf = [&args.output_dir, Path::new("processed")].iter().collect();
+		let entities_dir = [&processed_dir, Path::new("entities")].iter().collect();
 		let metadata_path = [&args.output_dir, Path::new("info.json")].iter().collect();
 
 		Config {
@@ -146,6 +166,7 @@ impl Config {
 			level_dat_path,
 			output_dir: args.output_dir.clone(),
 			processed_dir,
+			entities_dir,
 			metadata_path,
 		}
 	}
@@ -162,6 +183,20 @@ impl Config {
 		[&self.processed_dir, Path::new(&filename)].iter().collect()
 	}
 
+	/// Constructs the base output path for processed entity data
+	pub fn entities_dir(&self, level: usize) -> PathBuf {
+		[&self.entities_dir, Path::new(&level.to_string())]
+			.iter()
+			.collect()
+	}
+
+	/// Constructs the path of a processed entity data file
+	pub fn entities_path(&self, level: usize, coords: TileCoords) -> PathBuf {
+		let filename = coord_filename(coords, "bin");
+		let dir = self.entities_dir(level);
+		[Path::new(&dir), Path::new(&filename)].iter().collect()
+	}
+
 	/// Constructs the base output path for a [TileKind] and mipmap level
 	pub fn tile_dir(&self, kind: TileKind, level: usize) -> PathBuf {
 		let prefix = match kind {
diff --git a/src/core/region_processor.rs b/src/core/region_processor.rs
index 52cb165..f1f8441 100644
--- a/src/core/region_processor.rs
+++ b/src/core/region_processor.rs
@@ -64,20 +64,28 @@ struct SingleRegionProcessor<'a> {
 	output_path: PathBuf,
 	/// Lightmap output filename
 	lightmap_path: PathBuf,
+	/// Processed entity output filename
+	entities_path: PathBuf,
 	/// Timestamp of last modification of input file
 	input_timestamp: SystemTime,
 	/// Timestamp of last modification of processed region output file (if valid)
 	output_timestamp: Option<SystemTime>,
 	/// Timestamp of last modification of lightmap output file (if valid)
 	lightmap_timestamp: Option<SystemTime>,
+	/// Timestamp of last modification of entity list output file (if valid)
+	entities_timestamp: Option<SystemTime>,
 	/// True if processed region output file needs to be updated
 	output_needed: bool,
 	/// True if lightmap output file needs to be updated
 	lightmap_needed: bool,
+	/// True if entity output file needs to be updated
+	entities_needed: bool,
 	/// Processed region intermediate data
 	processed_region: ProcessedRegion,
 	/// Lightmap intermediate data
 	lightmap: image::GrayAlphaImage,
+	/// Processed entity intermediate data
+	entities: ProcessedEntities,
 	/// True if any unknown block or biome types were encountered during processing
 	has_unknown: bool,
 }
@@ -93,14 +101,20 @@ impl<'a> SingleRegionProcessor<'a> {
 
 		let output_path = processor.config.processed_path(coords);
 		let output_timestamp = fs::read_timestamp(&output_path, REGION_FILE_META_VERSION);
+
 		let lightmap_path = processor.config.tile_path(TileKind::Lightmap, 0, coords);
 		let lightmap_timestamp = fs::read_timestamp(&lightmap_path, LIGHTMAP_FILE_META_VERSION);
 
+		let entities_path = processor.config.entities_path(0, coords);
+		let entities_timestamp = fs::read_timestamp(&entities_path, ENTITIES_FILE_META_VERSION);
+
 		let output_needed = Some(input_timestamp) > output_timestamp;
 		let lightmap_needed = Some(input_timestamp) > lightmap_timestamp;
+		let entities_needed = Some(input_timestamp) > entities_timestamp;
 
 		let processed_region = ProcessedRegion::default();
 		let lightmap = image::GrayAlphaImage::new(N, N);
+		let entities = ProcessedEntities::default();
 
 		Ok(SingleRegionProcessor {
 			block_types: &processor.block_types,
@@ -109,13 +123,17 @@ impl<'a> SingleRegionProcessor<'a> {
 			input_path,
 			output_path,
 			lightmap_path,
+			entities_path,
 			input_timestamp,
 			output_timestamp,
 			lightmap_timestamp,
+			entities_timestamp,
 			output_needed,
 			lightmap_needed,
+			entities_needed,
 			processed_region,
 			lightmap,
+			entities,
 			has_unknown: false,
 		})
 	}
@@ -174,34 +192,57 @@ impl<'a> SingleRegionProcessor<'a> {
 		)
 	}
 
+	/// Saves processed entity data
+	///
+	/// The timestamp is the time of the last modification of the input region data.
+	fn save_entities(&self) -> Result<()> {
+		if !self.entities_needed {
+			return Ok(());
+		}
+
+		storage::write_file(
+			&self.entities_path,
+			&self.entities,
+			storage::Format::Json,
+			ENTITIES_FILE_META_VERSION,
+			self.input_timestamp,
+		)
+	}
+
 	/// Processes a single chunk
 	fn process_chunk(&mut self, chunk_coords: ChunkCoords, data: world::de::Chunk) -> Result<()> {
 		let (chunk, has_unknown) =
 			world::chunk::Chunk::new(&data, self.block_types, self.biome_types)
 				.with_context(|| format!("Failed to decode chunk {:?}", chunk_coords))?;
 		self.has_unknown |= has_unknown;
-		let Some(layer::LayerData {
-			blocks,
-			biomes,
-			block_light,
-			depths,
-		}) = world::layer::top_layer(&mut self.processed_region.biome_list, &chunk)
-			.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))?
-		else {
-			return Ok(());
-		};
 
-		if self.output_needed {
-			self.processed_region.chunks[chunk_coords] = Some(Box::new(ProcessedChunk {
+		if self.output_needed || self.lightmap_needed {
+			if let Some(layer::LayerData {
 				blocks,
 				biomes,
+				block_light,
 				depths,
-			}));
+			}) = world::layer::top_layer(&mut self.processed_region.biome_list, &chunk)
+				.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))?
+			{
+				if self.output_needed {
+					self.processed_region.chunks[chunk_coords] = Some(Box::new(ProcessedChunk {
+						blocks,
+						biomes,
+						depths,
+					}));
+				}
+
+				if self.lightmap_needed {
+					let chunk_lightmap = Self::render_chunk_lightmap(block_light);
+					overlay_chunk(&mut self.lightmap, &chunk_lightmap, chunk_coords);
+				}
+			}
 		}
 
-		if self.lightmap_needed {
-			let chunk_lightmap = Self::render_chunk_lightmap(block_light);
-			overlay_chunk(&mut self.lightmap, &chunk_lightmap, chunk_coords);
+		if self.entities_needed {
+			let mut block_entities = chunk.block_entities();
+			self.entities.block_entities.append(&mut block_entities);
 		}
 
 		Ok(())
@@ -215,7 +256,7 @@ impl<'a> SingleRegionProcessor<'a> {
 
 	/// Processes the region
 	fn run(mut self) -> Result<RegionProcessorStatus> {
-		if !self.output_needed && !self.lightmap_needed {
+		if !self.output_needed && !self.lightmap_needed && !self.entities_needed {
 			debug!(
 				"Skipping unchanged region r.{}.{}.mca",
 				self.coords.x, self.coords.z
@@ -229,7 +270,10 @@ impl<'a> SingleRegionProcessor<'a> {
 		);
 
 		if let Err(err) = self.process_chunks() {
-			if self.output_timestamp.is_some() && self.lightmap_timestamp.is_some() {
+			if self.output_timestamp.is_some()
+				&& self.lightmap_timestamp.is_some()
+				&& self.entities_timestamp.is_some()
+			{
 				warn!(
 					"Failed to process region {:?}, using old data: {:?}",
 					self.coords, err
@@ -246,6 +290,7 @@ impl<'a> SingleRegionProcessor<'a> {
 
 		self.save_region()?;
 		self.save_lightmap()?;
+		self.save_entities()?;
 
 		Ok(if self.has_unknown {
 			RegionProcessorStatus::OkWithUnknown
@@ -313,6 +358,7 @@ impl<'a> RegionProcessor<'a> {
 	pub fn run(self) -> Result<Vec<TileCoords>> {
 		fs::create_dir_all(&self.config.processed_dir)?;
 		fs::create_dir_all(&self.config.tile_dir(TileKind::Lightmap, 0))?;
+		fs::create_dir_all(&self.config.entities_dir(0))?;
 
 		info!("Processing region files...");
 

From 825cf70e515d84cb20cfb42c4f7afdfc88df2312 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 26 Nov 2023 01:20:09 +0100
Subject: [PATCH 325/460] core: split TileCollector trait out of TileMipmapper

Make mipmap-style recursive processing of tiles reusable.
---
 src/core/mod.rs            |   1 +
 src/core/tile_collector.rs | 107 +++++++++++++++++++
 src/core/tile_mipmapper.rs | 205 ++++++++++++++++++-------------------
 3 files changed, 206 insertions(+), 107 deletions(-)
 create mode 100644 src/core/tile_collector.rs

diff --git a/src/core/mod.rs b/src/core/mod.rs
index 0e77768..e3f2ea3 100644
--- a/src/core/mod.rs
+++ b/src/core/mod.rs
@@ -4,6 +4,7 @@ mod common;
 mod metadata_writer;
 mod region_group;
 mod region_processor;
+mod tile_collector;
 mod tile_mipmapper;
 mod tile_renderer;
 
diff --git a/src/core/tile_collector.rs b/src/core/tile_collector.rs
new file mode 100644
index 0000000..dfc6085
--- /dev/null
+++ b/src/core/tile_collector.rs
@@ -0,0 +1,107 @@
+//! A trait for recursively processing tiles
+//!
+//! Used for mipmap generation and collecting entity data
+
+use std::sync::mpsc;
+
+use anyhow::Result;
+use rayon::prelude::*;
+
+use super::common::*;
+
+/// Helper to determine if no further mipmap levels are needed
+///
+/// If all tile coordinates are -1 or 0, further mipmap levels will not
+/// decrease the number of tiles and mipmap generated is considered finished.
+fn done(tiles: &TileCoordMap) -> bool {
+	tiles
+		.0
+		.iter()
+		.all(|(z, xs)| (-1..=0).contains(z) && xs.iter().all(|x| (-1..=0).contains(x)))
+}
+
+/// Derives the map of populated tile coordinates for the next mipmap level
+fn map_coords(tiles: &TileCoordMap) -> TileCoordMap {
+	let mut ret = TileCoordMap::default();
+
+	for (&z, xs) in &tiles.0 {
+		for &x in xs {
+			let xt = x >> 1;
+			let zt = z >> 1;
+
+			ret.0.entry(zt).or_default().insert(xt);
+		}
+	}
+
+	ret
+}
+
+/// Trait to implement for collecting tiles recursively
+pub trait TileCollector: Sync {
+	/// Return value of [TileCollector::collect_one]
+	type CollectOutput: Send;
+
+	/// List of level 0 tiles
+	fn tiles(&self) -> &[TileCoords];
+
+	/// Called at the beginning of each level of processing
+	fn prepare(&self, level: usize) -> Result<()>;
+
+	/// Called at the end of each level of processing
+	fn finish(
+		&self,
+		level: usize,
+		outputs: impl Iterator<Item = Self::CollectOutput>,
+	) -> Result<()>;
+
+	/// Called for each tile coordinate of the level that is currently being generated
+	fn collect_one(
+		&self,
+		level: usize,
+		coords: TileCoords,
+		prev: &TileCoordMap,
+	) -> Result<Self::CollectOutput>;
+
+	/// Collects tiles recursively
+	fn collect_tiles(&self) -> Result<Vec<TileCoordMap>> {
+		let mut tile_stack = {
+			let mut tile_map = TileCoordMap::default();
+
+			for &TileCoords { x, z } in self.tiles() {
+				tile_map.0.entry(z).or_default().insert(x);
+			}
+
+			vec![tile_map]
+		};
+
+		loop {
+			let level = tile_stack.len();
+			let prev = &tile_stack[level - 1];
+			if done(prev) {
+				break;
+			}
+
+			self.prepare(level)?;
+
+			let next = map_coords(prev);
+
+			let (send, recv) = mpsc::channel();
+
+			next.0
+				.par_iter()
+				.flat_map(|(&z, xs)| xs.par_iter().map(move |&x| TileCoords { x, z }))
+				.try_for_each(|coords| {
+					let output = self.collect_one(level, coords, prev)?;
+					send.send(output).unwrap();
+					anyhow::Ok(())
+				})?;
+
+			drop(send);
+			self.finish(level, recv.into_iter())?;
+
+			tile_stack.push(next);
+		}
+
+		Ok(tile_stack)
+	}
+}
diff --git a/src/core/tile_mipmapper.rs b/src/core/tile_mipmapper.rs
index 6ea8750..a372ca5 100644
--- a/src/core/tile_mipmapper.rs
+++ b/src/core/tile_mipmapper.rs
@@ -1,14 +1,53 @@
 //! The [TileMipmapper]
 
-use std::sync::mpsc;
+use std::ops::Add;
 
 use anyhow::{Context, Result};
-use rayon::prelude::*;
 use tracing::{debug, info, warn};
 
-use super::common::*;
+use super::{common::*, tile_collector::TileCollector};
 use crate::{io::fs, types::*};
 
+/// Counters for the number of processed and total tiles
+///
+/// Used as return of [TileMipmapper::collect_one]
+#[derive(Debug, Clone, Copy)]
+pub struct MipmapStat {
+	/// Total number of tiles
+	total: usize,
+	/// Processed number of tiles
+	processed: usize,
+}
+
+impl MipmapStat {
+	/// Mipmap step return when none of the input files exist
+	const NOT_FOUND: MipmapStat = MipmapStat {
+		total: 0,
+		processed: 0,
+	};
+	/// Mipmap step return when output file is up-to-date
+	const SKIPPED: MipmapStat = MipmapStat {
+		total: 1,
+		processed: 0,
+	};
+	/// Mipmap step return when a new output file has been generated
+	const PROCESSED: MipmapStat = MipmapStat {
+		total: 1,
+		processed: 1,
+	};
+}
+
+impl Add for MipmapStat {
+	type Output = MipmapStat;
+
+	fn add(self, rhs: Self) -> Self::Output {
+		MipmapStat {
+			total: self.total + rhs.total,
+			processed: self.processed + rhs.processed,
+		}
+	}
+}
+
 /// Generates mipmap tiles from full-resolution tile images
 pub struct TileMipmapper<'a> {
 	/// Common MinedMap configuration from command line
@@ -17,39 +56,63 @@ pub struct TileMipmapper<'a> {
 	regions: &'a [TileCoords],
 }
 
+impl<'a> TileCollector for TileMipmapper<'a> {
+	type CollectOutput = MipmapStat;
+
+	fn tiles(&self) -> &[TileCoords] {
+		self.regions
+	}
+
+	fn prepare(&self, level: usize) -> Result<()> {
+		info!("Generating level {} mipmaps...", level);
+
+		fs::create_dir_all(&self.config.tile_dir(TileKind::Map, level))?;
+		fs::create_dir_all(&self.config.tile_dir(TileKind::Lightmap, level))?;
+
+		Ok(())
+	}
+
+	fn finish(
+		&self,
+		level: usize,
+		outputs: impl Iterator<Item = Self::CollectOutput>,
+	) -> Result<()> {
+		let stat = outputs.fold(
+			MipmapStat {
+				total: 0,
+				processed: 0,
+			},
+			MipmapStat::add,
+		);
+		info!(
+			"Generated level {} mipmaps ({} processed, {} unchanged)",
+			level,
+			stat.processed,
+			stat.total - stat.processed,
+		);
+
+		Ok(())
+	}
+
+	fn collect_one(
+		&self,
+		level: usize,
+		coords: TileCoords,
+		prev: &TileCoordMap,
+	) -> Result<Self::CollectOutput> {
+		let map_stat = self.render_mipmap::<image::Rgba<u8>>(TileKind::Map, level, coords, prev)?;
+		let lightmap_stat =
+			self.render_mipmap::<image::LumaA<u8>>(TileKind::Lightmap, level, coords, prev)?;
+		Ok(map_stat + lightmap_stat)
+	}
+}
+
 impl<'a> TileMipmapper<'a> {
 	/// Constructs a new TileMipmapper
 	pub fn new(config: &'a Config, regions: &'a [TileCoords]) -> Self {
 		TileMipmapper { config, regions }
 	}
 
-	/// Helper to determine if no further mipmap levels are needed
-	///
-	/// If all tile coordinates are -1 or 0, further mipmap levels will not
-	/// decrease the number of tiles and mipmap generated is considered finished.
-	fn done(tiles: &TileCoordMap) -> bool {
-		tiles
-			.0
-			.iter()
-			.all(|(z, xs)| (-1..=0).contains(z) && xs.iter().all(|x| (-1..=0).contains(x)))
-	}
-
-	/// Derives the map of populated tile coordinates for the next mipmap level
-	fn map_coords(tiles: &TileCoordMap) -> TileCoordMap {
-		let mut ret = TileCoordMap::default();
-
-		for (&z, xs) in &tiles.0 {
-			for &x in xs {
-				let xt = x >> 1;
-				let zt = z >> 1;
-
-				ret.0.entry(zt).or_default().insert(xt);
-			}
-		}
-
-		ret
-	}
-
 	/// Renders and saves a single mipmap tile image
 	///
 	/// Each mipmap tile is rendered by taking 2x2 tiles from the
@@ -60,9 +123,7 @@ impl<'a> TileMipmapper<'a> {
 		level: usize,
 		coords: TileCoords,
 		prev: &TileCoordMap,
-		count_total: &mpsc::Sender<()>,
-		count_processed: &mpsc::Sender<()>,
-	) -> Result<()>
+	) -> Result<MipmapStat>
 	where
 		[P::Subpixel]: image::EncodableLayout,
 		image::ImageBuffer<P, Vec<P::Subpixel>>: Into<image::DynamicImage>,
@@ -97,11 +158,9 @@ impl<'a> TileMipmapper<'a> {
 			.collect();
 
 		let Some(input_timestamp) = sources.iter().map(|(_, _, ts)| *ts).max() else {
-			return Ok(());
+			return Ok(MipmapStat::NOT_FOUND);
 		};
 
-		count_total.send(()).unwrap();
-
 		if Some(input_timestamp) <= output_timestamp {
 			debug!(
 				"Skipping unchanged mipmap tile {}",
@@ -110,7 +169,7 @@ impl<'a> TileMipmapper<'a> {
 					.expect("tile path must be in output directory")
 					.display(),
 			);
-			return Ok(());
+			return Ok(MipmapStat::SKIPPED);
 		}
 
 		debug!(
@@ -156,79 +215,11 @@ impl<'a> TileMipmapper<'a> {
 			},
 		)?;
 
-		count_processed.send(()).unwrap();
-		Ok(())
+		Ok(MipmapStat::PROCESSED)
 	}
 
 	/// Runs the mipmap generation
 	pub fn run(self) -> Result<Vec<TileCoordMap>> {
-		let mut tile_stack = {
-			let mut tile_map = TileCoordMap::default();
-
-			for &TileCoords { x, z } in self.regions {
-				tile_map.0.entry(z).or_default().insert(x);
-			}
-
-			vec![tile_map]
-		};
-
-		loop {
-			let level = tile_stack.len();
-			let prev = &tile_stack[level - 1];
-			if Self::done(prev) {
-				break;
-			}
-
-			info!("Generating level {} mipmaps...", level);
-
-			fs::create_dir_all(&self.config.tile_dir(TileKind::Map, level))?;
-			fs::create_dir_all(&self.config.tile_dir(TileKind::Lightmap, level))?;
-
-			let next = Self::map_coords(prev);
-
-			let (total_send, total_recv) = mpsc::channel();
-			let (processed_send, processed_recv) = mpsc::channel();
-
-			next.0
-				.par_iter()
-				.flat_map(|(&z, xs)| xs.par_iter().map(move |&x| TileCoords { x, z }))
-				.try_for_each(|coords| {
-					self.render_mipmap::<image::Rgba<u8>>(
-						TileKind::Map,
-						level,
-						coords,
-						prev,
-						&total_send,
-						&processed_send,
-					)?;
-					self.render_mipmap::<image::LumaA<u8>>(
-						TileKind::Lightmap,
-						level,
-						coords,
-						prev,
-						&total_send,
-						&processed_send,
-					)?;
-
-					anyhow::Ok(())
-				})?;
-
-			drop(total_send);
-			let total = total_recv.into_iter().count();
-
-			drop(processed_send);
-			let processed = processed_recv.into_iter().count();
-
-			info!(
-				"Generated level {} mipmaps ({} processed, {} unchanged)",
-				level,
-				processed,
-				total - processed,
-			);
-
-			tile_stack.push(next);
-		}
-
-		Ok(tile_stack)
+		self.collect_tiles()
 	}
 }

From e36ae4601df41bbe0df4b801832a06d99ca9d639 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 26 Nov 2023 12:27:18 +0100
Subject: [PATCH 326/460] world: add Eq + Ord to all block entity types

---
 src/world/block_entity.rs | 8 ++++----
 src/world/json_text.rs    | 4 ++--
 src/world/sign.rs         | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/world/block_entity.rs b/src/world/block_entity.rs
index 65d95e4..9e60a23 100644
--- a/src/world/block_entity.rs
+++ b/src/world/block_entity.rs
@@ -8,7 +8,7 @@ use super::{
 };
 
 /// Kind of sign block
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
 #[serde(rename_all = "snake_case")]
 pub enum SignKind {
 	/// Standing or attached sign
@@ -18,7 +18,7 @@ pub enum SignKind {
 }
 
 /// Processed sign data
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
 pub struct Sign {
 	/// The kind of the sign
 	pub kind: SignKind,
@@ -45,7 +45,7 @@ impl Sign {
 }
 
 /// Data for different kinds of [BlockEntity]
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
 #[serde(tag = "type", rename_all = "snake_case")]
 pub enum BlockEntityData {
 	/// A sign block
@@ -53,7 +53,7 @@ pub enum BlockEntityData {
 }
 
 /// A processed block entity
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
 pub struct BlockEntity {
 	/// Global X coordinate
 	pub x: i32,
diff --git a/src/world/json_text.rs b/src/world/json_text.rs
index a9c1f13..0f72dcc 100644
--- a/src/world/json_text.rs
+++ b/src/world/json_text.rs
@@ -11,7 +11,7 @@ use serde::{Deserialize, Serialize};
 /// is handled by [DeserializedText].
 ///
 /// Formatting that is not set in a node is inherited from the parent.
-#[derive(Debug, Serialize, Deserialize, Default)]
+#[derive(Debug, Serialize, Deserialize, Default, PartialEq, Eq, PartialOrd, Ord)]
 pub struct FormattedText {
 	#[serde(default)]
 	/// Text content
@@ -77,7 +77,7 @@ impl From<String> for FormattedTextTree {
 }
 
 /// List of [FormattedText]
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
 pub struct FormattedTextList(pub Vec<FormattedText>);
 
 impl FormattedTextList {
diff --git a/src/world/sign.rs b/src/world/sign.rs
index e53be87..43cac47 100644
--- a/src/world/sign.rs
+++ b/src/world/sign.rs
@@ -79,7 +79,7 @@ impl BlockEntitySignExt for de::BlockEntitySign {
 	}
 }
 
-#[derive(Debug, Default, Serialize, Deserialize)]
+#[derive(Debug, Default, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
 /// Deserialized and linearized sign text
 pub struct SignText(pub Vec<FormattedTextList>);
 

From 7740ce0522d3459b7f905346c3b864b2aa75802d Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 26 Nov 2023 12:27:43 +0100
Subject: [PATCH 327/460] core/region_processor: sort processed block entities

Make the block entity list more reproducible when the stored chunk order
changes.
---
 src/core/region_processor.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/core/region_processor.rs b/src/core/region_processor.rs
index f1f8441..cff87b7 100644
--- a/src/core/region_processor.rs
+++ b/src/core/region_processor.rs
@@ -195,11 +195,13 @@ impl<'a> SingleRegionProcessor<'a> {
 	/// Saves processed entity data
 	///
 	/// The timestamp is the time of the last modification of the input region data.
-	fn save_entities(&self) -> Result<()> {
+	fn save_entities(&mut self) -> Result<()> {
 		if !self.entities_needed {
 			return Ok(());
 		}
 
+		self.entities.block_entities.sort_unstable();
+
 		storage::write_file(
 			&self.entities_path,
 			&self.entities,

From 0f308788ef7b1579407b5a7f18b153179cf9bb7e Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 26 Nov 2023 02:28:11 +0100
Subject: [PATCH 328/460] core: split TileMerger out of TileMipmapper

Reusable mipmap-style tile merging
---
 src/core/mod.rs            |   1 +
 src/core/tile_merger.rs    |  97 ++++++++++++++++
 src/core/tile_mipmapper.rs | 228 ++++++++++++++++++++-----------------
 3 files changed, 220 insertions(+), 106 deletions(-)
 create mode 100644 src/core/tile_merger.rs

diff --git a/src/core/mod.rs b/src/core/mod.rs
index e3f2ea3..f892a62 100644
--- a/src/core/mod.rs
+++ b/src/core/mod.rs
@@ -5,6 +5,7 @@ mod metadata_writer;
 mod region_group;
 mod region_processor;
 mod tile_collector;
+mod tile_merger;
 mod tile_mipmapper;
 mod tile_renderer;
 
diff --git a/src/core/tile_merger.rs b/src/core/tile_merger.rs
new file mode 100644
index 0000000..3a14390
--- /dev/null
+++ b/src/core/tile_merger.rs
@@ -0,0 +1,97 @@
+//! Mipmap-style merging of tiles
+
+use std::{
+	fs::File,
+	io::BufWriter,
+	path::{Path, PathBuf},
+	time::SystemTime,
+};
+
+use anyhow::Result;
+use tracing::warn;
+
+use super::common::*;
+use crate::io::fs;
+
+/// [TileMerger::merge_tiles] return
+#[derive(Debug, Clone, Copy)]
+pub enum Stat {
+	/// None of the input files were found
+	NotFound,
+	/// The output file is up-to-date
+	Skipped,
+	/// The output file is regenerated
+	Regenerate,
+}
+
+/// A source file for the [TileMerger]
+///
+/// The tuple elements are X and Z coordinate offsets in the range [0, 1],
+/// the file path and the time of last change of the input.
+pub type Source = ((i32, i32), PathBuf, SystemTime);
+
+/// Reusable trait for mipmap-style tile merging with change tracking
+pub trait TileMerger {
+	/// [fs::FileMetaVersion] of input and output files
+	///
+	/// The version in the file metadata on disk must match the returned
+	/// version for the a to be considered up-to-date.
+	fn file_meta_version(&self) -> fs::FileMetaVersion;
+
+	/// Returns the paths of input and output files
+	fn tile_path(&self, level: usize, coords: TileCoords) -> PathBuf;
+
+	/// Can be used to log the processing status
+	fn log(&self, _output_path: &Path, _stat: Stat) {}
+
+	/// Handles the actual merging of source files
+	fn write_tile(&self, file: &mut BufWriter<File>, sources: &[Source]) -> Result<()>;
+
+	/// Generates a tile at given coordinates and mipmap level
+	fn merge_tiles(&self, level: usize, coords: TileCoords, prev: &TileCoordMap) -> Result<Stat> {
+		let version = self.file_meta_version();
+		let output_path = self.tile_path(level, coords);
+		let output_timestamp = fs::read_timestamp(&output_path, version);
+
+		let sources: Vec<_> = [(0, 0), (0, 1), (1, 0), (1, 1)]
+			.into_iter()
+			.filter_map(|(dx, dz)| {
+				let source_coords = TileCoords {
+					x: 2 * coords.x + dx,
+					z: 2 * coords.z + dz,
+				};
+				if !prev.contains(source_coords) {
+					return None;
+				}
+
+				let source_path = self.tile_path(level - 1, source_coords);
+				let timestamp = match fs::modified_timestamp(&source_path) {
+					Ok(timestamp) => timestamp,
+					Err(err) => {
+						warn!("{}", err);
+						return None;
+					}
+				};
+				Some(((dx, dz), source_path, timestamp))
+			})
+			.collect();
+
+		let Some(input_timestamp) = sources.iter().map(|(_, _, ts)| *ts).max() else {
+			self.log(&output_path, Stat::NotFound);
+			return Ok(Stat::NotFound);
+		};
+
+		if Some(input_timestamp) <= output_timestamp {
+			self.log(&output_path, Stat::Skipped);
+			return Ok(Stat::Skipped);
+		}
+
+		self.log(&output_path, Stat::Regenerate);
+
+		fs::create_with_timestamp(&output_path, version, input_timestamp, |file| {
+			self.write_tile(file, &sources)
+		})?;
+
+		Ok(Stat::Regenerate)
+	}
+}
diff --git a/src/core/tile_mipmapper.rs b/src/core/tile_mipmapper.rs
index a372ca5..1873cf9 100644
--- a/src/core/tile_mipmapper.rs
+++ b/src/core/tile_mipmapper.rs
@@ -1,11 +1,15 @@
 //! The [TileMipmapper]
 
-use std::ops::Add;
+use std::{marker::PhantomData, ops::Add};
 
 use anyhow::{Context, Result};
 use tracing::{debug, info, warn};
 
-use super::{common::*, tile_collector::TileCollector};
+use super::{
+	common::*,
+	tile_collector::TileCollector,
+	tile_merger::{self, TileMerger},
+};
 use crate::{io::fs, types::*};
 
 /// Counters for the number of processed and total tiles
@@ -19,22 +23,23 @@ pub struct MipmapStat {
 	processed: usize,
 }
 
-impl MipmapStat {
-	/// Mipmap step return when none of the input files exist
-	const NOT_FOUND: MipmapStat = MipmapStat {
-		total: 0,
-		processed: 0,
-	};
-	/// Mipmap step return when output file is up-to-date
-	const SKIPPED: MipmapStat = MipmapStat {
-		total: 1,
-		processed: 0,
-	};
-	/// Mipmap step return when a new output file has been generated
-	const PROCESSED: MipmapStat = MipmapStat {
-		total: 1,
-		processed: 1,
-	};
+impl From<tile_merger::Stat> for MipmapStat {
+	fn from(value: tile_merger::Stat) -> Self {
+		match value {
+			tile_merger::Stat::NotFound => MipmapStat {
+				total: 0,
+				processed: 0,
+			},
+			tile_merger::Stat::Skipped => MipmapStat {
+				total: 1,
+				processed: 0,
+			},
+			tile_merger::Stat::Regenerate => MipmapStat {
+				total: 1,
+				processed: 1,
+			},
+		}
+	}
 }
 
 impl Add for MipmapStat {
@@ -48,6 +53,102 @@ impl Add for MipmapStat {
 	}
 }
 
+/// [TileMerger] for map tile images
+struct MapMerger<'a, P> {
+	/// Common MinedMap configuration from command line
+	config: &'a Config,
+	/// Tile kind (map or lightmap)
+	kind: TileKind,
+	/// Pixel format type
+	_pixel: PhantomData<P>,
+}
+
+impl<'a, P> MapMerger<'a, P> {
+	/// Creates a new [MapMerger]
+	fn new(config: &'a Config, kind: TileKind) -> Self {
+		MapMerger {
+			config,
+			kind,
+			_pixel: PhantomData,
+		}
+	}
+}
+
+impl<'a, P: image::PixelWithColorType> TileMerger for MapMerger<'a, P>
+where
+	[P::Subpixel]: image::EncodableLayout,
+	image::ImageBuffer<P, Vec<P::Subpixel>>: Into<image::DynamicImage>,
+{
+	fn file_meta_version(&self) -> fs::FileMetaVersion {
+		MIPMAP_FILE_META_VERSION
+	}
+
+	fn tile_path(&self, level: usize, coords: TileCoords) -> std::path::PathBuf {
+		self.config.tile_path(self.kind, level, coords)
+	}
+
+	fn log(&self, output_path: &std::path::Path, stat: super::tile_merger::Stat) {
+		match stat {
+			super::tile_merger::Stat::NotFound => {}
+			super::tile_merger::Stat::Skipped => {
+				debug!(
+					"Skipping unchanged mipmap tile {}",
+					output_path
+						.strip_prefix(&self.config.output_dir)
+						.expect("tile path must be in output directory")
+						.display(),
+				);
+			}
+			super::tile_merger::Stat::Regenerate => {
+				debug!(
+					"Rendering mipmap tile {}",
+					output_path
+						.strip_prefix(&self.config.output_dir)
+						.expect("tile path must be in output directory")
+						.display(),
+				);
+			}
+		};
+	}
+
+	fn write_tile(
+		&self,
+		file: &mut std::io::BufWriter<std::fs::File>,
+		sources: &[super::tile_merger::Source],
+	) -> Result<()> {
+		/// Tile width/height
+		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
+
+		let mut image: image::DynamicImage =
+			image::ImageBuffer::<P, Vec<P::Subpixel>>::new(N, N).into();
+
+		for ((dx, dz), source_path, _) in sources {
+			let source = match image::open(source_path) {
+				Ok(source) => source,
+				Err(err) => {
+					warn!(
+						"Failed to read source image {}: {}",
+						source_path.display(),
+						err,
+					);
+					continue;
+				}
+			};
+			let resized = source.resize(N / 2, N / 2, image::imageops::FilterType::Triangle);
+			image::imageops::overlay(
+				&mut image,
+				&resized,
+				*dx as i64 * (N / 2) as i64,
+				*dz as i64 * (N / 2) as i64,
+			);
+		}
+
+		image
+			.write_to(file, image::ImageFormat::Png)
+			.context("Failed to save image")
+	}
+}
+
 /// Generates mipmap tiles from full-resolution tile images
 pub struct TileMipmapper<'a> {
 	/// Common MinedMap configuration from command line
@@ -128,94 +229,9 @@ impl<'a> TileMipmapper<'a> {
 		[P::Subpixel]: image::EncodableLayout,
 		image::ImageBuffer<P, Vec<P::Subpixel>>: Into<image::DynamicImage>,
 	{
-		/// Tile width/height
-		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
-
-		let output_path = self.config.tile_path(kind, level, coords);
-		let output_timestamp = fs::read_timestamp(&output_path, MIPMAP_FILE_META_VERSION);
-
-		let sources: Vec<_> = [(0, 0), (0, 1), (1, 0), (1, 1)]
-			.into_iter()
-			.filter_map(|(dx, dz)| {
-				let source_coords = TileCoords {
-					x: 2 * coords.x + dx,
-					z: 2 * coords.z + dz,
-				};
-				if !prev.contains(source_coords) {
-					return None;
-				}
-
-				let source_path = self.config.tile_path(kind, level - 1, source_coords);
-				let timestamp = match fs::modified_timestamp(&source_path) {
-					Ok(timestamp) => timestamp,
-					Err(err) => {
-						warn!("{}", err);
-						return None;
-					}
-				};
-				Some(((dx, dz), source_path, timestamp))
-			})
-			.collect();
-
-		let Some(input_timestamp) = sources.iter().map(|(_, _, ts)| *ts).max() else {
-			return Ok(MipmapStat::NOT_FOUND);
-		};
-
-		if Some(input_timestamp) <= output_timestamp {
-			debug!(
-				"Skipping unchanged mipmap tile {}",
-				output_path
-					.strip_prefix(&self.config.output_dir)
-					.expect("tile path must be in output directory")
-					.display(),
-			);
-			return Ok(MipmapStat::SKIPPED);
-		}
-
-		debug!(
-			"Rendering mipmap tile {}",
-			output_path
-				.strip_prefix(&self.config.output_dir)
-				.expect("tile path must be in output directory")
-				.display(),
-		);
-
-		let mut image: image::DynamicImage =
-			image::ImageBuffer::<P, Vec<P::Subpixel>>::new(N, N).into();
-
-		for ((dx, dz), source_path, _) in sources {
-			let source = match image::open(&source_path) {
-				Ok(source) => source,
-				Err(err) => {
-					warn!(
-						"Failed to read source image {}: {}",
-						source_path.display(),
-						err,
-					);
-					continue;
-				}
-			};
-			let resized = source.resize(N / 2, N / 2, image::imageops::FilterType::Triangle);
-			image::imageops::overlay(
-				&mut image,
-				&resized,
-				dx as i64 * (N / 2) as i64,
-				dz as i64 * (N / 2) as i64,
-			);
-		}
-
-		fs::create_with_timestamp(
-			&output_path,
-			MIPMAP_FILE_META_VERSION,
-			input_timestamp,
-			|file| {
-				image
-					.write_to(file, image::ImageFormat::Png)
-					.context("Failed to save image")
-			},
-		)?;
-
-		Ok(MipmapStat::PROCESSED)
+		let merger = MapMerger::<P>::new(self.config, kind);
+		let ret = merger.merge_tiles(level, coords, prev)?;
+		Ok(ret.into())
 	}
 
 	/// Runs the mipmap generation

From 1143396068b1e0c7310ad49968709508a0934281 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 26 Nov 2023 13:50:05 +0100
Subject: [PATCH 329/460] core: use debug format for logging errors

Show the full cause stack.
---
 src/core/tile_merger.rs    | 2 +-
 src/core/tile_mipmapper.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/tile_merger.rs b/src/core/tile_merger.rs
index 3a14390..6f3cc22 100644
--- a/src/core/tile_merger.rs
+++ b/src/core/tile_merger.rs
@@ -68,7 +68,7 @@ pub trait TileMerger {
 				let timestamp = match fs::modified_timestamp(&source_path) {
 					Ok(timestamp) => timestamp,
 					Err(err) => {
-						warn!("{}", err);
+						warn!("{:?}", err);
 						return None;
 					}
 				};
diff --git a/src/core/tile_mipmapper.rs b/src/core/tile_mipmapper.rs
index 1873cf9..cd90e20 100644
--- a/src/core/tile_mipmapper.rs
+++ b/src/core/tile_mipmapper.rs
@@ -127,7 +127,7 @@ where
 				Ok(source) => source,
 				Err(err) => {
 					warn!(
-						"Failed to read source image {}: {}",
+						"Failed to read source image {}: {:?}",
 						source_path.display(),
 						err,
 					);

From cde6a4b6e602bfabecdcd00caf9d63e83b0b45dc Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 26 Nov 2023 12:39:51 +0100
Subject: [PATCH 330/460] core: merge entity data for all regions into one file

Introduce the EntityCollector, using the TileCollector and TileMerger
traits.
---
 src/core/common.rs           |   6 +-
 src/core/entity_collector.rs | 123 +++++++++++++++++++++++++++++++++++
 src/core/mod.rs              |   4 ++
 3 files changed, 132 insertions(+), 1 deletion(-)
 create mode 100644 src/core/entity_collector.rs

diff --git a/src/core/common.rs b/src/core/common.rs
index cd8fd8f..7280be9 100644
--- a/src/core/common.rs
+++ b/src/core/common.rs
@@ -141,6 +141,8 @@ pub struct Config {
 	pub processed_dir: PathBuf,
 	/// Path for storage of processed entity data files
 	pub entities_dir: PathBuf,
+	/// Path for storage of the final merged processed entity data file
+	pub entities_path_final: PathBuf,
 	/// Path of viewer metadata file
 	pub metadata_path: PathBuf,
 }
@@ -157,7 +159,8 @@ impl Config {
 		let region_dir = [&args.input_dir, Path::new("region")].iter().collect();
 		let level_dat_path = [&args.input_dir, Path::new("level.dat")].iter().collect();
 		let processed_dir: PathBuf = [&args.output_dir, Path::new("processed")].iter().collect();
-		let entities_dir = [&processed_dir, Path::new("entities")].iter().collect();
+		let entities_dir: PathBuf = [&processed_dir, Path::new("entities")].iter().collect();
+		let entities_path_final = [&entities_dir, Path::new("entities.bin")].iter().collect();
 		let metadata_path = [&args.output_dir, Path::new("info.json")].iter().collect();
 
 		Config {
@@ -167,6 +170,7 @@ impl Config {
 			output_dir: args.output_dir.clone(),
 			processed_dir,
 			entities_dir,
+			entities_path_final,
 			metadata_path,
 		}
 	}
diff --git a/src/core/entity_collector.rs b/src/core/entity_collector.rs
new file mode 100644
index 0000000..3d9b6ab
--- /dev/null
+++ b/src/core/entity_collector.rs
@@ -0,0 +1,123 @@
+//! The [EntityCollector]
+
+use std::path::Path;
+
+use anyhow::{Context, Result};
+use tracing::{info, warn};
+
+use super::{common::*, tile_collector::TileCollector, tile_merger::TileMerger};
+use crate::io::{fs, storage};
+
+/// Generates mipmap tiles from full-resolution tile images
+pub struct EntityCollector<'a> {
+	/// Common MinedMap configuration from command line
+	config: &'a Config,
+	/// List of populated tiles for base mipmap level (level 0)
+	regions: &'a [TileCoords],
+}
+
+impl<'a> TileMerger for EntityCollector<'a> {
+	fn file_meta_version(&self) -> fs::FileMetaVersion {
+		ENTITIES_FILE_META_VERSION
+	}
+
+	fn tile_path(&self, level: usize, coords: TileCoords) -> std::path::PathBuf {
+		self.config.entities_path(level, coords)
+	}
+
+	fn write_tile(
+		&self,
+		file: &mut std::io::BufWriter<std::fs::File>,
+		sources: &[super::tile_merger::Source],
+	) -> Result<()> {
+		Self::merge_entity_lists(file, sources.iter().map(|source| &source.1))
+	}
+}
+
+impl<'a> TileCollector for EntityCollector<'a> {
+	type CollectOutput = ();
+
+	fn tiles(&self) -> &[TileCoords] {
+		self.regions
+	}
+
+	fn prepare(&self, level: usize) -> Result<()> {
+		fs::create_dir_all(&self.config.entities_dir(level))
+	}
+
+	fn finish(
+		&self,
+		_level: usize,
+		_outputs: impl Iterator<Item = Self::CollectOutput>,
+	) -> Result<()> {
+		Ok(())
+	}
+
+	fn collect_one(
+		&self,
+		level: usize,
+		coords: TileCoords,
+		prev: &TileCoordMap,
+	) -> Result<Self::CollectOutput> {
+		self.merge_tiles(level, coords, prev)?;
+		Ok(())
+	}
+}
+
+impl<'a> EntityCollector<'a> {
+	/// Constructs a new EntityCollector
+	pub fn new(config: &'a Config, regions: &'a [TileCoords]) -> Self {
+		EntityCollector { config, regions }
+	}
+
+	/// Merges multiple entity lists into one
+	fn merge_entity_lists<P: AsRef<Path>>(
+		file: &mut std::io::BufWriter<std::fs::File>,
+		sources: impl Iterator<Item = P>,
+	) -> Result<()> {
+		let mut output = ProcessedEntities::default();
+
+		for source_path in sources {
+			let mut source: ProcessedEntities =
+				match storage::read_file(source_path.as_ref(), storage::Format::Json) {
+					Ok(source) => source,
+					Err(err) => {
+						warn!(
+							"Failed to read entity data file {}: {:?}",
+							source_path.as_ref().display(),
+							err,
+						);
+						continue;
+					}
+				};
+
+			output.block_entities.append(&mut source.block_entities);
+		}
+
+		storage::write(file, &output, storage::Format::Json).context("Failed to write entity data")
+	}
+
+	/// Runs the mipmap generation
+	pub fn run(self) -> Result<()> {
+		info!("Collecting entity data...");
+
+		let tile_stack = self.collect_tiles()?;
+
+		// Final merge
+		let level = tile_stack.len() - 1;
+		let tile_map = &tile_stack[level];
+		let sources: Vec<_> = [(-1, -1), (-1, 0), (0, -1), (0, 0)]
+			.into_iter()
+			.map(|(x, z)| TileCoords { x, z })
+			.filter(|&coords| tile_map.contains(coords))
+			.map(|coords| self.tile_path(level, coords))
+			.collect();
+
+		fs::create_with_tmpfile(&self.config.entities_path_final, |file| {
+			Self::merge_entity_lists(file, sources.iter())
+		})?;
+
+		info!("Collected entity data.");
+		Ok(())
+	}
+}
diff --git a/src/core/mod.rs b/src/core/mod.rs
index f892a62..61bdb76 100644
--- a/src/core/mod.rs
+++ b/src/core/mod.rs
@@ -1,6 +1,7 @@
 //! Core functions of the MinedMap CLI
 
 mod common;
+mod entity_collector;
 mod metadata_writer;
 mod region_group;
 mod region_processor;
@@ -21,6 +22,8 @@ use region_processor::RegionProcessor;
 use tile_mipmapper::TileMipmapper;
 use tile_renderer::TileRenderer;
 
+use self::entity_collector::EntityCollector;
+
 /// MinedMap version number
 const VERSION: &str = git_version!(
 	args = ["--abbrev=7", "--match=v*", "--dirty=-modified"],
@@ -77,6 +80,7 @@ pub fn cli() -> Result<()> {
 	let regions = RegionProcessor::new(&config).run()?;
 	TileRenderer::new(&config, &rt, &regions).run()?;
 	let tiles = TileMipmapper::new(&config, &regions).run()?;
+	EntityCollector::new(&config, &regions).run()?;
 	MetadataWriter::new(&config, &tiles).run()?;
 
 	Ok(())

From d29c0df25db287a3f9cbd2b4bfad7712428e9c91 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 26 Nov 2023 15:31:57 +0100
Subject: [PATCH 331/460] core/metadata_writer: write entity list for viewer

---
 src/core/common.rs          | 12 +++++++++---
 src/core/metadata_writer.rs | 39 +++++++++++++++++++++++++++++++++----
 2 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/src/core/common.rs b/src/core/common.rs
index 7280be9..d961ea9 100644
--- a/src/core/common.rs
+++ b/src/core/common.rs
@@ -144,7 +144,9 @@ pub struct Config {
 	/// Path for storage of the final merged processed entity data file
 	pub entities_path_final: PathBuf,
 	/// Path of viewer metadata file
-	pub metadata_path: PathBuf,
+	pub viewer_info_path: PathBuf,
+	/// Path of viewer entities file
+	pub viewer_entities_path: PathBuf,
 }
 
 impl Config {
@@ -161,7 +163,10 @@ impl Config {
 		let processed_dir: PathBuf = [&args.output_dir, Path::new("processed")].iter().collect();
 		let entities_dir: PathBuf = [&processed_dir, Path::new("entities")].iter().collect();
 		let entities_path_final = [&entities_dir, Path::new("entities.bin")].iter().collect();
-		let metadata_path = [&args.output_dir, Path::new("info.json")].iter().collect();
+		let viewer_info_path = [&args.output_dir, Path::new("info.json")].iter().collect();
+		let viewer_entities_path = [&args.output_dir, Path::new("entities.json")]
+			.iter()
+			.collect();
 
 		Config {
 			num_threads,
@@ -171,7 +176,8 @@ impl Config {
 			processed_dir,
 			entities_dir,
 			entities_path_final,
-			metadata_path,
+			viewer_info_path,
+			viewer_entities_path,
 		}
 	}
 
diff --git a/src/core/metadata_writer.rs b/src/core/metadata_writer.rs
index 5783356..caf7726 100644
--- a/src/core/metadata_writer.rs
+++ b/src/core/metadata_writer.rs
@@ -3,7 +3,11 @@
 use anyhow::{Context, Result};
 use serde::Serialize;
 
-use crate::{core::common::*, io::fs, world::de};
+use crate::{
+	core::common::*,
+	io::{fs, storage},
+	world::{block_entity::BlockEntity, de},
+};
 
 /// Minimum and maximum X and Z tile coordinates for a mipmap level
 #[derive(Debug, Serialize)]
@@ -46,6 +50,13 @@ struct Metadata<'t> {
 	spawn: Spawn,
 }
 
+/// Viewer entity JSON data structure
+#[derive(Debug, Serialize, Default)]
+struct Entities {
+	/// List of signs
+	signs: Vec<BlockEntity>,
+}
+
 /// The MetadataWriter is used to generate the viewer metadata file
 pub struct MetadataWriter<'a> {
 	/// Common MinedMap configuration from command line
@@ -109,6 +120,19 @@ impl<'a> MetadataWriter<'a> {
 		}
 	}
 
+	/// Generates [Entities] data from collected entity lists
+	fn entities(&self) -> Result<Entities> {
+		let data: ProcessedEntities =
+			storage::read_file(&self.config.entities_path_final, storage::Format::Json)
+				.context("Failed to read entity data file")?;
+
+		let ret = Entities {
+			signs: data.block_entities,
+		};
+
+		Ok(ret)
+	}
+
 	/// Runs the viewer metadata file generation
 	pub fn run(self) -> Result<()> {
 		let level_dat = self.read_level_dat()?;
@@ -122,8 +146,15 @@ impl<'a> MetadataWriter<'a> {
 			metadata.mipmaps.push(Self::mipmap_entry(tile_map));
 		}
 
-		fs::create_with_tmpfile(&self.config.metadata_path, |file| {
-			serde_json::to_writer(file, &metadata).context("Failed to write metadata")
-		})
+		fs::create_with_tmpfile(&self.config.viewer_info_path, |file| {
+			serde_json::to_writer(file, &metadata).context("Failed to write info.json")
+		})?;
+
+		let entities = self.entities()?;
+		fs::create_with_tmpfile(&self.config.viewer_entities_path, |file| {
+			serde_json::to_writer(file, &entities).context("Failed to write entities.json")
+		})?;
+
+		Ok(())
 	}
 }

From 1874d3082dc35830e9091860391f7043bac21fea Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 29 Dec 2023 21:09:34 +0100
Subject: [PATCH 332/460] resource: fix typo in doc comment

---
 crates/resource/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/resource/src/lib.rs b/crates/resource/src/lib.rs
index a832a58..ad3553f 100644
--- a/crates/resource/src/lib.rs
+++ b/crates/resource/src/lib.rs
@@ -27,7 +27,7 @@ pub enum BlockFlag {
 	Foliage,
 	/// The block type is birch foliage
 	Birch,
-	/// The block type is spurce foliage
+	/// The block type is spruce foliage
 	Spruce,
 	/// The block type is colored using biome water colors
 	Water,

From 8814dcff89431cfe4b9935105ee8d0bdf1e194bf Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 30 Dec 2023 01:42:17 +0100
Subject: [PATCH 333/460] resource: split BlockType in Copy and !Copy parts

Preparation for actually adding !Copy fields to BlockType.

Only the Copy parts are added to the processed data, avoiding .clone()
for the most part.
---
 crates/resource/src/block_color.rs |   10 +-
 crates/resource/src/block_types.rs | 6048 ++++++++++++++++++----------
 crates/resource/src/lib.rs         |   30 +-
 resource/generate.py               |    6 +-
 src/world/layer.rs                 |   14 +-
 src/world/section.rs               |    8 +-
 6 files changed, 4073 insertions(+), 2043 deletions(-)

diff --git a/crates/resource/src/block_color.rs b/crates/resource/src/block_color.rs
index cffebeb..e95e0ed 100644
--- a/crates/resource/src/block_color.rs
+++ b/crates/resource/src/block_color.rs
@@ -1,6 +1,6 @@
 //! Functions for computations of block colors
 
-use super::{Biome, BlockType, Color, Colorf};
+use super::{Biome, BlockColor, Color, Colorf};
 
 /// Converts an u8 RGB color to a float vector
 fn color_vec_unscaled(color: Color) -> Colorf {
@@ -91,18 +91,18 @@ const BIRCH_COLOR: Colorf = Colorf::new(0.502, 0.655, 0.333); // == color_vec(Co
 /// Color multiplier for spruce leaves
 const EVERGREEN_COLOR: Colorf = Colorf::new(0.380, 0.600, 0.380); // == color_vec(Color([97, 153, 97]))
 
-/// Determined if calling [block_color] for a given [BlockType] needs biome information
-pub fn needs_biome(block: BlockType) -> bool {
+/// Determined if calling [block_color] for a given [BlockColor] needs biome information
+pub fn needs_biome(block: BlockColor) -> bool {
 	use super::BlockFlag::*;
 
 	block.is(Grass) || block.is(Foliage) || block.is(Water)
 }
 
-/// Determined the block color to display for a given [BlockType]
+/// Determined the block color to display for a given [BlockColor]
 ///
 /// [needs_biome] must be used to determine whether passing a [Biome] is necessary.
 /// Will panic if a [Biome] is necessary, but none is passed.
-pub fn block_color(block: BlockType, biome: Option<&Biome>, depth: f32) -> Colorf {
+pub fn block_color(block: BlockColor, biome: Option<&Biome>, depth: f32) -> Colorf {
 	use super::BlockFlag::*;
 
 	let get_biome = || biome.expect("needs biome to determine block color");
diff --git a/crates/resource/src/block_types.rs b/crates/resource/src/block_types.rs
index a70106c..87d57c8 100644
--- a/crates/resource/src/block_types.rs
+++ b/crates/resource/src/block_types.rs
@@ -6,5692 +6,7318 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 	(
 		"acacia_button",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"acacia_door",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([167, 95, 60]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([167, 95, 60]),
+			},
 		},
 	),
 	(
 		"acacia_fence",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([168, 90, 50]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([168, 90, 50]),
+			},
 		},
 	),
 	(
 		"acacia_fence_gate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([168, 90, 50]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([168, 90, 50]),
+			},
 		},
 	),
 	(
 		"acacia_hanging_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"acacia_leaves",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
-			color: Color([149, 148, 148]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
+				color: Color([149, 148, 148]),
+			},
 		},
 	),
 	(
 		"acacia_log",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([150, 88, 55]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([150, 88, 55]),
+			},
 		},
 	),
 	(
 		"acacia_planks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([168, 90, 50]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([168, 90, 50]),
+			},
 		},
 	),
 	(
 		"acacia_pressure_plate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([168, 90, 50]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([168, 90, 50]),
+			},
 		},
 	),
 	(
 		"acacia_sapling",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([118, 117, 23]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([118, 117, 23]),
+			},
 		},
 	),
 	(
 		"acacia_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([168, 90, 50]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([168, 90, 50]),
+			},
 		},
 	),
 	(
 		"acacia_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([168, 90, 50]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([168, 90, 50]),
+			},
 		},
 	),
 	(
 		"acacia_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([168, 90, 50]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([168, 90, 50]),
+			},
 		},
 	),
 	(
 		"acacia_trapdoor",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([156, 87, 51]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([156, 87, 51]),
+			},
 		},
 	),
 	(
 		"acacia_wall_hanging_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"acacia_wall_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"acacia_wood",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([103, 96, 86]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([103, 96, 86]),
+			},
 		},
 	),
 	(
 		"activator_rail",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([115, 87, 74]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([115, 87, 74]),
+			},
 		},
 	),
 	(
 		"air",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"allium",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"amethyst_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([133, 97, 191]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([133, 97, 191]),
+			},
 		},
 	),
 	(
 		"amethyst_cluster",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([163, 126, 207]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([163, 126, 207]),
+			},
 		},
 	),
 	(
 		"ancient_debris",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([94, 66, 58]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([94, 66, 58]),
+			},
 		},
 	),
 	(
 		"andesite",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([136, 136, 136]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([136, 136, 136]),
+			},
 		},
 	),
 	(
 		"andesite_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([136, 136, 136]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([136, 136, 136]),
+			},
 		},
 	),
 	(
 		"andesite_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([136, 136, 136]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([136, 136, 136]),
+			},
 		},
 	),
 	(
 		"andesite_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([136, 136, 136]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([136, 136, 136]),
+			},
 		},
 	),
 	(
 		"anvil",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([72, 72, 72]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([72, 72, 72]),
+			},
 		},
 	),
 	(
 		"attached_melon_stem",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: Color([141, 142, 141]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
+				color: Color([141, 142, 141]),
+			},
 		},
 	),
 	(
 		"attached_pumpkin_stem",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: Color([139, 139, 139]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
+				color: Color([139, 139, 139]),
+			},
 		},
 	),
 	(
 		"azalea",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([101, 124, 47]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([101, 124, 47]),
+			},
 		},
 	),
 	(
 		"azalea_leaves",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([90, 114, 44]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([90, 114, 44]),
+			},
 		},
 	),
 	(
 		"azure_bluet",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"bamboo",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([93, 144, 19]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([93, 144, 19]),
+			},
 		},
 	),
 	(
 		"bamboo_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([139, 141, 62]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([139, 141, 62]),
+			},
 		},
 	),
 	(
 		"bamboo_button",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"bamboo_door",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([191, 171, 81]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([191, 171, 81]),
+			},
 		},
 	),
 	(
 		"bamboo_fence",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([193, 173, 80]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([193, 173, 80]),
+			},
 		},
 	),
 	(
 		"bamboo_fence_gate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([193, 173, 80]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([193, 173, 80]),
+			},
 		},
 	),
 	(
 		"bamboo_hanging_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"bamboo_mosaic",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([190, 170, 78]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([190, 170, 78]),
+			},
 		},
 	),
 	(
 		"bamboo_mosaic_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([190, 170, 78]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([190, 170, 78]),
+			},
 		},
 	),
 	(
 		"bamboo_mosaic_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([190, 170, 78]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([190, 170, 78]),
+			},
 		},
 	),
 	(
 		"bamboo_planks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([193, 173, 80]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([193, 173, 80]),
+			},
 		},
 	),
 	(
 		"bamboo_pressure_plate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([193, 173, 80]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([193, 173, 80]),
+			},
 		},
 	),
 	(
 		"bamboo_sapling",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"bamboo_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([193, 173, 80]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([193, 173, 80]),
+			},
 		},
 	),
 	(
 		"bamboo_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([193, 173, 80]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([193, 173, 80]),
+			},
 		},
 	),
 	(
 		"bamboo_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([193, 173, 80]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([193, 173, 80]),
+			},
 		},
 	),
 	(
 		"bamboo_trapdoor",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([198, 179, 85]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([198, 179, 85]),
+			},
 		},
 	),
 	(
 		"bamboo_wall_hanging_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"bamboo_wall_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"barrel",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([134, 100, 58]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([134, 100, 58]),
+			},
 		},
 	),
 	(
 		"barrier",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"basalt",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([80, 81, 86]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([80, 81, 86]),
+			},
 		},
 	),
 	(
 		"beacon",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([117, 220, 215]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([117, 220, 215]),
+			},
 		},
 	),
 	(
 		"bedrock",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([85, 85, 85]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([85, 85, 85]),
+			},
 		},
 	),
 	(
 		"bee_nest",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([202, 160, 74]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([202, 160, 74]),
+			},
 		},
 	),
 	(
 		"beehive",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([180, 146, 90]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([180, 146, 90]),
+			},
 		},
 	),
 	(
 		"beetroots",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([93, 91, 30]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([93, 91, 30]),
+			},
 		},
 	),
 	(
 		"bell",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([253, 235, 110]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([253, 235, 110]),
+			},
 		},
 	),
 	(
 		"big_dripleaf",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([111, 141, 51]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([111, 141, 51]),
+			},
 		},
 	),
 	(
 		"big_dripleaf_stem",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"birch_button",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"birch_door",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([220, 209, 176]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([220, 209, 176]),
+			},
 		},
 	),
 	(
 		"birch_fence",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([192, 175, 121]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([192, 175, 121]),
+			},
 		},
 	),
 	(
 		"birch_fence_gate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([192, 175, 121]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([192, 175, 121]),
+			},
 		},
 	),
 	(
 		"birch_hanging_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"birch_leaves",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque|Birch}),
-			color: Color([130, 129, 130]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque|Birch}),
+				color: Color([130, 129, 130]),
+			},
 		},
 	),
 	(
 		"birch_log",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([193, 179, 135]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([193, 179, 135]),
+			},
 		},
 	),
 	(
 		"birch_planks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([192, 175, 121]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([192, 175, 121]),
+			},
 		},
 	),
 	(
 		"birch_pressure_plate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([192, 175, 121]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([192, 175, 121]),
+			},
 		},
 	),
 	(
 		"birch_sapling",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([127, 160, 79]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([127, 160, 79]),
+			},
 		},
 	),
 	(
 		"birch_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([192, 175, 121]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([192, 175, 121]),
+			},
 		},
 	),
 	(
 		"birch_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([192, 175, 121]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([192, 175, 121]),
+			},
 		},
 	),
 	(
 		"birch_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([192, 175, 121]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([192, 175, 121]),
+			},
 		},
 	),
 	(
 		"birch_trapdoor",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([207, 194, 157]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([207, 194, 157]),
+			},
 		},
 	),
 	(
 		"birch_wall_hanging_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"birch_wall_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"birch_wood",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([216, 215, 210]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([216, 215, 210]),
+			},
 		},
 	),
 	(
 		"black_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"black_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"black_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"black_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([248, 222, 214]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([248, 222, 214]),
+			},
 		},
 	),
 	(
 		"black_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([20, 21, 25]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([20, 21, 25]),
+			},
 		},
 	),
 	(
 		"black_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([8, 10, 15]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([8, 10, 15]),
+			},
 		},
 	),
 	(
 		"black_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([25, 26, 31]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([25, 26, 31]),
+			},
 		},
 	),
 	(
 		"black_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([67, 30, 32]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([67, 30, 32]),
+			},
 		},
 	),
 	(
 		"black_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([25, 25, 29]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([25, 25, 29]),
+			},
 		},
 	),
 	(
 		"black_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([25, 25, 25]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([25, 25, 25]),
+			},
 		},
 	),
 	(
 		"black_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([24, 24, 24]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([24, 24, 24]),
+			},
 		},
 	),
 	(
 		"black_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([37, 22, 16]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([37, 22, 16]),
+			},
 		},
 	),
 	(
 		"black_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"black_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([20, 21, 25]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([20, 21, 25]),
+			},
 		},
 	),
 	(
 		"blackstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([42, 36, 41]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([42, 36, 41]),
+			},
 		},
 	),
 	(
 		"blackstone_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([42, 36, 41]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([42, 36, 41]),
+			},
 		},
 	),
 	(
 		"blackstone_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([42, 36, 41]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([42, 36, 41]),
+			},
 		},
 	),
 	(
 		"blackstone_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([42, 36, 41]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([42, 36, 41]),
+			},
 		},
 	),
 	(
 		"blast_furnace",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([80, 80, 81]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([80, 80, 81]),
+			},
 		},
 	),
 	(
 		"blue_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"blue_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"blue_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"blue_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([248, 222, 214]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([248, 222, 214]),
+			},
 		},
 	),
 	(
 		"blue_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([53, 57, 157]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([53, 57, 157]),
+			},
 		},
 	),
 	(
 		"blue_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([44, 46, 143]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([44, 46, 143]),
+			},
 		},
 	),
 	(
 		"blue_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([70, 73, 166]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([70, 73, 166]),
+			},
 		},
 	),
 	(
 		"blue_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([47, 64, 139]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([47, 64, 139]),
+			},
 		},
 	),
 	(
 		"blue_ice",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([116, 167, 253]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([116, 167, 253]),
+			},
 		},
 	),
 	(
 		"blue_orchid",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"blue_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([43, 45, 140]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([43, 45, 140]),
+			},
 		},
 	),
 	(
 		"blue_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([51, 76, 178]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([51, 76, 178]),
+			},
 		},
 	),
 	(
 		"blue_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([48, 73, 171]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([48, 73, 171]),
+			},
 		},
 	),
 	(
 		"blue_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([74, 59, 91]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([74, 59, 91]),
+			},
 		},
 	),
 	(
 		"blue_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"blue_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([53, 57, 157]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([53, 57, 157]),
+			},
 		},
 	),
 	(
 		"bone_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([209, 206, 179]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([209, 206, 179]),
+			},
 		},
 	),
 	(
 		"bookshelf",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([162, 130, 78]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([162, 130, 78]),
+			},
 		},
 	),
 	(
 		"brain_coral",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"brain_coral_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([207, 91, 159]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([207, 91, 159]),
+			},
 		},
 	),
 	(
 		"brain_coral_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"brain_coral_wall_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"brewing_stand",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([122, 100, 80]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([122, 100, 80]),
+			},
 		},
 	),
 	(
 		"brick_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([150, 97, 83]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([150, 97, 83]),
+			},
 		},
 	),
 	(
 		"brick_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([150, 97, 83]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([150, 97, 83]),
+			},
 		},
 	),
 	(
 		"brick_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([150, 97, 83]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([150, 97, 83]),
+			},
 		},
 	),
 	(
 		"bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([150, 97, 83]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([150, 97, 83]),
+			},
 		},
 	),
 	(
 		"brown_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"brown_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"brown_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"brown_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([248, 222, 214]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([248, 222, 214]),
+			},
 		},
 	),
 	(
 		"brown_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([114, 71, 40]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([114, 71, 40]),
+			},
 		},
 	),
 	(
 		"brown_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([96, 59, 31]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([96, 59, 31]),
+			},
 		},
 	),
 	(
 		"brown_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([125, 84, 53]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([125, 84, 53]),
+			},
 		},
 	),
 	(
 		"brown_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([119, 106, 85]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([119, 106, 85]),
+			},
 		},
 	),
 	(
 		"brown_mushroom",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"brown_mushroom_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([149, 111, 81]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([149, 111, 81]),
+			},
 		},
 	),
 	(
 		"brown_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([106, 66, 35]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([106, 66, 35]),
+			},
 		},
 	),
 	(
 		"brown_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([102, 76, 51]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([102, 76, 51]),
+			},
 		},
 	),
 	(
 		"brown_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([97, 73, 48]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([97, 73, 48]),
+			},
 		},
 	),
 	(
 		"brown_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([77, 51, 35]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([77, 51, 35]),
+			},
 		},
 	),
 	(
 		"brown_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"brown_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([114, 71, 40]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([114, 71, 40]),
+			},
 		},
 	),
 	(
 		"bubble_column",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque|Water}),
-			color: Color([177, 177, 177]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque|Water}),
+				color: Color([177, 177, 177]),
+			},
 		},
 	),
 	(
 		"bubble_coral",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"bubble_coral_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([165, 26, 162]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([165, 26, 162]),
+			},
 		},
 	),
 	(
 		"bubble_coral_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"bubble_coral_wall_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"budding_amethyst",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([132, 96, 186]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([132, 96, 186]),
+			},
 		},
 	),
 	(
 		"cactus",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([85, 127, 43]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([85, 127, 43]),
+			},
 		},
 	),
 	(
 		"cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([248, 222, 214]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([248, 222, 214]),
+			},
 		},
 	),
 	(
 		"calcite",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([223, 224, 220]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([223, 224, 220]),
+			},
 		},
 	),
 	(
 		"calibrated_sculk_sensor",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([27, 79, 100]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([27, 79, 100]),
+			},
 		},
 	),
 	(
 		"campfire",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([110, 88, 54]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([110, 88, 54]),
+			},
 		},
 	),
 	(
 		"candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([248, 222, 214]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([248, 222, 214]),
+			},
 		},
 	),
 	(
 		"carrots",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([81, 124, 37]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([81, 124, 37]),
+			},
 		},
 	),
 	(
 		"cartography_table",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([103, 87, 67]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([103, 87, 67]),
+			},
 		},
 	),
 	(
 		"carved_pumpkin",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([198, 118, 24]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([198, 118, 24]),
+			},
 		},
 	),
 	(
 		"cauldron",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([73, 72, 74]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([73, 72, 74]),
+			},
 		},
 	),
 	(
 		"cave_air",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"cave_vines",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([90, 109, 40]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([90, 109, 40]),
+			},
 		},
 	),
 	(
 		"cave_vines_plant",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([88, 101, 38]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([88, 101, 38]),
+			},
 		},
 	),
 	(
 		"chain",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"chain_command_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([131, 161, 147]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([131, 161, 147]),
+			},
 		},
 	),
 	(
 		"cherry_button",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"cherry_door",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([223, 170, 164]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([223, 170, 164]),
+			},
 		},
 	),
 	(
 		"cherry_fence",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([226, 178, 172]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([226, 178, 172]),
+			},
 		},
 	),
 	(
 		"cherry_fence_gate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([226, 178, 172]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([226, 178, 172]),
+			},
 		},
 	),
 	(
 		"cherry_hanging_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"cherry_leaves",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([229, 172, 194]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([229, 172, 194]),
+			},
 		},
 	),
 	(
 		"cherry_log",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([185, 141, 137]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([185, 141, 137]),
+			},
 		},
 	),
 	(
 		"cherry_planks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([226, 178, 172]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([226, 178, 172]),
+			},
 		},
 	),
 	(
 		"cherry_pressure_plate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([226, 178, 172]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([226, 178, 172]),
+			},
 		},
 	),
 	(
 		"cherry_sapling",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"cherry_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([226, 178, 172]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([226, 178, 172]),
+			},
 		},
 	),
 	(
 		"cherry_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([226, 178, 172]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([226, 178, 172]),
+			},
 		},
 	),
 	(
 		"cherry_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([226, 178, 172]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([226, 178, 172]),
+			},
 		},
 	),
 	(
 		"cherry_trapdoor",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([226, 178, 172]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([226, 178, 172]),
+			},
 		},
 	),
 	(
 		"cherry_wall_hanging_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"cherry_wall_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"cherry_wood",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([54, 33, 44]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([54, 33, 44]),
+			},
 		},
 	),
 	(
 		"chest",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([162, 130, 78]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([162, 130, 78]),
+			},
 		},
 	),
 	(
 		"chipped_anvil",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([72, 72, 72]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([72, 72, 72]),
+			},
 		},
 	),
 	(
 		"chiseled_bookshelf",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([178, 144, 88]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([178, 144, 88]),
+			},
 		},
 	),
 	(
 		"chiseled_deepslate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([54, 54, 54]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([54, 54, 54]),
+			},
 		},
 	),
 	(
 		"chiseled_nether_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([47, 23, 28]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([47, 23, 28]),
+			},
 		},
 	),
 	(
 		"chiseled_polished_blackstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([53, 48, 56]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([53, 48, 56]),
+			},
 		},
 	),
 	(
 		"chiseled_quartz_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([231, 226, 218]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([231, 226, 218]),
+			},
 		},
 	),
 	(
 		"chiseled_red_sandstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([181, 97, 31]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([181, 97, 31]),
+			},
 		},
 	),
 	(
 		"chiseled_sandstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([223, 214, 170]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([223, 214, 170]),
+			},
 		},
 	),
 	(
 		"chiseled_stone_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([119, 118, 119]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([119, 118, 119]),
+			},
 		},
 	),
 	(
 		"chorus_flower",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([151, 120, 151]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([151, 120, 151]),
+			},
 		},
 	),
 	(
 		"chorus_plant",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([93, 57, 93]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([93, 57, 93]),
+			},
 		},
 	),
 	(
 		"clay",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([160, 166, 179]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([160, 166, 179]),
+			},
 		},
 	),
 	(
 		"coal_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([16, 15, 15]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([16, 15, 15]),
+			},
 		},
 	),
 	(
 		"coal_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([105, 105, 105]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([105, 105, 105]),
+			},
 		},
 	),
 	(
 		"coarse_dirt",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([119, 85, 59]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([119, 85, 59]),
+			},
 		},
 	),
 	(
 		"cobbled_deepslate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([77, 77, 80]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([77, 77, 80]),
+			},
 		},
 	),
 	(
 		"cobbled_deepslate_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([77, 77, 80]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([77, 77, 80]),
+			},
 		},
 	),
 	(
 		"cobbled_deepslate_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([77, 77, 80]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([77, 77, 80]),
+			},
 		},
 	),
 	(
 		"cobbled_deepslate_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([77, 77, 80]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([77, 77, 80]),
+			},
 		},
 	),
 	(
 		"cobblestone",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([127, 127, 127]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([127, 127, 127]),
+			},
 		},
 	),
 	(
 		"cobblestone_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([127, 127, 127]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([127, 127, 127]),
+			},
 		},
 	),
 	(
 		"cobblestone_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([127, 127, 127]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([127, 127, 127]),
+			},
 		},
 	),
 	(
 		"cobblestone_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([127, 127, 127]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([127, 127, 127]),
+			},
 		},
 	),
 	(
 		"cobweb",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([228, 233, 234]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([228, 233, 234]),
+			},
 		},
 	),
 	(
 		"cocoa",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([154, 91, 40]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([154, 91, 40]),
+			},
 		},
 	),
 	(
 		"command_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([181, 136, 108]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([181, 136, 108]),
+			},
 		},
 	),
 	(
 		"comparator",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([166, 161, 159]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([166, 161, 159]),
+			},
 		},
 	),
 	(
 		"composter",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([88, 61, 23]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([88, 61, 23]),
+			},
 		},
 	),
 	(
 		"conduit",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([159, 139, 113]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([159, 139, 113]),
+			},
 		},
 	),
 	(
 		"copper_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([192, 107, 79]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([192, 107, 79]),
+			},
 		},
 	),
 	(
 		"copper_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([124, 125, 120]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([124, 125, 120]),
+			},
 		},
 	),
 	(
 		"cornflower",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"cracked_deepslate_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([64, 64, 65]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([64, 64, 65]),
+			},
 		},
 	),
 	(
 		"cracked_deepslate_tiles",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([52, 52, 52]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([52, 52, 52]),
+			},
 		},
 	),
 	(
 		"cracked_nether_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([40, 20, 23]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([40, 20, 23]),
+			},
 		},
 	),
 	(
 		"cracked_polished_blackstone_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([44, 37, 43]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([44, 37, 43]),
+			},
 		},
 	),
 	(
 		"cracked_stone_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([118, 117, 118]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([118, 117, 118]),
+			},
 		},
 	),
 	(
 		"crafting_table",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([119, 73, 42]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([119, 73, 42]),
+			},
 		},
 	),
 	(
 		"creeper_head",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"creeper_wall_head",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"crimson_button",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"crimson_door",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([114, 54, 79]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([114, 54, 79]),
+			},
 		},
 	),
 	(
 		"crimson_fence",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([101, 48, 70]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([101, 48, 70]),
+			},
 		},
 	),
 	(
 		"crimson_fence_gate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([101, 48, 70]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([101, 48, 70]),
+			},
 		},
 	),
 	(
 		"crimson_fungus",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"crimson_hanging_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"crimson_hyphae",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([92, 25, 29]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([92, 25, 29]),
+			},
 		},
 	),
 	(
 		"crimson_nylium",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([130, 31, 31]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([130, 31, 31]),
+			},
 		},
 	),
 	(
 		"crimson_planks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([101, 48, 70]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([101, 48, 70]),
+			},
 		},
 	),
 	(
 		"crimson_pressure_plate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([101, 48, 70]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([101, 48, 70]),
+			},
 		},
 	),
 	(
 		"crimson_roots",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([126, 8, 41]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([126, 8, 41]),
+			},
 		},
 	),
 	(
 		"crimson_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([101, 48, 70]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([101, 48, 70]),
+			},
 		},
 	),
 	(
 		"crimson_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([101, 48, 70]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([101, 48, 70]),
+			},
 		},
 	),
 	(
 		"crimson_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([101, 48, 70]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([101, 48, 70]),
+			},
 		},
 	),
 	(
 		"crimson_stem",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([112, 49, 70]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([112, 49, 70]),
+			},
 		},
 	),
 	(
 		"crimson_trapdoor",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([103, 50, 72]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([103, 50, 72]),
+			},
 		},
 	),
 	(
 		"crimson_wall_hanging_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"crimson_wall_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"crying_obsidian",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([32, 10, 60]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([32, 10, 60]),
+			},
 		},
 	),
 	(
 		"cut_copper",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([191, 106, 80]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([191, 106, 80]),
+			},
 		},
 	),
 	(
 		"cut_copper_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([191, 106, 80]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([191, 106, 80]),
+			},
 		},
 	),
 	(
 		"cut_copper_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([191, 106, 80]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([191, 106, 80]),
+			},
 		},
 	),
 	(
 		"cut_red_sandstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([181, 97, 31]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([181, 97, 31]),
+			},
 		},
 	),
 	(
 		"cut_red_sandstone_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([181, 97, 31]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([181, 97, 31]),
+			},
 		},
 	),
 	(
 		"cut_sandstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([223, 214, 170]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([223, 214, 170]),
+			},
 		},
 	),
 	(
 		"cut_sandstone_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([223, 214, 170]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([223, 214, 170]),
+			},
 		},
 	),
 	(
 		"cyan_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"cyan_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"cyan_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"cyan_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([248, 222, 214]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([248, 222, 214]),
+			},
 		},
 	),
 	(
 		"cyan_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([21, 137, 145]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([21, 137, 145]),
+			},
 		},
 	),
 	(
 		"cyan_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([21, 119, 136]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([21, 119, 136]),
+			},
 		},
 	),
 	(
 		"cyan_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([36, 147, 157]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([36, 147, 157]),
+			},
 		},
 	),
 	(
 		"cyan_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([52, 118, 125]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([52, 118, 125]),
+			},
 		},
 	),
 	(
 		"cyan_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([20, 121, 135]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([20, 121, 135]),
+			},
 		},
 	),
 	(
 		"cyan_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([76, 127, 153]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([76, 127, 153]),
+			},
 		},
 	),
 	(
 		"cyan_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([73, 122, 147]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([73, 122, 147]),
+			},
 		},
 	),
 	(
 		"cyan_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([86, 91, 91]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([86, 91, 91]),
+			},
 		},
 	),
 	(
 		"cyan_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"cyan_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([21, 137, 145]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([21, 137, 145]),
+			},
 		},
 	),
 	(
 		"damaged_anvil",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([72, 72, 72]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([72, 72, 72]),
+			},
 		},
 	),
 	(
 		"dandelion",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"dark_oak_button",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"dark_oak_door",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([76, 51, 25]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([76, 51, 25]),
+			},
 		},
 	),
 	(
 		"dark_oak_fence",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([66, 43, 20]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([66, 43, 20]),
+			},
 		},
 	),
 	(
 		"dark_oak_fence_gate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([66, 43, 20]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([66, 43, 20]),
+			},
 		},
 	),
 	(
 		"dark_oak_hanging_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"dark_oak_leaves",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
-			color: Color([150, 150, 150]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
+				color: Color([150, 150, 150]),
+			},
 		},
 	),
 	(
 		"dark_oak_log",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([67, 45, 22]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([67, 45, 22]),
+			},
 		},
 	),
 	(
 		"dark_oak_planks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([66, 43, 20]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([66, 43, 20]),
+			},
 		},
 	),
 	(
 		"dark_oak_pressure_plate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([66, 43, 20]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([66, 43, 20]),
+			},
 		},
 	),
 	(
 		"dark_oak_sapling",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([61, 90, 30]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([61, 90, 30]),
+			},
 		},
 	),
 	(
 		"dark_oak_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([66, 43, 20]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([66, 43, 20]),
+			},
 		},
 	),
 	(
 		"dark_oak_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([66, 43, 20]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([66, 43, 20]),
+			},
 		},
 	),
 	(
 		"dark_oak_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([66, 43, 20]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([66, 43, 20]),
+			},
 		},
 	),
 	(
 		"dark_oak_trapdoor",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([75, 49, 23]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([75, 49, 23]),
+			},
 		},
 	),
 	(
 		"dark_oak_wall_hanging_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"dark_oak_wall_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"dark_oak_wood",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([60, 46, 26]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([60, 46, 26]),
+			},
 		},
 	),
 	(
 		"dark_prismarine",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([51, 91, 75]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([51, 91, 75]),
+			},
 		},
 	),
 	(
 		"dark_prismarine_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([51, 91, 75]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([51, 91, 75]),
+			},
 		},
 	),
 	(
 		"dark_prismarine_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([51, 91, 75]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([51, 91, 75]),
+			},
 		},
 	),
 	(
 		"daylight_detector",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([130, 116, 94]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([130, 116, 94]),
+			},
 		},
 	),
 	(
 		"dead_brain_coral",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"dead_brain_coral_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([124, 117, 114]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([124, 117, 114]),
+			},
 		},
 	),
 	(
 		"dead_brain_coral_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"dead_brain_coral_wall_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"dead_bubble_coral",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"dead_bubble_coral_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([131, 123, 119]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([131, 123, 119]),
+			},
 		},
 	),
 	(
 		"dead_bubble_coral_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"dead_bubble_coral_wall_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"dead_bush",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([107, 78, 40]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([107, 78, 40]),
+			},
 		},
 	),
 	(
 		"dead_fire_coral",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"dead_fire_coral_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([131, 123, 119]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([131, 123, 119]),
+			},
 		},
 	),
 	(
 		"dead_fire_coral_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"dead_fire_coral_wall_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"dead_horn_coral",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"dead_horn_coral_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([133, 126, 122]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([133, 126, 122]),
+			},
 		},
 	),
 	(
 		"dead_horn_coral_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"dead_horn_coral_wall_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"dead_tube_coral",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"dead_tube_coral_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([130, 123, 119]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([130, 123, 119]),
+			},
 		},
 	),
 	(
 		"dead_tube_coral_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"dead_tube_coral_wall_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"decorated_pot",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([124, 68, 53]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([124, 68, 53]),
+			},
 		},
 	),
 	(
 		"deepslate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([80, 80, 82]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([80, 80, 82]),
+			},
 		},
 	),
 	(
 		"deepslate_brick_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([70, 70, 71]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([70, 70, 71]),
+			},
 		},
 	),
 	(
 		"deepslate_brick_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([70, 70, 71]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([70, 70, 71]),
+			},
 		},
 	),
 	(
 		"deepslate_brick_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([70, 70, 71]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([70, 70, 71]),
+			},
 		},
 	),
 	(
 		"deepslate_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([70, 70, 71]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([70, 70, 71]),
+			},
 		},
 	),
 	(
 		"deepslate_coal_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([74, 74, 76]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([74, 74, 76]),
+			},
 		},
 	),
 	(
 		"deepslate_copper_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([92, 93, 89]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([92, 93, 89]),
+			},
 		},
 	),
 	(
 		"deepslate_diamond_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([83, 106, 106]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([83, 106, 106]),
+			},
 		},
 	),
 	(
 		"deepslate_emerald_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([78, 104, 87]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([78, 104, 87]),
+			},
 		},
 	),
 	(
 		"deepslate_gold_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([115, 102, 78]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([115, 102, 78]),
+			},
 		},
 	),
 	(
 		"deepslate_iron_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([106, 99, 94]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([106, 99, 94]),
+			},
 		},
 	),
 	(
 		"deepslate_lapis_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([79, 90, 115]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([79, 90, 115]),
+			},
 		},
 	),
 	(
 		"deepslate_redstone_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([104, 73, 74]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([104, 73, 74]),
+			},
 		},
 	),
 	(
 		"deepslate_tile_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([54, 54, 55]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([54, 54, 55]),
+			},
 		},
 	),
 	(
 		"deepslate_tile_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([54, 54, 55]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([54, 54, 55]),
+			},
 		},
 	),
 	(
 		"deepslate_tile_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([54, 54, 55]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([54, 54, 55]),
+			},
 		},
 	),
 	(
 		"deepslate_tiles",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([54, 54, 55]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([54, 54, 55]),
+			},
 		},
 	),
 	(
 		"detector_rail",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([123, 104, 90]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([123, 104, 90]),
+			},
 		},
 	),
 	(
 		"diamond_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([98, 237, 228]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([98, 237, 228]),
+			},
 		},
 	),
 	(
 		"diamond_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([121, 141, 140]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([121, 141, 140]),
+			},
 		},
 	),
 	(
 		"diorite",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([188, 188, 188]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([188, 188, 188]),
+			},
 		},
 	),
 	(
 		"diorite_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([188, 188, 188]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([188, 188, 188]),
+			},
 		},
 	),
 	(
 		"diorite_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([188, 188, 188]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([188, 188, 188]),
+			},
 		},
 	),
 	(
 		"diorite_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([188, 188, 188]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([188, 188, 188]),
+			},
 		},
 	),
 	(
 		"dirt",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([134, 96, 67]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([134, 96, 67]),
+			},
 		},
 	),
 	(
 		"dirt_path",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([148, 121, 65]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([148, 121, 65]),
+			},
 		},
 	),
 	(
 		"dispenser",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([110, 109, 109]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([110, 109, 109]),
+			},
 		},
 	),
 	(
 		"dragon_egg",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([12, 9, 15]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([12, 9, 15]),
+			},
 		},
 	),
 	(
 		"dragon_head",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"dragon_wall_head",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"dried_kelp_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([50, 58, 38]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([50, 58, 38]),
+			},
 		},
 	),
 	(
 		"dripstone_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([134, 107, 92]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([134, 107, 92]),
+			},
 		},
 	),
 	(
 		"dropper",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([110, 109, 109]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([110, 109, 109]),
+			},
 		},
 	),
 	(
 		"emerald_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([42, 203, 87]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([42, 203, 87]),
+			},
 		},
 	),
 	(
 		"emerald_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([108, 136, 115]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([108, 136, 115]),
+			},
 		},
 	),
 	(
 		"enchanting_table",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([128, 75, 85]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([128, 75, 85]),
+			},
 		},
 	),
 	(
 		"end_gateway",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([15, 10, 24]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([15, 10, 24]),
+			},
 		},
 	),
 	(
 		"end_portal",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([15, 10, 24]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([15, 10, 24]),
+			},
 		},
 	),
 	(
 		"end_portal_frame",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([91, 120, 97]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([91, 120, 97]),
+			},
 		},
 	),
 	(
 		"end_rod",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"end_stone",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([219, 222, 158]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([219, 222, 158]),
+			},
 		},
 	),
 	(
 		"end_stone_brick_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([218, 224, 162]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([218, 224, 162]),
+			},
 		},
 	),
 	(
 		"end_stone_brick_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([218, 224, 162]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([218, 224, 162]),
+			},
 		},
 	),
 	(
 		"end_stone_brick_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([218, 224, 162]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([218, 224, 162]),
+			},
 		},
 	),
 	(
 		"end_stone_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([218, 224, 162]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([218, 224, 162]),
+			},
 		},
 	),
 	(
 		"ender_chest",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([15, 10, 24]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([15, 10, 24]),
+			},
 		},
 	),
 	(
 		"exposed_copper",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([161, 125, 103]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([161, 125, 103]),
+			},
 		},
 	),
 	(
 		"exposed_cut_copper",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([154, 121, 101]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([154, 121, 101]),
+			},
 		},
 	),
 	(
 		"exposed_cut_copper_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([154, 121, 101]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([154, 121, 101]),
+			},
 		},
 	),
 	(
 		"exposed_cut_copper_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([154, 121, 101]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([154, 121, 101]),
+			},
 		},
 	),
 	(
 		"farmland",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([81, 44, 15]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([81, 44, 15]),
+			},
 		},
 	),
 	(
 		"fern",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"fire",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([211, 140, 53]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([211, 140, 53]),
+			},
 		},
 	),
 	(
 		"fire_coral",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"fire_coral_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([163, 35, 46]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([163, 35, 46]),
+			},
 		},
 	),
 	(
 		"fire_coral_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"fire_coral_wall_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"fletching_table",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([197, 180, 133]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([197, 180, 133]),
+			},
 		},
 	),
 	(
 		"flower_pot",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([124, 68, 53]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([124, 68, 53]),
+			},
 		},
 	),
 	(
 		"flowering_azalea",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([112, 121, 64]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([112, 121, 64]),
+			},
 		},
 	),
 	(
 		"flowering_azalea_leaves",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([99, 111, 60]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([99, 111, 60]),
+			},
 		},
 	),
 	(
 		"frogspawn",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([105, 90, 82]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([105, 90, 82]),
+			},
 		},
 	),
 	(
 		"frosted_ice",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([140, 181, 252]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([140, 181, 252]),
+			},
 		},
 	),
 	(
 		"furnace",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([110, 109, 109]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([110, 109, 109]),
+			},
 		},
 	),
 	(
 		"gilded_blackstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([55, 42, 38]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([55, 42, 38]),
+			},
 		},
 	),
 	(
 		"glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([175, 213, 219]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([175, 213, 219]),
+			},
 		},
 	),
 	(
 		"glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([170, 210, 217]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([170, 210, 217]),
+			},
 		},
 	),
 	(
 		"glow_item_frame",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"glow_lichen",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"glowstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([171, 131, 84]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([171, 131, 84]),
+			},
 		},
 	),
 	(
 		"gold_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([246, 208, 61]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([246, 208, 61]),
+			},
 		},
 	),
 	(
 		"gold_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([145, 133, 106]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([145, 133, 106]),
+			},
 		},
 	),
 	(
 		"granite",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([149, 103, 85]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([149, 103, 85]),
+			},
 		},
 	),
 	(
 		"granite_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([149, 103, 85]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([149, 103, 85]),
+			},
 		},
 	),
 	(
 		"granite_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([149, 103, 85]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([149, 103, 85]),
+			},
 		},
 	),
 	(
 		"granite_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([149, 103, 85]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([149, 103, 85]),
+			},
 		},
 	),
 	(
 		"grass",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"grass_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: Color([147, 147, 147]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
+				color: Color([147, 147, 147]),
+			},
 		},
 	),
 	(
 		"grass_path",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([148, 121, 65]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([148, 121, 65]),
+			},
 		},
 	),
 	(
 		"gravel",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([131, 127, 126]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([131, 127, 126]),
+			},
 		},
 	),
 	(
 		"gray_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"gray_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"gray_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"gray_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([248, 222, 214]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([248, 222, 214]),
+			},
 		},
 	),
 	(
 		"gray_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([62, 68, 71]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([62, 68, 71]),
+			},
 		},
 	),
 	(
 		"gray_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([54, 57, 61]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([54, 57, 61]),
+			},
 		},
 	),
 	(
 		"gray_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([76, 81, 84]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([76, 81, 84]),
+			},
 		},
 	),
 	(
 		"gray_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([83, 90, 93]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([83, 90, 93]),
+			},
 		},
 	),
 	(
 		"gray_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([55, 58, 62]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([55, 58, 62]),
+			},
 		},
 	),
 	(
 		"gray_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([76, 76, 76]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([76, 76, 76]),
+			},
 		},
 	),
 	(
 		"gray_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([73, 73, 73]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([73, 73, 73]),
+			},
 		},
 	),
 	(
 		"gray_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([57, 42, 35]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([57, 42, 35]),
+			},
 		},
 	),
 	(
 		"gray_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"gray_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([62, 68, 71]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([62, 68, 71]),
+			},
 		},
 	),
 	(
 		"green_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"green_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"green_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"green_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([248, 222, 214]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([248, 222, 214]),
+			},
 		},
 	),
 	(
 		"green_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([84, 109, 27]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([84, 109, 27]),
+			},
 		},
 	),
 	(
 		"green_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([73, 91, 36]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([73, 91, 36]),
+			},
 		},
 	),
 	(
 		"green_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([97, 119, 44]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([97, 119, 44]),
+			},
 		},
 	),
 	(
 		"green_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([117, 142, 67]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([117, 142, 67]),
+			},
 		},
 	),
 	(
 		"green_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([79, 100, 31]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([79, 100, 31]),
+			},
 		},
 	),
 	(
 		"green_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([102, 127, 51]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([102, 127, 51]),
+			},
 		},
 	),
 	(
 		"green_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([97, 122, 48]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([97, 122, 48]),
+			},
 		},
 	),
 	(
 		"green_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([76, 83, 42]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([76, 83, 42]),
+			},
 		},
 	),
 	(
 		"green_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"green_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([84, 109, 27]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([84, 109, 27]),
+			},
 		},
 	),
 	(
 		"grindstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([142, 142, 142]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([142, 142, 142]),
+			},
 		},
 	),
 	(
 		"hanging_roots",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([161, 115, 91]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([161, 115, 91]),
+			},
 		},
 	),
 	(
 		"hay_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([165, 139, 12]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([165, 139, 12]),
+			},
 		},
 	),
 	(
 		"heavy_weighted_pressure_plate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([220, 220, 220]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([220, 220, 220]),
+			},
 		},
 	),
 	(
 		"honey_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([251, 185, 52]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([251, 185, 52]),
+			},
 		},
 	),
 	(
 		"honeycomb_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([229, 148, 29]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([229, 148, 29]),
+			},
 		},
 	),
 	(
 		"hopper",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([75, 74, 75]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([75, 74, 75]),
+			},
 		},
 	),
 	(
 		"horn_coral",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"horn_coral_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([216, 199, 66]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([216, 199, 66]),
+			},
 		},
 	),
 	(
 		"horn_coral_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"horn_coral_wall_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"ice",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([145, 183, 253]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([145, 183, 253]),
+			},
 		},
 	),
 	(
 		"infested_chiseled_stone_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([119, 118, 119]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([119, 118, 119]),
+			},
 		},
 	),
 	(
 		"infested_cobblestone",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([127, 127, 127]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([127, 127, 127]),
+			},
 		},
 	),
 	(
 		"infested_cracked_stone_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([118, 117, 118]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([118, 117, 118]),
+			},
 		},
 	),
 	(
 		"infested_deepslate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([80, 80, 82]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([80, 80, 82]),
+			},
 		},
 	),
 	(
 		"infested_mossy_stone_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([115, 121, 105]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([115, 121, 105]),
+			},
 		},
 	),
 	(
 		"infested_stone",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([125, 125, 125]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([125, 125, 125]),
+			},
 		},
 	),
 	(
 		"infested_stone_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([122, 121, 122]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([122, 121, 122]),
+			},
 		},
 	),
 	(
 		"iron_bars",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([136, 139, 135]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([136, 139, 135]),
+			},
 		},
 	),
 	(
 		"iron_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([220, 220, 220]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([220, 220, 220]),
+			},
 		},
 	),
 	(
 		"iron_door",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([194, 193, 193]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([194, 193, 193]),
+			},
 		},
 	),
 	(
 		"iron_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([136, 129, 122]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([136, 129, 122]),
+			},
 		},
 	),
 	(
 		"iron_trapdoor",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([202, 202, 202]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([202, 202, 202]),
+			},
 		},
 	),
 	(
 		"item_frame",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"jack_o_lantern",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([214, 152, 52]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([214, 152, 52]),
+			},
 		},
 	),
 	(
 		"jigsaw",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([80, 69, 81]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([80, 69, 81]),
+			},
 		},
 	),
 	(
 		"jukebox",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([93, 64, 47]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([93, 64, 47]),
+			},
 		},
 	),
 	(
 		"jungle_button",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"jungle_door",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([163, 119, 84]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([163, 119, 84]),
+			},
 		},
 	),
 	(
 		"jungle_fence",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([160, 115, 80]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([160, 115, 80]),
+			},
 		},
 	),
 	(
 		"jungle_fence_gate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([160, 115, 80]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([160, 115, 80]),
+			},
 		},
 	),
 	(
 		"jungle_hanging_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"jungle_leaves",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
-			color: Color([156, 154, 143]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
+				color: Color([156, 154, 143]),
+			},
 		},
 	),
 	(
 		"jungle_log",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([149, 109, 70]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([149, 109, 70]),
+			},
 		},
 	),
 	(
 		"jungle_planks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([160, 115, 80]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([160, 115, 80]),
+			},
 		},
 	),
 	(
 		"jungle_pressure_plate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([160, 115, 80]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([160, 115, 80]),
+			},
 		},
 	),
 	(
 		"jungle_sapling",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([47, 81, 16]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([47, 81, 16]),
+			},
 		},
 	),
 	(
 		"jungle_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([160, 115, 80]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([160, 115, 80]),
+			},
 		},
 	),
 	(
 		"jungle_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([160, 115, 80]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([160, 115, 80]),
+			},
 		},
 	),
 	(
 		"jungle_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([160, 115, 80]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([160, 115, 80]),
+			},
 		},
 	),
 	(
 		"jungle_trapdoor",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([152, 110, 77]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([152, 110, 77]),
+			},
 		},
 	),
 	(
 		"jungle_wall_hanging_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"jungle_wall_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"jungle_wood",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([85, 67, 25]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([85, 67, 25]),
+			},
 		},
 	),
 	(
 		"kelp",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"kelp_plant",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([86, 130, 42]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([86, 130, 42]),
+			},
 		},
 	),
 	(
 		"ladder",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"lantern",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([106, 91, 83]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([106, 91, 83]),
+			},
 		},
 	),
 	(
 		"lapis_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([30, 67, 140]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([30, 67, 140]),
+			},
 		},
 	),
 	(
 		"lapis_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([107, 117, 141]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([107, 117, 141]),
+			},
 		},
 	),
 	(
 		"large_amethyst_bud",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"large_fern",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: Color([125, 125, 125]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
+				color: Color([125, 125, 125]),
+			},
 		},
 	),
 	(
 		"lava",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([212, 90, 18]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([212, 90, 18]),
+			},
 		},
 	),
 	(
 		"lava_cauldron",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([73, 72, 74]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([73, 72, 74]),
+			},
 		},
 	),
 	(
 		"lectern",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([173, 137, 83]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([173, 137, 83]),
+			},
 		},
 	),
 	(
 		"lever",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"light",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"light_blue_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"light_blue_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"light_blue_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"light_blue_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([248, 222, 214]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([248, 222, 214]),
+			},
 		},
 	),
 	(
 		"light_blue_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([58, 175, 217]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([58, 175, 217]),
+			},
 		},
 	),
 	(
 		"light_blue_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([35, 137, 198]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([35, 137, 198]),
+			},
 		},
 	),
 	(
 		"light_blue_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([74, 180, 213]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([74, 180, 213]),
+			},
 		},
 	),
 	(
 		"light_blue_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([94, 164, 208]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([94, 164, 208]),
+			},
 		},
 	),
 	(
 		"light_blue_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([49, 163, 212]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([49, 163, 212]),
+			},
 		},
 	),
 	(
 		"light_blue_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([102, 153, 216]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([102, 153, 216]),
+			},
 		},
 	),
 	(
 		"light_blue_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([97, 147, 208]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([97, 147, 208]),
+			},
 		},
 	),
 	(
 		"light_blue_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([113, 108, 137]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([113, 108, 137]),
+			},
 		},
 	),
 	(
 		"light_blue_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"light_blue_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([58, 175, 217]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([58, 175, 217]),
+			},
 		},
 	),
 	(
 		"light_gray_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"light_gray_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"light_gray_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"light_gray_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([248, 222, 214]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([248, 222, 214]),
+			},
 		},
 	),
 	(
 		"light_gray_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([142, 142, 134]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([142, 142, 134]),
+			},
 		},
 	),
 	(
 		"light_gray_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([125, 125, 115]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([125, 125, 115]),
+			},
 		},
 	),
 	(
 		"light_gray_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([154, 154, 148]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([154, 154, 148]),
+			},
 		},
 	),
 	(
 		"light_gray_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([144, 166, 167]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([144, 166, 167]),
+			},
 		},
 	),
 	(
 		"light_gray_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([124, 124, 115]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([124, 124, 115]),
+			},
 		},
 	),
 	(
 		"light_gray_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([153, 153, 153]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([153, 153, 153]),
+			},
 		},
 	),
 	(
 		"light_gray_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([147, 147, 147]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([147, 147, 147]),
+			},
 		},
 	),
 	(
 		"light_gray_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([135, 106, 97]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([135, 106, 97]),
+			},
 		},
 	),
 	(
 		"light_gray_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"light_gray_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([142, 142, 134]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([142, 142, 134]),
+			},
 		},
 	),
 	(
 		"light_weighted_pressure_plate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([246, 208, 61]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([246, 208, 61]),
+			},
 		},
 	),
 	(
 		"lightning_rod",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"lilac",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([154, 125, 147]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([154, 125, 147]),
+			},
 		},
 	),
 	(
 		"lily_of_the_valley",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"lily_pad",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: Color([133, 133, 133]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
+				color: Color([133, 133, 133]),
+			},
 		},
 	),
 	(
 		"lime_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"lime_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"lime_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"lime_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([248, 222, 214]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([248, 222, 214]),
+			},
 		},
 	),
 	(
 		"lime_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([112, 185, 25]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([112, 185, 25]),
+			},
 		},
 	),
 	(
 		"lime_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([94, 168, 24]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([94, 168, 24]),
+			},
 		},
 	),
 	(
 		"lime_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([125, 189, 41]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([125, 189, 41]),
+			},
 		},
 	),
 	(
 		"lime_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([162, 197, 55]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([162, 197, 55]),
+			},
 		},
 	),
 	(
 		"lime_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([99, 172, 23]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([99, 172, 23]),
+			},
 		},
 	),
 	(
 		"lime_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([127, 204, 25]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([127, 204, 25]),
+			},
 		},
 	),
 	(
 		"lime_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([122, 196, 24]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([122, 196, 24]),
+			},
 		},
 	),
 	(
 		"lime_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([103, 117, 52]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([103, 117, 52]),
+			},
 		},
 	),
 	(
 		"lime_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"lime_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([112, 185, 25]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([112, 185, 25]),
+			},
 		},
 	),
 	(
 		"lodestone",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([147, 149, 152]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([147, 149, 152]),
+			},
 		},
 	),
 	(
 		"loom",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([142, 119, 91]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([142, 119, 91]),
+			},
 		},
 	),
 	(
 		"magenta_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"magenta_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"magenta_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"magenta_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([248, 222, 214]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([248, 222, 214]),
+			},
 		},
 	),
 	(
 		"magenta_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([189, 68, 179]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([189, 68, 179]),
+			},
 		},
 	),
 	(
 		"magenta_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([169, 48, 159]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([169, 48, 159]),
+			},
 		},
 	),
 	(
 		"magenta_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([192, 83, 184]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([192, 83, 184]),
+			},
 		},
 	),
 	(
 		"magenta_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([208, 100, 191]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([208, 100, 191]),
+			},
 		},
 	),
 	(
 		"magenta_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([173, 54, 163]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([173, 54, 163]),
+			},
 		},
 	),
 	(
 		"magenta_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([178, 76, 216]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([178, 76, 216]),
+			},
 		},
 	),
 	(
 		"magenta_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([171, 73, 208]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([171, 73, 208]),
+			},
 		},
 	),
 	(
 		"magenta_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([149, 88, 108]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([149, 88, 108]),
+			},
 		},
 	),
 	(
 		"magenta_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"magenta_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([189, 68, 179]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([189, 68, 179]),
+			},
 		},
 	),
 	(
 		"magma_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([142, 63, 31]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([142, 63, 31]),
+			},
 		},
 	),
 	(
 		"mangrove_button",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"mangrove_door",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([112, 48, 46]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([112, 48, 46]),
+			},
 		},
 	),
 	(
 		"mangrove_fence",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([117, 54, 48]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([117, 54, 48]),
+			},
 		},
 	),
 	(
 		"mangrove_fence_gate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([117, 54, 48]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([117, 54, 48]),
+			},
 		},
 	),
 	(
 		"mangrove_hanging_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"mangrove_leaves",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
-			color: Color([129, 128, 128]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
+				color: Color([129, 128, 128]),
+			},
 		},
 	),
 	(
 		"mangrove_log",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([102, 48, 42]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([102, 48, 42]),
+			},
 		},
 	),
 	(
 		"mangrove_planks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([117, 54, 48]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([117, 54, 48]),
+			},
 		},
 	),
 	(
 		"mangrove_pressure_plate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([117, 54, 48]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([117, 54, 48]),
+			},
 		},
 	),
 	(
 		"mangrove_propagule",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([96, 174, 83]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([96, 174, 83]),
+			},
 		},
 	),
 	(
 		"mangrove_roots",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([74, 59, 38]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([74, 59, 38]),
+			},
 		},
 	),
 	(
 		"mangrove_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([117, 54, 48]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([117, 54, 48]),
+			},
 		},
 	),
 	(
 		"mangrove_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([117, 54, 48]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([117, 54, 48]),
+			},
 		},
 	),
 	(
 		"mangrove_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([117, 54, 48]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([117, 54, 48]),
+			},
 		},
 	),
 	(
 		"mangrove_trapdoor",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([110, 46, 42]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([110, 46, 42]),
+			},
 		},
 	),
 	(
 		"mangrove_wall_hanging_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"mangrove_wall_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"mangrove_wood",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([83, 66, 41]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([83, 66, 41]),
+			},
 		},
 	),
 	(
 		"medium_amethyst_bud",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"melon",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([111, 144, 30]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([111, 144, 30]),
+			},
 		},
 	),
 	(
 		"melon_stem",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: Color([153, 153, 153]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
+				color: Color([153, 153, 153]),
+			},
 		},
 	),
 	(
 		"moss_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([89, 109, 45]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([89, 109, 45]),
+			},
 		},
 	),
 	(
 		"moss_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([89, 109, 45]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([89, 109, 45]),
+			},
 		},
 	),
 	(
 		"mossy_cobblestone",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([110, 118, 94]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([110, 118, 94]),
+			},
 		},
 	),
 	(
 		"mossy_cobblestone_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([110, 118, 94]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([110, 118, 94]),
+			},
 		},
 	),
 	(
 		"mossy_cobblestone_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([110, 118, 94]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([110, 118, 94]),
+			},
 		},
 	),
 	(
 		"mossy_cobblestone_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([110, 118, 94]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([110, 118, 94]),
+			},
 		},
 	),
 	(
 		"mossy_stone_brick_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([115, 121, 105]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([115, 121, 105]),
+			},
 		},
 	),
 	(
 		"mossy_stone_brick_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([115, 121, 105]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([115, 121, 105]),
+			},
 		},
 	),
 	(
 		"mossy_stone_brick_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([115, 121, 105]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([115, 121, 105]),
+			},
 		},
 	),
 	(
 		"mossy_stone_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([115, 121, 105]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([115, 121, 105]),
+			},
 		},
 	),
 	(
 		"moving_piston",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"mud",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([60, 57, 60]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([60, 57, 60]),
+			},
 		},
 	),
 	(
 		"mud_brick_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([137, 103, 79]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([137, 103, 79]),
+			},
 		},
 	),
 	(
 		"mud_brick_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([137, 103, 79]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([137, 103, 79]),
+			},
 		},
 	),
 	(
 		"mud_brick_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([137, 103, 79]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([137, 103, 79]),
+			},
 		},
 	),
 	(
 		"mud_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([137, 103, 79]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([137, 103, 79]),
+			},
 		},
 	),
 	(
 		"muddy_mangrove_roots",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([70, 58, 45]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([70, 58, 45]),
+			},
 		},
 	),
 	(
 		"mushroom_stem",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([203, 196, 185]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([203, 196, 185]),
+			},
 		},
 	),
 	(
 		"mycelium",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([111, 98, 101]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([111, 98, 101]),
+			},
 		},
 	),
 	(
 		"nether_brick_fence",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([44, 21, 26]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([44, 21, 26]),
+			},
 		},
 	),
 	(
 		"nether_brick_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([44, 21, 26]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([44, 21, 26]),
+			},
 		},
 	),
 	(
 		"nether_brick_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([44, 21, 26]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([44, 21, 26]),
+			},
 		},
 	),
 	(
 		"nether_brick_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([44, 21, 26]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([44, 21, 26]),
+			},
 		},
 	),
 	(
 		"nether_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([44, 21, 26]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([44, 21, 26]),
+			},
 		},
 	),
 	(
 		"nether_gold_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([115, 54, 42]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([115, 54, 42]),
+			},
 		},
 	),
 	(
 		"nether_portal",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([89, 11, 192]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([89, 11, 192]),
+			},
 		},
 	),
 	(
 		"nether_quartz_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([117, 65, 62]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([117, 65, 62]),
+			},
 		},
 	),
 	(
 		"nether_sprouts",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([19, 151, 133]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([19, 151, 133]),
+			},
 		},
 	),
 	(
 		"nether_wart",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([111, 18, 19]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([111, 18, 19]),
+			},
 		},
 	),
 	(
 		"nether_wart_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([114, 2, 2]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([114, 2, 2]),
+			},
 		},
 	),
 	(
 		"netherite_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([66, 61, 63]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([66, 61, 63]),
+			},
 		},
 	),
 	(
 		"netherrack",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([97, 38, 38]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([97, 38, 38]),
+			},
 		},
 	),
 	(
 		"note_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([88, 58, 40]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([88, 58, 40]),
+			},
 		},
 	),
 	(
 		"oak_button",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"oak_door",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([140, 110, 66]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([140, 110, 66]),
+			},
 		},
 	),
 	(
 		"oak_fence",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([162, 130, 78]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([162, 130, 78]),
+			},
 		},
 	),
 	(
 		"oak_fence_gate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([162, 130, 78]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([162, 130, 78]),
+			},
 		},
 	),
 	(
 		"oak_hanging_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"oak_leaves",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
-			color: Color([144, 144, 144]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
+				color: Color([144, 144, 144]),
+			},
 		},
 	),
 	(
 		"oak_log",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([151, 121, 73]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([151, 121, 73]),
+			},
 		},
 	),
 	(
 		"oak_planks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([162, 130, 78]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([162, 130, 78]),
+			},
 		},
 	),
 	(
 		"oak_pressure_plate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([162, 130, 78]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([162, 130, 78]),
+			},
 		},
 	),
 	(
 		"oak_sapling",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([77, 106, 40]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([77, 106, 40]),
+			},
 		},
 	),
 	(
 		"oak_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([162, 130, 78]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([162, 130, 78]),
+			},
 		},
 	),
 	(
 		"oak_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([162, 130, 78]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([162, 130, 78]),
+			},
 		},
 	),
 	(
 		"oak_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([162, 130, 78]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([162, 130, 78]),
+			},
 		},
 	),
 	(
 		"oak_trapdoor",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([124, 99, 56]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([124, 99, 56]),
+			},
 		},
 	),
 	(
 		"oak_wall_hanging_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"oak_wall_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"oak_wood",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([109, 85, 50]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([109, 85, 50]),
+			},
 		},
 	),
 	(
 		"observer",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([98, 98, 98]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([98, 98, 98]),
+			},
 		},
 	),
 	(
 		"obsidian",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([15, 10, 24]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([15, 10, 24]),
+			},
 		},
 	),
 	(
 		"ochre_froglight",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([250, 245, 206]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([250, 245, 206]),
+			},
 		},
 	),
 	(
 		"orange_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"orange_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"orange_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"orange_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([248, 222, 214]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([248, 222, 214]),
+			},
 		},
 	),
 	(
 		"orange_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([240, 118, 19]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([240, 118, 19]),
+			},
 		},
 	),
 	(
 		"orange_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([224, 97, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([224, 97, 0]),
+			},
 		},
 	),
 	(
 		"orange_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([227, 131, 31]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([227, 131, 31]),
+			},
 		},
 	),
 	(
 		"orange_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([154, 147, 91]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([154, 147, 91]),
+			},
 		},
 	),
 	(
 		"orange_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([234, 106, 8]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([234, 106, 8]),
+			},
 		},
 	),
 	(
 		"orange_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([216, 127, 51]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([216, 127, 51]),
+			},
 		},
 	),
 	(
 		"orange_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([208, 122, 48]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([208, 122, 48]),
+			},
 		},
 	),
 	(
 		"orange_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([161, 83, 37]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([161, 83, 37]),
+			},
 		},
 	),
 	(
 		"orange_tulip",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"orange_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"orange_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([240, 118, 19]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([240, 118, 19]),
+			},
 		},
 	),
 	(
 		"oxeye_daisy",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"oxidized_copper",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([82, 162, 132]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([82, 162, 132]),
+			},
 		},
 	),
 	(
 		"oxidized_cut_copper",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([79, 153, 126]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([79, 153, 126]),
+			},
 		},
 	),
 	(
 		"oxidized_cut_copper_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([79, 153, 126]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([79, 153, 126]),
+			},
 		},
 	),
 	(
 		"oxidized_cut_copper_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([79, 153, 126]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([79, 153, 126]),
+			},
 		},
 	),
 	(
 		"packed_ice",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([141, 180, 250]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([141, 180, 250]),
+			},
 		},
 	),
 	(
 		"packed_mud",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([142, 106, 79]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([142, 106, 79]),
+			},
 		},
 	),
 	(
 		"pearlescent_froglight",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([245, 240, 239]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([245, 240, 239]),
+			},
 		},
 	),
 	(
 		"peony",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([129, 126, 139]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([129, 126, 139]),
+			},
 		},
 	),
 	(
 		"petrified_oak_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([162, 130, 78]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([162, 130, 78]),
+			},
 		},
 	),
 	(
 		"piglin_head",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"piglin_wall_head",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"pink_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"pink_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"pink_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"pink_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([248, 222, 214]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([248, 222, 214]),
+			},
 		},
 	),
 	(
 		"pink_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([237, 141, 172]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([237, 141, 172]),
+			},
 		},
 	),
 	(
 		"pink_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([213, 101, 142]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([213, 101, 142]),
+			},
 		},
 	),
 	(
 		"pink_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([228, 153, 181]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([228, 153, 181]),
+			},
 		},
 	),
 	(
 		"pink_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([235, 154, 181]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([235, 154, 181]),
+			},
 		},
 	),
 	(
 		"pink_petals",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"pink_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([230, 121, 157]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([230, 121, 157]),
+			},
 		},
 	),
 	(
 		"pink_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([242, 127, 165]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([242, 127, 165]),
+			},
 		},
 	),
 	(
 		"pink_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([233, 122, 159]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([233, 122, 159]),
+			},
 		},
 	),
 	(
 		"pink_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([161, 78, 78]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([161, 78, 78]),
+			},
 		},
 	),
 	(
 		"pink_tulip",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"pink_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"pink_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([237, 141, 172]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([237, 141, 172]),
+			},
 		},
 	),
 	(
 		"piston",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([109, 104, 96]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([109, 104, 96]),
+			},
 		},
 	),
 	(
 		"piston_head",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([153, 127, 85]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([153, 127, 85]),
+			},
 		},
 	),
 	(
 		"pitcher_crop",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([193, 165, 103]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([193, 165, 103]),
+			},
 		},
 	),
 	(
 		"pitcher_plant",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([122, 144, 189]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([122, 144, 189]),
+			},
 		},
 	),
 	(
 		"player_head",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"player_wall_head",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"podzol",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([91, 63, 24]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([91, 63, 24]),
+			},
 		},
 	),
 	(
 		"pointed_dripstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([129, 102, 89]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([129, 102, 89]),
+			},
 		},
 	),
 	(
 		"polished_andesite",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([132, 134, 133]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([132, 134, 133]),
+			},
 		},
 	),
 	(
 		"polished_andesite_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([132, 134, 133]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([132, 134, 133]),
+			},
 		},
 	),
 	(
 		"polished_andesite_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([132, 134, 133]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([132, 134, 133]),
+			},
 		},
 	),
 	(
 		"polished_basalt",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([99, 98, 100]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([99, 98, 100]),
+			},
 		},
 	),
 	(
 		"polished_blackstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([53, 48, 56]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([53, 48, 56]),
+			},
 		},
 	),
 	(
 		"polished_blackstone_brick_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([48, 42, 49]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([48, 42, 49]),
+			},
 		},
 	),
 	(
 		"polished_blackstone_brick_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([48, 42, 49]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([48, 42, 49]),
+			},
 		},
 	),
 	(
 		"polished_blackstone_brick_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([48, 42, 49]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([48, 42, 49]),
+			},
 		},
 	),
 	(
 		"polished_blackstone_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([48, 42, 49]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([48, 42, 49]),
+			},
 		},
 	),
 	(
 		"polished_blackstone_button",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"polished_blackstone_pressure_plate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([53, 48, 56]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([53, 48, 56]),
+			},
 		},
 	),
 	(
 		"polished_blackstone_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([53, 48, 56]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([53, 48, 56]),
+			},
 		},
 	),
 	(
 		"polished_blackstone_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([53, 48, 56]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([53, 48, 56]),
+			},
 		},
 	),
 	(
 		"polished_blackstone_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([53, 48, 56]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([53, 48, 56]),
+			},
 		},
 	),
 	(
 		"polished_deepslate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([72, 72, 73]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([72, 72, 73]),
+			},
 		},
 	),
 	(
 		"polished_deepslate_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([72, 72, 73]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([72, 72, 73]),
+			},
 		},
 	),
 	(
 		"polished_deepslate_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([72, 72, 73]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([72, 72, 73]),
+			},
 		},
 	),
 	(
 		"polished_deepslate_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([72, 72, 73]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([72, 72, 73]),
+			},
 		},
 	),
 	(
 		"polished_diorite",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([192, 193, 194]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([192, 193, 194]),
+			},
 		},
 	),
 	(
 		"polished_diorite_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([192, 193, 194]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([192, 193, 194]),
+			},
 		},
 	),
 	(
 		"polished_diorite_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([192, 193, 194]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([192, 193, 194]),
+			},
 		},
 	),
 	(
 		"polished_granite",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([154, 106, 89]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([154, 106, 89]),
+			},
 		},
 	),
 	(
 		"polished_granite_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([154, 106, 89]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([154, 106, 89]),
+			},
 		},
 	),
 	(
 		"polished_granite_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([154, 106, 89]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([154, 106, 89]),
+			},
 		},
 	),
 	(
 		"poppy",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"potatoes",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([84, 135, 47]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([84, 135, 47]),
+			},
 		},
 	),
 	(
 		"potted_acacia_sapling",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([118, 117, 23]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([118, 117, 23]),
+			},
 		},
 	),
 	(
 		"potted_allium",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([158, 137, 183]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([158, 137, 183]),
+			},
 		},
 	),
 	(
 		"potted_azalea_bush",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([101, 124, 47]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([101, 124, 47]),
+			},
 		},
 	),
 	(
 		"potted_azure_bluet",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([169, 204, 127]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([169, 204, 127]),
+			},
 		},
 	),
 	(
 		"potted_bamboo",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([93, 144, 19]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([93, 144, 19]),
+			},
 		},
 	),
 	(
 		"potted_birch_sapling",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([127, 160, 79]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([127, 160, 79]),
+			},
 		},
 	),
 	(
 		"potted_blue_orchid",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([47, 162, 168]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([47, 162, 168]),
+			},
 		},
 	),
 	(
 		"potted_brown_mushroom",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([153, 116, 92]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([153, 116, 92]),
+			},
 		},
 	),
 	(
 		"potted_cactus",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([85, 127, 43]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([85, 127, 43]),
+			},
 		},
 	),
 	(
 		"potted_cherry_sapling",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([164, 117, 143]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([164, 117, 143]),
+			},
 		},
 	),
 	(
 		"potted_cornflower",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([79, 121, 146]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([79, 121, 146]),
+			},
 		},
 	),
 	(
 		"potted_crimson_fungus",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([141, 44, 29]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([141, 44, 29]),
+			},
 		},
 	),
 	(
 		"potted_crimson_roots",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([127, 8, 41]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([127, 8, 41]),
+			},
 		},
 	),
 	(
 		"potted_dandelion",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([147, 172, 43]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([147, 172, 43]),
+			},
 		},
 	),
 	(
 		"potted_dark_oak_sapling",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([61, 90, 30]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([61, 90, 30]),
+			},
 		},
 	),
 	(
 		"potted_dead_bush",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([107, 78, 40]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([107, 78, 40]),
+			},
 		},
 	),
 	(
 		"potted_fern",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: Color([124, 124, 124]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
+				color: Color([124, 124, 124]),
+			},
 		},
 	),
 	(
 		"potted_flowering_azalea_bush",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([112, 121, 64]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([112, 121, 64]),
+			},
 		},
 	),
 	(
 		"potted_jungle_sapling",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([47, 81, 16]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([47, 81, 16]),
+			},
 		},
 	),
 	(
 		"potted_lily_of_the_valley",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([123, 174, 95]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([123, 174, 95]),
+			},
 		},
 	),
 	(
 		"potted_mangrove_propagule",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([96, 174, 83]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([96, 174, 83]),
+			},
 		},
 	),
 	(
 		"potted_oak_sapling",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([77, 106, 40]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([77, 106, 40]),
+			},
 		},
 	),
 	(
 		"potted_orange_tulip",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([93, 142, 30]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([93, 142, 30]),
+			},
 		},
 	),
 	(
 		"potted_oxeye_daisy",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([179, 202, 143]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([179, 202, 143]),
+			},
 		},
 	),
 	(
 		"potted_pink_tulip",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([99, 157, 78]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([99, 157, 78]),
+			},
 		},
 	),
 	(
 		"potted_poppy",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([128, 64, 37]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([128, 64, 37]),
+			},
 		},
 	),
 	(
 		"potted_red_mushroom",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([216, 75, 67]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([216, 75, 67]),
+			},
 		},
 	),
 	(
 		"potted_red_tulip",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([89, 128, 32]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([89, 128, 32]),
+			},
 		},
 	),
 	(
 		"potted_spruce_sapling",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([44, 60, 36]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([44, 60, 36]),
+			},
 		},
 	),
 	(
 		"potted_torchflower",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([100, 101, 77]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([100, 101, 77]),
+			},
 		},
 	),
 	(
 		"potted_warped_fungus",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([74, 109, 87]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([74, 109, 87]),
+			},
 		},
 	),
 	(
 		"potted_warped_roots",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([20, 136, 123]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([20, 136, 123]),
+			},
 		},
 	),
 	(
 		"potted_white_tulip",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([93, 164, 71]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([93, 164, 71]),
+			},
 		},
 	),
 	(
 		"potted_wither_rose",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([41, 44, 23]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([41, 44, 23]),
+			},
 		},
 	),
 	(
 		"powder_snow",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([248, 253, 253]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([248, 253, 253]),
+			},
 		},
 	),
 	(
 		"powder_snow_cauldron",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([73, 72, 74]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([73, 72, 74]),
+			},
 		},
 	),
 	(
 		"powered_rail",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([137, 109, 74]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([137, 109, 74]),
+			},
 		},
 	),
 	(
 		"prismarine",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([99, 156, 151]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([99, 156, 151]),
+			},
 		},
 	),
 	(
 		"prismarine_brick_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([99, 171, 158]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([99, 171, 158]),
+			},
 		},
 	),
 	(
 		"prismarine_brick_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([99, 171, 158]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([99, 171, 158]),
+			},
 		},
 	),
 	(
 		"prismarine_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([99, 171, 158]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([99, 171, 158]),
+			},
 		},
 	),
 	(
 		"prismarine_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([99, 156, 151]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([99, 156, 151]),
+			},
 		},
 	),
 	(
 		"prismarine_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([99, 156, 151]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([99, 156, 151]),
+			},
 		},
 	),
 	(
 		"prismarine_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([99, 156, 151]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([99, 156, 151]),
+			},
 		},
 	),
 	(
 		"pumpkin",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([198, 118, 24]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([198, 118, 24]),
+			},
 		},
 	),
 	(
 		"pumpkin_stem",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: Color([154, 154, 154]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
+				color: Color([154, 154, 154]),
+			},
 		},
 	),
 	(
 		"purple_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"purple_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"purple_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"purple_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([248, 222, 214]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([248, 222, 214]),
+			},
 		},
 	),
 	(
 		"purple_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([121, 42, 172]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([121, 42, 172]),
+			},
 		},
 	),
 	(
 		"purple_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([100, 31, 156]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([100, 31, 156]),
+			},
 		},
 	),
 	(
 		"purple_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([131, 55, 177]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([131, 55, 177]),
+			},
 		},
 	),
 	(
 		"purple_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([109, 47, 152]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([109, 47, 152]),
+			},
 		},
 	),
 	(
 		"purple_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([103, 32, 156]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([103, 32, 156]),
+			},
 		},
 	),
 	(
 		"purple_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([127, 63, 178]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([127, 63, 178]),
+			},
 		},
 	),
 	(
 		"purple_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([122, 61, 171]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([122, 61, 171]),
+			},
 		},
 	),
 	(
 		"purple_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([118, 70, 86]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([118, 70, 86]),
+			},
 		},
 	),
 	(
 		"purple_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"purple_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([121, 42, 172]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([121, 42, 172]),
+			},
 		},
 	),
 	(
 		"purpur_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([169, 125, 169]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([169, 125, 169]),
+			},
 		},
 	),
 	(
 		"purpur_pillar",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([171, 129, 171]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([171, 129, 171]),
+			},
 		},
 	),
 	(
 		"purpur_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([169, 125, 169]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([169, 125, 169]),
+			},
 		},
 	),
 	(
 		"purpur_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([169, 125, 169]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([169, 125, 169]),
+			},
 		},
 	),
 	(
 		"quartz_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([235, 229, 222]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([235, 229, 222]),
+			},
 		},
 	),
 	(
 		"quartz_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([234, 229, 221]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([234, 229, 221]),
+			},
 		},
 	),
 	(
 		"quartz_pillar",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([235, 230, 224]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([235, 230, 224]),
+			},
 		},
 	),
 	(
 		"quartz_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([235, 229, 222]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([235, 229, 222]),
+			},
 		},
 	),
 	(
 		"quartz_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([235, 229, 222]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([235, 229, 222]),
+			},
 		},
 	),
 	(
 		"rail",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([125, 111, 88]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([125, 111, 88]),
+			},
 		},
 	),
 	(
 		"raw_copper_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([154, 105, 79]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([154, 105, 79]),
+			},
 		},
 	),
 	(
 		"raw_gold_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([221, 169, 46]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([221, 169, 46]),
+			},
 		},
 	),
 	(
 		"raw_iron_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([166, 135, 107]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([166, 135, 107]),
+			},
 		},
 	),
 	(
 		"red_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"red_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"red_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"red_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([248, 222, 214]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([248, 222, 214]),
+			},
 		},
 	),
 	(
 		"red_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([160, 39, 34]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([160, 39, 34]),
+			},
 		},
 	),
 	(
 		"red_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([142, 32, 32]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([142, 32, 32]),
+			},
 		},
 	),
 	(
 		"red_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([168, 54, 50]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([168, 54, 50]),
+			},
 		},
 	),
 	(
 		"red_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([181, 59, 53]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([181, 59, 53]),
+			},
 		},
 	),
 	(
 		"red_mushroom",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"red_mushroom_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([200, 46, 45]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([200, 46, 45]),
+			},
 		},
 	),
 	(
 		"red_nether_brick_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([69, 7, 9]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([69, 7, 9]),
+			},
 		},
 	),
 	(
 		"red_nether_brick_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([69, 7, 9]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([69, 7, 9]),
+			},
 		},
 	),
 	(
 		"red_nether_brick_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([69, 7, 9]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([69, 7, 9]),
+			},
 		},
 	),
 	(
 		"red_nether_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([69, 7, 9]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([69, 7, 9]),
+			},
 		},
 	),
 	(
 		"red_sand",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([190, 102, 33]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([190, 102, 33]),
+			},
 		},
 	),
 	(
 		"red_sandstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([181, 97, 31]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([181, 97, 31]),
+			},
 		},
 	),
 	(
 		"red_sandstone_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([181, 97, 31]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([181, 97, 31]),
+			},
 		},
 	),
 	(
 		"red_sandstone_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([181, 97, 31]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([181, 97, 31]),
+			},
 		},
 	),
 	(
 		"red_sandstone_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([181, 97, 31]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([181, 97, 31]),
+			},
 		},
 	),
 	(
 		"red_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([140, 31, 30]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([140, 31, 30]),
+			},
 		},
 	),
 	(
 		"red_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([153, 51, 51]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([153, 51, 51]),
+			},
 		},
 	),
 	(
 		"red_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([147, 48, 48]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([147, 48, 48]),
+			},
 		},
 	),
 	(
 		"red_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([143, 61, 46]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([143, 61, 46]),
+			},
 		},
 	),
 	(
 		"red_tulip",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"red_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"red_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([160, 39, 34]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([160, 39, 34]),
+			},
 		},
 	),
 	(
 		"redstone_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([175, 24, 5]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([175, 24, 5]),
+			},
 		},
 	),
 	(
 		"redstone_lamp",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([95, 54, 30]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([95, 54, 30]),
+			},
 		},
 	),
 	(
 		"redstone_ore",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([140, 109, 109]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([140, 109, 109]),
+			},
 		},
 	),
 	(
 		"redstone_torch",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"redstone_wall_torch",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"redstone_wire",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([175, 24, 5]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([175, 24, 5]),
+			},
 		},
 	),
 	(
 		"reinforced_deepslate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([80, 82, 78]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([80, 82, 78]),
+			},
 		},
 	),
 	(
 		"repeater",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([160, 157, 156]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([160, 157, 156]),
+			},
 		},
 	),
 	(
 		"repeating_command_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([129, 111, 176]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([129, 111, 176]),
+			},
 		},
 	),
 	(
 		"respawn_anchor",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([75, 26, 144]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([75, 26, 144]),
+			},
 		},
 	),
 	(
 		"rooted_dirt",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([144, 103, 76]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([144, 103, 76]),
+			},
 		},
 	),
 	(
 		"rose_bush",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([131, 66, 37]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([131, 66, 37]),
+			},
 		},
 	),
 	(
 		"sand",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([219, 207, 163]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([219, 207, 163]),
+			},
 		},
 	),
 	(
 		"sandstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([223, 214, 170]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([223, 214, 170]),
+			},
 		},
 	),
 	(
 		"sandstone_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([223, 214, 170]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([223, 214, 170]),
+			},
 		},
 	),
 	(
 		"sandstone_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([223, 214, 170]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([223, 214, 170]),
+			},
 		},
 	),
 	(
 		"sandstone_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([223, 214, 170]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([223, 214, 170]),
+			},
 		},
 	),
 	(
 		"scaffolding",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([170, 131, 73]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([170, 131, 73]),
+			},
 		},
 	),
 	(
 		"sculk",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([12, 29, 36]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([12, 29, 36]),
+			},
 		},
 	),
 	(
 		"sculk_catalyst",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([15, 31, 38]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([15, 31, 38]),
+			},
 		},
 	),
 	(
 		"sculk_sensor",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([7, 70, 84]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([7, 70, 84]),
+			},
 		},
 	),
 	(
 		"sculk_shrieker",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([198, 205, 169]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([198, 205, 169]),
+			},
 		},
 	),
 	(
 		"sculk_vein",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([7, 48, 57]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([7, 48, 57]),
+			},
 		},
 	),
 	(
 		"sea_lantern",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([172, 199, 190]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([172, 199, 190]),
+			},
 		},
 	),
 	(
 		"sea_pickle",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([90, 97, 39]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([90, 97, 39]),
+			},
 		},
 	),
 	(
 		"seagrass",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
@@ -5704,1366 +7330,1756 @@ pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
 	(
 		"shroomlight",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([240, 146, 70]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([240, 146, 70]),
+			},
 		},
 	),
 	(
 		"shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([139, 96, 139]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([139, 96, 139]),
+			},
 		},
 	),
 	(
 		"sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([162, 130, 78]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([162, 130, 78]),
+			},
 		},
 	),
 	(
 		"skeleton_skull",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"skeleton_wall_skull",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"slime_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([111, 192, 91]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([111, 192, 91]),
+			},
 		},
 	),
 	(
 		"small_amethyst_bud",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"small_dripleaf",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"smithing_table",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([57, 58, 70]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([57, 58, 70]),
+			},
 		},
 	),
 	(
 		"smoker",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([85, 83, 81]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([85, 83, 81]),
+			},
 		},
 	),
 	(
 		"smooth_basalt",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([72, 72, 78]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([72, 72, 78]),
+			},
 		},
 	),
 	(
 		"smooth_quartz",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([235, 229, 222]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([235, 229, 222]),
+			},
 		},
 	),
 	(
 		"smooth_quartz_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([235, 229, 222]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([235, 229, 222]),
+			},
 		},
 	),
 	(
 		"smooth_quartz_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([235, 229, 222]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([235, 229, 222]),
+			},
 		},
 	),
 	(
 		"smooth_red_sandstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([181, 97, 31]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([181, 97, 31]),
+			},
 		},
 	),
 	(
 		"smooth_red_sandstone_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([181, 97, 31]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([181, 97, 31]),
+			},
 		},
 	),
 	(
 		"smooth_red_sandstone_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([181, 97, 31]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([181, 97, 31]),
+			},
 		},
 	),
 	(
 		"smooth_sandstone",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([223, 214, 170]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([223, 214, 170]),
+			},
 		},
 	),
 	(
 		"smooth_sandstone_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([223, 214, 170]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([223, 214, 170]),
+			},
 		},
 	),
 	(
 		"smooth_sandstone_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([223, 214, 170]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([223, 214, 170]),
+			},
 		},
 	),
 	(
 		"smooth_stone",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([158, 158, 158]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([158, 158, 158]),
+			},
 		},
 	),
 	(
 		"smooth_stone_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([158, 158, 158]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([158, 158, 158]),
+			},
 		},
 	),
 	(
 		"sniffer_egg",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([135, 105, 67]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([135, 105, 67]),
+			},
 		},
 	),
 	(
 		"snow",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([249, 254, 254]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([249, 254, 254]),
+			},
 		},
 	),
 	(
 		"snow_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([249, 254, 254]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([249, 254, 254]),
+			},
 		},
 	),
 	(
 		"soul_campfire",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([80, 204, 208]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([80, 204, 208]),
+			},
 		},
 	),
 	(
 		"soul_fire",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([51, 192, 197]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([51, 192, 197]),
+			},
 		},
 	),
 	(
 		"soul_lantern",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([71, 99, 114]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([71, 99, 114]),
+			},
 		},
 	),
 	(
 		"soul_sand",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([81, 62, 50]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([81, 62, 50]),
+			},
 		},
 	),
 	(
 		"soul_soil",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([75, 57, 46]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([75, 57, 46]),
+			},
 		},
 	),
 	(
 		"soul_torch",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"soul_wall_torch",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"spawner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([36, 46, 62]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([36, 46, 62]),
+			},
 		},
 	),
 	(
 		"sponge",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([195, 192, 74]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([195, 192, 74]),
+			},
 		},
 	),
 	(
 		"spore_blossom",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([206, 96, 158]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([206, 96, 158]),
+			},
 		},
 	),
 	(
 		"spruce_button",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"spruce_door",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([106, 80, 48]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([106, 80, 48]),
+			},
 		},
 	),
 	(
 		"spruce_fence",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([114, 84, 48]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([114, 84, 48]),
+			},
 		},
 	),
 	(
 		"spruce_fence_gate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([114, 84, 48]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([114, 84, 48]),
+			},
 		},
 	),
 	(
 		"spruce_hanging_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"spruce_leaves",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque|Spruce}),
-			color: Color([126, 126, 126]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque|Spruce}),
+				color: Color([126, 126, 126]),
+			},
 		},
 	),
 	(
 		"spruce_log",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([108, 80, 46]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([108, 80, 46]),
+			},
 		},
 	),
 	(
 		"spruce_planks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([114, 84, 48]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([114, 84, 48]),
+			},
 		},
 	),
 	(
 		"spruce_pressure_plate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([114, 84, 48]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([114, 84, 48]),
+			},
 		},
 	),
 	(
 		"spruce_sapling",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([44, 60, 36]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([44, 60, 36]),
+			},
 		},
 	),
 	(
 		"spruce_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([114, 84, 48]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([114, 84, 48]),
+			},
 		},
 	),
 	(
 		"spruce_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([114, 84, 48]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([114, 84, 48]),
+			},
 		},
 	),
 	(
 		"spruce_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([114, 84, 48]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([114, 84, 48]),
+			},
 		},
 	),
 	(
 		"spruce_trapdoor",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([103, 79, 47]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([103, 79, 47]),
+			},
 		},
 	),
 	(
 		"spruce_wall_hanging_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"spruce_wall_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"spruce_wood",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([58, 37, 16]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([58, 37, 16]),
+			},
 		},
 	),
 	(
 		"sticky_piston",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([109, 104, 96]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([109, 104, 96]),
+			},
 		},
 	),
 	(
 		"stone",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([125, 125, 125]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([125, 125, 125]),
+			},
 		},
 	),
 	(
 		"stone_brick_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([122, 121, 122]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([122, 121, 122]),
+			},
 		},
 	),
 	(
 		"stone_brick_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([122, 121, 122]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([122, 121, 122]),
+			},
 		},
 	),
 	(
 		"stone_brick_wall",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([122, 121, 122]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([122, 121, 122]),
+			},
 		},
 	),
 	(
 		"stone_bricks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([122, 121, 122]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([122, 121, 122]),
+			},
 		},
 	),
 	(
 		"stone_button",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"stone_pressure_plate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([125, 125, 125]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([125, 125, 125]),
+			},
 		},
 	),
 	(
 		"stone_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([125, 125, 125]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([125, 125, 125]),
+			},
 		},
 	),
 	(
 		"stone_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([125, 125, 125]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([125, 125, 125]),
+			},
 		},
 	),
 	(
 		"stonecutter",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([123, 118, 111]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([123, 118, 111]),
+			},
 		},
 	),
 	(
 		"stripped_acacia_log",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([166, 91, 51]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([166, 91, 51]),
+			},
 		},
 	),
 	(
 		"stripped_acacia_wood",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([174, 92, 59]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([174, 92, 59]),
+			},
 		},
 	),
 	(
 		"stripped_bamboo_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([178, 158, 72]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([178, 158, 72]),
+			},
 		},
 	),
 	(
 		"stripped_birch_log",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([191, 171, 116]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([191, 171, 116]),
+			},
 		},
 	),
 	(
 		"stripped_birch_wood",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([196, 176, 118]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([196, 176, 118]),
+			},
 		},
 	),
 	(
 		"stripped_cherry_log",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([221, 164, 157]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([221, 164, 157]),
+			},
 		},
 	),
 	(
 		"stripped_cherry_wood",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([215, 145, 148]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([215, 145, 148]),
+			},
 		},
 	),
 	(
 		"stripped_crimson_hyphae",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([137, 57, 90]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([137, 57, 90]),
+			},
 		},
 	),
 	(
 		"stripped_crimson_stem",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([121, 56, 82]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([121, 56, 82]),
+			},
 		},
 	),
 	(
 		"stripped_dark_oak_log",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([65, 44, 22]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([65, 44, 22]),
+			},
 		},
 	),
 	(
 		"stripped_dark_oak_wood",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([72, 56, 36]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([72, 56, 36]),
+			},
 		},
 	),
 	(
 		"stripped_jungle_log",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([165, 122, 81]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([165, 122, 81]),
+			},
 		},
 	),
 	(
 		"stripped_jungle_wood",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([171, 132, 84]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([171, 132, 84]),
+			},
 		},
 	),
 	(
 		"stripped_mangrove_log",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([109, 43, 43]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([109, 43, 43]),
+			},
 		},
 	),
 	(
 		"stripped_mangrove_wood",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([119, 54, 47]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([119, 54, 47]),
+			},
 		},
 	),
 	(
 		"stripped_oak_log",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([160, 129, 77]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([160, 129, 77]),
+			},
 		},
 	),
 	(
 		"stripped_oak_wood",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([177, 144, 86]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([177, 144, 86]),
+			},
 		},
 	),
 	(
 		"stripped_spruce_log",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([105, 80, 46]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([105, 80, 46]),
+			},
 		},
 	),
 	(
 		"stripped_spruce_wood",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([115, 89, 52]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([115, 89, 52]),
+			},
 		},
 	),
 	(
 		"stripped_warped_hyphae",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([57, 150, 147]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([57, 150, 147]),
+			},
 		},
 	),
 	(
 		"stripped_warped_stem",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([52, 128, 124]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([52, 128, 124]),
+			},
 		},
 	),
 	(
 		"structure_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([88, 74, 90]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([88, 74, 90]),
+			},
 		},
 	),
 	(
 		"structure_void",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"sugar_cane",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([148, 192, 101]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([148, 192, 101]),
+			},
 		},
 	),
 	(
 		"sunflower",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([246, 196, 54]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([246, 196, 54]),
+			},
 		},
 	),
 	(
 		"suspicious_gravel",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([129, 125, 124]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([129, 125, 124]),
+			},
 		},
 	),
 	(
 		"suspicious_sand",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([217, 204, 159]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([217, 204, 159]),
+			},
 		},
 	),
 	(
 		"sweet_berry_bush",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([68, 77, 50]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([68, 77, 50]),
+			},
 		},
 	),
 	(
 		"tall_grass",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: Color([151, 149, 151]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
+				color: Color([151, 149, 151]),
+			},
 		},
 	),
 	(
 		"tall_seagrass",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([59, 139, 14]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([59, 139, 14]),
+			},
 		},
 	),
 	(
 		"target",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([226, 170, 157]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([226, 170, 157]),
+			},
 		},
 	),
 	(
 		"terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([152, 94, 67]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([152, 94, 67]),
+			},
 		},
 	),
 	(
 		"tinted_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([44, 38, 46]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([44, 38, 46]),
+			},
 		},
 	),
 	(
 		"tnt",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([142, 62, 53]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([142, 62, 53]),
+			},
 		},
 	),
 	(
 		"torch",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"torchflower",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"torchflower_crop",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"trapped_chest",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([162, 130, 78]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([162, 130, 78]),
+			},
 		},
 	),
 	(
 		"tripwire",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"tripwire_hook",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"tube_coral",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"tube_coral_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([49, 87, 206]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([49, 87, 206]),
+			},
 		},
 	),
 	(
 		"tube_coral_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"tube_coral_wall_fan",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"tuff",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([108, 109, 102]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([108, 109, 102]),
+			},
 		},
 	),
 	(
 		"turtle_egg",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([228, 226, 191]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([228, 226, 191]),
+			},
 		},
 	),
 	(
 		"twisting_vines",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([20, 143, 124]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([20, 143, 124]),
+			},
 		},
 	),
 	(
 		"twisting_vines_plant",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([20, 135, 122]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([20, 135, 122]),
+			},
 		},
 	),
 	(
 		"verdant_froglight",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([229, 244, 228]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([229, 244, 228]),
+			},
 		},
 	),
 	(
 		"vine",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
-			color: Color([116, 116, 116]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
+				color: Color([116, 116, 116]),
+			},
 		},
 	),
 	(
 		"void_air",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"wall_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"wall_torch",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"warped_button",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"warped_door",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([44, 126, 120]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([44, 126, 120]),
+			},
 		},
 	),
 	(
 		"warped_fence",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([43, 104, 99]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([43, 104, 99]),
+			},
 		},
 	),
 	(
 		"warped_fence_gate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([43, 104, 99]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([43, 104, 99]),
+			},
 		},
 	),
 	(
 		"warped_fungus",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"warped_hanging_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"warped_hyphae",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([58, 58, 77]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([58, 58, 77]),
+			},
 		},
 	),
 	(
 		"warped_nylium",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([43, 114, 101]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([43, 114, 101]),
+			},
 		},
 	),
 	(
 		"warped_planks",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([43, 104, 99]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([43, 104, 99]),
+			},
 		},
 	),
 	(
 		"warped_pressure_plate",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([43, 104, 99]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([43, 104, 99]),
+			},
 		},
 	),
 	(
 		"warped_roots",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([20, 138, 124]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([20, 138, 124]),
+			},
 		},
 	),
 	(
 		"warped_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([43, 104, 99]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([43, 104, 99]),
+			},
 		},
 	),
 	(
 		"warped_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([43, 104, 99]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([43, 104, 99]),
+			},
 		},
 	),
 	(
 		"warped_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([43, 104, 99]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([43, 104, 99]),
+			},
 		},
 	),
 	(
 		"warped_stem",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([53, 109, 110]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([53, 109, 110]),
+			},
 		},
 	),
 	(
 		"warped_trapdoor",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([47, 119, 111]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([47, 119, 111]),
+			},
 		},
 	),
 	(
 		"warped_wall_hanging_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"warped_wall_sign",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"warped_wart_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([22, 119, 121]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([22, 119, 121]),
+			},
 		},
 	),
 	(
 		"water",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque|Water}),
-			color: Color([177, 177, 177]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque|Water}),
+				color: Color([177, 177, 177]),
+			},
 		},
 	),
 	(
 		"water_cauldron",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([73, 72, 74]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([73, 72, 74]),
+			},
 		},
 	),
 	(
 		"waxed_copper_block",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([192, 107, 79]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([192, 107, 79]),
+			},
 		},
 	),
 	(
 		"waxed_cut_copper",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([191, 106, 80]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([191, 106, 80]),
+			},
 		},
 	),
 	(
 		"waxed_cut_copper_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([191, 106, 80]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([191, 106, 80]),
+			},
 		},
 	),
 	(
 		"waxed_cut_copper_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([191, 106, 80]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([191, 106, 80]),
+			},
 		},
 	),
 	(
 		"waxed_exposed_copper",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([161, 125, 103]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([161, 125, 103]),
+			},
 		},
 	),
 	(
 		"waxed_exposed_cut_copper",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([154, 121, 101]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([154, 121, 101]),
+			},
 		},
 	),
 	(
 		"waxed_exposed_cut_copper_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([154, 121, 101]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([154, 121, 101]),
+			},
 		},
 	),
 	(
 		"waxed_exposed_cut_copper_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([154, 121, 101]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([154, 121, 101]),
+			},
 		},
 	),
 	(
 		"waxed_oxidized_copper",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([82, 162, 132]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([82, 162, 132]),
+			},
 		},
 	),
 	(
 		"waxed_oxidized_cut_copper",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([79, 153, 126]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([79, 153, 126]),
+			},
 		},
 	),
 	(
 		"waxed_oxidized_cut_copper_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([79, 153, 126]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([79, 153, 126]),
+			},
 		},
 	),
 	(
 		"waxed_oxidized_cut_copper_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([79, 153, 126]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([79, 153, 126]),
+			},
 		},
 	),
 	(
 		"waxed_weathered_copper",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([108, 153, 110]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([108, 153, 110]),
+			},
 		},
 	),
 	(
 		"waxed_weathered_cut_copper",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([109, 145, 107]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([109, 145, 107]),
+			},
 		},
 	),
 	(
 		"waxed_weathered_cut_copper_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([109, 145, 107]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([109, 145, 107]),
+			},
 		},
 	),
 	(
 		"waxed_weathered_cut_copper_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([109, 145, 107]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([109, 145, 107]),
+			},
 		},
 	),
 	(
 		"weathered_copper",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([108, 153, 110]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([108, 153, 110]),
+			},
 		},
 	),
 	(
 		"weathered_cut_copper",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([109, 145, 107]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([109, 145, 107]),
+			},
 		},
 	),
 	(
 		"weathered_cut_copper_slab",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([109, 145, 107]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([109, 145, 107]),
+			},
 		},
 	),
 	(
 		"weathered_cut_copper_stairs",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([109, 145, 107]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([109, 145, 107]),
+			},
 		},
 	),
 	(
 		"weeping_vines",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([104, 1, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([104, 1, 0]),
+			},
 		},
 	),
 	(
 		"weeping_vines_plant",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([132, 16, 12]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([132, 16, 12]),
+			},
 		},
 	),
 	(
 		"wet_sponge",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([171, 181, 70]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([171, 181, 70]),
+			},
 		},
 	),
 	(
 		"wheat",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([166, 151, 73]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([166, 151, 73]),
+			},
 		},
 	),
 	(
 		"white_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"white_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"white_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"white_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([248, 222, 214]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([248, 222, 214]),
+			},
 		},
 	),
 	(
 		"white_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([233, 236, 236]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([233, 236, 236]),
+			},
 		},
 	),
 	(
 		"white_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([207, 213, 214]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([207, 213, 214]),
+			},
 		},
 	),
 	(
 		"white_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([225, 227, 227]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([225, 227, 227]),
+			},
 		},
 	),
 	(
 		"white_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([188, 212, 202]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([188, 212, 202]),
+			},
 		},
 	),
 	(
 		"white_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([215, 220, 221]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([215, 220, 221]),
+			},
 		},
 	),
 	(
 		"white_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([255, 255, 255]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([255, 255, 255]),
+			},
 		},
 	),
 	(
 		"white_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([246, 246, 246]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([246, 246, 246]),
+			},
 		},
 	),
 	(
 		"white_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([209, 178, 161]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([209, 178, 161]),
+			},
 		},
 	),
 	(
 		"white_tulip",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"white_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"white_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([233, 236, 236]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([233, 236, 236]),
+			},
 		},
 	),
 	(
 		"wither_rose",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"wither_skeleton_skull",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"wither_skeleton_wall_skull",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"yellow_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"yellow_bed",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"yellow_candle",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"yellow_candle_cake",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([248, 222, 214]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([248, 222, 214]),
+			},
 		},
 	),
 	(
 		"yellow_carpet",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([248, 197, 39]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([248, 197, 39]),
+			},
 		},
 	),
 	(
 		"yellow_concrete",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([240, 175, 21]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([240, 175, 21]),
+			},
 		},
 	),
 	(
 		"yellow_concrete_powder",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([232, 199, 54]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([232, 199, 54]),
+			},
 		},
 	),
 	(
 		"yellow_glazed_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([234, 192, 88]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([234, 192, 88]),
+			},
 		},
 	),
 	(
 		"yellow_shulker_box",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([248, 188, 29]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([248, 188, 29]),
+			},
 		},
 	),
 	(
 		"yellow_stained_glass",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([229, 229, 51]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([229, 229, 51]),
+			},
 		},
 	),
 	(
 		"yellow_stained_glass_pane",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([221, 221, 48]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([221, 221, 48]),
+			},
 		},
 	),
 	(
 		"yellow_terracotta",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([186, 133, 35]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([186, 133, 35]),
+			},
 		},
 	),
 	(
 		"yellow_wall_banner",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"yellow_wool",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{Opaque}),
-			color: Color([248, 197, 39]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([248, 197, 39]),
+			},
 		},
 	),
 	(
 		"zombie_head",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 	(
 		"zombie_wall_head",
 		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
 		},
 	),
 ];
diff --git a/crates/resource/src/lib.rs b/crates/resource/src/lib.rs
index ad3553f..676b92b 100644
--- a/crates/resource/src/lib.rs
+++ b/crates/resource/src/lib.rs
@@ -42,21 +42,28 @@ pub type Colorf = glam::Vec3;
 
 /// A block type specification
 #[derive(Debug, Clone, Copy, Serialize, Deserialize)]
-pub struct BlockType {
+pub struct BlockColor {
 	/// Bit set of [BlockFlag]s describing special properties of the block type
 	pub flags: BitFlags<BlockFlag>,
 	/// Base color of the block type
 	pub color: Color,
 }
 
-impl BlockType {
-	/// Checks whether a block type has a given [BlockFlag] set
+impl BlockColor {
+	/// Checks whether a block color has a given [BlockFlag] set
 	#[inline]
 	pub fn is(&self, flag: BlockFlag) -> bool {
 		self.flags.contains(flag)
 	}
 }
 
+/// A block type specification
+#[derive(Debug, Clone)]
+pub struct BlockType {
+	/// Determines the rendered color of the block type
+	pub block_color: BlockColor,
+}
+
 /// Used to look up standard Minecraft block types
 #[derive(Debug)]
 pub struct BlockTypes {
@@ -70,10 +77,15 @@ impl Default for BlockTypes {
 	fn default() -> Self {
 		let block_type_map: HashMap<_, _> = block_types::BLOCK_TYPES
 			.iter()
-			.map(|(k, v)| (String::from(*k), *v))
+			.map(|(k, v)| (String::from(*k), v.clone()))
 			.collect();
 		let legacy_block_types = Box::new(legacy_block_types::LEGACY_BLOCK_TYPES.map(|inner| {
-			inner.map(|id| *block_type_map.get(id).expect("Unknown legacy block type"))
+			inner.map(|id| {
+				block_type_map
+					.get(id)
+					.expect("Unknown legacy block type")
+					.clone()
+			})
 		}));
 
 		BlockTypes {
@@ -86,15 +98,15 @@ impl Default for BlockTypes {
 impl BlockTypes {
 	/// Resolves a Minecraft 1.13+ string block type ID
 	#[inline]
-	pub fn get(&self, id: &str) -> Option<BlockType> {
+	pub fn get(&self, id: &str) -> Option<&BlockType> {
 		let suffix = id.strip_prefix("minecraft:")?;
-		self.block_type_map.get(suffix).copied()
+		self.block_type_map.get(suffix)
 	}
 
 	/// Resolves a Minecraft pre-1.13 numeric block type ID
 	#[inline]
-	pub fn get_legacy(&self, id: u8, data: u8) -> Option<BlockType> {
-		Some(self.legacy_block_types[id as usize][data as usize])
+	pub fn get_legacy(&self, id: u8, data: u8) -> Option<&BlockType> {
+		Some(&self.legacy_block_types[id as usize][data as usize])
 	}
 }
 
diff --git a/resource/generate.py b/resource/generate.py
index 73bb91d..2e6cf21 100755
--- a/resource/generate.py
+++ b/resource/generate.py
@@ -36,11 +36,13 @@ with open(sys.argv[2], 'w') as f:
 			flags.append('Water')
 		flags = 'make_bitflags!(BlockFlag::{' + '|'.join(flags) + '})'
 
-		print('\t("%s", BlockType { flags: %s, color: Color([%u, %u, %u]) }),' % (
-			name,
+		print('\t("%s", BlockType { ' % name, file=f)
+		print('\t\tblock_color: BlockColor { flags: %s, color: Color([%u, %u, %u]) },' % (
 			flags,
 			info['color']['r'],
 			info['color']['g'],
 			info['color']['b'],
 		), file=f)
+		print('}),', file=f)
+
 	print('];', file=f)
diff --git a/src/world/layer.rs b/src/world/layer.rs
index ce88107..576dfa4 100644
--- a/src/world/layer.rs
+++ b/src/world/layer.rs
@@ -8,7 +8,7 @@ use serde::{Deserialize, Serialize};
 
 use super::chunk::{Chunk, SectionIterItem};
 use crate::{
-	resource::{Biome, BlockFlag, BlockType},
+	resource::{Biome, BlockColor, BlockFlag},
 	types::*,
 };
 
@@ -31,8 +31,8 @@ impl BlockHeight {
 	}
 }
 
-/// Array optionally storing a [BlockType] for each coordinate of a chunk
-pub type BlockArray = LayerBlockArray<Option<BlockType>>;
+/// Array optionally storing a [BlockColor] for each coordinate of a chunk
+pub type BlockArray = LayerBlockArray<Option<BlockColor>>;
 
 /// Array optionally storing a biome index for each coordinate of a chunk
 ///
@@ -49,7 +49,7 @@ pub type DepthArray = LayerBlockArray<Option<BlockHeight>>;
 /// References to LayerData entries for a single coordinate pair
 struct LayerEntry<'a> {
 	/// The block type of the referenced entry
-	block: &'a mut Option<BlockType>,
+	block: &'a mut Option<BlockColor>,
 	/// The biome type of the referenced entry
 	biome: &'a mut Option<NonZeroU16>,
 	/// The block light of the referenced entry
@@ -86,7 +86,7 @@ impl<'a> LayerEntry<'a> {
 		let Some(block_type) = section
 			.section
 			.block_at(coords)?
-			.filter(|block_type| block_type.is(BlockFlag::Opaque))
+			.filter(|block_type| block_type.block_color.is(BlockFlag::Opaque))
 		else {
 			if self.is_empty() {
 				*self.block_light = section.block_light.block_light_at(coords);
@@ -96,7 +96,7 @@ impl<'a> LayerEntry<'a> {
 		};
 
 		if self.is_empty() {
-			*self.block = Some(block_type);
+			*self.block = Some(block_type.block_color);
 			if let Some(biome) = section.biomes.biome_at(section.y, coords)? {
 				let (biome_index, _) = biome_list.insert_full(*biome);
 				*self.biome = NonZeroU16::new(
@@ -107,7 +107,7 @@ impl<'a> LayerEntry<'a> {
 			}
 		}
 
-		if block_type.is(BlockFlag::Water) {
+		if block_type.block_color.is(BlockFlag::Water) {
 			return Ok(false);
 		}
 
diff --git a/src/world/section.rs b/src/world/section.rs
index 97e0061..62b510b 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -44,7 +44,7 @@ fn palette_bits(len: usize, min: u8, max: u8) -> Option<u8> {
 /// Trait for common functions of [SectionV1_13] and [SectionV0]
 pub trait Section: Debug {
 	/// Returns the [BlockType] at a coordinate tuple inside the section
-	fn block_at(&self, coords: SectionBlockCoords) -> Result<Option<BlockType>>;
+	fn block_at(&self, coords: SectionBlockCoords) -> Result<Option<&BlockType>>;
 }
 
 /// Minecraft v1.13+ section block data
@@ -53,7 +53,7 @@ pub struct SectionV1_13<'a> {
 	/// Packed block type data
 	block_states: Option<&'a [i64]>,
 	/// List of block types indexed by entries encoded in *block_states*
-	palette: Vec<Option<BlockType>>,
+	palette: Vec<Option<&'a BlockType>>,
 	/// Number of bits per block in *block_states*
 	bits: u8,
 	/// Set to true if packed block entries in *block_states* are aligned to i64
@@ -146,7 +146,7 @@ impl<'a> SectionV1_13<'a> {
 }
 
 impl<'a> Section for SectionV1_13<'a> {
-	fn block_at(&self, coords: SectionBlockCoords) -> Result<Option<BlockType>> {
+	fn block_at(&self, coords: SectionBlockCoords) -> Result<Option<&BlockType>> {
 		let index = self.palette_index_at(coords);
 		Ok(*self
 			.palette
@@ -189,7 +189,7 @@ impl<'a> SectionV0<'a> {
 }
 
 impl<'a> Section for SectionV0<'a> {
-	fn block_at(&self, coords: SectionBlockCoords) -> Result<Option<BlockType>> {
+	fn block_at(&self, coords: SectionBlockCoords) -> Result<Option<&BlockType>> {
 		let offset = coords.offset();
 		let block = self.blocks[offset] as u8;
 

From abf87e75ee377ba64c32cb19e44b8d7746f51190 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 29 Dec 2023 20:54:26 +0100
Subject: [PATCH 334/460] resource: add sign material to block types

---
 crates/resource/src/block_types.rs | 3035 ++++++++++++++++++----------
 crates/resource/src/lib.rs         |   22 +-
 resource/blocks.json               |  182 +-
 resource/extract.py                |    9 +-
 resource/generate.py               |    9 +-
 5 files changed, 2207 insertions(+), 1050 deletions(-)

diff --git a/crates/resource/src/block_types.rs b/crates/resource/src/block_types.rs
index 87d57c8..f9ec70d 100644
--- a/crates/resource/src/block_types.rs
+++ b/crates/resource/src/block_types.rs
@@ -2,9084 +2,10095 @@ use enumflags2::make_bitflags;
 
 use super::*;
 
-pub const BLOCK_TYPES: &[(&str, BlockType)] = &[
+pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 	(
 		"acacia_button",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"acacia_door",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([167, 95, 60]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"acacia_fence",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([168, 90, 50]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"acacia_fence_gate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([168, 90, 50]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"acacia_hanging_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("acacia"),
 		},
 	),
 	(
 		"acacia_leaves",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
 				color: Color([149, 148, 148]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"acacia_log",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([150, 88, 55]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"acacia_planks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([168, 90, 50]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"acacia_pressure_plate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([168, 90, 50]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"acacia_sapling",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([118, 117, 23]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"acacia_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([168, 90, 50]),
 			},
+			sign_material: Some("acacia"),
 		},
 	),
 	(
 		"acacia_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([168, 90, 50]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"acacia_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([168, 90, 50]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"acacia_trapdoor",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([156, 87, 51]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"acacia_wall_hanging_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("acacia"),
 		},
 	),
 	(
 		"acacia_wall_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("acacia"),
 		},
 	),
 	(
 		"acacia_wood",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([103, 96, 86]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"activator_rail",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([115, 87, 74]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"air",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"allium",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"amethyst_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([133, 97, 191]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"amethyst_cluster",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([163, 126, 207]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"ancient_debris",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([94, 66, 58]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"andesite",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([136, 136, 136]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"andesite_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([136, 136, 136]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"andesite_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([136, 136, 136]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"andesite_wall",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([136, 136, 136]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"anvil",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([72, 72, 72]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"attached_melon_stem",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 				color: Color([141, 142, 141]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"attached_pumpkin_stem",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 				color: Color([139, 139, 139]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"azalea",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([101, 124, 47]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"azalea_leaves",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([90, 114, 44]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"azure_bluet",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"bamboo",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([93, 144, 19]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"bamboo_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([139, 141, 62]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"bamboo_button",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"bamboo_door",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([191, 171, 81]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"bamboo_fence",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([193, 173, 80]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"bamboo_fence_gate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([193, 173, 80]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"bamboo_hanging_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("bamboo"),
 		},
 	),
 	(
 		"bamboo_mosaic",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([190, 170, 78]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"bamboo_mosaic_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([190, 170, 78]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"bamboo_mosaic_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([190, 170, 78]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"bamboo_planks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([193, 173, 80]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"bamboo_pressure_plate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([193, 173, 80]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"bamboo_sapling",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"bamboo_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([193, 173, 80]),
 			},
+			sign_material: Some("bamboo"),
 		},
 	),
 	(
 		"bamboo_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([193, 173, 80]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"bamboo_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([193, 173, 80]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"bamboo_trapdoor",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([198, 179, 85]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"bamboo_wall_hanging_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("bamboo"),
 		},
 	),
 	(
 		"bamboo_wall_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("bamboo"),
 		},
 	),
 	(
 		"barrel",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([134, 100, 58]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"barrier",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"basalt",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([80, 81, 86]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"beacon",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([117, 220, 215]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"bedrock",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([85, 85, 85]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"bee_nest",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([202, 160, 74]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"beehive",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([180, 146, 90]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"beetroots",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([93, 91, 30]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"bell",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([253, 235, 110]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"big_dripleaf",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([111, 141, 51]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"big_dripleaf_stem",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"birch_button",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"birch_door",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([220, 209, 176]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"birch_fence",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([192, 175, 121]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"birch_fence_gate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([192, 175, 121]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"birch_hanging_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("birch"),
 		},
 	),
 	(
 		"birch_leaves",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque|Birch}),
 				color: Color([130, 129, 130]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"birch_log",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([193, 179, 135]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"birch_planks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([192, 175, 121]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"birch_pressure_plate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([192, 175, 121]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"birch_sapling",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([127, 160, 79]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"birch_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([192, 175, 121]),
 			},
+			sign_material: Some("birch"),
 		},
 	),
 	(
 		"birch_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([192, 175, 121]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"birch_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([192, 175, 121]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"birch_trapdoor",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([207, 194, 157]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"birch_wall_hanging_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("birch"),
 		},
 	),
 	(
 		"birch_wall_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("birch"),
 		},
 	),
 	(
 		"birch_wood",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([216, 215, 210]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"black_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"black_bed",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"black_candle",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"black_candle_cake",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([248, 222, 214]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"black_carpet",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([20, 21, 25]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"black_concrete",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([8, 10, 15]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"black_concrete_powder",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([25, 26, 31]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"black_glazed_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([67, 30, 32]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"black_shulker_box",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([25, 25, 29]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"black_stained_glass",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([25, 25, 25]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"black_stained_glass_pane",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([24, 24, 24]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"black_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([37, 22, 16]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"black_wall_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"black_wool",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([20, 21, 25]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"blackstone",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([42, 36, 41]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"blackstone_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([42, 36, 41]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"blackstone_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([42, 36, 41]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"blackstone_wall",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([42, 36, 41]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"blast_furnace",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([80, 80, 81]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"blue_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"blue_bed",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"blue_candle",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"blue_candle_cake",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([248, 222, 214]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"blue_carpet",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([53, 57, 157]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"blue_concrete",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([44, 46, 143]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"blue_concrete_powder",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([70, 73, 166]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"blue_glazed_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([47, 64, 139]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"blue_ice",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([116, 167, 253]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"blue_orchid",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"blue_shulker_box",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([43, 45, 140]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"blue_stained_glass",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([51, 76, 178]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"blue_stained_glass_pane",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([48, 73, 171]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"blue_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([74, 59, 91]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"blue_wall_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"blue_wool",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([53, 57, 157]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"bone_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([209, 206, 179]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"bookshelf",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([162, 130, 78]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"brain_coral",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"brain_coral_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([207, 91, 159]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"brain_coral_fan",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"brain_coral_wall_fan",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"brewing_stand",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([122, 100, 80]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"brick_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([150, 97, 83]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"brick_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([150, 97, 83]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"brick_wall",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([150, 97, 83]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"bricks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([150, 97, 83]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"brown_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"brown_bed",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"brown_candle",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"brown_candle_cake",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([248, 222, 214]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"brown_carpet",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([114, 71, 40]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"brown_concrete",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([96, 59, 31]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"brown_concrete_powder",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([125, 84, 53]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"brown_glazed_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([119, 106, 85]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"brown_mushroom",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"brown_mushroom_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([149, 111, 81]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"brown_shulker_box",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([106, 66, 35]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"brown_stained_glass",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([102, 76, 51]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"brown_stained_glass_pane",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([97, 73, 48]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"brown_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([77, 51, 35]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"brown_wall_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"brown_wool",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([114, 71, 40]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"bubble_column",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque|Water}),
 				color: Color([177, 177, 177]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"bubble_coral",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"bubble_coral_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([165, 26, 162]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"bubble_coral_fan",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"bubble_coral_wall_fan",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"budding_amethyst",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([132, 96, 186]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cactus",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([85, 127, 43]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cake",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([248, 222, 214]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"calcite",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([223, 224, 220]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"calibrated_sculk_sensor",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([27, 79, 100]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"campfire",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([110, 88, 54]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"candle",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"candle_cake",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([248, 222, 214]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"carrots",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([81, 124, 37]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cartography_table",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([103, 87, 67]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"carved_pumpkin",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([198, 118, 24]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cauldron",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([73, 72, 74]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cave_air",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cave_vines",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([90, 109, 40]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cave_vines_plant",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([88, 101, 38]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"chain",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"chain_command_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([131, 161, 147]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cherry_button",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cherry_door",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([223, 170, 164]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cherry_fence",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([226, 178, 172]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cherry_fence_gate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([226, 178, 172]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cherry_hanging_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("cherry"),
 		},
 	),
 	(
 		"cherry_leaves",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([229, 172, 194]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cherry_log",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([185, 141, 137]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cherry_planks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([226, 178, 172]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cherry_pressure_plate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([226, 178, 172]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cherry_sapling",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cherry_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([226, 178, 172]),
 			},
+			sign_material: Some("cherry"),
 		},
 	),
 	(
 		"cherry_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([226, 178, 172]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cherry_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([226, 178, 172]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cherry_trapdoor",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([226, 178, 172]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cherry_wall_hanging_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("cherry"),
 		},
 	),
 	(
 		"cherry_wall_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("cherry"),
 		},
 	),
 	(
 		"cherry_wood",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([54, 33, 44]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"chest",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([162, 130, 78]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"chipped_anvil",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([72, 72, 72]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"chiseled_bookshelf",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([178, 144, 88]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"chiseled_deepslate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([54, 54, 54]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"chiseled_nether_bricks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([47, 23, 28]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"chiseled_polished_blackstone",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([53, 48, 56]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"chiseled_quartz_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([231, 226, 218]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"chiseled_red_sandstone",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([181, 97, 31]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"chiseled_sandstone",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([223, 214, 170]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"chiseled_stone_bricks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([119, 118, 119]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"chorus_flower",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([151, 120, 151]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"chorus_plant",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([93, 57, 93]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"clay",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([160, 166, 179]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"coal_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([16, 15, 15]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"coal_ore",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([105, 105, 105]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"coarse_dirt",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([119, 85, 59]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cobbled_deepslate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([77, 77, 80]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cobbled_deepslate_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([77, 77, 80]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cobbled_deepslate_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([77, 77, 80]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cobbled_deepslate_wall",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([77, 77, 80]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cobblestone",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([127, 127, 127]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cobblestone_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([127, 127, 127]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cobblestone_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([127, 127, 127]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cobblestone_wall",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([127, 127, 127]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cobweb",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([228, 233, 234]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cocoa",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([154, 91, 40]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"command_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([181, 136, 108]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"comparator",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([166, 161, 159]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"composter",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([88, 61, 23]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"conduit",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([159, 139, 113]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"copper_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([192, 107, 79]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"copper_ore",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([124, 125, 120]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cornflower",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cracked_deepslate_bricks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([64, 64, 65]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cracked_deepslate_tiles",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([52, 52, 52]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cracked_nether_bricks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([40, 20, 23]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cracked_polished_blackstone_bricks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([44, 37, 43]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cracked_stone_bricks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([118, 117, 118]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"crafting_table",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([119, 73, 42]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"creeper_head",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"creeper_wall_head",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"crimson_button",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"crimson_door",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([114, 54, 79]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"crimson_fence",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([101, 48, 70]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"crimson_fence_gate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([101, 48, 70]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"crimson_fungus",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"crimson_hanging_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("crimson"),
 		},
 	),
 	(
 		"crimson_hyphae",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([92, 25, 29]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"crimson_nylium",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([130, 31, 31]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"crimson_planks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([101, 48, 70]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"crimson_pressure_plate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([101, 48, 70]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"crimson_roots",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([126, 8, 41]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"crimson_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([101, 48, 70]),
 			},
+			sign_material: Some("crimson"),
 		},
 	),
 	(
 		"crimson_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([101, 48, 70]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"crimson_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([101, 48, 70]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"crimson_stem",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([112, 49, 70]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"crimson_trapdoor",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([103, 50, 72]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"crimson_wall_hanging_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("crimson"),
 		},
 	),
 	(
 		"crimson_wall_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("crimson"),
 		},
 	),
 	(
 		"crying_obsidian",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([32, 10, 60]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cut_copper",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([191, 106, 80]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cut_copper_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([191, 106, 80]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cut_copper_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([191, 106, 80]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cut_red_sandstone",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([181, 97, 31]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cut_red_sandstone_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([181, 97, 31]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cut_sandstone",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([223, 214, 170]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cut_sandstone_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([223, 214, 170]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cyan_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cyan_bed",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cyan_candle",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cyan_candle_cake",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([248, 222, 214]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cyan_carpet",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([21, 137, 145]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cyan_concrete",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([21, 119, 136]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cyan_concrete_powder",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([36, 147, 157]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cyan_glazed_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([52, 118, 125]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cyan_shulker_box",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([20, 121, 135]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cyan_stained_glass",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([76, 127, 153]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cyan_stained_glass_pane",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([73, 122, 147]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cyan_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([86, 91, 91]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cyan_wall_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"cyan_wool",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([21, 137, 145]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"damaged_anvil",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([72, 72, 72]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dandelion",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dark_oak_button",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dark_oak_door",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([76, 51, 25]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dark_oak_fence",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([66, 43, 20]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dark_oak_fence_gate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([66, 43, 20]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dark_oak_hanging_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("dark_oak"),
 		},
 	),
 	(
 		"dark_oak_leaves",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
 				color: Color([150, 150, 150]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dark_oak_log",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([67, 45, 22]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dark_oak_planks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([66, 43, 20]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dark_oak_pressure_plate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([66, 43, 20]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dark_oak_sapling",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([61, 90, 30]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dark_oak_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([66, 43, 20]),
 			},
+			sign_material: Some("dark_oak"),
 		},
 	),
 	(
 		"dark_oak_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([66, 43, 20]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dark_oak_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([66, 43, 20]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dark_oak_trapdoor",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([75, 49, 23]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dark_oak_wall_hanging_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("dark_oak"),
 		},
 	),
 	(
 		"dark_oak_wall_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("dark_oak"),
 		},
 	),
 	(
 		"dark_oak_wood",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([60, 46, 26]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dark_prismarine",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([51, 91, 75]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dark_prismarine_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([51, 91, 75]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dark_prismarine_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([51, 91, 75]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"daylight_detector",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([130, 116, 94]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dead_brain_coral",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dead_brain_coral_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([124, 117, 114]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dead_brain_coral_fan",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dead_brain_coral_wall_fan",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dead_bubble_coral",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dead_bubble_coral_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([131, 123, 119]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dead_bubble_coral_fan",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dead_bubble_coral_wall_fan",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dead_bush",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([107, 78, 40]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dead_fire_coral",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dead_fire_coral_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([131, 123, 119]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dead_fire_coral_fan",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dead_fire_coral_wall_fan",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dead_horn_coral",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dead_horn_coral_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([133, 126, 122]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dead_horn_coral_fan",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dead_horn_coral_wall_fan",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dead_tube_coral",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dead_tube_coral_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([130, 123, 119]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dead_tube_coral_fan",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dead_tube_coral_wall_fan",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"decorated_pot",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([124, 68, 53]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"deepslate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([80, 80, 82]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"deepslate_brick_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([70, 70, 71]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"deepslate_brick_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([70, 70, 71]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"deepslate_brick_wall",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([70, 70, 71]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"deepslate_bricks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([70, 70, 71]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"deepslate_coal_ore",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([74, 74, 76]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"deepslate_copper_ore",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([92, 93, 89]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"deepslate_diamond_ore",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([83, 106, 106]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"deepslate_emerald_ore",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([78, 104, 87]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"deepslate_gold_ore",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([115, 102, 78]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"deepslate_iron_ore",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([106, 99, 94]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"deepslate_lapis_ore",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([79, 90, 115]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"deepslate_redstone_ore",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([104, 73, 74]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"deepslate_tile_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([54, 54, 55]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"deepslate_tile_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([54, 54, 55]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"deepslate_tile_wall",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([54, 54, 55]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"deepslate_tiles",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([54, 54, 55]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"detector_rail",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([123, 104, 90]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"diamond_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([98, 237, 228]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"diamond_ore",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([121, 141, 140]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"diorite",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([188, 188, 188]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"diorite_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([188, 188, 188]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"diorite_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([188, 188, 188]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"diorite_wall",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([188, 188, 188]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dirt",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([134, 96, 67]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dirt_path",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([148, 121, 65]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dispenser",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([110, 109, 109]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dragon_egg",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([12, 9, 15]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dragon_head",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dragon_wall_head",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dried_kelp_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([50, 58, 38]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dripstone_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([134, 107, 92]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"dropper",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([110, 109, 109]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"emerald_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([42, 203, 87]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"emerald_ore",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([108, 136, 115]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"enchanting_table",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([128, 75, 85]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"end_gateway",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([15, 10, 24]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"end_portal",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([15, 10, 24]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"end_portal_frame",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([91, 120, 97]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"end_rod",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"end_stone",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([219, 222, 158]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"end_stone_brick_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([218, 224, 162]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"end_stone_brick_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([218, 224, 162]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"end_stone_brick_wall",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([218, 224, 162]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"end_stone_bricks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([218, 224, 162]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"ender_chest",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([15, 10, 24]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"exposed_copper",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([161, 125, 103]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"exposed_cut_copper",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([154, 121, 101]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"exposed_cut_copper_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([154, 121, 101]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"exposed_cut_copper_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([154, 121, 101]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"farmland",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([81, 44, 15]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"fern",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"fire",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([211, 140, 53]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"fire_coral",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"fire_coral_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([163, 35, 46]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"fire_coral_fan",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"fire_coral_wall_fan",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"fletching_table",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([197, 180, 133]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"flower_pot",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([124, 68, 53]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"flowering_azalea",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([112, 121, 64]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"flowering_azalea_leaves",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([99, 111, 60]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"frogspawn",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([105, 90, 82]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"frosted_ice",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([140, 181, 252]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"furnace",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([110, 109, 109]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"gilded_blackstone",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([55, 42, 38]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"glass",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([175, 213, 219]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"glass_pane",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([170, 210, 217]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"glow_item_frame",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"glow_lichen",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"glowstone",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([171, 131, 84]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"gold_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([246, 208, 61]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"gold_ore",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([145, 133, 106]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"granite",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([149, 103, 85]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"granite_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([149, 103, 85]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"granite_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([149, 103, 85]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"granite_wall",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([149, 103, 85]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"grass",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"grass_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 				color: Color([147, 147, 147]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"grass_path",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([148, 121, 65]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"gravel",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([131, 127, 126]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"gray_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"gray_bed",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"gray_candle",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"gray_candle_cake",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([248, 222, 214]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"gray_carpet",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([62, 68, 71]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"gray_concrete",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([54, 57, 61]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"gray_concrete_powder",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([76, 81, 84]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"gray_glazed_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([83, 90, 93]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"gray_shulker_box",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([55, 58, 62]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"gray_stained_glass",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([76, 76, 76]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"gray_stained_glass_pane",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([73, 73, 73]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"gray_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([57, 42, 35]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"gray_wall_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"gray_wool",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([62, 68, 71]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"green_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"green_bed",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"green_candle",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"green_candle_cake",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([248, 222, 214]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"green_carpet",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([84, 109, 27]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"green_concrete",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([73, 91, 36]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"green_concrete_powder",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([97, 119, 44]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"green_glazed_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([117, 142, 67]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"green_shulker_box",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([79, 100, 31]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"green_stained_glass",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([102, 127, 51]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"green_stained_glass_pane",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([97, 122, 48]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"green_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([76, 83, 42]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"green_wall_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"green_wool",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([84, 109, 27]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"grindstone",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([142, 142, 142]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"hanging_roots",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([161, 115, 91]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"hay_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([165, 139, 12]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"heavy_weighted_pressure_plate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([220, 220, 220]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"honey_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([251, 185, 52]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"honeycomb_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([229, 148, 29]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"hopper",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([75, 74, 75]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"horn_coral",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"horn_coral_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([216, 199, 66]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"horn_coral_fan",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"horn_coral_wall_fan",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"ice",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([145, 183, 253]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"infested_chiseled_stone_bricks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([119, 118, 119]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"infested_cobblestone",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([127, 127, 127]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"infested_cracked_stone_bricks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([118, 117, 118]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"infested_deepslate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([80, 80, 82]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"infested_mossy_stone_bricks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([115, 121, 105]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"infested_stone",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([125, 125, 125]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"infested_stone_bricks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([122, 121, 122]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"iron_bars",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([136, 139, 135]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"iron_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([220, 220, 220]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"iron_door",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([194, 193, 193]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"iron_ore",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([136, 129, 122]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"iron_trapdoor",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([202, 202, 202]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"item_frame",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"jack_o_lantern",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([214, 152, 52]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"jigsaw",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([80, 69, 81]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"jukebox",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([93, 64, 47]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"jungle_button",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"jungle_door",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([163, 119, 84]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"jungle_fence",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([160, 115, 80]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"jungle_fence_gate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([160, 115, 80]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"jungle_hanging_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("jungle"),
 		},
 	),
 	(
 		"jungle_leaves",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
 				color: Color([156, 154, 143]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"jungle_log",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([149, 109, 70]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"jungle_planks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([160, 115, 80]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"jungle_pressure_plate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([160, 115, 80]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"jungle_sapling",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([47, 81, 16]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"jungle_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([160, 115, 80]),
 			},
+			sign_material: Some("jungle"),
 		},
 	),
 	(
 		"jungle_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([160, 115, 80]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"jungle_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([160, 115, 80]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"jungle_trapdoor",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([152, 110, 77]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"jungle_wall_hanging_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("jungle"),
 		},
 	),
 	(
 		"jungle_wall_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("jungle"),
 		},
 	),
 	(
 		"jungle_wood",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([85, 67, 25]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"kelp",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"kelp_plant",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([86, 130, 42]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"ladder",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"lantern",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([106, 91, 83]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"lapis_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([30, 67, 140]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"lapis_ore",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([107, 117, 141]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"large_amethyst_bud",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"large_fern",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 				color: Color([125, 125, 125]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"lava",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([212, 90, 18]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"lava_cauldron",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([73, 72, 74]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"lectern",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([173, 137, 83]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"lever",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_blue_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_blue_bed",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_blue_candle",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_blue_candle_cake",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([248, 222, 214]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_blue_carpet",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([58, 175, 217]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_blue_concrete",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([35, 137, 198]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_blue_concrete_powder",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([74, 180, 213]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_blue_glazed_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([94, 164, 208]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_blue_shulker_box",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([49, 163, 212]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_blue_stained_glass",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([102, 153, 216]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_blue_stained_glass_pane",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([97, 147, 208]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_blue_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([113, 108, 137]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_blue_wall_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_blue_wool",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([58, 175, 217]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_gray_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_gray_bed",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_gray_candle",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_gray_candle_cake",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([248, 222, 214]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_gray_carpet",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([142, 142, 134]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_gray_concrete",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([125, 125, 115]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_gray_concrete_powder",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([154, 154, 148]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_gray_glazed_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([144, 166, 167]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_gray_shulker_box",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([124, 124, 115]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_gray_stained_glass",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([153, 153, 153]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_gray_stained_glass_pane",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([147, 147, 147]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_gray_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([135, 106, 97]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_gray_wall_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_gray_wool",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([142, 142, 134]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"light_weighted_pressure_plate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([246, 208, 61]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"lightning_rod",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"lilac",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([154, 125, 147]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"lily_of_the_valley",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"lily_pad",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 				color: Color([133, 133, 133]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"lime_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"lime_bed",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"lime_candle",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"lime_candle_cake",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([248, 222, 214]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"lime_carpet",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([112, 185, 25]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"lime_concrete",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([94, 168, 24]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"lime_concrete_powder",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([125, 189, 41]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"lime_glazed_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([162, 197, 55]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"lime_shulker_box",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([99, 172, 23]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"lime_stained_glass",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([127, 204, 25]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"lime_stained_glass_pane",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([122, 196, 24]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"lime_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([103, 117, 52]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"lime_wall_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"lime_wool",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([112, 185, 25]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"lodestone",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([147, 149, 152]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"loom",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([142, 119, 91]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"magenta_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"magenta_bed",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"magenta_candle",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"magenta_candle_cake",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([248, 222, 214]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"magenta_carpet",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([189, 68, 179]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"magenta_concrete",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([169, 48, 159]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"magenta_concrete_powder",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([192, 83, 184]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"magenta_glazed_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([208, 100, 191]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"magenta_shulker_box",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([173, 54, 163]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"magenta_stained_glass",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([178, 76, 216]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"magenta_stained_glass_pane",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([171, 73, 208]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"magenta_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([149, 88, 108]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"magenta_wall_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"magenta_wool",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([189, 68, 179]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"magma_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([142, 63, 31]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mangrove_button",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mangrove_door",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([112, 48, 46]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mangrove_fence",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([117, 54, 48]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mangrove_fence_gate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([117, 54, 48]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mangrove_hanging_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("mangrove"),
 		},
 	),
 	(
 		"mangrove_leaves",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
 				color: Color([129, 128, 128]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mangrove_log",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([102, 48, 42]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mangrove_planks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([117, 54, 48]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mangrove_pressure_plate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([117, 54, 48]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mangrove_propagule",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([96, 174, 83]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mangrove_roots",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([74, 59, 38]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mangrove_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([117, 54, 48]),
 			},
+			sign_material: Some("mangrove"),
 		},
 	),
 	(
 		"mangrove_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([117, 54, 48]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mangrove_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([117, 54, 48]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mangrove_trapdoor",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([110, 46, 42]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mangrove_wall_hanging_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("mangrove"),
 		},
 	),
 	(
 		"mangrove_wall_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("mangrove"),
 		},
 	),
 	(
 		"mangrove_wood",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([83, 66, 41]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"medium_amethyst_bud",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"melon",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([111, 144, 30]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"melon_stem",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 				color: Color([153, 153, 153]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"moss_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([89, 109, 45]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"moss_carpet",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([89, 109, 45]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mossy_cobblestone",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([110, 118, 94]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mossy_cobblestone_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([110, 118, 94]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mossy_cobblestone_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([110, 118, 94]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mossy_cobblestone_wall",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([110, 118, 94]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mossy_stone_brick_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([115, 121, 105]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mossy_stone_brick_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([115, 121, 105]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mossy_stone_brick_wall",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([115, 121, 105]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mossy_stone_bricks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([115, 121, 105]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"moving_piston",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mud",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([60, 57, 60]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mud_brick_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([137, 103, 79]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mud_brick_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([137, 103, 79]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mud_brick_wall",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([137, 103, 79]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mud_bricks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([137, 103, 79]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"muddy_mangrove_roots",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([70, 58, 45]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mushroom_stem",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([203, 196, 185]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"mycelium",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([111, 98, 101]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"nether_brick_fence",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([44, 21, 26]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"nether_brick_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([44, 21, 26]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"nether_brick_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([44, 21, 26]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"nether_brick_wall",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([44, 21, 26]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"nether_bricks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([44, 21, 26]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"nether_gold_ore",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([115, 54, 42]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"nether_portal",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([89, 11, 192]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"nether_quartz_ore",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([117, 65, 62]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"nether_sprouts",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([19, 151, 133]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"nether_wart",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([111, 18, 19]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"nether_wart_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([114, 2, 2]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"netherite_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([66, 61, 63]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"netherrack",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([97, 38, 38]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"note_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([88, 58, 40]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"oak_button",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"oak_door",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([140, 110, 66]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"oak_fence",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([162, 130, 78]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"oak_fence_gate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([162, 130, 78]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"oak_hanging_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("oak"),
 		},
 	),
 	(
 		"oak_leaves",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque|Foliage}),
 				color: Color([144, 144, 144]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"oak_log",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([151, 121, 73]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"oak_planks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([162, 130, 78]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"oak_pressure_plate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([162, 130, 78]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"oak_sapling",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([77, 106, 40]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"oak_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([162, 130, 78]),
 			},
+			sign_material: Some("oak"),
 		},
 	),
 	(
 		"oak_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([162, 130, 78]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"oak_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([162, 130, 78]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"oak_trapdoor",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([124, 99, 56]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"oak_wall_hanging_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("oak"),
 		},
 	),
 	(
 		"oak_wall_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("oak"),
 		},
 	),
 	(
 		"oak_wood",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([109, 85, 50]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"observer",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([98, 98, 98]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"obsidian",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([15, 10, 24]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"ochre_froglight",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([250, 245, 206]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"orange_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"orange_bed",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"orange_candle",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"orange_candle_cake",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([248, 222, 214]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"orange_carpet",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([240, 118, 19]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"orange_concrete",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([224, 97, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"orange_concrete_powder",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([227, 131, 31]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"orange_glazed_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([154, 147, 91]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"orange_shulker_box",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([234, 106, 8]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"orange_stained_glass",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([216, 127, 51]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"orange_stained_glass_pane",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([208, 122, 48]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"orange_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([161, 83, 37]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"orange_tulip",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"orange_wall_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"orange_wool",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([240, 118, 19]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"oxeye_daisy",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"oxidized_copper",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([82, 162, 132]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"oxidized_cut_copper",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([79, 153, 126]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"oxidized_cut_copper_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([79, 153, 126]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"oxidized_cut_copper_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([79, 153, 126]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"packed_ice",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([141, 180, 250]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"packed_mud",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([142, 106, 79]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"pearlescent_froglight",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([245, 240, 239]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"peony",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([129, 126, 139]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"petrified_oak_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([162, 130, 78]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"piglin_head",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"piglin_wall_head",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"pink_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"pink_bed",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"pink_candle",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"pink_candle_cake",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([248, 222, 214]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"pink_carpet",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([237, 141, 172]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"pink_concrete",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([213, 101, 142]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"pink_concrete_powder",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([228, 153, 181]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"pink_glazed_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([235, 154, 181]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"pink_petals",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"pink_shulker_box",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([230, 121, 157]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"pink_stained_glass",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([242, 127, 165]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"pink_stained_glass_pane",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([233, 122, 159]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"pink_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([161, 78, 78]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"pink_tulip",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"pink_wall_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"pink_wool",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([237, 141, 172]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"piston",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([109, 104, 96]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"piston_head",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([153, 127, 85]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"pitcher_crop",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([193, 165, 103]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"pitcher_plant",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([122, 144, 189]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"player_head",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"player_wall_head",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"podzol",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([91, 63, 24]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"pointed_dripstone",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([129, 102, 89]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"polished_andesite",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([132, 134, 133]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"polished_andesite_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([132, 134, 133]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"polished_andesite_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([132, 134, 133]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"polished_basalt",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([99, 98, 100]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"polished_blackstone",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([53, 48, 56]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"polished_blackstone_brick_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([48, 42, 49]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"polished_blackstone_brick_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([48, 42, 49]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"polished_blackstone_brick_wall",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([48, 42, 49]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"polished_blackstone_bricks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([48, 42, 49]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"polished_blackstone_button",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"polished_blackstone_pressure_plate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([53, 48, 56]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"polished_blackstone_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([53, 48, 56]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"polished_blackstone_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([53, 48, 56]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"polished_blackstone_wall",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([53, 48, 56]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"polished_deepslate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([72, 72, 73]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"polished_deepslate_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([72, 72, 73]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"polished_deepslate_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([72, 72, 73]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"polished_deepslate_wall",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([72, 72, 73]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"polished_diorite",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([192, 193, 194]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"polished_diorite_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([192, 193, 194]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"polished_diorite_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([192, 193, 194]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"polished_granite",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([154, 106, 89]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"polished_granite_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([154, 106, 89]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"polished_granite_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([154, 106, 89]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"poppy",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potatoes",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([84, 135, 47]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_acacia_sapling",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([118, 117, 23]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_allium",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([158, 137, 183]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_azalea_bush",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([101, 124, 47]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_azure_bluet",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([169, 204, 127]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_bamboo",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([93, 144, 19]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_birch_sapling",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([127, 160, 79]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_blue_orchid",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([47, 162, 168]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_brown_mushroom",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([153, 116, 92]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_cactus",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([85, 127, 43]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_cherry_sapling",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([164, 117, 143]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_cornflower",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([79, 121, 146]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_crimson_fungus",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([141, 44, 29]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_crimson_roots",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([127, 8, 41]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_dandelion",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([147, 172, 43]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_dark_oak_sapling",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([61, 90, 30]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_dead_bush",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([107, 78, 40]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_fern",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 				color: Color([124, 124, 124]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_flowering_azalea_bush",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([112, 121, 64]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_jungle_sapling",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([47, 81, 16]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_lily_of_the_valley",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([123, 174, 95]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_mangrove_propagule",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([96, 174, 83]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_oak_sapling",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([77, 106, 40]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_orange_tulip",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([93, 142, 30]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_oxeye_daisy",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([179, 202, 143]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_pink_tulip",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([99, 157, 78]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_poppy",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([128, 64, 37]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_red_mushroom",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([216, 75, 67]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_red_tulip",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([89, 128, 32]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_spruce_sapling",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([44, 60, 36]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_torchflower",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([100, 101, 77]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_warped_fungus",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([74, 109, 87]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_warped_roots",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([20, 136, 123]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_white_tulip",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([93, 164, 71]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"potted_wither_rose",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([41, 44, 23]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"powder_snow",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([248, 253, 253]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"powder_snow_cauldron",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([73, 72, 74]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"powered_rail",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([137, 109, 74]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"prismarine",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([99, 156, 151]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"prismarine_brick_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([99, 171, 158]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"prismarine_brick_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([99, 171, 158]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"prismarine_bricks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([99, 171, 158]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"prismarine_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([99, 156, 151]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"prismarine_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([99, 156, 151]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"prismarine_wall",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([99, 156, 151]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"pumpkin",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([198, 118, 24]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"pumpkin_stem",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 				color: Color([154, 154, 154]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"purple_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"purple_bed",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"purple_candle",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"purple_candle_cake",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([248, 222, 214]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"purple_carpet",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([121, 42, 172]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"purple_concrete",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([100, 31, 156]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"purple_concrete_powder",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([131, 55, 177]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"purple_glazed_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([109, 47, 152]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"purple_shulker_box",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([103, 32, 156]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"purple_stained_glass",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([127, 63, 178]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"purple_stained_glass_pane",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([122, 61, 171]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"purple_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([118, 70, 86]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"purple_wall_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"purple_wool",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([121, 42, 172]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"purpur_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([169, 125, 169]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"purpur_pillar",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([171, 129, 171]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"purpur_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([169, 125, 169]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"purpur_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([169, 125, 169]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"quartz_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([235, 229, 222]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"quartz_bricks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([234, 229, 221]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"quartz_pillar",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([235, 230, 224]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"quartz_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([235, 229, 222]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"quartz_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([235, 229, 222]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"rail",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([125, 111, 88]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"raw_copper_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([154, 105, 79]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"raw_gold_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([221, 169, 46]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"raw_iron_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([166, 135, 107]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"red_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"red_bed",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"red_candle",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"red_candle_cake",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([248, 222, 214]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"red_carpet",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([160, 39, 34]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"red_concrete",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([142, 32, 32]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"red_concrete_powder",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([168, 54, 50]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"red_glazed_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([181, 59, 53]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"red_mushroom",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"red_mushroom_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([200, 46, 45]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"red_nether_brick_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([69, 7, 9]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"red_nether_brick_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([69, 7, 9]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"red_nether_brick_wall",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([69, 7, 9]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"red_nether_bricks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([69, 7, 9]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"red_sand",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([190, 102, 33]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"red_sandstone",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([181, 97, 31]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"red_sandstone_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([181, 97, 31]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"red_sandstone_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([181, 97, 31]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"red_sandstone_wall",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([181, 97, 31]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"red_shulker_box",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([140, 31, 30]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"red_stained_glass",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([153, 51, 51]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"red_stained_glass_pane",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([147, 48, 48]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"red_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([143, 61, 46]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"red_tulip",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"red_wall_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"red_wool",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([160, 39, 34]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"redstone_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([175, 24, 5]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"redstone_lamp",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([95, 54, 30]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"redstone_ore",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([140, 109, 109]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"redstone_torch",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"redstone_wall_torch",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"redstone_wire",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([175, 24, 5]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"reinforced_deepslate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([80, 82, 78]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"repeater",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([160, 157, 156]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"repeating_command_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([129, 111, 176]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"respawn_anchor",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([75, 26, 144]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"rooted_dirt",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([144, 103, 76]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"rose_bush",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([131, 66, 37]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"sand",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([219, 207, 163]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"sandstone",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([223, 214, 170]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"sandstone_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([223, 214, 170]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"sandstone_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([223, 214, 170]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"sandstone_wall",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([223, 214, 170]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"scaffolding",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([170, 131, 73]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"sculk",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([12, 29, 36]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"sculk_catalyst",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([15, 31, 38]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"sculk_sensor",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([7, 70, 84]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"sculk_shrieker",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([198, 205, 169]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"sculk_vein",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([7, 48, 57]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"sea_lantern",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([172, 199, 190]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"sea_pickle",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([90, 97, 39]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"seagrass",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"short_grass",
-		BlockType {
-			flags: make_bitflags!(BlockFlag::{}),
-			color: Color([0, 0, 0]),
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
+			sign_material: None,
 		},
 	),
 	(
 		"shroomlight",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([240, 146, 70]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"shulker_box",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([139, 96, 139]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([162, 130, 78]),
 			},
+			sign_material: Some("oak"),
 		},
 	),
 	(
 		"skeleton_skull",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"skeleton_wall_skull",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"slime_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([111, 192, 91]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"small_amethyst_bud",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"small_dripleaf",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"smithing_table",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([57, 58, 70]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"smoker",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([85, 83, 81]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"smooth_basalt",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([72, 72, 78]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"smooth_quartz",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([235, 229, 222]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"smooth_quartz_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([235, 229, 222]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"smooth_quartz_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([235, 229, 222]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"smooth_red_sandstone",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([181, 97, 31]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"smooth_red_sandstone_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([181, 97, 31]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"smooth_red_sandstone_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([181, 97, 31]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"smooth_sandstone",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([223, 214, 170]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"smooth_sandstone_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([223, 214, 170]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"smooth_sandstone_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([223, 214, 170]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"smooth_stone",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([158, 158, 158]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"smooth_stone_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([158, 158, 158]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"sniffer_egg",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([135, 105, 67]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"snow",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([249, 254, 254]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"snow_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([249, 254, 254]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"soul_campfire",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([80, 204, 208]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"soul_fire",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([51, 192, 197]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"soul_lantern",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([71, 99, 114]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"soul_sand",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([81, 62, 50]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"soul_soil",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([75, 57, 46]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"soul_torch",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"soul_wall_torch",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"spawner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([36, 46, 62]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"sponge",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([195, 192, 74]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"spore_blossom",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([206, 96, 158]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"spruce_button",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"spruce_door",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([106, 80, 48]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"spruce_fence",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([114, 84, 48]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"spruce_fence_gate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([114, 84, 48]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"spruce_hanging_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("spruce"),
 		},
 	),
 	(
 		"spruce_leaves",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque|Spruce}),
 				color: Color([126, 126, 126]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"spruce_log",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([108, 80, 46]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"spruce_planks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([114, 84, 48]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"spruce_pressure_plate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([114, 84, 48]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"spruce_sapling",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([44, 60, 36]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"spruce_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([114, 84, 48]),
 			},
+			sign_material: Some("spruce"),
 		},
 	),
 	(
 		"spruce_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([114, 84, 48]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"spruce_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([114, 84, 48]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"spruce_trapdoor",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([103, 79, 47]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"spruce_wall_hanging_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("spruce"),
 		},
 	),
 	(
 		"spruce_wall_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("spruce"),
 		},
 	),
 	(
 		"spruce_wood",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([58, 37, 16]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"sticky_piston",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([109, 104, 96]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stone",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([125, 125, 125]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stone_brick_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([122, 121, 122]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stone_brick_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([122, 121, 122]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stone_brick_wall",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([122, 121, 122]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stone_bricks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([122, 121, 122]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stone_button",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stone_pressure_plate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([125, 125, 125]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stone_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([125, 125, 125]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stone_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([125, 125, 125]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stonecutter",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([123, 118, 111]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stripped_acacia_log",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([166, 91, 51]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stripped_acacia_wood",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([174, 92, 59]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stripped_bamboo_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([178, 158, 72]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stripped_birch_log",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([191, 171, 116]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stripped_birch_wood",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([196, 176, 118]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stripped_cherry_log",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([221, 164, 157]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stripped_cherry_wood",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([215, 145, 148]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stripped_crimson_hyphae",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([137, 57, 90]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stripped_crimson_stem",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([121, 56, 82]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stripped_dark_oak_log",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([65, 44, 22]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stripped_dark_oak_wood",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([72, 56, 36]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stripped_jungle_log",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([165, 122, 81]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stripped_jungle_wood",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([171, 132, 84]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stripped_mangrove_log",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([109, 43, 43]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stripped_mangrove_wood",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([119, 54, 47]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stripped_oak_log",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([160, 129, 77]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stripped_oak_wood",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([177, 144, 86]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stripped_spruce_log",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([105, 80, 46]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stripped_spruce_wood",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([115, 89, 52]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stripped_warped_hyphae",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([57, 150, 147]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"stripped_warped_stem",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([52, 128, 124]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"structure_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([88, 74, 90]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"structure_void",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"sugar_cane",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([148, 192, 101]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"sunflower",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([246, 196, 54]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"suspicious_gravel",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([129, 125, 124]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"suspicious_sand",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([217, 204, 159]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"sweet_berry_bush",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([68, 77, 50]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"tall_grass",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 				color: Color([151, 149, 151]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"tall_seagrass",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([59, 139, 14]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"target",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([226, 170, 157]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([152, 94, 67]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"tinted_glass",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([44, 38, 46]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"tnt",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([142, 62, 53]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"torch",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"torchflower",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"torchflower_crop",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"trapped_chest",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([162, 130, 78]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"tripwire",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"tripwire_hook",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"tube_coral",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"tube_coral_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([49, 87, 206]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"tube_coral_fan",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"tube_coral_wall_fan",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"tuff",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([108, 109, 102]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"turtle_egg",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([228, 226, 191]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"twisting_vines",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([20, 143, 124]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"twisting_vines_plant",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([20, 135, 122]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"verdant_froglight",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([229, 244, 228]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"vine",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
 				color: Color([116, 116, 116]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"void_air",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"wall_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("oak"),
 		},
 	),
 	(
 		"wall_torch",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"warped_button",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"warped_door",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([44, 126, 120]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"warped_fence",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([43, 104, 99]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"warped_fence_gate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([43, 104, 99]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"warped_fungus",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"warped_hanging_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("warped"),
 		},
 	),
 	(
 		"warped_hyphae",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([58, 58, 77]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"warped_nylium",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([43, 114, 101]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"warped_planks",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([43, 104, 99]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"warped_pressure_plate",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([43, 104, 99]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"warped_roots",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([20, 138, 124]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"warped_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([43, 104, 99]),
 			},
+			sign_material: Some("warped"),
 		},
 	),
 	(
 		"warped_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([43, 104, 99]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"warped_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([43, 104, 99]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"warped_stem",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([53, 109, 110]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"warped_trapdoor",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([47, 119, 111]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"warped_wall_hanging_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("warped"),
 		},
 	),
 	(
 		"warped_wall_sign",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: Some("warped"),
 		},
 	),
 	(
 		"warped_wart_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([22, 119, 121]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"water",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque|Water}),
 				color: Color([177, 177, 177]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"water_cauldron",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([73, 72, 74]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"waxed_copper_block",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([192, 107, 79]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"waxed_cut_copper",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([191, 106, 80]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"waxed_cut_copper_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([191, 106, 80]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"waxed_cut_copper_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([191, 106, 80]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"waxed_exposed_copper",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([161, 125, 103]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"waxed_exposed_cut_copper",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([154, 121, 101]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"waxed_exposed_cut_copper_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([154, 121, 101]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"waxed_exposed_cut_copper_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([154, 121, 101]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"waxed_oxidized_copper",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([82, 162, 132]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"waxed_oxidized_cut_copper",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([79, 153, 126]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"waxed_oxidized_cut_copper_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([79, 153, 126]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"waxed_oxidized_cut_copper_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([79, 153, 126]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"waxed_weathered_copper",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([108, 153, 110]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"waxed_weathered_cut_copper",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([109, 145, 107]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"waxed_weathered_cut_copper_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([109, 145, 107]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"waxed_weathered_cut_copper_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([109, 145, 107]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"weathered_copper",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([108, 153, 110]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"weathered_cut_copper",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([109, 145, 107]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"weathered_cut_copper_slab",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([109, 145, 107]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"weathered_cut_copper_stairs",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([109, 145, 107]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"weeping_vines",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([104, 1, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"weeping_vines_plant",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([132, 16, 12]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"wet_sponge",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([171, 181, 70]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"wheat",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([166, 151, 73]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"white_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"white_bed",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"white_candle",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"white_candle_cake",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([248, 222, 214]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"white_carpet",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([233, 236, 236]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"white_concrete",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([207, 213, 214]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"white_concrete_powder",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([225, 227, 227]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"white_glazed_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([188, 212, 202]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"white_shulker_box",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([215, 220, 221]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"white_stained_glass",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([255, 255, 255]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"white_stained_glass_pane",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([246, 246, 246]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"white_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([209, 178, 161]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"white_tulip",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"white_wall_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"white_wool",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([233, 236, 236]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"wither_rose",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"wither_skeleton_skull",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"wither_skeleton_wall_skull",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"yellow_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"yellow_bed",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"yellow_candle",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"yellow_candle_cake",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([248, 222, 214]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"yellow_carpet",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([248, 197, 39]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"yellow_concrete",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([240, 175, 21]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"yellow_concrete_powder",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([232, 199, 54]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"yellow_glazed_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([234, 192, 88]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"yellow_shulker_box",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([248, 188, 29]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"yellow_stained_glass",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([229, 229, 51]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"yellow_stained_glass_pane",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([221, 221, 48]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"yellow_terracotta",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([186, 133, 35]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"yellow_wall_banner",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"yellow_wool",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
 				color: Color([248, 197, 39]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"zombie_head",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 	(
 		"zombie_wall_head",
-		BlockType {
+		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{}),
 				color: Color([0, 0, 0]),
 			},
+			sign_material: None,
 		},
 	),
 ];
diff --git a/crates/resource/src/lib.rs b/crates/resource/src/lib.rs
index 676b92b..1175c88 100644
--- a/crates/resource/src/lib.rs
+++ b/crates/resource/src/lib.rs
@@ -57,11 +57,31 @@ impl BlockColor {
 	}
 }
 
+/// A block type specification (for use in constants)
+#[derive(Debug, Clone)]
+struct ConstBlockType {
+	/// Determines the rendered color of the block type
+	pub block_color: BlockColor,
+	/// Material of a sign block
+	pub sign_material: Option<&'static str>,
+}
+
 /// A block type specification
 #[derive(Debug, Clone)]
 pub struct BlockType {
 	/// Determines the rendered color of the block type
 	pub block_color: BlockColor,
+	/// Material of a sign block
+	pub sign_material: Option<String>,
+}
+
+impl From<&ConstBlockType> for BlockType {
+	fn from(value: &ConstBlockType) -> Self {
+		BlockType {
+			block_color: value.block_color,
+			sign_material: value.sign_material.map(String::from),
+		}
+	}
 }
 
 /// Used to look up standard Minecraft block types
@@ -77,7 +97,7 @@ impl Default for BlockTypes {
 	fn default() -> Self {
 		let block_type_map: HashMap<_, _> = block_types::BLOCK_TYPES
 			.iter()
-			.map(|(k, v)| (String::from(*k), v.clone()))
+			.map(|(k, v)| (String::from(*k), BlockType::from(v)))
 			.collect();
 		let legacy_block_types = Box::new(legacy_block_types::LEGACY_BLOCK_TYPES.map(|inner| {
 			inner.map(|id| {
diff --git a/resource/blocks.json b/resource/blocks.json
index 6f4f5e7..ce5c497 100644
--- a/resource/blocks.json
+++ b/resource/blocks.json
@@ -9,7 +9,10 @@
 	"acacia_fence_gate": {
 		"texture": "acacia_planks"
 	},
-	"acacia_hanging_sign": null,
+	"acacia_hanging_sign": {
+		"sign_material": "acacia",
+		"texture": null
+	},
 	"acacia_leaves": {
 		"foliage": true
 	},
@@ -22,6 +25,7 @@
 	},
 	"acacia_sapling": {},
 	"acacia_sign": {
+		"sign_material": "acacia",
 		"texture": "acacia_planks"
 	},
 	"acacia_slab": {
@@ -31,8 +35,14 @@
 		"texture": "acacia_planks"
 	},
 	"acacia_trapdoor": {},
-	"acacia_wall_hanging_sign": null,
-	"acacia_wall_sign": null,
+	"acacia_wall_hanging_sign": {
+		"sign_material": "acacia",
+		"texture": null
+	},
+	"acacia_wall_sign": {
+		"sign_material": "acacia",
+		"texture": null
+	},
 	"acacia_wood": {
 		"texture": "acacia_log"
 	},
@@ -84,7 +94,10 @@
 	"bamboo_fence_gate": {
 		"texture": "bamboo_planks"
 	},
-	"bamboo_hanging_sign": null,
+	"bamboo_hanging_sign": {
+		"sign_material": "bamboo",
+		"texture": null
+	},
 	"bamboo_mosaic": {},
 	"bamboo_mosaic_slab": {
 		"texture": "bamboo_mosaic"
@@ -98,6 +111,7 @@
 	},
 	"bamboo_sapling": null,
 	"bamboo_sign": {
+		"sign_material": "bamboo",
 		"texture": "bamboo_planks"
 	},
 	"bamboo_slab": {
@@ -107,8 +121,14 @@
 		"texture": "bamboo_planks"
 	},
 	"bamboo_trapdoor": {},
-	"bamboo_wall_hanging_sign": null,
-	"bamboo_wall_sign": null,
+	"bamboo_wall_hanging_sign": {
+		"sign_material": "bamboo",
+		"texture": null
+	},
+	"bamboo_wall_sign": {
+		"sign_material": "bamboo",
+		"texture": null
+	},
 	"barrel": {
 		"texture": "barrel_top"
 	},
@@ -144,7 +164,10 @@
 	"birch_fence_gate": {
 		"texture": "birch_planks"
 	},
-	"birch_hanging_sign": null,
+	"birch_hanging_sign": {
+		"sign_material": "birch",
+		"texture": null
+	},
 	"birch_leaves": {
 		"birch": true
 	},
@@ -157,6 +180,7 @@
 	},
 	"birch_sapling": {},
 	"birch_sign": {
+		"sign_material": "birch",
 		"texture": "birch_planks"
 	},
 	"birch_slab": {
@@ -166,8 +190,14 @@
 		"texture": "birch_planks"
 	},
 	"birch_trapdoor": {},
-	"birch_wall_hanging_sign": null,
-	"birch_wall_sign": null,
+	"birch_wall_hanging_sign": {
+		"sign_material": "birch",
+		"texture": null
+	},
+	"birch_wall_sign": {
+		"sign_material": "birch",
+		"texture": null
+	},
 	"birch_wood": {
 		"texture": "birch_log"
 	},
@@ -326,7 +356,10 @@
 	"cherry_fence_gate": {
 		"texture": "cherry_planks"
 	},
-	"cherry_hanging_sign": null,
+	"cherry_hanging_sign": {
+		"sign_material": "cherry",
+		"texture": null
+	},
 	"cherry_leaves": {},
 	"cherry_log": {
 		"texture": "cherry_log_top"
@@ -337,6 +370,7 @@
 	},
 	"cherry_sapling": null,
 	"cherry_sign": {
+		"sign_material": "cherry",
 		"texture": "cherry_planks"
 	},
 	"cherry_slab": {
@@ -346,8 +380,14 @@
 		"texture": "cherry_planks"
 	},
 	"cherry_trapdoor": {},
-	"cherry_wall_hanging_sign": null,
-	"cherry_wall_sign": null,
+	"cherry_wall_hanging_sign": {
+		"sign_material": "cherry",
+		"texture": null
+	},
+	"cherry_wall_sign": {
+		"sign_material": "cherry",
+		"texture": null
+	},
 	"cherry_wood": {
 		"texture": "cherry_log"
 	},
@@ -433,7 +473,10 @@
 		"texture": "crimson_planks"
 	},
 	"crimson_fungus": null,
-	"crimson_hanging_sign": null,
+	"crimson_hanging_sign": {
+		"sign_material": "crimson",
+		"texture": null
+	},
 	"crimson_hyphae": {
 		"texture": "crimson_stem"
 	},
@@ -444,6 +487,7 @@
 	},
 	"crimson_roots": {},
 	"crimson_sign": {
+		"sign_material": "crimson",
 		"texture": "crimson_planks"
 	},
 	"crimson_slab": {
@@ -456,8 +500,14 @@
 		"texture": "crimson_stem_top"
 	},
 	"crimson_trapdoor": {},
-	"crimson_wall_hanging_sign": null,
-	"crimson_wall_sign": null,
+	"crimson_wall_hanging_sign": {
+		"sign_material": "crimson",
+		"texture": null
+	},
+	"crimson_wall_sign": {
+		"sign_material": "crimson",
+		"texture": null
+	},
 	"crying_obsidian": {},
 	"cut_copper": {},
 	"cut_copper_slab": {
@@ -512,7 +562,10 @@
 	"dark_oak_fence_gate": {
 		"texture": "dark_oak_planks"
 	},
-	"dark_oak_hanging_sign": null,
+	"dark_oak_hanging_sign": {
+		"sign_material": "dark_oak",
+		"texture": null
+	},
 	"dark_oak_leaves": {
 		"foliage": true
 	},
@@ -525,6 +578,7 @@
 	},
 	"dark_oak_sapling": {},
 	"dark_oak_sign": {
+		"sign_material": "dark_oak",
 		"texture": "dark_oak_planks"
 	},
 	"dark_oak_slab": {
@@ -534,8 +588,14 @@
 		"texture": "dark_oak_planks"
 	},
 	"dark_oak_trapdoor": {},
-	"dark_oak_wall_hanging_sign": null,
-	"dark_oak_wall_sign": null,
+	"dark_oak_wall_hanging_sign": {
+		"sign_material": "dark_oak",
+		"texture": null
+	},
+	"dark_oak_wall_sign": {
+		"sign_material": "dark_oak",
+		"texture": null
+	},
 	"dark_oak_wood": {
 		"texture": "dark_oak_log"
 	},
@@ -832,7 +892,10 @@
 	"jungle_fence_gate": {
 		"texture": "jungle_planks"
 	},
-	"jungle_hanging_sign": null,
+	"jungle_hanging_sign": {
+		"sign_material": "jungle",
+		"texture": null
+	},
 	"jungle_leaves": {
 		"foliage": true
 	},
@@ -845,6 +908,7 @@
 	},
 	"jungle_sapling": {},
 	"jungle_sign": {
+		"sign_material": "jungle",
 		"texture": "jungle_planks"
 	},
 	"jungle_slab": {
@@ -854,8 +918,14 @@
 		"texture": "jungle_planks"
 	},
 	"jungle_trapdoor": {},
-	"jungle_wall_hanging_sign": null,
-	"jungle_wall_sign": null,
+	"jungle_wall_hanging_sign": {
+		"sign_material": "jungle",
+		"texture": null
+	},
+	"jungle_wall_sign": {
+		"sign_material": "jungle",
+		"texture": null
+	},
 	"jungle_wood": {
 		"texture": "jungle_log"
 	},
@@ -991,7 +1061,10 @@
 	"mangrove_fence_gate": {
 		"texture": "mangrove_planks"
 	},
-	"mangrove_hanging_sign": null,
+	"mangrove_hanging_sign": {
+		"sign_material": "mangrove",
+		"texture": null
+	},
 	"mangrove_leaves": {
 		"foliage": true
 	},
@@ -1007,6 +1080,7 @@
 		"texture": "mangrove_roots_top"
 	},
 	"mangrove_sign": {
+		"sign_material": "mangrove",
 		"texture": "mangrove_planks"
 	},
 	"mangrove_slab": {
@@ -1016,8 +1090,14 @@
 		"texture": "mangrove_planks"
 	},
 	"mangrove_trapdoor": {},
-	"mangrove_wall_hanging_sign": null,
-	"mangrove_wall_sign": null,
+	"mangrove_wall_hanging_sign": {
+		"sign_material": "mangrove",
+		"texture": null
+	},
+	"mangrove_wall_sign": {
+		"sign_material": "mangrove",
+		"texture": null
+	},
 	"mangrove_wood": {
 		"texture": "mangrove_log"
 	},
@@ -1105,7 +1185,10 @@
 	"oak_fence_gate": {
 		"texture": "oak_planks"
 	},
-	"oak_hanging_sign": null,
+	"oak_hanging_sign": {
+		"sign_material": "oak",
+		"texture": null
+	},
 	"oak_leaves": {
 		"foliage": true
 	},
@@ -1118,6 +1201,7 @@
 	},
 	"oak_sapling": {},
 	"oak_sign": {
+		"sign_material": "oak",
 		"texture": "oak_planks"
 	},
 	"oak_slab": {
@@ -1127,8 +1211,14 @@
 		"texture": "oak_planks"
 	},
 	"oak_trapdoor": {},
-	"oak_wall_hanging_sign": null,
-	"oak_wall_sign": null,
+	"oak_wall_hanging_sign": {
+		"sign_material": "oak",
+		"texture": null
+	},
+	"oak_wall_sign": {
+		"sign_material": "oak",
+		"texture": null
+	},
 	"oak_wood": {
 		"texture": "oak_log"
 	},
@@ -1562,6 +1652,7 @@
 	"shroomlight": {},
 	"shulker_box": {},
 	"sign": {
+		"sign_material": "oak",
 		"texture": "oak_planks"
 	},
 	"skeleton_skull": null,
@@ -1638,7 +1729,10 @@
 	"spruce_fence_gate": {
 		"texture": "spruce_planks"
 	},
-	"spruce_hanging_sign": null,
+	"spruce_hanging_sign": {
+		"sign_material": "spruce",
+		"texture": null
+	},
 	"spruce_leaves": {
 		"spruce": true
 	},
@@ -1651,6 +1745,7 @@
 	},
 	"spruce_sapling": {},
 	"spruce_sign": {
+		"sign_material": "spruce",
 		"texture": "spruce_planks"
 	},
 	"spruce_slab": {
@@ -1660,8 +1755,14 @@
 		"texture": "spruce_planks"
 	},
 	"spruce_trapdoor": {},
-	"spruce_wall_hanging_sign": null,
-	"spruce_wall_sign": null,
+	"spruce_wall_hanging_sign": {
+		"sign_material": "spruce",
+		"texture": null
+	},
+	"spruce_wall_sign": {
+		"sign_material": "spruce",
+		"texture": null
+	},
 	"spruce_wood": {
 		"texture": "spruce_log"
 	},
@@ -1808,7 +1909,10 @@
 		"grass": true
 	},
 	"void_air": null,
-	"wall_sign": null,
+	"wall_sign": {
+		"sign_material": "oak",
+		"texture": null
+	},
 	"wall_torch": null,
 	"warped_button": null,
 	"warped_door": {
@@ -1821,7 +1925,10 @@
 		"texture": "warped_planks"
 	},
 	"warped_fungus": null,
-	"warped_hanging_sign": null,
+	"warped_hanging_sign": {
+		"sign_material": "warped",
+		"texture": null
+	},
 	"warped_hyphae": {
 		"texture": "warped_stem"
 	},
@@ -1832,6 +1939,7 @@
 	},
 	"warped_roots": {},
 	"warped_sign": {
+		"sign_material": "warped",
 		"texture": "warped_planks"
 	},
 	"warped_slab": {
@@ -1844,8 +1952,14 @@
 		"texture": "warped_stem_top"
 	},
 	"warped_trapdoor": {},
-	"warped_wall_hanging_sign": null,
-	"warped_wall_sign": null,
+	"warped_wall_hanging_sign": {
+		"sign_material": "warped",
+		"texture": null
+	},
+	"warped_wall_sign": {
+		"sign_material": "warped",
+		"texture": null
+	},
 	"warped_wart_block": {},
 	"water": {
 		"texture": "water_still",
diff --git a/resource/extract.py b/resource/extract.py
index 281f3a7..22a6c76 100755
--- a/resource/extract.py
+++ b/resource/extract.py
@@ -45,12 +45,17 @@ for name, info in blocks.items():
 		'birch': False,
 		'spruce': False,
 		'water': False,
+		'sign_material': None,
 	}
 
 	if info is None:
 		continue
 
-	color = mean_color(info.get('texture', name))
+	texture = info.get('texture', name)
+
+	color = None
+	if texture:
+		color = mean_color(texture)
 	if color:
 		output[id]['color'] = color
 		output[id]['opaque'] = True
@@ -60,5 +65,7 @@ for name, info in blocks.items():
 		output[id]['spruce'] = info.get('spruce', False)
 		output[id]['water'] = info.get('water', False)
 
+	output[id]['sign_material'] = info.get('sign_material')
+
 with open(sys.argv[3], 'w') as f:
 	json.dump(output, f)
diff --git a/resource/generate.py b/resource/generate.py
index 2e6cf21..da5cb94 100755
--- a/resource/generate.py
+++ b/resource/generate.py
@@ -18,7 +18,7 @@ with open(sys.argv[2], 'w') as f:
 	print('', file=f)
 	print('use super::*;', file=f)
 	print('', file=f)
-	print('pub const BLOCK_TYPES: &[(&str, BlockType)] = &[', file=f)
+	print('pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[', file=f)
 
 	for name, info in colors.items():
 		flags = []
@@ -36,13 +36,18 @@ with open(sys.argv[2], 'w') as f:
 			flags.append('Water')
 		flags = 'make_bitflags!(BlockFlag::{' + '|'.join(flags) + '})'
 
-		print('\t("%s", BlockType { ' % name, file=f)
+		sign_material = 'None'
+		if info['sign_material']:
+			sign_material = 'Some("%s")' % info['sign_material']
+
+		print('\t("%s", ConstBlockType { ' % name, file=f)
 		print('\t\tblock_color: BlockColor { flags: %s, color: Color([%u, %u, %u]) },' % (
 			flags,
 			info['color']['r'],
 			info['color']['g'],
 			info['color']['b'],
 		), file=f)
+		print('\t\tsign_material: %s,' % sign_material, file=f)
 		print('}),', file=f)
 
 	print('];', file=f)

From 48a6e242ea5fdc6de8050bc3b96d018d1c387124 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 30 Dec 2023 02:29:40 +0100
Subject: [PATCH 335/460] resource: add WallSign flag to block types

Allow to distinguish wall signs from freestanding or -hanging signs.
---
 crates/resource/src/block_types.rs | 46 ++++++++++----------
 crates/resource/src/lib.rs         |  5 +++
 resource/blocks.json               | 69 ++++++++++++++++++++----------
 resource/extract.py                | 13 +++---
 resource/generate.py               |  2 +
 5 files changed, 84 insertions(+), 51 deletions(-)

diff --git a/crates/resource/src/block_types.rs b/crates/resource/src/block_types.rs
index f9ec70d..7ee50af 100644
--- a/crates/resource/src/block_types.rs
+++ b/crates/resource/src/block_types.rs
@@ -147,7 +147,7 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"acacia_wall_hanging_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{}),
+				flags: make_bitflags!(BlockFlag::{WallSign}),
 				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("acacia"),
@@ -157,7 +157,7 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"acacia_wall_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{}),
+				flags: make_bitflags!(BlockFlag::{WallSign}),
 				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("acacia"),
@@ -507,7 +507,7 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"bamboo_wall_hanging_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{}),
+				flags: make_bitflags!(BlockFlag::{WallSign}),
 				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("bamboo"),
@@ -517,7 +517,7 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"bamboo_wall_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{}),
+				flags: make_bitflags!(BlockFlag::{WallSign}),
 				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("bamboo"),
@@ -777,7 +777,7 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"birch_wall_hanging_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{}),
+				flags: make_bitflags!(BlockFlag::{WallSign}),
 				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("birch"),
@@ -787,7 +787,7 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"birch_wall_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{}),
+				flags: make_bitflags!(BlockFlag::{WallSign}),
 				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("birch"),
@@ -1787,7 +1787,7 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"cherry_wall_hanging_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{}),
+				flags: make_bitflags!(BlockFlag::{WallSign}),
 				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("cherry"),
@@ -1797,7 +1797,7 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"cherry_wall_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{}),
+				flags: make_bitflags!(BlockFlag::{WallSign}),
 				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("cherry"),
@@ -2387,7 +2387,7 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"crimson_wall_hanging_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{}),
+				flags: make_bitflags!(BlockFlag::{WallSign}),
 				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("crimson"),
@@ -2397,7 +2397,7 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"crimson_wall_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{}),
+				flags: make_bitflags!(BlockFlag::{WallSign}),
 				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("crimson"),
@@ -2787,7 +2787,7 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"dark_oak_wall_hanging_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{}),
+				flags: make_bitflags!(BlockFlag::{WallSign}),
 				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("dark_oak"),
@@ -2797,7 +2797,7 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"dark_oak_wall_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{}),
+				flags: make_bitflags!(BlockFlag::{WallSign}),
 				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("dark_oak"),
@@ -4577,7 +4577,7 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"jungle_wall_hanging_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{}),
+				flags: make_bitflags!(BlockFlag::{WallSign}),
 				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("jungle"),
@@ -4587,7 +4587,7 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"jungle_wall_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{}),
+				flags: make_bitflags!(BlockFlag::{WallSign}),
 				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("jungle"),
@@ -5527,7 +5527,7 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"mangrove_wall_hanging_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{}),
+				flags: make_bitflags!(BlockFlag::{WallSign}),
 				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("mangrove"),
@@ -5537,7 +5537,7 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"mangrove_wall_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{}),
+				flags: make_bitflags!(BlockFlag::{WallSign}),
 				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("mangrove"),
@@ -6057,7 +6057,7 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"oak_wall_hanging_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{}),
+				flags: make_bitflags!(BlockFlag::{WallSign}),
 				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("oak"),
@@ -6067,7 +6067,7 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"oak_wall_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{}),
+				flags: make_bitflags!(BlockFlag::{WallSign}),
 				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("oak"),
@@ -8637,7 +8637,7 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"spruce_wall_hanging_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{}),
+				flags: make_bitflags!(BlockFlag::{WallSign}),
 				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("spruce"),
@@ -8647,7 +8647,7 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"spruce_wall_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{}),
+				flags: make_bitflags!(BlockFlag::{WallSign}),
 				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("spruce"),
@@ -9287,7 +9287,7 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"wall_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{}),
+				flags: make_bitflags!(BlockFlag::{WallSign}),
 				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("oak"),
@@ -9467,7 +9467,7 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"warped_wall_hanging_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{}),
+				flags: make_bitflags!(BlockFlag::{WallSign}),
 				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("warped"),
@@ -9477,7 +9477,7 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"warped_wall_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{}),
+				flags: make_bitflags!(BlockFlag::{WallSign}),
 				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("warped"),
diff --git a/crates/resource/src/lib.rs b/crates/resource/src/lib.rs
index 1175c88..1baffda 100644
--- a/crates/resource/src/lib.rs
+++ b/crates/resource/src/lib.rs
@@ -31,6 +31,11 @@ pub enum BlockFlag {
 	Spruce,
 	/// The block type is colored using biome water colors
 	Water,
+	/// The block type is a wall sign
+	///
+	/// The WallSign flag is used to distinguish wall signs from
+	/// freestanding or -hanging signs.
+	WallSign,
 }
 
 /// An RGB color with u8 components
diff --git a/resource/blocks.json b/resource/blocks.json
index ce5c497..ee052bd 100644
--- a/resource/blocks.json
+++ b/resource/blocks.json
@@ -37,11 +37,13 @@
 	"acacia_trapdoor": {},
 	"acacia_wall_hanging_sign": {
 		"sign_material": "acacia",
-		"texture": null
+		"texture": null,
+		"wall_sign": true
 	},
 	"acacia_wall_sign": {
 		"sign_material": "acacia",
-		"texture": null
+		"texture": null,
+		"wall_sign": true
 	},
 	"acacia_wood": {
 		"texture": "acacia_log"
@@ -123,11 +125,13 @@
 	"bamboo_trapdoor": {},
 	"bamboo_wall_hanging_sign": {
 		"sign_material": "bamboo",
-		"texture": null
+		"texture": null,
+		"wall_sign": true
 	},
 	"bamboo_wall_sign": {
 		"sign_material": "bamboo",
-		"texture": null
+		"texture": null,
+		"wall_sign": true
 	},
 	"barrel": {
 		"texture": "barrel_top"
@@ -192,11 +196,13 @@
 	"birch_trapdoor": {},
 	"birch_wall_hanging_sign": {
 		"sign_material": "birch",
-		"texture": null
+		"texture": null,
+		"wall_sign": true
 	},
 	"birch_wall_sign": {
 		"sign_material": "birch",
-		"texture": null
+		"texture": null,
+		"wall_sign": true
 	},
 	"birch_wood": {
 		"texture": "birch_log"
@@ -382,11 +388,13 @@
 	"cherry_trapdoor": {},
 	"cherry_wall_hanging_sign": {
 		"sign_material": "cherry",
-		"texture": null
+		"texture": null,
+		"wall_sign": true
 	},
 	"cherry_wall_sign": {
 		"sign_material": "cherry",
-		"texture": null
+		"texture": null,
+		"wall_sign": true
 	},
 	"cherry_wood": {
 		"texture": "cherry_log"
@@ -502,11 +510,13 @@
 	"crimson_trapdoor": {},
 	"crimson_wall_hanging_sign": {
 		"sign_material": "crimson",
-		"texture": null
+		"texture": null,
+		"wall_sign": true
 	},
 	"crimson_wall_sign": {
 		"sign_material": "crimson",
-		"texture": null
+		"texture": null,
+		"wall_sign": true
 	},
 	"crying_obsidian": {},
 	"cut_copper": {},
@@ -590,11 +600,13 @@
 	"dark_oak_trapdoor": {},
 	"dark_oak_wall_hanging_sign": {
 		"sign_material": "dark_oak",
-		"texture": null
+		"texture": null,
+		"wall_sign": true
 	},
 	"dark_oak_wall_sign": {
 		"sign_material": "dark_oak",
-		"texture": null
+		"texture": null,
+		"wall_sign": true
 	},
 	"dark_oak_wood": {
 		"texture": "dark_oak_log"
@@ -920,11 +932,13 @@
 	"jungle_trapdoor": {},
 	"jungle_wall_hanging_sign": {
 		"sign_material": "jungle",
-		"texture": null
+		"texture": null,
+		"wall_sign": true
 	},
 	"jungle_wall_sign": {
 		"sign_material": "jungle",
-		"texture": null
+		"texture": null,
+		"wall_sign": true
 	},
 	"jungle_wood": {
 		"texture": "jungle_log"
@@ -1092,11 +1106,13 @@
 	"mangrove_trapdoor": {},
 	"mangrove_wall_hanging_sign": {
 		"sign_material": "mangrove",
-		"texture": null
+		"texture": null,
+		"wall_sign": true
 	},
 	"mangrove_wall_sign": {
 		"sign_material": "mangrove",
-		"texture": null
+		"texture": null,
+		"wall_sign": true
 	},
 	"mangrove_wood": {
 		"texture": "mangrove_log"
@@ -1213,11 +1229,13 @@
 	"oak_trapdoor": {},
 	"oak_wall_hanging_sign": {
 		"sign_material": "oak",
-		"texture": null
+		"texture": null,
+		"wall_sign": true
 	},
 	"oak_wall_sign": {
 		"sign_material": "oak",
-		"texture": null
+		"texture": null,
+		"wall_sign": true
 	},
 	"oak_wood": {
 		"texture": "oak_log"
@@ -1757,11 +1775,13 @@
 	"spruce_trapdoor": {},
 	"spruce_wall_hanging_sign": {
 		"sign_material": "spruce",
-		"texture": null
+		"texture": null,
+		"wall_sign": true
 	},
 	"spruce_wall_sign": {
 		"sign_material": "spruce",
-		"texture": null
+		"texture": null,
+		"wall_sign": true
 	},
 	"spruce_wood": {
 		"texture": "spruce_log"
@@ -1911,7 +1931,8 @@
 	"void_air": null,
 	"wall_sign": {
 		"sign_material": "oak",
-		"texture": null
+		"texture": null,
+		"wall_sign": true
 	},
 	"wall_torch": null,
 	"warped_button": null,
@@ -1954,11 +1975,13 @@
 	"warped_trapdoor": {},
 	"warped_wall_hanging_sign": {
 		"sign_material": "warped",
-		"texture": null
+		"texture": null,
+		"wall_sign": true
 	},
 	"warped_wall_sign": {
 		"sign_material": "warped",
-		"texture": null
+		"texture": null,
+		"wall_sign": true
 	},
 	"warped_wart_block": {},
 	"water": {
diff --git a/resource/extract.py b/resource/extract.py
index 22a6c76..9621b95 100755
--- a/resource/extract.py
+++ b/resource/extract.py
@@ -45,6 +45,7 @@ for name, info in blocks.items():
 		'birch': False,
 		'spruce': False,
 		'water': False,
+		'wall_sign': False,
 		'sign_material': None,
 	}
 
@@ -59,11 +60,13 @@ for name, info in blocks.items():
 	if color:
 		output[id]['color'] = color
 		output[id]['opaque'] = True
-		output[id]['grass'] = info.get('grass', False)
-		output[id]['foliage'] = info.get('foliage', False)
-		output[id]['birch'] = info.get('birch', False)
-		output[id]['spruce'] = info.get('spruce', False)
-		output[id]['water'] = info.get('water', False)
+
+	output[id]['grass'] = info.get('grass', False)
+	output[id]['foliage'] = info.get('foliage', False)
+	output[id]['birch'] = info.get('birch', False)
+	output[id]['spruce'] = info.get('spruce', False)
+	output[id]['water'] = info.get('water', False)
+	output[id]['wall_sign'] = info.get('wall_sign', False)
 
 	output[id]['sign_material'] = info.get('sign_material')
 
diff --git a/resource/generate.py b/resource/generate.py
index da5cb94..8064482 100755
--- a/resource/generate.py
+++ b/resource/generate.py
@@ -34,6 +34,8 @@ with open(sys.argv[2], 'w') as f:
 			flags.append('Spruce')
 		if info['water']:
 			flags.append('Water')
+		if info['wall_sign']:
+			flags.append('WallSign')
 		flags = 'make_bitflags!(BlockFlag::{' + '|'.join(flags) + '})'
 
 		sign_material = 'None'

From 9aacd9cc2b787495f4f54b39afe130d1e821b259 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 5 Jan 2024 22:06:23 +0100
Subject: [PATCH 336/460] resource: make regular signs transparent

For consistency with other sign types. Signs will be shown on a separate
layer.
---
 crates/resource/src/block_types.rs | 48 +++++++++++++++---------------
 resource/blocks.json               | 24 +++++++--------
 src/core/common.rs                 |  4 +--
 3 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/crates/resource/src/block_types.rs b/crates/resource/src/block_types.rs
index 7ee50af..6229016 100644
--- a/crates/resource/src/block_types.rs
+++ b/crates/resource/src/block_types.rs
@@ -107,8 +107,8 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"acacia_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{Opaque}),
-				color: Color([168, 90, 50]),
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("acacia"),
 		},
@@ -467,8 +467,8 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"bamboo_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{Opaque}),
-				color: Color([193, 173, 80]),
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("bamboo"),
 		},
@@ -737,8 +737,8 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"birch_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{Opaque}),
-				color: Color([192, 175, 121]),
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("birch"),
 		},
@@ -1747,8 +1747,8 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"cherry_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{Opaque}),
-				color: Color([226, 178, 172]),
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("cherry"),
 		},
@@ -2337,8 +2337,8 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"crimson_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{Opaque}),
-				color: Color([101, 48, 70]),
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("crimson"),
 		},
@@ -2747,8 +2747,8 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"dark_oak_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{Opaque}),
-				color: Color([66, 43, 20]),
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("dark_oak"),
 		},
@@ -4537,8 +4537,8 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"jungle_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{Opaque}),
-				color: Color([160, 115, 80]),
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("jungle"),
 		},
@@ -5487,8 +5487,8 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"mangrove_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{Opaque}),
-				color: Color([117, 54, 48]),
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("mangrove"),
 		},
@@ -6017,8 +6017,8 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"oak_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{Opaque}),
-				color: Color([162, 130, 78]),
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("oak"),
 		},
@@ -8167,8 +8167,8 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{Opaque}),
-				color: Color([162, 130, 78]),
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("oak"),
 		},
@@ -8597,8 +8597,8 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"spruce_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{Opaque}),
-				color: Color([114, 84, 48]),
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("spruce"),
 		},
@@ -9417,8 +9417,8 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"warped_sign",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{Opaque}),
-				color: Color([43, 104, 99]),
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
 			},
 			sign_material: Some("warped"),
 		},
diff --git a/resource/blocks.json b/resource/blocks.json
index ee052bd..f8b0165 100644
--- a/resource/blocks.json
+++ b/resource/blocks.json
@@ -26,7 +26,7 @@
 	"acacia_sapling": {},
 	"acacia_sign": {
 		"sign_material": "acacia",
-		"texture": "acacia_planks"
+		"texture": null
 	},
 	"acacia_slab": {
 		"texture": "acacia_planks"
@@ -114,7 +114,7 @@
 	"bamboo_sapling": null,
 	"bamboo_sign": {
 		"sign_material": "bamboo",
-		"texture": "bamboo_planks"
+		"texture": null
 	},
 	"bamboo_slab": {
 		"texture": "bamboo_planks"
@@ -185,7 +185,7 @@
 	"birch_sapling": {},
 	"birch_sign": {
 		"sign_material": "birch",
-		"texture": "birch_planks"
+		"texture": null
 	},
 	"birch_slab": {
 		"texture": "birch_planks"
@@ -377,7 +377,7 @@
 	"cherry_sapling": null,
 	"cherry_sign": {
 		"sign_material": "cherry",
-		"texture": "cherry_planks"
+		"texture": null
 	},
 	"cherry_slab": {
 		"texture": "cherry_planks"
@@ -496,7 +496,7 @@
 	"crimson_roots": {},
 	"crimson_sign": {
 		"sign_material": "crimson",
-		"texture": "crimson_planks"
+		"texture": null
 	},
 	"crimson_slab": {
 		"texture": "crimson_planks"
@@ -589,7 +589,7 @@
 	"dark_oak_sapling": {},
 	"dark_oak_sign": {
 		"sign_material": "dark_oak",
-		"texture": "dark_oak_planks"
+		"texture": null
 	},
 	"dark_oak_slab": {
 		"texture": "dark_oak_planks"
@@ -921,7 +921,7 @@
 	"jungle_sapling": {},
 	"jungle_sign": {
 		"sign_material": "jungle",
-		"texture": "jungle_planks"
+		"texture": null
 	},
 	"jungle_slab": {
 		"texture": "jungle_planks"
@@ -1095,7 +1095,7 @@
 	},
 	"mangrove_sign": {
 		"sign_material": "mangrove",
-		"texture": "mangrove_planks"
+		"texture": null
 	},
 	"mangrove_slab": {
 		"texture": "mangrove_planks"
@@ -1218,7 +1218,7 @@
 	"oak_sapling": {},
 	"oak_sign": {
 		"sign_material": "oak",
-		"texture": "oak_planks"
+		"texture": null
 	},
 	"oak_slab": {
 		"texture": "oak_planks"
@@ -1671,7 +1671,7 @@
 	"shulker_box": {},
 	"sign": {
 		"sign_material": "oak",
-		"texture": "oak_planks"
+		"texture": null
 	},
 	"skeleton_skull": null,
 	"skeleton_wall_skull": null,
@@ -1764,7 +1764,7 @@
 	"spruce_sapling": {},
 	"spruce_sign": {
 		"sign_material": "spruce",
-		"texture": "spruce_planks"
+		"texture": null
 	},
 	"spruce_slab": {
 		"texture": "spruce_planks"
@@ -1961,7 +1961,7 @@
 	"warped_roots": {},
 	"warped_sign": {
 		"sign_material": "warped",
-		"texture": "warped_planks"
+		"texture": null
 	},
 	"warped_slab": {
 		"texture": "warped_planks"
diff --git a/src/core/common.rs b/src/core/common.rs
index d961ea9..ca6f424 100644
--- a/src/core/common.rs
+++ b/src/core/common.rs
@@ -22,7 +22,7 @@ use crate::{
 ///
 /// Increase when the generation of processed regions from region data changes
 /// (usually because of updated resource data)
-pub const REGION_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
+pub const REGION_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(1);
 
 /// MinedMap map tile data version number
 ///
@@ -34,7 +34,7 @@ pub const MAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
 ///
 /// Increase when the generation of lightmap tiles from region data changes
 /// (usually because of updated resource data)
-pub const LIGHTMAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
+pub const LIGHTMAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(1);
 
 /// MinedMap mipmap data version number
 ///

From fb361145eb4896aa83b457b3665d41999dcfb765 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 30 Dec 2023 03:33:33 +0100
Subject: [PATCH 337/460] world: add sign position and material information to
 block entities

---
 src/core/region_processor.rs |  7 ++++-
 src/world/block_entity.rs    | 36 ++++++++++++++++-------
 src/world/chunk.rs           | 57 ++++++++++++++++++++++++++++++++----
 3 files changed, 83 insertions(+), 17 deletions(-)

diff --git a/src/core/region_processor.rs b/src/core/region_processor.rs
index cff87b7..63d5c09 100644
--- a/src/core/region_processor.rs
+++ b/src/core/region_processor.rs
@@ -243,7 +243,12 @@ impl<'a> SingleRegionProcessor<'a> {
 		}
 
 		if self.entities_needed {
-			let mut block_entities = chunk.block_entities();
+			let mut block_entities = chunk.block_entities().with_context(|| {
+				format!(
+					"Failed to process block entities for chunk {:?}",
+					chunk_coords,
+				)
+			})?;
 			self.entities.block_entities.append(&mut block_entities);
 		}
 
diff --git a/src/world/block_entity.rs b/src/world/block_entity.rs
index 9e60a23..182ad50 100644
--- a/src/world/block_entity.rs
+++ b/src/world/block_entity.rs
@@ -1,5 +1,6 @@
 //! Processing of block entity data
 
+use minedmap_resource::{BlockFlag, BlockType};
 use serde::{Deserialize, Serialize};
 
 use super::{
@@ -11,10 +12,14 @@ use super::{
 #[derive(Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
 #[serde(rename_all = "snake_case")]
 pub enum SignKind {
-	/// Standing or attached sign
+	/// Standing sign
 	Sign,
+	/// Sign attached to wall
+	WallSign,
 	/// Hanging sign
 	HangingSign,
+	/// Hanging sign attached to wall
+	HangingWallSign,
 }
 
 /// Processed sign data
@@ -22,6 +27,9 @@ pub enum SignKind {
 pub struct Sign {
 	/// The kind of the sign
 	pub kind: SignKind,
+	/// The material of the sign
+	#[serde(skip_serializing_if = "Option::is_none", default)]
+	pub material: Option<String>,
 	/// The sign's front text
 	#[serde(skip_serializing_if = "SignText::is_empty", default)]
 	pub front_text: SignText,
@@ -32,12 +40,13 @@ pub struct Sign {
 
 impl Sign {
 	/// Processes a [de::BlockEntitySign] into a [Sign]
-	fn new(sign: &de::BlockEntitySign, kind: SignKind) -> Sign {
+	fn new(sign: &de::BlockEntitySign, kind: SignKind, material: Option<String>) -> Sign {
 		let (front_text, back_text) = sign.text();
 		let front_text = front_text.decode();
 		let back_text = back_text.decode();
 		Sign {
 			kind,
+			material,
 			front_text,
 			back_text,
 		}
@@ -68,16 +77,21 @@ pub struct BlockEntity {
 
 impl BlockEntity {
 	/// Processes a [de::BlockEntity] into a [BlockEntity]
-	pub fn new(entity: &de::BlockEntity) -> Option<Self> {
-		let data = match &entity.data {
-			de::BlockEntityData::Sign(sign) => {
-				BlockEntityData::Sign(Sign::new(sign, SignKind::Sign))
-			}
-			de::BlockEntityData::HangingSign(sign) => {
-				BlockEntityData::Sign(Sign::new(sign, SignKind::HangingSign))
-			}
-			de::BlockEntityData::Other => return None,
+	pub fn new(entity: &de::BlockEntity, block_type: Option<&BlockType>) -> Option<Self> {
+		let wall_sign = block_type
+			.map(|block_type| block_type.block_color.is(BlockFlag::WallSign))
+			.unwrap_or_default();
+		let (kind, sign) = match (&entity.data, wall_sign) {
+			(de::BlockEntityData::Sign(sign), false) => (SignKind::Sign, sign),
+			(de::BlockEntityData::Sign(sign), true) => (SignKind::WallSign, sign),
+			(de::BlockEntityData::HangingSign(sign), false) => (SignKind::HangingSign, sign),
+			(de::BlockEntityData::HangingSign(sign), true) => (SignKind::HangingWallSign, sign),
+			(de::BlockEntityData::Other, _) => return None,
 		};
+		let material = block_type
+			.as_ref()
+			.and_then(|block_type| block_type.sign_material.as_ref());
+		let data = BlockEntityData::Sign(Sign::new(sign, kind, material.cloned()));
 
 		Some(BlockEntity {
 			x: entity.x,
diff --git a/src/world/chunk.rs b/src/world/chunk.rs
index 5a8937e..bf1d78b 100644
--- a/src/world/chunk.rs
+++ b/src/world/chunk.rs
@@ -12,8 +12,9 @@ use anyhow::{bail, Context, Result};
 
 use super::{block_entity::BlockEntity, de, section::*};
 use crate::{
-	resource::{BiomeTypes, BlockTypes},
+	resource::{BiomeTypes, BlockType, BlockTypes},
 	types::*,
+	util::{self, ShiftMask},
 };
 
 /// Version-specific part of [Chunk]
@@ -243,12 +244,58 @@ impl<'a> Chunk<'a> {
 		}
 	}
 
+	/// Returns the section at a [SectionY] coordinate
+	fn section_at(&self, y: SectionY) -> Option<&dyn Section> {
+		match &self.inner {
+			ChunkInner::V1_18 { section_map } => section_map
+				.get(&y)
+				.map(|(section, _, _)| -> &dyn Section { section }),
+			ChunkInner::V1_13 { section_map, .. } => section_map
+				.get(&y)
+				.map(|(section, _)| -> &dyn Section { section }),
+			ChunkInner::V0 { section_map, .. } => section_map
+				.get(&y)
+				.map(|(section, _)| -> &dyn Section { section }),
+			ChunkInner::Empty => None,
+		}
+	}
+
+	/// Returns the [BlockType] at a given coordinate
+	fn block_type_at(&self, y: SectionY, coords: SectionBlockCoords) -> Result<Option<&BlockType>> {
+		let Some(section) = self.section_at(y) else {
+			return Ok(None);
+		};
+		section.block_at(coords)
+	}
+
+	/// Returns the [BlockType] at the coordinates of a [de::BlockEntity]
+	fn block_type_at_block_entity(
+		&self,
+		block_entity: &de::BlockEntity,
+	) -> Result<Option<&BlockType>> {
+		let x: BlockX = util::from_flat_coord(block_entity.x).2;
+		let z: BlockZ = util::from_flat_coord(block_entity.z).2;
+		let (section_y, block_y) = block_entity.y.shift_mask(BLOCK_BITS);
+
+		let coords = SectionBlockCoords {
+			xz: LayerBlockCoords { x, z },
+			y: BlockY::new(block_y),
+		};
+
+		self.block_type_at(SectionY(section_y), coords)
+	}
+
 	/// Processes all of the chunk's block entities
-	pub fn block_entities(&self) -> Vec<BlockEntity> {
-		self.block_entities
+	pub fn block_entities(&self) -> Result<Vec<BlockEntity>> {
+		let entities: Vec<Option<BlockEntity>> = self
+			.block_entities
 			.iter()
-			.filter_map(BlockEntity::new)
-			.collect()
+			.map(|block_entity| {
+				let block_type = self.block_type_at_block_entity(block_entity)?;
+				Ok(BlockEntity::new(block_entity, block_type))
+			})
+			.collect::<Result<_>>()?;
+		Ok(entities.into_iter().flatten().collect())
 	}
 }
 

From 6da921cca3aceecd9d891cd472d4c2f165dc8a5e Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 4 Jan 2024 12:36:27 +0100
Subject: [PATCH 338/460] core: wrap long help texts

---
 Cargo.lock      | 63 +++++++++++++++++++++++++++++++++++++++++++++----
 Cargo.toml      |  2 +-
 src/core/mod.rs |  6 ++++-
 3 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ab7a97a..7c96fdc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -70,7 +70,7 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
 dependencies = [
- "windows-sys",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -80,7 +80,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
 dependencies = [
  "anstyle",
- "windows-sys",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -125,6 +125,12 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
+[[package]]
+name = "bitflags"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+
 [[package]]
 name = "bytemuck"
 version = "1.14.0"
@@ -179,6 +185,7 @@ dependencies = [
  "anstyle",
  "clap_lex",
  "strsim",
+ "terminal_size",
 ]
 
 [[package]]
@@ -287,6 +294,16 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
+[[package]]
+name = "errno"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "fastnbt"
 version = "2.4.4"
@@ -481,6 +498,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
+
 [[package]]
 name = "lock_api"
 version = "0.4.11"
@@ -698,7 +721,7 @@ version = "0.17.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
  "crc32fast",
  "fdeflate",
  "flate2",
@@ -749,7 +772,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
 dependencies = [
- "bitflags",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
@@ -764,6 +787,19 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
+[[package]]
+name = "rustix"
+version = "0.38.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
+dependencies = [
+ "bitflags 2.4.1",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "ryu"
 version = "1.0.16"
@@ -863,6 +899,16 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "terminal_size"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
+dependencies = [
+ "rustix",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "thread_local"
 version = "1.1.7"
@@ -987,6 +1033,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
diff --git a/Cargo.toml b/Cargo.toml
index f1b3094..28359f3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,7 +39,7 @@ pre-release-replacements = [
 [dependencies]
 anyhow = "1.0.68"
 bincode = "1.3.3"
-clap = { version = "4.1.4", features = ["derive"] }
+clap = { version = "4.1.4", features = ["derive", "wrap_help"] }
 fastnbt = "2.3.2"
 futures-util = "0.3.28"
 git-version = "0.3.5"
diff --git a/src/core/mod.rs b/src/core/mod.rs
index 61bdb76..1afdf91 100644
--- a/src/core/mod.rs
+++ b/src/core/mod.rs
@@ -32,7 +32,11 @@ const VERSION: &str = git_version!(
 
 /// Command line arguments for minedmap CLI
 #[derive(Debug, Parser)]
-#[command(about, version = VERSION.strip_prefix("v").unwrap())]
+#[command(
+	about,
+	version = VERSION.strip_prefix("v").unwrap(),
+	max_term_width = 100,
+)]
 pub struct Args {
 	/// Number of parallel threads to use for processing
 	///

From 9fd5689ebb1dab17398fb8866b337165cd0acdef Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 4 Jan 2024 14:21:12 +0100
Subject: [PATCH 339/460] core: add sign pattern command line argument handling

---
 Cargo.lock         | 39 +++++++++++++++++++++++++++++++++++++++
 Cargo.toml         |  1 +
 src/core/common.rs | 25 ++++++++++++++++++++++---
 src/core/mod.rs    | 14 +++++++++++++-
 4 files changed, 75 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7c96fdc..e50f306 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -29,6 +29,15 @@ dependencies = [
  "zerocopy",
 ]
 
+[[package]]
+name = "aho-corasick"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "allocator-api2"
 version = "0.2.16"
@@ -554,6 +563,7 @@ dependencies = [
  "num-integer",
  "num_cpus",
  "rayon",
+ "regex",
  "rustc-hash",
  "serde",
  "serde_json",
@@ -775,6 +785,35 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
+[[package]]
+name = "regex"
+version = "1.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.23"
diff --git a/Cargo.toml b/Cargo.toml
index 28359f3..5442162 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -52,6 +52,7 @@ minedmap-types = { version = "0.1.2", path = "crates/types" }
 num-integer = "0.1.45"
 num_cpus = "1.16.0"
 rayon = "1.7.0"
+regex = "1.10.2"
 rustc-hash = "1.1.0"
 serde = { version = "1.0.152", features = ["rc", "derive"] }
 serde_json = "1.0.99"
diff --git a/src/core/common.rs b/src/core/common.rs
index ca6f424..92d0019 100644
--- a/src/core/common.rs
+++ b/src/core/common.rs
@@ -6,7 +6,9 @@ use std::{
 	path::{Path, PathBuf},
 };
 
+use anyhow::{Context, Result};
 use indexmap::IndexSet;
+use regex::RegexSet;
 use serde::{Deserialize, Serialize};
 
 use crate::{
@@ -147,11 +149,13 @@ pub struct Config {
 	pub viewer_info_path: PathBuf,
 	/// Path of viewer entities file
 	pub viewer_entities_path: PathBuf,
+	/// Sign text filter patterns
+	pub sign_patterns: RegexSet,
 }
 
 impl Config {
 	/// Crates a new [Config] from [command line arguments](super::Args)
-	pub fn new(args: &super::Args) -> Self {
+	pub fn new(args: &super::Args) -> Result<Self> {
 		let num_threads = match args.jobs {
 			Some(0) => num_cpus::get(),
 			Some(threads) => threads,
@@ -168,7 +172,9 @@ impl Config {
 			.iter()
 			.collect();
 
-		Config {
+		let sign_patterns = Self::sign_patterns(args).context("Failed to parse sign patterns")?;
+
+		Ok(Config {
 			num_threads,
 			region_dir,
 			level_dat_path,
@@ -178,7 +184,20 @@ impl Config {
 			entities_path_final,
 			viewer_info_path,
 			viewer_entities_path,
-		}
+			sign_patterns,
+		})
+	}
+
+	/// Parses the sign prefixes and sign filters into a [RegexSet]
+	fn sign_patterns(args: &super::Args) -> Result<RegexSet> {
+		let prefix_patterns: Vec<_> = args
+			.sign_prefix
+			.iter()
+			.map(|prefix| format!("^{}", regex::escape(prefix)))
+			.collect();
+		Ok(RegexSet::new(
+			prefix_patterns.iter().chain(args.sign_filter.iter()),
+		)?)
 	}
 
 	/// Constructs the path to an input region file
diff --git a/src/core/mod.rs b/src/core/mod.rs
index 1afdf91..274bae8 100644
--- a/src/core/mod.rs
+++ b/src/core/mod.rs
@@ -47,6 +47,18 @@ pub struct Args {
 	/// Enable verbose messages
 	#[arg(short, long)]
 	pub verbose: bool,
+	/// Prefix for text of signs to show on the map
+	#[arg(long)]
+	pub sign_prefix: Vec<String>,
+	/// Regular expression for text of signs to show on the map
+	///
+	/// --sign-prefix and --sign-filter allow to filter for signs to display;
+	/// by default, none are visible. The options may be passed multiple times,
+	/// and a sign will be visible if it matches any pattern.
+	///
+	/// To make all signs visible, pass an empty string to either option.
+	#[arg(long)]
+	pub sign_filter: Vec<String>,
 	/// Minecraft save directory
 	pub input_dir: PathBuf,
 	/// MinedMap data directory
@@ -64,7 +76,7 @@ fn setup_threads(num_threads: usize) -> Result<()> {
 /// MinedMap CLI main function
 pub fn cli() -> Result<()> {
 	let args = Args::parse();
-	let config = Config::new(&args);
+	let config = Config::new(&args)?;
 
 	tracing_subscriber::fmt()
 		.with_max_level(if args.verbose {

From a1dd77c8fdd5b5d13bc20c60a66bda4591c5cd6a Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 5 Jan 2024 03:03:53 +0100
Subject: [PATCH 340/460] world/sign: implement Display for SignText

---
 src/world/json_text.rs | 18 +++++++++++++++++-
 src/world/sign.rs      | 43 +++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/src/world/json_text.rs b/src/world/json_text.rs
index 0f72dcc..a153179 100644
--- a/src/world/json_text.rs
+++ b/src/world/json_text.rs
@@ -1,6 +1,6 @@
 //! Newtype and helper methods for handling Minecraft Raw JSON Text
 
-use std::{collections::VecDeque, sync::Arc};
+use std::{collections::VecDeque, fmt::Display, sync::Arc};
 
 use serde::{Deserialize, Serialize};
 
@@ -51,6 +51,12 @@ impl FormattedText {
 	}
 }
 
+impl Display for FormattedText {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		self.text.fmt(f)
+	}
+}
+
 /// A tree of [FormattedText] nodes
 ///
 /// Each node including the root has a `text` and a list of children (`extra`).
@@ -87,6 +93,16 @@ impl FormattedTextList {
 	}
 }
 
+impl Display for FormattedTextList {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		for text in &self.0 {
+			text.fmt(f)?;
+		}
+
+		Ok(())
+	}
+}
+
 /// Raw deserialized [JSONText]
 ///
 /// A [JSONText] can contain various different JSON types.
diff --git a/src/world/sign.rs b/src/world/sign.rs
index 43cac47..616f7fa 100644
--- a/src/world/sign.rs
+++ b/src/world/sign.rs
@@ -1,6 +1,6 @@
 //! Processing of sign text
 
-use std::sync::Arc;
+use std::{fmt::Display, sync::Arc};
 
 use serde::{Deserialize, Serialize};
 
@@ -89,3 +89,44 @@ impl SignText {
 		self.0.iter().all(|line| line.is_empty())
 	}
 }
+
+impl Display for SignText {
+	fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+		let mut iter = self.0.iter();
+
+		let Some(first) = iter.next() else {
+			return Ok(());
+		};
+		first.fmt(f)?;
+
+		for text in iter {
+			f.write_str("\n")?;
+			text.fmt(f)?;
+		}
+
+		Ok(())
+	}
+}
+
+#[cfg(test)]
+mod test {
+	use super::*;
+
+	fn formatted_text(text: &str) -> FormattedText {
+		FormattedText {
+			text: text.to_string(),
+			..Default::default()
+		}
+	}
+
+	#[test]
+	fn test_sign_text_display() {
+		let sign_text = SignText(vec![
+			FormattedTextList(vec![formatted_text("a"), formatted_text("b")]),
+			FormattedTextList(vec![formatted_text("c")]),
+			FormattedTextList(vec![formatted_text("d")]),
+			FormattedTextList(vec![formatted_text("e")]),
+		]);
+		assert_eq!("ab\nc\nd\ne", sign_text.to_string());
+	}
+}

From 87d4371922d0e1b287e253ad73d0dc8521559688 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 5 Jan 2024 03:27:08 +0100
Subject: [PATCH 341/460] core/metadata_writer: implement filtering for signs

---
 src/core/metadata_writer.rs | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/core/metadata_writer.rs b/src/core/metadata_writer.rs
index caf7726..03aac70 100644
--- a/src/core/metadata_writer.rs
+++ b/src/core/metadata_writer.rs
@@ -6,7 +6,10 @@ use serde::Serialize;
 use crate::{
 	core::common::*,
 	io::{fs, storage},
-	world::{block_entity::BlockEntity, de},
+	world::{
+		block_entity::{self, BlockEntity, BlockEntityData},
+		de,
+	},
 };
 
 /// Minimum and maximum X and Z tile coordinates for a mipmap level
@@ -120,6 +123,19 @@ impl<'a> MetadataWriter<'a> {
 		}
 	}
 
+	/// Filter signs according to the sign pattern configuration
+	fn sign_filter(&self, sign: &block_entity::Sign) -> bool {
+		let front_text = sign.front_text.to_string();
+		if self.config.sign_patterns.is_match(front_text.trim()) {
+			return true;
+		}
+		let back_text = sign.back_text.to_string();
+		if self.config.sign_patterns.is_match(back_text.trim()) {
+			return true;
+		}
+		false
+	}
+
 	/// Generates [Entities] data from collected entity lists
 	fn entities(&self) -> Result<Entities> {
 		let data: ProcessedEntities =
@@ -127,7 +143,13 @@ impl<'a> MetadataWriter<'a> {
 				.context("Failed to read entity data file")?;
 
 		let ret = Entities {
-			signs: data.block_entities,
+			signs: data
+				.block_entities
+				.into_iter()
+				.filter(|entity| match &entity.data {
+					BlockEntityData::Sign(sign) => self.sign_filter(sign),
+				})
+				.collect(),
 		};
 
 		Ok(ret)

From dca9c394f2493a902474ad437e42d96155d3bbb9 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 26 Nov 2023 16:20:16 +0100
Subject: [PATCH 342/460] viewer: display markers for signs

Still needs better styling. It might also be nice to include the currently
opened marker in the URL.
---
 viewer/MinedMap.js | 122 ++++++++++++++++++++++++++++++++++++++++++++-
 viewer/index.html  |   4 ++
 2 files changed, 124 insertions(+), 2 deletions(-)

diff --git a/viewer/MinedMap.js b/viewer/MinedMap.js
index 1288dc9..0e9abe0 100644
--- a/viewer/MinedMap.js
+++ b/viewer/MinedMap.js
@@ -98,6 +98,106 @@ const parseHash = function () {
 	return args;
 }
 
+const colors = {
+	black: '#000000',
+	dark_blue: '#0000AA',
+	dark_green: '#00AA00',
+	dark_aqua: '#00AAAA',
+	dark_red: '#AA0000',
+	dark_purple: '#AA00AA',
+	gold: '#FFAA00',
+	gray: '#AAAAAA',
+	dark_gray: '#555555',
+	blue: '#5555FF',
+	green: '#55FF55',
+	aqua: '#55FFFF',
+	red: '#FF5555',
+	light_purple: '#FF55FF',
+	yellow: '#FFFF55',
+	white: '#FFFFFF',
+};
+
+function formatSignLine(line) {
+	const el = document.createElement('span');
+	el.style.whiteSpace = 'pre';
+	el.style.fontFamily = 'sans';
+
+	for (const span of line) {
+		const child = document.createElement('span');
+		child.textContent = span.text;
+
+		const color = colors[span.color ?? 'black'] || colors['black'];
+
+		if (span.bold)
+			child.style.fontWeight = 'bold';
+		if (span.italic)
+			child.style.fontStyle = 'italic';
+
+		child.style.textDecoration = '';
+		if (span.underlined)
+			child.style.textDecoration += ' underline';
+		if (span.strikethrough)
+			child.style.textDecoration += ' line-through';
+
+		child.style.color = color;
+		if (span.obfuscated) {
+			child.style.backgroundColor = color;
+			child.className = 'obfuscated';
+		}
+
+		el.appendChild(child);
+	}
+	return el;
+}
+
+function loadSigns(signLayer) {
+	const xhr = new XMLHttpRequest();
+	xhr.onload = function () {
+		const res = JSON.parse(this.responseText);
+		const groups = {};
+
+		// Group signs by x,z coordinates
+		for (const sign of res.signs) {
+			const key = `${sign.x},${sign.z}`;
+			const group = groups[key] ??= [];
+			group[sign.y] = sign;
+		}
+
+		for (const [key, group] of Object.entries(groups)) {
+			const el = document.createElement('span');
+			const [x, z] = key.split(',').map((i) => +i);
+
+			group.forEach((sign) => {
+				if (sign.front_text) {
+					for (const line of sign.front_text) {
+						el.appendChild(formatSignLine(line));
+						el.appendChild(document.createElement('br'));
+					}
+
+					el.appendChild(document.createElement('hr'));
+				}
+
+				if (sign.back_text) {
+					for (let line of sign.back_text) {
+						el.appendChild(formatSignLine(line));
+						el.appendChild(document.createElement('br'));
+					}
+
+					el.appendChild(document.createElement('hr'));
+				}
+			});
+
+			const lastChild = el.lastChild;
+			if (lastChild)
+				lastChild.remove();
+
+			L.marker([-z-0.5, x+0.5]).addTo(signLayer).bindPopup(el);
+		}
+	}
+
+	xhr.open('GET', 'data/entities.json', true);
+	xhr.send();
+}
 
 window.createMap = function () {
 	const xhr = new XMLHttpRequest();
@@ -106,7 +206,7 @@ window.createMap = function () {
 		    mipmaps = res.mipmaps,
 		    spawn = res.spawn;
 
-		let x, z, zoom, light;
+		let x, z, zoom, light, signs;
 
 		const updateParams = function () {
 			const args = parseHash();
@@ -115,6 +215,7 @@ window.createMap = function () {
 			x = parseFloat(args['x']);
 			z = parseFloat(args['z']);
 			light = parseInt(args['light']);
+			signs = parseInt(args['signs'] ?? '1');
 
 			if (isNaN(zoom))
 				zoom = 0;
@@ -140,14 +241,20 @@ window.createMap = function () {
 
 		const mapLayer = new MinedMapLayer(mipmaps, 'map');
 		const lightLayer = new MinedMapLayer(mipmaps, 'light');
+		const signLayer = L.layerGroup();
+
+		loadSigns(signLayer);
 
 		mapLayer.addTo(map);
 
 		if (light)
 			map.addLayer(lightLayer);
+		if (signs)
+			map.addLayer(signLayer);
 
 		const overlayMaps = {
 			"Illumination": lightLayer,
+			"Signs": signLayer,
 		};
 
 		L.control.layers({}, overlayMaps).addTo(map);
@@ -167,6 +274,8 @@ window.createMap = function () {
 
 			if (map.hasLayer(lightLayer))
 				ret += '&light=1';
+			if (!map.hasLayer(signLayer))
+				ret += '&signs=0';
 
 			return ret;
 		};
@@ -175,7 +284,12 @@ window.createMap = function () {
 			window.location.hash = makeHash();
 		};
 
-		const refreshHash = function () {
+		const refreshHash = function (ev) {
+			if (ev.type === 'layeradd' || ev.type === 'layerremove') {
+				if (ev.layer !== lightLayer && ev.layer !== signLayer)
+					return;
+			}
+
 			zoom = map.getZoom();
 			center = map.getCenter();
 			x = Math.round(center.lng);
@@ -203,6 +317,10 @@ window.createMap = function () {
 				map.addLayer(lightLayer);
 			else
 				map.removeLayer(lightLayer);
+			if (signs)
+				map.addLayer(signLayer);
+			else
+				map.removeLayer(signLayer);
 
 			updateHash();
 		};
diff --git a/viewer/index.html b/viewer/index.html
index df57cb6..8327600 100644
--- a/viewer/index.html
+++ b/viewer/index.html
@@ -30,6 +30,10 @@
         image-rendering: pixelated;
         -ms-interpolation-mode: nearest-neighbor;
       }
+
+      span.obfuscated:hover {
+        background-color: transparent !important;
+      }
     </style>
   </head>
   <body>

From 7834315dd339555f6d5a5aa3e24e4ceba0802689 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 6 Jan 2024 22:59:37 +0100
Subject: [PATCH 343/460] viewer: add sign images

---
 resource/sign_textures.py                     |  90 ++++++++++++++++++
 viewer/images/README.md                       |   7 ++
 viewer/images/bg/acacia_hanging_sign.png      | Bin 0 -> 321 bytes
 viewer/images/bg/acacia_hanging_wall_sign.png | Bin 0 -> 232 bytes
 viewer/images/bg/acacia_sign.png              | Bin 0 -> 441 bytes
 viewer/images/bg/acacia_wall_sign.png         | Bin 0 -> 328 bytes
 viewer/images/bg/bamboo_hanging_sign.png      | Bin 0 -> 384 bytes
 viewer/images/bg/bamboo_hanging_wall_sign.png | Bin 0 -> 244 bytes
 viewer/images/bg/bamboo_sign.png              | Bin 0 -> 564 bytes
 viewer/images/bg/bamboo_wall_sign.png         | Bin 0 -> 459 bytes
 viewer/images/bg/birch_hanging_sign.png       | Bin 0 -> 363 bytes
 viewer/images/bg/birch_hanging_wall_sign.png  | Bin 0 -> 239 bytes
 viewer/images/bg/birch_sign.png               | Bin 0 -> 460 bytes
 viewer/images/bg/birch_wall_sign.png          | Bin 0 -> 341 bytes
 viewer/images/bg/cherry_hanging_sign.png      | Bin 0 -> 311 bytes
 viewer/images/bg/cherry_hanging_wall_sign.png | Bin 0 -> 224 bytes
 viewer/images/bg/cherry_sign.png              | Bin 0 -> 442 bytes
 viewer/images/bg/cherry_wall_sign.png         | Bin 0 -> 323 bytes
 viewer/images/bg/crimson_hanging_sign.png     | Bin 0 -> 371 bytes
 .../images/bg/crimson_hanging_wall_sign.png   | Bin 0 -> 235 bytes
 viewer/images/bg/crimson_sign.png             | Bin 0 -> 531 bytes
 viewer/images/bg/crimson_wall_sign.png        | Bin 0 -> 392 bytes
 viewer/images/bg/dark_oak_hanging_sign.png    | Bin 0 -> 307 bytes
 .../images/bg/dark_oak_hanging_wall_sign.png  | Bin 0 -> 240 bytes
 viewer/images/bg/dark_oak_sign.png            | Bin 0 -> 416 bytes
 viewer/images/bg/dark_oak_wall_sign.png       | Bin 0 -> 315 bytes
 viewer/images/bg/jungle_hanging_sign.png      | Bin 0 -> 412 bytes
 viewer/images/bg/jungle_hanging_wall_sign.png | Bin 0 -> 242 bytes
 viewer/images/bg/jungle_sign.png              | Bin 0 -> 451 bytes
 viewer/images/bg/jungle_wall_sign.png         | Bin 0 -> 308 bytes
 viewer/images/bg/mangrove_hanging_sign.png    | Bin 0 -> 329 bytes
 .../images/bg/mangrove_hanging_wall_sign.png  | Bin 0 -> 224 bytes
 viewer/images/bg/mangrove_sign.png            | Bin 0 -> 451 bytes
 viewer/images/bg/mangrove_wall_sign.png       | Bin 0 -> 342 bytes
 viewer/images/bg/oak_hanging_sign.png         | Bin 0 -> 339 bytes
 viewer/images/bg/oak_hanging_wall_sign.png    | Bin 0 -> 225 bytes
 viewer/images/bg/oak_sign.png                 | Bin 0 -> 440 bytes
 viewer/images/bg/oak_wall_sign.png            | Bin 0 -> 332 bytes
 viewer/images/bg/spruce_hanging_sign.png      | Bin 0 -> 345 bytes
 viewer/images/bg/spruce_hanging_wall_sign.png | Bin 0 -> 236 bytes
 viewer/images/bg/spruce_sign.png              | Bin 0 -> 421 bytes
 viewer/images/bg/spruce_wall_sign.png         | Bin 0 -> 316 bytes
 viewer/images/bg/warped_hanging_sign.png      | Bin 0 -> 374 bytes
 viewer/images/bg/warped_hanging_wall_sign.png | Bin 0 -> 236 bytes
 viewer/images/bg/warped_sign.png              | Bin 0 -> 531 bytes
 viewer/images/bg/warped_wall_sign.png         | Bin 0 -> 394 bytes
 viewer/images/icon/acacia_hanging_sign.png    | Bin 0 -> 268 bytes
 .../images/icon/acacia_hanging_wall_sign.png  | Bin 0 -> 327 bytes
 viewer/images/icon/acacia_sign.png            | Bin 0 -> 301 bytes
 viewer/images/icon/acacia_wall_sign.png       | Bin 0 -> 237 bytes
 viewer/images/icon/bamboo_hanging_sign.png    | Bin 0 -> 391 bytes
 .../images/icon/bamboo_hanging_wall_sign.png  | Bin 0 -> 469 bytes
 viewer/images/icon/bamboo_sign.png            | Bin 0 -> 416 bytes
 viewer/images/icon/bamboo_wall_sign.png       | Bin 0 -> 348 bytes
 viewer/images/icon/birch_hanging_sign.png     | Bin 0 -> 273 bytes
 .../images/icon/birch_hanging_wall_sign.png   | Bin 0 -> 340 bytes
 viewer/images/icon/birch_sign.png             | Bin 0 -> 298 bytes
 viewer/images/icon/birch_wall_sign.png        | Bin 0 -> 235 bytes
 viewer/images/icon/cherry_hanging_sign.png    | Bin 0 -> 280 bytes
 .../images/icon/cherry_hanging_wall_sign.png  | Bin 0 -> 347 bytes
 viewer/images/icon/cherry_sign.png            | Bin 0 -> 298 bytes
 viewer/images/icon/cherry_wall_sign.png       | Bin 0 -> 229 bytes
 viewer/images/icon/crimson_hanging_sign.png   | Bin 0 -> 284 bytes
 .../images/icon/crimson_hanging_wall_sign.png | Bin 0 -> 341 bytes
 viewer/images/icon/crimson_sign.png           | Bin 0 -> 340 bytes
 viewer/images/icon/crimson_wall_sign.png      | Bin 0 -> 262 bytes
 viewer/images/icon/dark_oak_hanging_sign.png  | Bin 0 -> 276 bytes
 .../icon/dark_oak_hanging_wall_sign.png       | Bin 0 -> 332 bytes
 viewer/images/icon/dark_oak_sign.png          | Bin 0 -> 302 bytes
 viewer/images/icon/dark_oak_wall_sign.png     | Bin 0 -> 244 bytes
 viewer/images/icon/jungle_hanging_sign.png    | Bin 0 -> 272 bytes
 .../images/icon/jungle_hanging_wall_sign.png  | Bin 0 -> 335 bytes
 viewer/images/icon/jungle_sign.png            | Bin 0 -> 315 bytes
 viewer/images/icon/jungle_wall_sign.png       | Bin 0 -> 238 bytes
 viewer/images/icon/mangrove_hanging_sign.png  | Bin 0 -> 276 bytes
 .../icon/mangrove_hanging_wall_sign.png       | Bin 0 -> 337 bytes
 viewer/images/icon/mangrove_sign.png          | Bin 0 -> 299 bytes
 viewer/images/icon/mangrove_wall_sign.png     | Bin 0 -> 234 bytes
 viewer/images/icon/oak_hanging_sign.png       | Bin 0 -> 289 bytes
 viewer/images/icon/oak_hanging_wall_sign.png  | Bin 0 -> 345 bytes
 viewer/images/icon/oak_sign.png               | Bin 0 -> 298 bytes
 viewer/images/icon/oak_wall_sign.png          | Bin 0 -> 237 bytes
 viewer/images/icon/spruce_hanging_sign.png    | Bin 0 -> 274 bytes
 .../images/icon/spruce_hanging_wall_sign.png  | Bin 0 -> 332 bytes
 viewer/images/icon/spruce_sign.png            | Bin 0 -> 289 bytes
 viewer/images/icon/spruce_wall_sign.png       | Bin 0 -> 233 bytes
 viewer/images/icon/warped_hanging_sign.png    | Bin 0 -> 296 bytes
 .../images/icon/warped_hanging_wall_sign.png  | Bin 0 -> 353 bytes
 viewer/images/icon/warped_sign.png            | Bin 0 -> 327 bytes
 viewer/images/icon/warped_wall_sign.png       | Bin 0 -> 244 bytes
 90 files changed, 97 insertions(+)
 create mode 100755 resource/sign_textures.py
 create mode 100644 viewer/images/README.md
 create mode 100644 viewer/images/bg/acacia_hanging_sign.png
 create mode 100644 viewer/images/bg/acacia_hanging_wall_sign.png
 create mode 100644 viewer/images/bg/acacia_sign.png
 create mode 100644 viewer/images/bg/acacia_wall_sign.png
 create mode 100644 viewer/images/bg/bamboo_hanging_sign.png
 create mode 100644 viewer/images/bg/bamboo_hanging_wall_sign.png
 create mode 100644 viewer/images/bg/bamboo_sign.png
 create mode 100644 viewer/images/bg/bamboo_wall_sign.png
 create mode 100644 viewer/images/bg/birch_hanging_sign.png
 create mode 100644 viewer/images/bg/birch_hanging_wall_sign.png
 create mode 100644 viewer/images/bg/birch_sign.png
 create mode 100644 viewer/images/bg/birch_wall_sign.png
 create mode 100644 viewer/images/bg/cherry_hanging_sign.png
 create mode 100644 viewer/images/bg/cherry_hanging_wall_sign.png
 create mode 100644 viewer/images/bg/cherry_sign.png
 create mode 100644 viewer/images/bg/cherry_wall_sign.png
 create mode 100644 viewer/images/bg/crimson_hanging_sign.png
 create mode 100644 viewer/images/bg/crimson_hanging_wall_sign.png
 create mode 100644 viewer/images/bg/crimson_sign.png
 create mode 100644 viewer/images/bg/crimson_wall_sign.png
 create mode 100644 viewer/images/bg/dark_oak_hanging_sign.png
 create mode 100644 viewer/images/bg/dark_oak_hanging_wall_sign.png
 create mode 100644 viewer/images/bg/dark_oak_sign.png
 create mode 100644 viewer/images/bg/dark_oak_wall_sign.png
 create mode 100644 viewer/images/bg/jungle_hanging_sign.png
 create mode 100644 viewer/images/bg/jungle_hanging_wall_sign.png
 create mode 100644 viewer/images/bg/jungle_sign.png
 create mode 100644 viewer/images/bg/jungle_wall_sign.png
 create mode 100644 viewer/images/bg/mangrove_hanging_sign.png
 create mode 100644 viewer/images/bg/mangrove_hanging_wall_sign.png
 create mode 100644 viewer/images/bg/mangrove_sign.png
 create mode 100644 viewer/images/bg/mangrove_wall_sign.png
 create mode 100644 viewer/images/bg/oak_hanging_sign.png
 create mode 100644 viewer/images/bg/oak_hanging_wall_sign.png
 create mode 100644 viewer/images/bg/oak_sign.png
 create mode 100644 viewer/images/bg/oak_wall_sign.png
 create mode 100644 viewer/images/bg/spruce_hanging_sign.png
 create mode 100644 viewer/images/bg/spruce_hanging_wall_sign.png
 create mode 100644 viewer/images/bg/spruce_sign.png
 create mode 100644 viewer/images/bg/spruce_wall_sign.png
 create mode 100644 viewer/images/bg/warped_hanging_sign.png
 create mode 100644 viewer/images/bg/warped_hanging_wall_sign.png
 create mode 100644 viewer/images/bg/warped_sign.png
 create mode 100644 viewer/images/bg/warped_wall_sign.png
 create mode 100644 viewer/images/icon/acacia_hanging_sign.png
 create mode 100644 viewer/images/icon/acacia_hanging_wall_sign.png
 create mode 100644 viewer/images/icon/acacia_sign.png
 create mode 100644 viewer/images/icon/acacia_wall_sign.png
 create mode 100644 viewer/images/icon/bamboo_hanging_sign.png
 create mode 100644 viewer/images/icon/bamboo_hanging_wall_sign.png
 create mode 100644 viewer/images/icon/bamboo_sign.png
 create mode 100644 viewer/images/icon/bamboo_wall_sign.png
 create mode 100644 viewer/images/icon/birch_hanging_sign.png
 create mode 100644 viewer/images/icon/birch_hanging_wall_sign.png
 create mode 100644 viewer/images/icon/birch_sign.png
 create mode 100644 viewer/images/icon/birch_wall_sign.png
 create mode 100644 viewer/images/icon/cherry_hanging_sign.png
 create mode 100644 viewer/images/icon/cherry_hanging_wall_sign.png
 create mode 100644 viewer/images/icon/cherry_sign.png
 create mode 100644 viewer/images/icon/cherry_wall_sign.png
 create mode 100644 viewer/images/icon/crimson_hanging_sign.png
 create mode 100644 viewer/images/icon/crimson_hanging_wall_sign.png
 create mode 100644 viewer/images/icon/crimson_sign.png
 create mode 100644 viewer/images/icon/crimson_wall_sign.png
 create mode 100644 viewer/images/icon/dark_oak_hanging_sign.png
 create mode 100644 viewer/images/icon/dark_oak_hanging_wall_sign.png
 create mode 100644 viewer/images/icon/dark_oak_sign.png
 create mode 100644 viewer/images/icon/dark_oak_wall_sign.png
 create mode 100644 viewer/images/icon/jungle_hanging_sign.png
 create mode 100644 viewer/images/icon/jungle_hanging_wall_sign.png
 create mode 100644 viewer/images/icon/jungle_sign.png
 create mode 100644 viewer/images/icon/jungle_wall_sign.png
 create mode 100644 viewer/images/icon/mangrove_hanging_sign.png
 create mode 100644 viewer/images/icon/mangrove_hanging_wall_sign.png
 create mode 100644 viewer/images/icon/mangrove_sign.png
 create mode 100644 viewer/images/icon/mangrove_wall_sign.png
 create mode 100644 viewer/images/icon/oak_hanging_sign.png
 create mode 100644 viewer/images/icon/oak_hanging_wall_sign.png
 create mode 100644 viewer/images/icon/oak_sign.png
 create mode 100644 viewer/images/icon/oak_wall_sign.png
 create mode 100644 viewer/images/icon/spruce_hanging_sign.png
 create mode 100644 viewer/images/icon/spruce_hanging_wall_sign.png
 create mode 100644 viewer/images/icon/spruce_sign.png
 create mode 100644 viewer/images/icon/spruce_wall_sign.png
 create mode 100644 viewer/images/icon/warped_hanging_sign.png
 create mode 100644 viewer/images/icon/warped_hanging_wall_sign.png
 create mode 100644 viewer/images/icon/warped_sign.png
 create mode 100644 viewer/images/icon/warped_wall_sign.png

diff --git a/resource/sign_textures.py b/resource/sign_textures.py
new file mode 100755
index 0000000..e0b548d
--- /dev/null
+++ b/resource/sign_textures.py
@@ -0,0 +1,90 @@
+#!/usr/bin/env python3
+
+import shutil
+import sys
+
+from PIL import Image
+
+MATERIALS = [
+	'acacia',
+	'bamboo',
+	'birch',
+	'cherry',
+	'crimson',
+	'dark_oak',
+	'jungle',
+	'mangrove',
+	'oak',
+	'spruce',
+	'warped',
+]
+
+in_dir = sys.argv[1]
+out_dir = sys.argv[2]
+
+def sign_bg_image(material):
+	in_path = f'{in_dir}/assets/minecraft/textures/entity/signs/{material}.png'
+	out_path = f'{out_dir}/bg/{material}_sign.png'
+	out_path_wall = f'{out_dir}/bg/{material}_wall_sign.png'
+
+	in_image = Image.open(in_path)
+
+	out_image = Image.new('RGBA', (24, 26))
+	out_image.paste(in_image.crop((2, 2, 26, 14)), (0, 0))
+	out_image.paste(in_image.crop((2, 16, 4, 30)), (11, 12))
+	out_image.save(out_path)
+
+	out_image = Image.new('RGBA', (24, 12))
+	out_image.paste(in_image.crop((2, 2, 26, 14)), (0, 0))
+	out_image.save(out_path_wall)
+
+def hanging_sign_bg_image(material):
+	in_path = f'{in_dir}/assets/minecraft/textures/gui/hanging_signs/{material}.png'
+	out_path = f'{out_dir}/bg/{material}_hanging_sign.png'
+	out_path_wall = f'{out_dir}/bg/{material}_hanging_wall_sign.png'
+
+	in_image = Image.open(in_path)
+
+	out_image = Image.new('RGBA', (16, 14))
+	out_image.paste(in_image.crop((0, 2, 16, 16)), (0, 0))
+	out_image.save(out_path)
+
+	shutil.copyfile(in_path, out_path_wall)
+
+
+def sign_icon_image(material):
+	in_path = f'{in_dir}/assets/minecraft/textures/item/{material}_sign.png'
+	out_path = f'{out_dir}/icon/{material}_sign.png'
+	out_path_wall = f'{out_dir}/icon/{material}_wall_sign.png'
+
+	in_image = Image.open(in_path)
+
+	out_image = Image.new('RGBA', (13, 14))
+	out_image.paste(in_image.crop((2, 2, 15, 16)), (0, 0))
+	out_image.save(out_path)
+
+	out_image = Image.new('RGBA', (13, 9))
+	out_image.paste(in_image.crop((2, 2, 15, 11)), (0, 0))
+	out_image.save(out_path_wall)
+
+
+def hanging_sign_icon_image(material):
+	in_path = f'{in_dir}/assets/minecraft/textures/item/{material}_hanging_sign.png'
+	out_path = f'{out_dir}/icon/{material}_hanging_sign.png'
+	out_path_wall = f'{out_dir}/icon/{material}_hanging_wall_sign.png'
+
+	in_image = Image.open(in_path)
+
+	out_image = Image.new('RGBA', (14, 12))
+	out_image.paste(in_image.crop((1, 3, 15, 15)), (0, 0))
+	out_image.save(out_path)
+
+	out_image = Image.new('RGBA', (14, 14))
+	out_image.paste(in_image.crop((1, 1, 15, 15)), (0, 0))
+	out_image.save(out_path_wall)
+
+for material in MATERIALS:
+	sign_bg_image(material)
+	hanging_sign_bg_image(material)
+	sign_icon_image(material)
+	hanging_sign_icon_image(material)
diff --git a/viewer/images/README.md b/viewer/images/README.md
new file mode 100644
index 0000000..2e840f1
--- /dev/null
+++ b/viewer/images/README.md
@@ -0,0 +1,7 @@
+# README
+
+The images in this directory are assets directly taken from Minecraft, or are derived from Minecraft
+assets. They are copyrighted by Mojang/Microsoft, and are used in accordance with the
+[Minecraft Usage Guidelines](https://www.minecraft.net/en-us/usage-guidelines).
+
+
diff --git a/viewer/images/bg/acacia_hanging_sign.png b/viewer/images/bg/acacia_hanging_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..33e319123c44d09445c845a1299c2bf9db230a3f
GIT binary patch
literal 321
zcmV-H0lxl;P)<h;3K|Lk000e1NJLTq000mG000gM1^@s6CNG?d00039Nkl<Zc$|%q
zK~BRk6hxn6LrKMoN}QmTSa1cpV#ksLa5e71j<Zw(MQT@p5aYxw-0#>XQu{alw*QQ0
z#&E37{e#~=K6_47Iaf)uUf-R<&dyco=Hs(DizJ<k1YhmpEO0re0N!4<9-uappw5k?
zXPq0f-YR%{eOCrxXDyxgY*+wb6*Shesx(#w!p2%|)g=IJ@Ay_@ZefK!vJYYP`G+ih
zMf>9bxV|!Z21{RMU?J>=Kr;M>^IEIe3nnV4b<ipx*{9(2K2sp2FM<t`db2RpW>Qir
ziUbl!=?{n@3Rv#55G62qS?bWcS<tM7{WxUuN;~pU)7#kp%b>JT1}R^?8z#~}rG1MY
T#;oaB00000NkvXXu0mjf1p<qv

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/acacia_hanging_wall_sign.png b/viewer/images/bg/acacia_hanging_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..c975fc35f8293ffe9470dd936b354273a274f862
GIT binary patch
literal 232
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv4DbnY1=6ZIwstPTo&l-TBFyJU
zTC9w)+7xZQHNkFoyxoyxhqPL^WS}C(k|4ie28U-i(tw;&PZ!4!4q4U)Lq5hpfwuiW
z%_m+pFq67!*UG$O={3_Br<FmgIjZhmnN+J>X7P60{i^uaftz<-x8-4AUc?~c!la_a
zz%*Na@4BSQ*Kf?{{XYFh>y&W>M`W@Ox44{~97p!u8J&}yTsTvcgPfN8zF+_CA4kf{
aPJ8v)y2q>=ugL%%z~JfX=d#Wzp$P!E2~Q3H

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/acacia_sign.png b/viewer/images/bg/acacia_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..ccc6e4701b043a5d7943e9a690aff8b11b63628c
GIT binary patch
literal 441
zcmV;q0Y?6bP)<h;3K|Lk000e1NJLTq000;O000^Y1^@s6t-qY}0004iNkl<Zc%03X
zF;BxV5QSf(iyYdT5~OU10in+P8YEUGm>Kyq{Y6MD49skiNK2X!CsoVPT;jToD_4rd
zTM|e2?%CftgW3JvCK?H_;!HtbcYP~X6#yVrYuNl0jYLx%kPlv`Y7Hqoq-qUSR)_&e
z;Wc#u`Sm-jeu^{Iq@_wh3a>VAO;UJJC3beD?_Sp-KP7p&Q<UTYP+&*{<f~2d{WDHs
z%B(r$r)eauj2VSZHb2Fgf+{PZX4kUyn?fB0&xM}=tbU3{0&#5)$nWIK1J*-;?QCp*
zVz&A$hBN?x9ll$(``p>r<)>*RaZDy-9mO#bABn|AzP^k`57Fmi%JdVnVy=9b^&du+
z6|TZ@)6|@g%}*`EwwUiS(DM9BmV0+zSC`*OuP;xV=f{WclmqgPm$bSJC-_O1PMdNH
zczgeFYVI6xF30@_oFb=yWHEO>#s4}%QT+BB006f)*Zl<q!I@KY=YVi>f$wC|U%)AH
j4(Rm+$ztx*902|RONs&Lteo+u00000NkvXXu0mjfdvL|Q

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/acacia_wall_sign.png b/viewer/images/bg/acacia_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7ec6214ecad2b96dd79e9de5f366b18faf5d7a5
GIT binary patch
literal 328
zcmV-O0k{5%P)<h;3K|Lk000e1NJLTq000;O000aK1^@s6crbl+0003GNkl<Zc$|fk
zF>-@25Jex%GV++HNI{p{bxxD><y@)Lsh}V*7I<(9SRrI1{|3bDL*ngHe1Co3o7$jp
zy(eBDJ-gl}06IUD<E5!hC_YJrt~)<tO-bix{5atNYsye}l4`vt%ZuxM*sb#(YswW~
zAZtqe$nI3}>Ek@(r5(myQ9A%!IZMHCyNBmLt|Lua^Ng2EW3!G`MJ_pBT<`JY1gpEv
zZ50Y*71|fQ0$E;~+Td3BB-No`ZE(B^EWOF`qHg0}oTUKR`CZ&TdROj<mrG-LmDF*p
z;#EXHNu!{Sud0bRiTjf#<waeoSDoefhw<aY$NO7&Y1*G0FPp=ySZ5hFpTF(j!_3Dy
a;{O33{phJE($fn70000<MNUMnLSTX~KbFY=

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/bamboo_hanging_sign.png b/viewer/images/bg/bamboo_hanging_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a66129806057d444584e272231a4f7acffb0b70
GIT binary patch
literal 384
zcmV-`0e}99P)<h;3K|Lk000e1NJLTq000mG000gM1^@s6CNG?d0003;Nkl<Zc$|%r
zU24KW6otPu(cmNzi-Mve6fEt7Tc}UnLEpQ$E~Tqzp%k&j`a?~KIwdi|KEz~V6!bpL
zoH=vm-j9KO-3}gh!^fu`XR7GCN*De9{kgj*eOLL-&vbrKNZywPY}U(*E*E_o!29d-
zE)0BX*KMR+BZLirl<Na?s(bE)vRUPB_@Wu<!RKtjMt%X{x-P3f#nY*10E{O~oQj4U
zMhtF}FayAL8gy$(>bcjYTw?`3w$o4n^Vx{$Z-nW1u=3Qra+`}-V2M(umCca~0BF?>
z%4YTGwNo90fuHGFz_%A*#QPcd3?e<oi1h<4tzJ79AcRe~=4TxMbUOAChg1s#KkF!i
z`1UczbUZe4izQ01@(K*V5=!g#3J_BUqN!#TP1Qw_!F-m37zTdE0Fs{;=`pZSuwtbf
eu}-U=fcyum`>18OB*xbO0000<MNUMnLSTYpjjX8v

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/bamboo_hanging_wall_sign.png b/viewer/images/bg/bamboo_hanging_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..325e4f0c32a18c233ab62659d851fb671b007472
GIT binary patch
literal 244
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv5AX?b1=61%^t``W_xMcK%|mgQ
zcLyBW>UUzJ@AlQ6yI1&l2Bg}#1gq-U_AqpR0xD%J3GxeOaCmkj4alkXba4!+xRq=W
z`SwMU(xzLj3zPkWpY!zE=JN0?my}RAlEtR6v5nE|O=5$9&cSnPdgqq$@tk@4)OdM#
zn1q2rtHkad61%kwHu!j-ev$FIAR&R1ag|{itC7{|bf5KeI74I}F<p7e6=JiNcM01H
oiz7EA*R*XdPIEtg<{Se<%ssU-hYB%apfeaeUHx3vIVCg!0A|2jG5`Po

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/bamboo_sign.png b/viewer/images/bg/bamboo_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc19aef3141cb5e366d9a2f17fdc697b37044f6b
GIT binary patch
literal 564
zcmV-40?Yl0P)<h;3K|Lk000e1NJLTq000;O000^Y1^@s6t-qY}0005|Nkl<Zc%0Q#
zJ#X7E6g-!-1W}?PB_0CHG0?p~r3LykyLQeW=-v()g1S%>!>QrWkQD}YC8z^M>cc_=
zrp?edN#v1t@4b5*eZBfvI_?C=Ly9n(p&3$U=mulKAm(^Tq3@*n(D(Zd*4qT!8@0gu
zr?U0WJ<(dvNda0Ab50y{0KmJqfg%W_83I1VJY2zXC%sDhRK{^&)-_hj3{jOqz^4EJ
zdUy8|QIui5&5@H00KjKsV81h$J<8v$%k_S}zJbri=ARY>j{5^bh`K}<=P4ZbtaZ_I
zS@iC4rC#qF0x2`x?hc^EgE_>#5rh!fKb6QyVU+1wCo6?*_Mq7>$5o`%X9NH+4_)J;
zrrKt$yUP1Q%FJZpGoms8fb}--b&*zTTvBDF)ps)kl*1O4<LRR;5Jsv8VKh6bbvFY5
zh@!T0y5Y05?m--1BH&Y8-z2!*Eh~U>MAJ>DPO4qxvvCVU3xfG#ia2iA^x~YtanE`u
zwX3$T4^n0TSKr4&ieLAYO?^hdSb${p0Pcxajq5sZ+SA&=bZf8A=t;JUt55ICFP}e@
z!^k?`*nqh=LL6UOiLxTlhOh}b45{PWa*27kvLdj`Ks{oUVc<&%x>Nqo30@Lb1mc(v
zK6ZaaKnr4Zxi!K6--A~lwCkG$i`nV>|6II!5B>m*rv-D5Y(V$`0000<MNUMnLSTZ}
CA_>0$

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/bamboo_wall_sign.png b/viewer/images/bg/bamboo_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..818286295f6828c4244b9e993a6acb0772825f64
GIT binary patch
literal 459
zcmV;+0W|)JP)<h;3K|Lk000e1NJLTq000;O000aK1^@s6crbl+0004!Nkl<Zc$|fk
z&2HN;5QINNv;<RPASFHomK&h=K1|;?kI_pHMG`oP;lyxc$O;2H65IntN>qe)PyCr(
z&g>2+zixk?!{~z3u_VnF^h4{4VMv+$7jrt6*qXv7-Mwtt>{h7R!~-8b&fZ?l3h%rQ
z8blMgyy8>?@Z)=89!RqViJG%a*M!l<DAO^Pd7ij)i`BX!YZWAF4uE)mek98(HoKZS
z*a8sCDIE5$*t`Dpirf3{d`m2+ZZDdEFnXXUimpZ1S0!O|=@t5yiqSh|*xP&efYudH
z`y--xb4hA8p(qLtA7|>Iam;M5S8Idq&!9iAFfxydSOx$r)5y7~&$i#|A@i}&x^gOF
z85jisn_WHXBFogdq*Z0v50!y&*iGwr@va-v%*-Io7GHWjQ~;1=zH^2V%d(q6o_`}z
zbAJC>@wC5h0mc!1H+^+d=b~6nJ&b4qmN#?qyl2zvD?u1tj{ejk+p#%lU4b&|)3N0B
zrL}1+1Efq?t=~|y!s~I@=dJ%+dzfMGZI1oPe*q|*@s@4RMi>A9002ovPDHLkV1j=h
B)L;Mr

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/birch_hanging_sign.png b/viewer/images/bg/birch_hanging_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b4972ce7a71f9a87c0f4edf5abf42f560328590
GIT binary patch
literal 363
zcmV-x0hIoUP)<h;3K|Lk000e1NJLTq000mG000gM1^@s6CNG?d0003pNkl<Zc$|%p
z!A`<J5Qab6t?e#c6yg(L;=!9|J$dl%6B(b&XYeVA4Nx~Elu~Gmhcauon7~|iclMu|
z?;kkE-NV!2`Q`1vnds{RxlE_`=W74e1>MJYI=`q%SLYh!>z|8?`?>+Z*XR2IK*d+?
zqbhfFb5*(X?#;g9@%3Y%02Z?pV>Gc&TC6Z6n=iQ@U$+I@5}R4Zw-bU$k=qrUP2pPr
zD2r{IjFf96VT`7!YXJ0U=<mQ74M40DR1yQY>A77IgrWPZwj}^XpFr>dntkPHgh*(*
zdDp=C2}7EFMX}DEK#ztjW+_3WSj^IPz|o3FAQQyD5H)p;F`C@2JpcM=`>#QyPKt#@
zkA}oLalTJ101i(k36agLcV_b?HnaW`<srqgsJ@Ny<c6*u;1}FUjZbsnh5rBm002ov
JPDHLkV1kDDsc`@R

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/birch_hanging_wall_sign.png b/viewer/images/bg/birch_hanging_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..b744d54ea4a99f967f1875f3829fc0f343d01906
GIT binary patch
literal 239
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv4DbnY1=5#~w4dMGcy>qa>8({q
z))ehpl(}(6f@eUgolCH)j_qGHH5Q;E#*!evU<QY0H`0Kd8c!F;kcwNnM>YyJIS8;`
z*dJe<zp$~HZBHYc%$kFIGS(Y9HnUi7kc!@MKw`RN(lmy+4;P;Q{`&2N|2D0xW$_P~
zb5h^z-SGXGm~`&el|ucs=2x8Oaugol((rESoZ}K4lOKpVeB|06=`iD_rl|72bE!-n
j-kT(LJ6Lv{)`(!#KCF?Rkh75+=ne)?S3j3^P6<r_q^4Y6

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/birch_sign.png b/viewer/images/bg/birch_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d76b7a1e13bdd62321e51141c471c6803f8b906
GIT binary patch
literal 460
zcmV;-0W<!IP)<h;3K|Lk000e1NJLTq000;O000^Y1^@s6t-qY}0004#Nkl<Zc%02s
z%SyvQ6g`ool4LQdmXaV{h}-^`U*O)4@D~I>!KGhd5fPe2MG#Hs%S1>A8ev?dlTO}T
zq~O^E?woVaopUqV{oR%DTpKEaFhRM-`4#{W#cAQJj;q$Rr-y67`4&-}!eIuYIK_r*
zuuK7m82|v&?A4mddYfM7d|PPXFasO@Q<zGfUWIJhrq^z7E(HLXHUm#$w4sgDbf%BT
zo-*ZWC5|ermK{~~dOkrZPYIc;`~tv+YdKfyn)G^8zH-5;2>^JmjUY_&rd@h{He128
z833)2;cB_NSt;Aq^1JYroF;v~gA5jc>c1U?qLO(XuTHP4Wc6w)N!DZ><rv!ZdJraX
zm;ukV^960VhKqA6ZyLpEZN{?RrqADjM3!fUu6I#~Kj~keU&M6!D7u+@=-re(PR@q3
zi2xi?$gDrW`eRNqAl<<CC-_{v9nQcVj!4Y`VnpHmoow*`ZovA3!x;eCq7P=^4oB#v
z$0P$1qV+-uAxJNo1hE4}LyE}vCy2k6q@l<=pyC%r=L&i1^=o(l0000<MNUMnLSTZ{
Cw$^z7

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/birch_wall_sign.png b/viewer/images/bg/birch_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..c83d292f0c9812f6d04697fe3264b9b0778d4353
GIT binary patch
literal 341
zcmV-b0jmCqP)<h;3K|Lk000e1NJLTq000;O000aK1^@s6crbl+0003TNkl<Zc$|fk
zF>Zt~6hxmT6A37clm^Nu?cOUVNS{OG3XyVzl(|9<ur(CB608K4AQCCaw+tBXG?vCQ
z-{13X_4WBWS7nZmy6M?+){X$Q-L%>ZX?;%pe80`sj<nrGVG`PIVz7!VoheKLK$<=T
z4--D-*Vc}!0)<H!?C+{8zk452H0D<y?=Leznj3825kpLKw5Ly}%IorR7sno1WJY_x
zb{%Z;6iBYJ0t{9;t@w`o`Y2x+uzv_ZRp!)9?~2~@>+|_anj1i^GQ3{?Z??(ydbzDu
z(H!~R3>IX-{%zOIyvsbK3;DG#_OIrPgp)Y7F~t13Zh8unP?fnG&|nqMPnj#)c2h88
n;bVUH4+Kk|3-0}k5Vrn5N3`3BIZ6==00000NkvXXu0mjf89bLZ

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/cherry_hanging_sign.png b/viewer/images/bg/cherry_hanging_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d6cf71ccc07da7c4289809da8055311185b69c1
GIT binary patch
literal 311
zcmV-70m%M|P)<h;3K|Lk000e1NJLTq000mG000gM1^@s6CNG?d0002~Nkl<Zc$|%p
zK~BRk5Ji9E@l+`7EsBH?S7=w<fOD|mHmo=q`yeE!DiR`%9fd_0XY595|H@<k_w_x%
zziuD)<KgjX#08bUN)Nl;-6eL>SJ|QY_`E8_`cgpGeqRNbz7+txzrKx*co7()008X!
z5CzhAxPN(G5dcWvA<7W|K+JI7n1dk76tb>2XLkeuQ3S*czNw*s&U0?$d{&Vi6jWHx
z(-(XO_P<|qK!`sG5%9E4ZM3R3)E0Km8hF}fCc6iFo;CR^g^3yKdXvmU5IFK@)yu%t
zpj?jgj3I{f4I6A#=?=<}_SB#~HH&Z*Nla>>7a`8+x>O64`U590j}WhNI}rc?002ov
JPDHLkV1jYFgeL$1

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/cherry_hanging_wall_sign.png b/viewer/images/bg/cherry_hanging_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7325f34714f9ad4b4f0cd39dae864b33c01241a
GIT binary patch
literal 224
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa3-AeX1=6ZIwstPTo&l+6TN^HQ
z_Fn6sd~?doJ2U3ppR<H#`eJ^d3dWKkzhDN3XE)M-oB~f5#}JNa-6IPn4=aeUJP^LH
zewVa?(@X}(MTY&ir22dg<W5Ly*_7*&RHt#xuUlI}>n2m9c!6Ny=VQJHjuxM*Jo8_i
z|8>^<zz5rFCDtAYj%63V6Ld4nyTHwJ@qzCf|1M#Q*X&|FH{*8(r{43UMSkkJEJ~qH
T{@14f?Pl<F^>bP0l+XkKxZG2D

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/cherry_sign.png b/viewer/images/bg/cherry_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..91b1949046b4aa2d4d13904804840d89b7028e67
GIT binary patch
literal 442
zcmV;r0Y(0aP)<h;3K|Lk000e1NJLTq000;O000^Y1^@s6t-qY}0004jNkl<Zc$~FV
zv2MaJ5PhzkI0TVYRfPl+>e3Eu{CKC1-TE74sVapkQxheC0m&VbGls^2liFKipYQqk
z-m@dJmuDl=1Qezy;m&<IY<07yHTv*Uq=_v?q(F0{HH1<yT4P^V2mlDBY#pLzEF#s5
zm!>F>r)rak6hxa6N&$6s+JSTWljy+9O`fAG<S@peUfcQMeR;8_YfY@)UQM6IBt>8J
z;iV}`?CT04c@a4}w}q}0<O_WP^x~yR69j~I3_I7?8tjk&z$Ls~leUf*au@?Zr@p^*
zC!7Z_<EKZvaIR(O$p>AUd+^eliBlQq`clpX+q$h^M#4+0CF$B4=suWzT_K!K?WRU+
zd(SW7z3+g6^xS2c_s;)WEM{}Fn9U6bBRR$6^tKs%UXQuq5CA|jh*|Zl4nFb~25P_}
zV0Cam8nHHK6V$r{n}8+JMsL^zY?HYjusV1cPnyAhUemnzX4SI@xSO*Hh9OH)KEdQ}
keEeNp8LT5MzcO|gKiQAn2ZzXpumAu607*qoM6N<$f+xGixc~qF

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/cherry_wall_sign.png b/viewer/images/bg/cherry_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..48d9511b151578c15989ccb4b0f20ff68348c19a
GIT binary patch
literal 323
zcmV-J0lfZ+P)<h;3K|Lk000e1NJLTq000;O000aK1^@s6crbl+0003BNkl<Zc$|fk
zKW~FD5XIj~2eya=d*=4zcj}leUn7~RlnsQ_xI}V>a2J!><`%d=&zRq{ssH{8)U}WZ
z!-zP~)o}CAp7$u}nYvboVGSe?-h+%m@E)_9PyrxgbPo3UPSzCl9ES0=tEC8QKud{?
z0o=6ygJ}1wNa*?ZazQG1*Wm81n%__7&6!k>evXGwVk{_1QPOi5M$B$PEne7&^D-Et
z5MSg8pr~i+T2!Kr414FR21g$OfGs^=g>B>o?-~F|^8LqMbQwK2pC8(IXIW?JRf>5=
z&uS*t807d$Ef(wCEss(3tSp7=Vqkn>W;dbU?{(4Oy`J+eefAzm2+zO1&z|{GJOIqD
V#mlX_=I#Ih002ovPDHLkV1iJFl;!{c

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/crimson_hanging_sign.png b/viewer/images/bg/crimson_hanging_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa3dabe922b5d3c96d140eb20b867bd4d57ba5f8
GIT binary patch
literal 371
zcmV-(0gV2MP)<h;3K|Lk000e1NJLTq000mG000gM1^@s6CNG?d0003xNkl<Zc$|%q
zOK!q25QaZT#&JN|A#njJb<r!dD{jzB^cX!#FVK7R6jjBhkRk+4;v^=*U4TtOkziIc
z<C*_4hGX14Ji4dZv*Svf&qY3&PVcYnUYv`%#rGn+38Xt00Lo&0)AIS80C=0dxMi7>
z4q}E%VXOsUs1yL*H-LHZ%bteUk9QFPd~ObsR<;Hpvs?0AgRz!nnFlswEnmeC0Q=VU
zEdY#_KA^X*$5^>K<cZJ#*t$9a*t()|mwzxF#39e@mdPlkZR^nMDOlN>Scov}Z;=Si
zvdn|*ZUg|2IvJ%%d61d!n$YXs0YK^G1mKHU2#mFil_nzYEq1MVf}Vm%ik>uYWnngf
zRZ1OH{W~H+xvPSIFIP%UX1Af&wF@A9QWplL6XxshLye(4TJr=-JIpcn@dx~dp+I?E
RFP8uS002ovPDHLkV1iWvq0|5X

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/crimson_hanging_wall_sign.png b/viewer/images/bg/crimson_hanging_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..35a78922998204e89892e7117b11534d6dff7054
GIT binary patch
literal 235
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv4DbnY1=6ZIwstPTo&l*9I-YeV
zK@AqcO%_p|meJGfk`}mR{L^D)2P$GL3GxeOaCmkj4alkRba4#fkY#N+D9C6i(zgH4
zW_9Be&(5WkEaHp`=!#l#pp!3*HHY<6*?N`pEuWt<)Y+D;-BacD(}BsOgJ*&u-vbV2
zgIz~8{a063UfzDy=-1(vwtYu)ikc&~cZjj?b?mVg7ZW`+r^CtRQEb|$sM^mtEqU(~
cZGXP!mzrjz;qvjHJJ1abp00i_>zopr0Nqkk!~g&Q

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/crimson_sign.png b/viewer/images/bg/crimson_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..08e23220070570a027a2b4628305bb2a54b122a5
GIT binary patch
literal 531
zcmV+u0_^>XP)<h;3K|Lk000e1NJLTq000;O000^Y1^@s6t-qY}0005nNkl<Zc$~eJ
zL2lDP7==H(GxnIINmQZWWxJq=4H6r2h;9(<xC!^*3><?!CqSs1vZ_f@RXZsj+eysA
zjAN&@Een~qvj2H+-al`C%ht!m`&>!EA#}E(seZX$@_ale+-jyrs*$IpK!jUOxP@gL
zaqKEQ+hKa7N>aGh0A(%63ZAKT>4ka0+Y5p$s&(VpPT8$5CtR+V<wjk4>*9Qod(r_Q
z&Qh$rSjervguHmJ)~y_r;}B<Qv3HAJ%*PW>pPbY>zWRMzt5u_lcPYM{0HCCJz&+Fp
zUrzX`*TlON&vuA+DXT<t#Vwxglv$f7Obi8z$lCP6WLwR9g)X}UYTZ|1Hf_^e7w3!I
z<XFwnz+~CPG3!lw@n(Ly&)9=!YD^n+wjszOd^suSzfCW6wgL8YZt|=ixtcG)D$!;3
z)w_92FPic-7hE*~Y7+#i@qUb6{D^)%I>%7tYqEu6{%<HgqMKDz<231e;gj#@@BCTb
z&D_K8L%t4zejW8S_~y^}pk~7vMBW*n_1$m=uH$r*{>5M<U6SdG;SBDxgpqW689e;g
zwIE5;ZqfmIo#1VJjT?R+&fp80m%-g|2IA=}zMj1v&H&(KbUd8FeU|jv9R9-;{Q=Cn
V7vedCW@7*V002ovPDHLkV1ieX23G(8

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/crimson_wall_sign.png b/viewer/images/bg/crimson_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce47274ad517b5557ad8da82338cfadb9138922c
GIT binary patch
literal 392
zcmV;30eAk1P)<h;3K|Lk000e1NJLTq000;O000aK1^@s6crbl+0003`Nkl<Zc$|fk
z!E%By5QaZ6p`l}OrU%Q>OMQg;5FYz9eO52_X0_uC;FL&2dPsx83hoIu|G!zjU4oCr
zd!wY_I<z^_mtP&WypE@2wPrF>y*ecYBC9o74cjv3=|K^P5tET>MOm!@+T6xioy*<x
z3->~NF>FlU=_U@Nw%b%DtPb0@&^>>!oG+SKMgWwiB53SE6Z{Dp`|Rg~22>PLn#$H5
z@Qdj<VfOgk>3IFK@8o<`<+&o22>?opf7)xmNM*v8K2V-3;xM8-R}@FhnmutCwX7Wq
zhrxzLHslwMt<Sqaw_O6A?)`8@hy1~EzGxgrpP>uKvQOjA`~2c<I=e8A;YE!Z3T;ko
zOin73cK?U`LYotC*>lI!|74#pKylP9dw({!{GyMq8?b)~(AgkRz4LK?@tJ?$++(nO
m9b2&bzr+4SyCUys`ux9E(e_FzKJ<0~0000<MNUMnLSTX?3%7g#

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/dark_oak_hanging_sign.png b/viewer/images/bg/dark_oak_hanging_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..7155078f7f60edecac762211f795b5209dcb20bc
GIT binary patch
literal 307
zcmV-30nGl1P)<h;3K|Lk000e1NJLTq000mG000gM1^@s6CNG?d0002`Nkl<Zc$|%q
zOH#uy5JaD4JAfB(iBOdVSAb%{4RTY?z%4icpM|RuLX7pX*mz`(3M$cRtnPX08N+;T
z@9yKn(>8MAls+THdc8T-`=`(3A8+rUXF+mb0(>9(vzkj^1+abGM1ZEQlHkL#j{IIU
z=L63#uT=x!e89~O*Ii5hWm98YS2zzYMA{iN*a_<=Jwg&k&(&&KjevcKsm^s%ng%;1
z@i>O`VhL0LIT9<cC7J9&pbFp%s=RX3H3}xaJdr7z#Jp;ZGD{MH{<yFJ_JdQR#QZNw
z{##Q5Y3eR&HIBePb|V10qX*!!tu-JwNxc4G)fnYHz%RySo+5yMg;oFn002ovPDHLk
FV1niXf<6EM

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/dark_oak_hanging_wall_sign.png b/viewer/images/bg/dark_oak_hanging_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..73479e8ebe6b6feaa9d2f1fb052c1582b953e232
GIT binary patch
literal 240
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv4DbnY1=5}Yso~C=b}qre4jO(o
zs-BiAu4c;iMvCUTa;iGES+CSBfr=PQg8YIR9G=}s19ECTT^vIyZmFIy<YRPXXnpv9
z?@Sl<W^SKNLKih&+;w=VvTi{!&-Vg0^N8NCwv^J{J{kKSUH(^;v3&An!#BHF{Y#nW
zJUrhcpT-j6!=|NZb}MD?_Q21-cjd-;2Zt>=*|0QcvVqdnNgD(7XYN}0q{z4IeU!Y?
jPqTAp7tdIcz`C!pL$-He)vpGiLl`_={an^LB{Ts5`8!uH

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/dark_oak_sign.png b/viewer/images/bg/dark_oak_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b1307d9f89ae16eb91240b74a278373ecf8b218
GIT binary patch
literal 416
zcmV;R0bl-!P)<h;3K|Lk000e1NJLTq000;O000^Y1^@s6t-qY}0004JNkl<Zc%03Y
zy-&k15XFBXiA$0yRrwegC^K8xm|*As-x!%uRFtIDZZJdY)UEPS7e(SNvCjAIo!{x=
zy*ys&c_grrttH1XS!n<YsSfVia_v|!j|8&P6jG6hkU}c9N|PZ;L<oTJJ%sPo=Uu*u
z5Ag$8>6*MNmWYs*I_%2s-bS&@@8f&RMXCW};Zw?rKJ?{u-31Rfant22p|PS5T{CLq
z2j*ZdjGqR^SMvqfDh*Mc+svkeA9VR^25gG}%p*aDY>E!?z2zd+vG4&}Jv?<bUHoPS
zHjX`R^Ze9!U<YCUG&{+}j2#BHja~d8Th|L=FU(eHZqrFqw2+G8s7o^!vkP7PW)BRE
zpV02<5dOq}dtT_*r+Yn|xyOY|aypI4%WtQqoCMxKKAnm?3ryq7aRttSlfWu3onP_4
zUa(O=;|c)WT_@uSOhR`@ofxxe%vWBHCvXm&1&WQ+ugHB5T=5GJc;VHoq98Z`0000<
KMNUMnLSTZ2X})m)

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/dark_oak_wall_sign.png b/viewer/images/bg/dark_oak_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..a163f04c9814569224e79d474af84f9f3deb30ca
GIT binary patch
literal 315
zcmV-B0mS}^P)<h;3K|Lk000e1NJLTq000;O000aK1^@s6crbl+00033Nkl<Zc$|%s
z!ES>v5JaDaaRo?JRP8lA=aw(X|Njl@!Hu*Axd&L+K^QU@tntixnbn&6^&<|ABggm<
zww%ln059R`Zcm$Yc4!<jN4x|&SK}oxg~*7|xf%dh8C+$S^Qu?=%x`6mi+L^9xtgEw
z+*RIv4!`P;{N{G)BS7maer4teN1D=|{r+rIm+u`ZiX)U}wCA^a&<o8|p}Fc8U<whM
zMVn?*@Y_<pI^g^ffT3}WNGf{fH@8b4TUP<>X87uCO8zv19NUcdGJln~ISK#2mW!0r
zI23t|CBGdX%R=M}Glj@k|CWk+3HVKyIv3rAl0WT%Li2?EOwX|O{{iZq$;jY~4ygbD
N002ovPDHLkV1maCkAMIG

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/jungle_hanging_sign.png b/viewer/images/bg/jungle_hanging_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecf1e87821b9d05c83e6089417bd40fe06091d78
GIT binary patch
literal 412
zcmV;N0b~A&P)<h;3K|Lk000e1NJLTq000mG000gM1^@s6CNG?d0004FNkl<Zc$|%r
zF;2rU7==G7D|Tx|QKUvN6p5io3|s*wMmEmCCAbBb;2K<mfuTbs3Mo{PF^wauWeE9c
z3ljW`?ceV`{qNcERmZ1i>+_4NHGkADuGekG<CDL*zv6nEho{-gzeF~1BH-WO{zcx!
z?E&21Uaw<}IOpUd&vO7KZU#VI*8m(23c+07-0dlVhjIddF$RE9e@Kjx5CTOnrCd3T
zF^u{{0H(|NPYcEvie4&!5CQ;A(~w0i{l~>rrU6hL`6xa3GTD+E8uC2HT8sCdf&{HK
z^x2w1b^a#I81;uO2(Z?+dfwAC4FKiJZRH^X`zoU%FkQ~cqNY-T(m5F&pi)8dnKBm<
z)m?T0g%Bu6C|8b31<7TkQ<PEwZEuinTX4~lrYTx$NndL%UXPTOXZ>LT;5k-Q%XZ8x
zYLX-oauzj<#iI2ezsVxt{RiD@?SNPR{oAY^P*V$Lw>|+K6RtVWgm7d40000<MNUMn
GLSTY7V6U|R

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/jungle_hanging_wall_sign.png b/viewer/images/bg/jungle_hanging_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..5cf2b40e1052e36f3610b6a6111adcb32ce8f077
GIT binary patch
literal 242
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv4DbnY1=6ZIwstPTo&l*nh1Sz+
zT<5p=u4@R{(iXM5H*x>ORQ<Cr7XuYBmIV0)GdMiEkp|?{d%8G=a761K*(i8OL4@tW
z{s|T7FWGt&gd+;Bi8Sf*@<%dU(F*;v$w9?$Lb6x)6K%T<ReMgXlJ?j&qgm&G<c**k
zyA%AAUVqW;)%h-<cUAGM+#}DJ6ICU-f7V=nq!^T&%*W<_YU72R3%WjkqN_W~=dNI7
le)veB+tlL4?rl-=|IOUg7Vym6vJ&VN22WQ%mvv4FO#lh<TbKX<

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/jungle_sign.png b/viewer/images/bg/jungle_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb7d54d5ba07e8082fdadf349f6f5b885d133276
GIT binary patch
literal 451
zcmV;!0X+VRP)<h;3K|Lk000e1NJLTq000;O000^Y1^@s6t-qY}0004sNkl<Zc$~FU
z%SyvQ6g`oljR~ZIN^J^-c2nH=4Q^cd58b(P=LdA{C%E)C{1{&#Hnkum!N!?UjH??a
zang8^o=wQ*o_p^(hjDH$&x&X;0wG>6Vg5JOvMd1rY-EmYeCPJ+yrAYF2ut!t=I~t)
z8<|5Y4Y%8Y?|PNK`Z60|#Or0*NJVpi?|P6*SFSRzH(}!osdS}DDvh@^K^>3JPrqt5
z)cImMo^18FZifxq_#$2}K`OE=DF@d5Bv3B&rK_9xA{vZ9IRru2=r09qE&+fxzH@zX
zTC{rb4~Xe_QvTSywAKIG2LOU30aY7FHq}fr)l6;^UyxViD+L%0MrFWKX^>K?*)p>6
zcb)+Yi}|cr%xA2F1gH7#^&N2{Sx4=0n&U*`;Lv3)U@3?~7f`JEyaheC!<)`skV=gY
z^~GAi$^Za{J+HmV082rfNW5rX2rLCh!vH78ebxe&f>oMhmFDe@23QLEk%#>*>n5Ip
t`-cqQ+S%QLDCE6j_JYqY(DQkZ?FZSv^rsoE7bXAz002ovPDHLkV1iT_%eMdk

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/jungle_wall_sign.png b/viewer/images/bg/jungle_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..6eb610b5928ff182b22c0ff41d4ee3e5e6dcfd88
GIT binary patch
literal 308
zcmV-40n7f0P)<h;3K|Lk000e1NJLTq000;O000aK1^@s6crbl+0002{Nkl<Zc$~G7
zK?;IE7=@oOlqg6mK_RHSwCWtK+I5PK(6VcEn}R?=2ux6BW@D>2jMHdA^fuz-|7PZY
zFE}5zeU|2+%Bq0<Kjt+}4FG6mhbca|9Ctm3lVoAwR(6QP2(9cOl}0$9Ar7O#oO_v%
z7iCqLL7MgfaTq}=J$RM<dRsnTNTmluQfWM%HC$cqw>Qrxmlx~hYBFOt4xgrYQC0=G
zMbp&gKsQf{z3|IdkMSZ)bFhabS&Zh(g6&HH;1eI5_M84=20uuwmn-w*%hKn6I|l%Q
zD*?k8xHdf-rf0KbykJ($l?7&LZVHx4gPYRxb>!p!-oXnhvd&kZX_>qL0000<MNUMn
GLSTY%Rf4+!

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/mangrove_hanging_sign.png b/viewer/images/bg/mangrove_hanging_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e36396e306dbf7c9c394bb0b121db0980fa9e07
GIT binary patch
literal 329
zcmV-P0k-~$P)<h;3K|Lk000e1NJLTq000mG000gM1^@s6CNG?d0003HNkl<Zc$|%r
zJx&8L5QV=uUMEP1Qv``39W_*N0xm?w-KaPQhyp3ASj&!sL*c*KRixxqJ2UUSeKRs-
z+-@I^k54a0&S1_n<zutCJEuL#GrIWv`o73S^QwX0|6C-V^A-TF&-cfx)#{{R7)Jo~
zd>BWhkG#EqEG&TZ5ibJ(odaBK4q^xbo`LQ<PI>?qAV?Cro3xSi*+daLHx(9GT}U63
zFq3gH2?4jx)IO!~!=V|--vJrGEiH(tA|xdW0%70Gbc&k5Ep3a+^bWOGY79u?n<DNU
z=}4{}%B^jSuA$89G)Q(<B>9bb4Kp#;Fy#jG-TW@%cX9ehb(5m02}&bB2g+(ek}%EH
b`^fkQ6`_DE6{Z5X00000NkvXXu0mjfKemSv

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/mangrove_hanging_wall_sign.png b/viewer/images/bg/mangrove_hanging_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fd994833c96e895eef7076852a18644f73fa817
GIT binary patch
literal 224
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa3-AeX1=6ZIwstPTo&l-(db*{C
zhE?W<Rkr#KuEw1{R@+0i+5lBBmIV0)GdMiEkp|=xc)B=-a761KStxl}L4@Uj@P+le
zqz#;AGB_?W?7t<|=W`%;LR!nFT$iLejcb10+7enfnHt3l1PebO^F461_*~_g|Kj|w
zv*rgr*j_8K_CRnfyYQW$n_1okZk~$|eBbzY2~)gg7wfqhzcV=Xo*ympQ_p2l3U%_o
RJ_TqugQu&X%Q~loCIA5AO{V|=

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/mangrove_sign.png b/viewer/images/bg/mangrove_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..d03bfd0fc08af642cacf4802e5123d84f53f4c48
GIT binary patch
literal 451
zcmV;!0X+VRP)<h;3K|Lk000e1NJLTq000;O000^Y1^@s6t-qY}0004sNkl<Zc$~FW
zu};G<5Ph{wW4j<FR6?LiT|i=CVPR!u;sZMK3;Zw>LMo}0)=ApRWk@b{(%O}&a*LbG
zd-r_r>~!$?{IXMt0fkN(>}OZ5$g9;9?RQ-)SBYuBLIU(`3I-+&Ou?`&b0C#q!ZbJ`
z>k87(=Q?G3^#WkRKuDlKRg4J(lxXeB-hHdnBYd7_^A-qMwTy-etF>;@t1pdibTP;H
zd@@a(9t%W!D;yCc^76S(D~}bTDp?n#mHecjxzGy0%jYUFKq>*$-Z}iG0ox)#JsS^y
z@bPfJ>$W`_DgZe27Y^S&d_I{b&5N#=F`}dSVJZ(ickwy3M6KIkJ7<$AXLDVAPF|6(
zbe8Q4vo3SQw^38n6s$Str}+DOkXc)?ev_Yz@3QT^jrZ__;{Ek;H+y?JI268Mry=cF
z=9?gVu)w9f=vScE4zvy{9xQM(R>1;11pG7ie<IEn_)iDHL%vc$dkX7dnQ!_%MZb$}
tQ1M`a>zMa@(eB14{-Dnl$n-XN27jM4@&KAR;1mD=002ovPDHLkV1jL#%<cdH

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/mangrove_wall_sign.png b/viewer/images/bg/mangrove_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fe527a02f3b8b7b9e2aa0a7c4f151e9368ed35f
GIT binary patch
literal 342
zcmV-c0jd6pP)<h;3K|Lk000e1NJLTq000;O000aK1^@s6crbl+0003UNkl<Zc$|fk
zv2Mg542J(hC;@H>Tcwk3xxPS`K2cwxFWjk1MWyHxlEK%3m^isWy%>ytgFoQ(`S$*B
zp1?K)1vxLp;+Q<e?b<$9J5M>;Sb*mg6_g=RRG6m`2o}mv&NFtYVC#B41hwuS0c8lr
z0uia0G6YQ6oJyX4)9Ha;hyG`igg&`*<8Ysc9KL@I*xNqmNUtwfUu101t|$uDp{?rm
z5E5gDHU*c0?3pJU-wS&HRlRnefM5YE><WDOg5@T_ayJ$I>EreG*tdOd8~{A?MS*)o
zuP;}h7xpYWw1@E~*eB*Cz2=s<b(t(<Qp_=_E$KD0Vy^s_<%gN45#39hi&9kio&Tp_
o|3NQ~BF4<~_j}s1m-!X_A2qhqUrrP|MgRZ+07*qoM6N<$f;7{ZBLDyZ

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/oak_hanging_sign.png b/viewer/images/bg/oak_hanging_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..fea3a3fa78ab76dce783b46e93e5b314027378c7
GIT binary patch
literal 339
zcmV-Z0j&OsP)<h;3K|Lk000e1NJLTq000mG000gM1^@s6CNG?d0003RNkl<Zc$|%q
zO-{ow5QV=+O(&#Cfu5mAEVu%!I02l3EoWlQEw}}h5G+btDIq97c3KfO9TSI0?OTnX
zXWqPL!yXq`*X_;ieaiv#`vNWI^UFiCgMC5wu>4#fCDQG40%egNHQetT0lYjtv_+mF
zQA{Yp)>^EoI8Dw0*jfufC<4H0y#nCw@p%*gEMDI!Z9|%W0bot#28%p%yq*CzY3@gu
z%EVJwH;PaMYbqp)y$DV~qL^87=ISo5;-zi8Wlo^p8E1Pc6SrBj552?5IPx8ow)tmK
zMU_*B>ck1CnqKHHbn`3pjq0889rU*j@p@N$|3wP`va<5XzD>>F<rHHr>YbrZ4a^eW
lmKy**><<8u1ekr@$1h1un&VF+;Q;^u002ovPDHLkV1j6Sjeh_D

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/oak_hanging_wall_sign.png b/viewer/images/bg/oak_hanging_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..9212d0787635ef5c56ce50007c651e5ce7555a0c
GIT binary patch
literal 225
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv4DbnY1=2^CWFDBCv~z02y1t-A
z4c;?roF|q#dIqH0xdf}~*uFe_XB$uvV@Z%-FoVOh8)-mJo~MgrNX0GDBO3(|8Hl(X
zEN?H~Co+rS@r(mK+|Aowc$p+{c6bOJX4@T|Un;|YJ-1+%wr1*%!}h@pTy6}9SR52$
zPkr22Ki@Vb^P0)bZ6Wh`H<zxm3JVcjJM+qw{fA<^&Iz?OsJu~7kvOsbvX-5Fv4ouO
U{%M)tfHpIDy85}Sb4q9e0N$fgdjJ3c

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/oak_sign.png b/viewer/images/bg/oak_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..fca0a80edf1c7fc76ea102c8ff29c5cfc743c692
GIT binary patch
literal 440
zcmV;p0Z0CcP)<h;3K|Lk000e1NJLTq000;O000^Y1^@s6t-qY}0004hNkl<Zc$~FU
zK}y3w6n&9_){IDKwU$6}Q4qa=72LV^0<NSt5L|cV1>Cyv9PYh<dsi(4+Y%WtlLTDE
zO@I6;lf;SSZD#W4y?H<HGtTqFb><KH;0RVBwrjE0005=a!kLN7Yr-G&5o-;lQ+Toq
zrBfs-LIA*%T>yY9C0r@<J(;;uqE0Vjt#dIp#Y9Dgu6XwxbZM2|nN24d01SIBK0aeq
zp^8&>=Da-JX1q(@O&O|Yw5=Dkp##d3K)KQi0Evo#P4;{?CcP-jmj=vD0Kgyg5wND}
z^v-NL$%Z`_0E`*_bv9*sad~l;e~dTlcE-Dg%uPI#UT`x1HBO=$#X;aPmgz;X3gO9a
z;lU&-!uaGkzf|eem@(C>^!Ym=P@aG}(>nZ1|9E$m-QS#N^~_)F*pNG&4%SN76Pp?|
zftA7gJZ#sX39JpmukZE@)=J}a<h5r20HdS5b`5M{ZLnBI?HL?;60dLb_6(Z9%D{HO
i)&`4ZgoEC`mBA0JH0sPIk>A4r0000<MNUMnLSTXv2+M5%

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/oak_wall_sign.png b/viewer/images/bg/oak_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6f9879cbe90037ce9007e0dd872f26c100fc32a
GIT binary patch
literal 332
zcmV-S0ki&zP)<h;3K|Lk000e1NJLTq000;O000aK1^@s6crbl+0003KNkl<Zc$|%s
zF>1sx5JjIsg(Ed)4Q6qZVj++dY#?XI9l{=DtDGWD&XEh5u&_aeWxI14j~E--&Tk~o
z%$LS*Q1<olHr7>%R&%?vjCCOZ;KMM>rD}D|)Ky6r0zM2BF2{#~-nTSB;c@`1b6Dr%
zUM{oFvFA5k2+_<G?0q}yN_Vd%hi>_^>*YKG91oVC-;OP9)vV>R@6Y#9cd5Hs)7FfZ
zej^)62v3o4l@*}(Ellk7Y*K!+##aWcF9E2ll14SP=g+Q}^LRX1fF#5J&SuSTUSFQ$
z$7x!Zj2{xrQ*|l7(Z%}Lbdkgahe%^w^PA>&r*Qe~!Suf6^z;}H^<hXdmiU%Gz5|i)
egf!DVE&YE*+0p?}{ggET0000<MNUMnLSTaTJC{5F

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/spruce_hanging_sign.png b/viewer/images/bg/spruce_hanging_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..295a2deb568b7af40ddcc7b8949ac218a7f1e6c2
GIT binary patch
literal 345
zcmV-f0jB<mP)<h;3K|Lk000e1NJLTq000mG000gM1^@s6CNG?d0003XNkl<Zc$|%q
zO-{ow6okL{r)?H=(K8f@1qWaQD{jCII1FoU!DYAyD2qs?Am_(+Sh(>|RH+>)l3(7u
z@ys)vaC`qaJw3lnT)>hi=EHt}cWL%4PvphdcXO3U&Wi$nzwK4SOI`)=_WCe&7L*9z
zv7gYgVxt1-*iY2DLWxux?|A?CtQ0_FEC98T+^j2%cW9}w9@_rYLlr#ZTp3}j6<St7
z-MQ#y9+=Ntt%?Xy;Agavlw-FJ!ZS9Cq83231F6~e7VE)`;mJE&3J;?#9n?Z%eYjz#
zR{%l4ySU6+$mq6kP|MV?K9M&nxyxSwV0GF>bkL4NaciElF-h2XS40*7hpy)wtWR-r
r+xZUE@`rJbVYD2&KH7}EMGf!|w&au6%J{1?00000NkvXXu0mjfg|3<z

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/spruce_hanging_wall_sign.png b/viewer/images/bg/spruce_hanging_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..87a62f936f9e472f6bcf77f982f6b8a4aae3468a
GIT binary patch
literal 236
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv4DbnY1=4Lv7EK8jb#WGz(dGq_
zCh1{@iGjMF0jYK_!Kym83nw{y0~Ilr1o;IsI6S+N2IN$Fx;TbZ+!8&tk@t{+i0j4Q
z@_CB)r#NzG3kzguCMZR8XWnRVxuCvH;(*54mFHglnQ^<Ue121sx$tALc^eem8Uzy=
z+6owsulfIG|Lgm%3ypWTuI^qqKRfOdV;s+k6SZDDH1cnUEYzBBBfr_hkiFj{A^8yV
e$178oePEBxlwa7drn3>~2nJ7AKbLh*2~7YAXH{PS

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/spruce_sign.png b/viewer/images/bg/spruce_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc5cbab2870257696cc9e9d5d50f1a6bd78627aa
GIT binary patch
literal 421
zcmV;W0b2fvP)<h;3K|Lk000e1NJLTq000;O000^Y1^@s6t-qY}0004ONkl<Zc%03Y
z!Arw17{z~crO9e#u)zeugD}vO7mr?d_2O}Vh5xQsuR<YMyQDbkVM~{7X=|nh-=!gW
z?|Wa~M>=?UzON?Z6c?GwIo#8x1fbC6-kFc<?nRSviZ&&ME=goep-YqjR8Ase0HlbK
zVz;(tQp9xWBW=oB43NkeW%j#tyLVxWw&@4U#k>L#BEgt~Hnee?&Z4{PnbYNdH-4lo
zGdk8sc3}@}o)$J&`vp)2CR?sM8=pRE%GVCqH32rAtGq7Sr5`L8^Gb*Wz?<PuXVavw
zXRyI0*Tal6#Zl%yo=+dSWcO+=$?n-WEZi8I^ij5b5blFf25x3)U9`}pH)Ffsrmx?D
zh0PQEnRek<`lpA>>hX43bu)K33n5D(`S@G~H5Fv=`t}}FJlNpkeAKVODF`wsRyz0=
z|LX>8z3$fl;A(pOPx>>1p&SMk4>m|f5^Z#U2B#p{Aj`k{GbmPJ@c?`SB=F;2<N+e@
P00000NkvXXu0mjfJ`uog

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/spruce_wall_sign.png b/viewer/images/bg/spruce_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..f8730b9de491bb7fcf5ff9911c0c6dfc0d307213
GIT binary patch
literal 316
zcmV-C0mJ@@P)<h;3K|Lk000e1NJLTq000;O000aK1^@s6crbl+00034Nkl<Zc$|%s
zF>1sx5JjIsSi%?<Tx^#jutlmp#hxJLo+2kV2#k=_IE8nVu~)Y98;hCwqwyQm{CwZ%
z;nJfu`iX5UrVK!cd6lcx>X;cWJuziM%yh0L#EegXpXgi*fU_;m{+;DAXIswvCZ=4>
z0G(^`X+5Q$UQ3!D`J3nCHUn7Oky7ADM>Tsn^Yw96Q?93}t3TM$yWhw`62em?T;&Vk
z6AZ6fy_=ff?D3Ta>q~%TazB-(Xa45-xXspf09A(n-OZlA>|oKtb<244yfLrU)%->m
z>tEAF5)&LEjd9O!#@B<;55_0>y!NGOh`GvG;z$1S4n)Ee>P*kH_5T9oNXvKIM+U9{
O0000<MNUMnLSTYb+?FB$

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/warped_hanging_sign.png b/viewer/images/bg/warped_hanging_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..100e0fc0bf9b65d88c500e743e262d0ae6664e31
GIT binary patch
literal 374
zcmV-+0g3*JP)<h;3K|Lk000e1NJLTq000mG000gM1^@s6CNG?d0003!Nkl<Zc$|%r
zOK!q25QaZOjbk7@?m(q3dIh@b4SJOJOqF_?uDhyKA&Ma3l|XDFLKk2sp-3>R8Rwt>
zF$$dO{&9GCdVV=@rOt7lZ3csfYr7Y5UU~SPOm8A7;~c>zncuX0j;jF-Ki&`da)t7J
zj4zSe0APFxK=~VhnN7${&gbh}%>zh&z5!Ur3jm@pBGnqH4f%5A)TA~fqw#UbO*H~Q
zC+K5l6Ua?Pahq&h-)y%4*ze+kV84sWvh-qR<@>IW!U(U|B})rz#lbpWAcS&Ydy8hf
zb&PVdT`ospS-oBtp^hY}*6yu*2Y`AbC<yEzghFaVC+H)jS6M7au>#cyo~&4NQKn<3
zDwJ}r{v8ouyPmuJ)~-;BD2&`&IWEARZT32(-UyhEz5s}I$o3S?3XlirRrPoO1Js(F
U;%w=8PXGV_07*qoM6N<$f-(N0&Hw-a

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/warped_hanging_wall_sign.png b/viewer/images/bg/warped_hanging_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..a80b913b4f57582eccfdc3d702d0b96cf0e4f4cf
GIT binary patch
literal 236
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv4DbnY1=6-Fm$@vQZ#{Fm*_1xR
z-X6p5R=w5=&wx}rmta*LTcfm~*FZ&#B|(0{3=Yq3qyagVo-U3d6}Lo>DGD7j5MaHq
z-~Q+}=@diVm<Ap(M)jubLQOU1eUT1{lhmG_EnZ$Nb^LDb%NO4{@8vhLUr<Q$UNcc_
z<wdbpkB-CJ|IgjI@bl!DDJK*!E(#Jc_|D|WUFmlA%M>2dX_xdj@El6GzQ(K2@1Faj
f!zR<u7yMX1B|*8*P*`^z&=Cxtu6{1-oD!M<E`C>}

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/warped_sign.png b/viewer/images/bg/warped_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fdc1811466fdfd0f9516760a56828ad680bef21
GIT binary patch
literal 531
zcmV+u0_^>XP)<h;3K|Lk000e1NJLTq000;O000^Y1^@s6t-qY}0005nNkl<Zc$~eH
zL2lDP7==Ga&P-_&6hq`JDx(U41eV+isaN0#Srx9p1zNG>09=GCaDYk(q?!dRDy%GO
zxw4u}5w;P-A{mng*<mV$x3T8;d-LXh|BMrz9P62stfF5OG}Y6|IsWb*mCES$hK;<L
zl(?13*iw*RDMr7(Q+ht#-moTBDg&r%P7*T$^rE&-@0x`N=-wWv3@3@}lL(;n{Q9&y
z2uUaBc#HKqy)!r(YbgW(MOpsUY7?XoHNQ>oK5&0BeHa07XHmTS^#jvK&u-*tq7r$E
z4nhECQqH+8dM7$L)|JW-c}nT|h&<(@vt8#2fATk2olBeEHQAcxO3#NYg$_cxD;tVD
zoqvtfV$(LgGdLRS)l8ev#%cQJ4xU6eGX8OYx7EZi3Y;WH2Vs5x+w^X~D1fD$FDG>r
zrsd^)0WLb*_`ufXq}Da*-KKoafR{}GbPzI1Vy05kXV^F&qhI?D{&hA@dMo&^-{|Mj
z3vHw6SUDtTR&;BFgHwmoS5G%*pw$_NZ$EF&zzov{t_^voE1~>iWnk68bydtwEMV2a
zZSJ{M2cKS!DaGT>863Qe`FLpc&g=|4{f+(i@p|HI4FK-#^fza4T@_ZF!+*F%zX4r?
V2qbK`zpMZN002ovPDHLkV1lR2_ALMa

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/warped_wall_sign.png b/viewer/images/bg/warped_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..86a7cab7ffc5850fd99b43b4577d9de826a6fcc1
GIT binary patch
literal 394
zcmV;50d@X~P)<h;3K|Lk000e1NJLTq000;O000aK1^@s6crbl+0003|Nkl<Zc$|%s
z!D_-l5I|of?po1esKkS$Na>*ja_Gl+@>BF5d&{W@K|B~DK@FuzO1B5ITTR*6xrCj}
z+u41SIMHgUPEyj0VNqbqC)+jtbVik@bO&Q=-APK^Do^R<kR5U+-yf8oPj@gjMOB^x
zn4GhTnE<NJ-Qr!n@BlTKL7w7lVsjD!l%8)+tAdbZyT+^6w|Hl?m@6p+07Y5;xvDLs
z5T?G3cOTs^j!zK)cXjgq{f*=E>y=NfN@NKt2mv@rd9H2YooKaGRh}ZUgwpd7S;DT<
zH$LIlzmDcy+IUyH)t4(h9}YPx2<bL96j^e9>Q42hZM-vD%vIB=E!t{q@7&Q#bmjQ-
zVcOcnFAAJZj0!^Y{kQS%uqc2F&-<-Wp|5=D7hu=v;{(0@)^Il7wfWTpzH9=Zf{@83
o<|rjY#@6|0{^o!1-`UvsA2SZ)klU!ZLI3~&07*qoM6N<$f-AqeT>t<8

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/acacia_hanging_sign.png b/viewer/images/icon/acacia_hanging_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..79c8ee59aa2db7815ae483cc5e194352b4536103
GIT binary patch
literal 268
zcmeAS@N?(olHy`uVBq!ia0vp^d_c^@!3HFQ8hUO4smq=&jv*Cuk`o-5;^N}|OBOJc
zSgJ`JK5^oOy-_dEhLeVh+Bdf4N-OJ0UwkSdDIp=j_w?5P^n`?jA0OYcGlKxTID4Dh
zj62Wc_e(a3&reQi<lHuI*SQJl3z(+2G)}TLmwe(f<6%+0-G3L0ub<c7=jp%qCspHS
zvGBTzORd%gXMx<-&-?%W?0<FTy1d=vPjXy8{(P2qKD3Iv$LGYm_L){M56Oy{8T}Q0
z#Va-=IPqMICGRqcV{I2jtf#g%Ha0%|_1N4c(}_)o2MDgq?Nf+UW~lP2Ivu!q)h3|#
O7(8A5T-G@yGywp!(QW?#

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/acacia_hanging_wall_sign.png b/viewer/images/icon/acacia_hanging_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8872cbf3c08344c677dc80002a44e26704c2f2c
GIT binary patch
literal 327
zcmV-N0l5B&P)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H0003FNkl<Zc$}q=
zF-ikL6o$WDw+MnDqF4xGVXMgYl70&tFW?1Yl`D9GT*1x*Y?W$DL0J$Cfq*6=DznAF
zK*%O0YoTwPU9+J0H}B1S@1Oafm$aIN(uQQ?7yzv`CyP6_*4F@7#xj!=+&m~ApWo1j
z2cLsVk-Q9XRb_iS+a*pEMFlmgGGCf73=6lqTE={LAdX|N?#C+g0FqX-0GNy?05nz`
zKa9f6bjIoBtry7U#dVMKqkRiS?QWml%@xZslYd7w(;1^|PP^N;!<}?s&7*8?&*S%^
z993ykw_ZsmUvPGndcK=qUhSlVQt#IMYmGpnN=%6+!_rIrchmr&_mut0<SGETAHM$C
Z_yKH_q^5>(3Ag|N002ovPDHLkV1fc%jzs_f

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/acacia_sign.png b/viewer/images/icon/acacia_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..c698b7d3e16b3bdd08af2de3c9dbdcb8f90e7ccc
GIT binary patch
literal 301
zcmV+|0n+}7P)<h;3K|Lk000e1NJLTq000dD000gM1^@s6^naGp0002=Nkl<Zc$}S%
zu}Z^G7)DP*lp;v258xoaN1wyhMI5?yb?gh|NnCX5P&#%oLun`k!8lau1tUMin|qCM
zC^xj2O6xaW4&S-|=Z$;a3P9%?05KMq<HG|0T1PE(t`TEVQsC=cb31xOjNK3bt{<ih
zCNaxQ7);`t`(iAqD(MgB0Q84*!YHW=sVWJhgjAIP<X;uuxYw<gnXqf5_+HHe>fggC
z*|@aM0SaRY#MpY8o8wCEz0UtVFNj~%&VoxYdw$(p@|xhy)n)bmk)ib`clV=T9luGs
zI6tG)KG}MyQ35#awD*_(O3(z8r<BFpVypB6D(i&&xFpq(00000NkvXXu0mjfx^sr+

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/acacia_wall_sign.png b/viewer/images/icon/acacia_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..83de3ac0a4df2f4f9c9accddc1237e2b028d549f
GIT binary patch
literal 237
zcmV<J022R+P)<h;3K|Lk000e1NJLTq000dD000RH1^@s6>3XJW0002ANkl<Zc$}S%
zF$%&!6hxmAB?z7=$FZ_YYv~1Y7%L00Ok)Z$1kxBAAzK7KESp_pEM$Xr(W!=E=KnW2
zuA?5nXaj&)hu3mG10Y<47;O;iP|`9r+ORpC5bM4M0IS`ZZJJXz!Zyu^d@9yasg8JG
z01)pBlB^sGmFh^cl1g;|=ts}wxQ_a|5ync|=Nk_gt|wXf_31MQXssg<>jpHB<4fLu
n=6~Y_`Av-;cm<d1{pZmO$oX{Gzy(=u00000NkvXXu0mjf%V%AK

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/bamboo_hanging_sign.png b/viewer/images/icon/bamboo_hanging_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..8acef555bdc550f2bce1176eb890658765bcb831
GIT binary patch
literal 391
zcmV;20eJq2P)<h;3K|Lk000e1NJLTq000gE000aK1^@s6Qh<!w0003_Nkl<Zc${^R
zKS%;m9LGQY!N|_&)Ik&lA*jJgnw`TTXpE?#Md;5cIJD~O)?Q=KdP~p{fewu>Egt9b
z4n?f6@G1_jLEd><ewX+AzVG9GzrQc|P%f8UmS9l}%Ar^+y8hFT|Foe0fu?DJWsZwl
z0N~~E*o{UN049@9<SaRWU*9U-1cLJN=<F6DOn$z{yuVopVIqXd?%^Gks^)R|K@dQR
zB{3|UgYyR>E9>l?+*50`$Yinr7?w?~(Lz;Klvr{;YIiV1jf7c?hUkwRVyn}YKI~~9
zsYICm$RU@G&qpof^VAwGHq<orX4`Y9H`{D)=D4_gBA1SPQNyx?(*897LYNqq4M3%;
zVOTaDUB|F&x`QEwyfTYwKA*a>P1&M^zfH-rJ68eEv1h%KN{j*Mj~s6&Cp5o%F3l`z
lN7w1;Uv%}ElYj2<7r)?!lX74GjavW!002ovPDHLkV1k%JwzL2M

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/bamboo_hanging_wall_sign.png b/viewer/images/icon/bamboo_hanging_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..a23377edec284b4cfc9310c02864fce00ea24789
GIT binary patch
literal 469
zcmV;`0V@89P)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H0004;Nkl<Zc${^T
zF-RL>7>1uqg2n5l^fZAGF%l5kAyeq=EE$B3rRZRXfUTntq(c|8rc?HIEV$lM=um_>
zI65en9CybZiI?P}hMX;da|r+CPMdf6zwdv4zW4oJe#tu93&!IS&0`gS;c&>;!!<^C
zJphz+hA+*VkURVkAj=A=i$5mmMTx7c9@%Ub*LAt>26&zafU1sSoaZGmodGdaDwTja
zc+4e4Q7)H*=o!WTxJ2}UrfJeV#mAfkaQS;DkYxpc@py!&MGp|=Uu}Gs65?|E;}2}x
z;@{s}hMt3MTiCY6=KEu+2U^&R0STB!Za6;gKK)|h*$cLIe^RTrSXo&Gz;JwO^%knC
zqNFo%tL?6fx{%_zoTSsAkY1dwbmvd=$StSn^d}VZOL42EVv$<C#Y;8MQR6gJIBJ~o
zdcDB@=MxI~rO;|hgs}1U8vwR#VK_bj)dLN~@j2IZ49BP4btx5<nN{)aWLXJQ6o{rN
z`qej0DO5C_0lDQ{06P6ixYHyV-@TA$X7yaxG4*@e`b;TWn>@t>^Mb+5x+t2400000
LNkvXXu0mjfynfuq

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/bamboo_sign.png b/viewer/images/icon/bamboo_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8702d1d0fa5a2521307741c8d1cfcdc74d0f911
GIT binary patch
literal 416
zcmV;R0bl-!P)<h;3K|Lk000e1NJLTq000dD000gM1^@s6^naGp0004JNkl<Zc$|%r
zze>YU6vlsPN=k1N@j^i`R8Smz3U@&S2L}fgTokmU;7}YKd=EGA0dx=@r05H{bg`r{
zLGjNmwkEbD#-SLLrr@2<ch32~?{Lo58rSQI5GMb9LC_^9gvr{@DW2!zc`nVT2inTV
z^IYbak6GI}rLFw5M+lRgX_ayOkk#EQq?BxIUsA2rvF!=~jvrF3)p7iglF%`&GFsz$
zJyA+g5;`A23_wZf0DrLRe_=!kQc7|^$shIoqg$%AI!0kE#p804gTtFtEDx}>c>#du
zxj23Z5p3<94dP$<hjx#d2?pc!d+&_PNrIr8Zb=Ap2)C7wQ5YLIJ-$XfzP7N68l5m9
z(qp8dQiAG7<l{H2qJ~j`{Qc82t>)*@Jz68~G&7x`Wfd+?788I-k6BnbAL_|xk>+Nn
zFs(A(&P%3SCh4x(L>exgFv%q4GL>Q-+pb_0GpElc!Qf+#a{2}qd7IvGJ;g2n0000<
KMNUMnLSTYTe7V5@

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/bamboo_wall_sign.png b/viewer/images/icon/bamboo_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..9af0ac2de38d0103c1e0b2aaef2264c5bb273a65
GIT binary patch
literal 348
zcmV-i0i*tjP)<h;3K|Lk000e1NJLTq000dD000RH1^@s6>3XJW0003aNkl<Zc$|%q
z!Ab&Q6otQWWW?VY@dqJLTI7TD2tmsh8nh`emq80@(W3Wg>jSijT8Pv$xJkzGAC%C4
zD4R(cn-=0wNYGu~bGY}M%RNTF+en14`EP~coQx1Q^=1d9Je2YnOhyFSM=6i}!&~aj
z4uSU586j*kwo}ISBaY4=ky3Je_CTxMqgves!1W_q?H;ZlQ4l7!Q^x3b8;RDMf-w0A
zR{#`*3GfT+<rh|*Af+U;AvfxmH_x=%J*-?Y#U)wc>iQ`a%K{vn+ykJLhwDcW!|BD{
zy8pqCf(5l5*5@r3Z<J((Fr24f62jiXf%dU-#kJFT8Z({_aq<T5Q9^94kd{st^fD&9
un&IRPtQ=%tCa(+!pIdnh|H!Gfm+%cgUxd4)Gg)2$0000<MNUMnLSTY&3Y$0p

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/birch_hanging_sign.png b/viewer/images/icon/birch_hanging_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..79adc5498f3eeef358f4306dea83c442492d563c
GIT binary patch
literal 273
zcmV+s0q*{ZP)<h;3K|Lk000e1NJLTq000gE000aK1^@s6Qh<!w0002kNkl<Zc$}4x
zu?~VT5QcvUgYj{gd<5;_EGv^w0Go+}F2;d`XJL0XVQ^t{U@#6Pu|tcA5*%tvi<0P{
zG<WTP*ZW$)5Fw<+fcl=R65sb*Gn)G5xn@C@WzNvVzUKfyaoo$B#9f|_N1vT<j|q;+
zZ0oq{a2c+_1ec3edXf3c@-EkBhsp#;NgD)V0ssiY1aXw=VI^(!zUItEWwaW4o~0Xm
zV7l0Kr~ve>ag<uQ8AUDs$Wy2aQ=zG1m8)o@9yTo#{4Z1w0E#pFsR`XIiF(TOKN_W8
XB{_TM|K=u>00000NkvXXu0mjfG-P!u

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/birch_hanging_wall_sign.png b/viewer/images/icon/birch_hanging_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..85f9c2ec551db3d387b258ae220430c03b564e6c
GIT binary patch
literal 340
zcmV-a0jvIrP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H0003SNkl<Zc$}4x
zF-yZh6vuxlLBz#DGdYU5XYwOx2IqFoq+g)j1P5KDL!sZnZxFgVN+E+w&{BtjrH}-2
zL#{$w;t(&%#Rlvjj`!~V@7?>|8Ns-pi74iIlmd_>3AgPN4v&uj*yha_YfS(3gUS1p
z$#f6PvIxVFk@rPab?@x_RP%8hC!;}iucZ>(wzF!iYMa-p7I>a#G)=5~20$?G=Qqjk
z{PbY|Z|AQkWXi?WqtQ}_H|{+`rumBEVma4$nm1ppOH?6KX3>U@I{={L4(N4<#jshl
zDfY`$=%^x!o1UjB5i2g+PbDf)+}i67wY(bTGXEn}p(;#;rixXrqK^9VkO`UYglYl=
mpW<Ill(TZwH{ai(G1m{8BBwy8(5ess0000<MNUMnLSTabP@N?J

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/birch_sign.png b/viewer/images/icon/birch_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..f05a4b40d11c37a7e78369080b8c08be99c905b4
GIT binary patch
literal 298
zcmV+_0oDGAP)<h;3K|Lk000e1NJLTq000dD000gM1^@s6^naGp0002-Nkl<Zc$}S%
zy-LGi6o#LK3{nU0!&$rt=L&YIHB*Mp$?PI@=upUYcnO`{ibeb(n?nZiCoP`g`x?-2
zI)sE43?#nO;pIH%JWjHhDgZVIK&+w4QSY!EdIw;0#2Vh-e{r!nfq#uyvj+g2UEC0i
zCrGv;7*Fcn6>CVdf`LB+VBpV)!nj^Yvw|p$NwWfgjS-w=F;&S{w9U8tlzKpYJqqK!
zPrE&U-8gt+O|4exR7=&o+y7h7OP)Vk17#e%$K|pk)TFTf($}XKozHKzHKeLK8us<{
w<hUEOmQNiG``w`?J@>Ej>hhe2`@6=YTWU~{Y!^3{cK`qY07*qoM6N<$f_y)Qb^rhX

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/birch_wall_sign.png b/viewer/images/icon/birch_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..b82e681116fa5bb435d6f7395c11cdd67c6c499c
GIT binary patch
literal 235
zcmeAS@N?(olHy`uVBq!ia0vp@K+MU(1|(lrEz1H@n><|{Ln`LX?K9+V3J__vKdPAX
zqW&v)R%ubewVkRN861DYo19tR@dbWpdG{gD$&>e!+|JN+E17dUzjM#Z`p@K0&ETTz
z*Ii*ZtAg#8a+YQMyp|0ASvdk*Co>)>+NyfCtmCD}=DFvc1HH4^uAO9TC@orW!aF|W
zti#0VThbUF<h3qX`Ay$Y_WmoienI{Z*Sq)3srhw=@r#^5XH@^Qf|!#(&;QBav%)fV
jzg!PjM_=jR#~k-652ndjzrPm+bUlNotDnm{r-UW|FSTMB

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/cherry_hanging_sign.png b/viewer/images/icon/cherry_hanging_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ea0a3fc6c6f20e21ba21e0ba3f0a74cc1b2cb1d
GIT binary patch
literal 280
zcmV+z0q6dSP)<h;3K|Lk000e1NJLTq000gE000aK1^@s6Qh<!w0002rNkl<Zc$}?{
zJ8Hu~6h)7I#=)fU9t`QV3@sx~Qe-bKOo~7X3G7O}cA!E^<4U+oDt9hri}@fIW=7*5
zB#;Zkd-Lx59B`B*NzWZ!dcH~GIPTr(>Xzrb4MkCS_by&~9>DkKvIo#g01$+ut3l&w
zC3$*#@qAPKS%0CGL@SBtTKiTX?`NKtVnEeOQdTv2mNFVo$g`B~rm@$`s<wY6#DLn&
z7kv<2<K0paM$BHHPpA)%QvkblyJ^mHH;O|$po*>~&r-^&wrB>=t^EsXXttP5zf}kz
e_Paj~0UQC!qlXDA^IReT0000<MNUMnLSTYU-*zkj

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/cherry_hanging_wall_sign.png b/viewer/images/icon/cherry_hanging_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..d14b399c0a27faa8e14caeaef470d6b611d08a8e
GIT binary patch
literal 347
zcmV-h0i^zkP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H0003ZNkl<Zc$}?}
zF-yZh6vux_)1pWRhs-X5do~Aga>>VV(ZR1E_zfJ2gU}&`I%V%S=+L<65(^co2z3aB
zfJDRPjyRNDFSP{)|8Tr_?|=8+k7rH0{ZdIm=jjoEG)=iYJf`8a09f^|j!sZg;D|iq
zBY9;qnc%uENs^GhKV!=D=5H}=cdzE-`+ms=t$KEqc%E09(bPK6HXjTI18dX7RnG#L
zcKanP76ItRn5sM_3l1*MEW0YcJlvyXfszFx&-A&wy{UPs5KB}g3x=bJuouwU+9B)(
z%*L^vHXKFzE`?a4#@C&)(fo<GP7SBY{`u(wb-TR_pu5h-aV<Ba_{x^3BF_kW0mD(G
t(JDN%_AjVT)urn6TR8yYbN;7K0N)OYwSl8j25|rY002ovPDHLkV1fc&oT&f+

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/cherry_sign.png b/viewer/images/icon/cherry_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9c7f49acaa4b0edbcc35eaf5516db5b7aca5190
GIT binary patch
literal 298
zcmV+_0oDGAP)<h;3K|Lk000e1NJLTq000dD000gM1^@s6^naGp0002-Nkl<Zc$}S%
zJ8Hu~7=%BW#d#<P2!V7doGzDe>&v7xr1LS{q;x6Lsop|+f(_)=35;W#*phY?fl{o!
z$V34-)BG?yv-1V1k~IJ($6brp>B;V%yLV$Lm!I@7Ir?$t!p#COy?;Q@o?yLlcc&i4
zA```QJaNJC1RcdbAQOd-Vq~HKsIr_ORkCKiqN{3a9UkC+*HL`1)bs(qvn>K+J=$P2
z^cZ`zrau@B|Bolix0lX^y~N`6{peEAX5L-j)?r_;*lc*7fBedbwo=#^gl89IWz~+?
wX1ef}!WP|2H<wp@75Q;X>2gk1R(~%208B227xnu%Pyhe`07*qoM6N<$f=D!nPyhe`

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/cherry_wall_sign.png b/viewer/images/icon/cherry_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ca0429bf6e8726221df53e9306bf611b8b0808f
GIT binary patch
literal 229
zcmV<B02=>^P)<h;3K|Lk000e1NJLTq000dD000RH1^@s6>3XJW00022Nkl<Zc$}S%
zJr06E5QRSoiN=#~5n3)|Nn*z_Y%D2>9rYIM3AXU3q*0*|vWq5IENrktU-Ocg_hvq?
zl41ZrcUU(#tyiOO>|PuC#~mNtp$?f1&kMkQyF+D1Xlm=De6&H7l6{ieV3MNp!UaSr
zQF(zVB>?ZX!>gniXlj;fFvj8m?z+m0uTS$iz^i={pp8Qd<H%u5X!Cg(NB`pm{pGZ{
fFe$j5uRoVQIX-7^gCY$900000NkvXXu0mjfMABRg

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/crimson_hanging_sign.png b/viewer/images/icon/crimson_hanging_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..629b2779c441449267213ffa610be2da7ac15d94
GIT binary patch
literal 284
zcmV+%0ptFOP)<h;3K|Lk000e1NJLTq000gE000aK1^@s6Qh<!w0002vNkl<Zc$|%n
zF>b;@5JjKKidcwr$kig6l&*XO%J>wVB}d3H($JY3P^6#&DFqeY3PnOe30P<&r<!4H
zK;kz$Gyl)dgFtzn*W6Is>qwDhSslKiu6dm>P!vUU>tfrB0N%!v8sO*e1VI0xd$A~9
z<vp+S_sGa_`uV}jbEc-KbdF`URqyNcdq%CiCyf(I=QKQ9FLXJL6Ycl@2!H_?Jodm^
z4Gyhkh}9a<es>Hm3cvh1TQ3@Q_>P_i=Zls1l+KaHiK0okJ!_!G#wgM?yl^I{2EZM@
ixmOL;)pm3DqUaxC<7U|#8Y+eW0000<MNUMnLSTZW5Pli}

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/crimson_hanging_wall_sign.png b/viewer/images/icon/crimson_hanging_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..9df4aa26f7836979fb999741c4436ecac51f6ab4
GIT binary patch
literal 341
zcmV-b0jmCqP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H0003TNkl<Zc$|%q
z%SyvQ6o$Xlpur1>Gyx%@8<$xHe1I;^Q}kJUgg%BFcj+6r=%OnH!7ikkRTFG0Z4=9s
zxR9AnVhjB@=klF1=ZCTS-CmXdtXbUO0x+M?>3kHl&&~nZ$MVezdpMhreq~%-FL7O$
zEX(*5DW;k%xN&QoIF2h0sL5I?iK3`7qp5wYWey}sVja5JWEMcb+p7SU+YJDhC#U}w
z6)UCW@#V>~RrC3M$irQvp;9UYujN#;e6!kFEu|!MJW?U_@L)XB%c0}x`dbzN*udYP
z`Mw?ue4hYc=YXzfg>g~&SFaAnqgrmp&Q*JNv6PZj2tvox*3@vbSF`Hawzjm-p4n4Y
nZ2+-eaI9)p-=>qJ7nObiisO*Y{#yFg00000NkvXXu0mjf4Je&o

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/crimson_sign.png b/viewer/images/icon/crimson_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..7cf1ae7e0ee77ddffabd26ca1c013bcb8177b125
GIT binary patch
literal 340
zcmV-a0jvIrP)<h;3K|Lk000e1NJLTq000dD000gM1^@s6^naGp0003SNkl<Zc$}4w
zO-{l<7=|BkB8}0|1!=kfT@sUe0~5m)T)N^O-hwNbxMkT3xFV5_A(Y4hp$nrJ3l{p5
zY3f2df*BM1HZys?d4HzVX|;2JFiQc5rKA``2mlWE_6f6;SW4#UigK8x+zjrBrQ8w#
zJWeKby&m&qP1oxwUXG>2F)U`j55Ua#amRi2z%eY`aUaL909eY1Qm56<=gFE~=l<>K
zs~(`--En^_X_Et-9Mur9l+1iz#TRE$={H}>2vMsXK)tS<8{hW^KWvk~M=ON)@w)SW
zRK3B=^k1Ss=Nj@$+srSH&vM<qtb;?_<jOEPpFU_!wW6fj<Tef%+NM?{bg;4*kyM+6
m(HaPLOFDfHs4Pa>6o5~AKYH(&QoTw50000<MNUMnLSTYjz?SF$

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/crimson_wall_sign.png b/viewer/images/icon/crimson_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..5fc699cbad2354983e7543b38c7b2c9b58acfe30
GIT binary patch
literal 262
zcmV+h0r~!kP)<h;3K|Lk000e1NJLTq000dD000RH1^@s6>3XJW0002ZNkl<Zc$}4w
zPY%IQ5XOIap%He{6>))H!cCmX6&%2_7qF7(PSQjd=vz^dQ2I2}u%OSM72jqizs!8|
zO=UC~-T=}f2f&C>%25h{R;^B2<QNf>{7f}1a>k1(M&x4wV7Xc`31=kN3zKkWdDV#E
zIWDo*0K{73M}Zyi92Y+d@EjL_qhwS@gW)Z?Uiek>{rV9Pu<m{od|Z0x0R46cWkiUz
zw&%-QM*8MQ$xxj}6S`gN+<W#tUhJJ8vNI|??SB5p##?MRe=Pyr0kCyrsGE<@-2eap
M07*qoM6N<$f(&|ZP5=M^

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/dark_oak_hanging_sign.png b/viewer/images/icon/dark_oak_hanging_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..a64df06e845b0431ee62cf2ed59d7683e7914602
GIT binary patch
literal 276
zcmV+v0qg#WP)<h;3K|Lk000e1NJLTq000gE000aK1^@s6Qh<!w0002nNkl<Zc$}4y
zv1-FG5QaY+ldX`ULn(OnZZ91Ro@@^t@&MV2M?amr_YFGr8A2hDfbI4Y<vLlGk{FU7
z#GUTf={_NFRF<VOqjN7DlQd1$jjpbFp?jch+hA_uxfcMeUY-@;C?^1-MR?ITdSaB1
zuT2n+#rW|7F^U+aAB<h^>sQa)buyufQHm;~sdE6DIwy&jc3M$ocHfKfQTxHnJ<n4o
z2R^^I6DnYDP2#1OyYYBXAGN7-iYl{cBc5BkKz&P}RLtz(Uqy`oe)fMiHMxoaHv8YZ
a8~*_&fNm0Sc^$6+0000<MNUMnLSTaIZgYwN

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/dark_oak_hanging_wall_sign.png b/viewer/images/icon/dark_oak_hanging_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ec5d94e9c6890ce75a3bcaaf6b8492bf312b16c
GIT binary patch
literal 332
zcmV-S0ki&zP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H0003KNkl<Zc$}4y
zF-yZh6vuywQB){&upou3c2Aa$g-l5Yhc0ezk};nyI{OK95-hGt4M<x}QZGHvDd{Cm
zK>u*Ockg%a-v2mbHXf=hmt0J)09Y=Uyg%G=dU60j8(XCU>*e)}&rN|bpEDQ?NRou-
zw>7$&tap4^;{-vV=unfHW#TxF(xa|6X6gsxI5xT_Hkko18xIx0R{Q{99hrNLB@<F{
z`?xU7vS^?65K<weBFkm9ZmuUawo1j$s*nnQ>Jo(>08!{MvisFEf9h8IOvt*`ESFu+
zt0@%)_fH=?t3Y+@$nMv2J#GtCw;F{W{?x6kmG<=7p4Cg|TnX9v_pMeffMossrzTw%
ez+%1mcjGS(V3`n&rxsBF0000<MNUMnLSTaD-HeU^

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/dark_oak_sign.png b/viewer/images/icon/dark_oak_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..569b97d3871b239a000357632320bafb99a339ae
GIT binary patch
literal 302
zcmV+}0nz@6P)<h;3K|Lk000e1NJLTq000dD000gM1^@s6^naGp0002>Nkl<Zc$}S%
zu}Z^G6o$XVO9iVWpo@V!bjmDQx(Rj)8T$-Eaq8prMI8GG&eF}TC`zd`iJs)<I!G=S
z(^CDX!_WE7`MmKkvH-O-0En@)=^c3hsGd(P4Pq?oT<~jY&=+Tjv0DJZ-R%v7D4-|}
zgD7ylFUFE)3De04fazpJtV6euW(lzlNwWliLJZz`7}=sU9GYCJZ#}?Wk9D~9>1Pj6
zR~9A4I<>`Y?lic6aC6%)X7m5+spV^VFwjOlzkmE0^190FD{a@Cg3qeq@oDvI$M1qJ
z&-(<YCp$lNLIC~aPKo`{zNoHp`Ihst+U$hB0AN^V(OD<cy8r+H07*qoM6N<$g6l$y
APyhe`

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/dark_oak_wall_sign.png b/viewer/images/icon/dark_oak_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..e9bdeb3ac1783a5ecc7489a9d52bd6658bf6ab54
GIT binary patch
literal 244
zcmeAS@N?(olHy`uVBq!ia0vp@K+MU(1|(lrEz1H@yFFbTLn`LX?K9+Sau9Hp_jti0
z5;i*^qL4u<Yc0ppbOXgOnfC68Di;0+oIRbrYE6>mk=%#ftiFU!p8wPM{Ou>Fm@-~6
z3M5N%q{}flzF54}z31sSff`-glSzFN)>;g2wrNk(TJ)C3TXg3g@np?YJ-ecq1H!W}
zsg!ZM&YY-b=sJ_}Lf1i{G27-QYVlXreqkuL^?h`4`Fk0M{W^^judn!>J(#({eplrQ
r|FaM4_dck3t0vCYbo%el;+MQ}abX7q-hC?vdV|5!)z4*}Q$iB}w31*C

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/jungle_hanging_sign.png b/viewer/images/icon/jungle_hanging_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec89fff07f8257102a95c0d3d210063d4c045b0a
GIT binary patch
literal 272
zcmV+r0q_2aP)<h;3K|Lk000e1NJLTq000gE000aK1^@s6Qh<!w0002jNkl<Zc$}4w
zzYf7r6vlt8CVc_3hv-8X8nazu^8kH>ZcKKQL5xyjvD?l5F0_)mLR2C(ow`L6zU7>I
zzw@2@yP(N+-IM~od!{sw<D`1k_02Q&fglKsq8Hyi17Ox}r2t8i0ASnpM^HSaV(R|T
zu;kM34`|h@9|5m7rcy3t-tiQ_P?d_=L=U{)I2-PcrdfCsJ+kxqaL%KK;lAj5IbCj7
z8lAu}b$;2}9Zhq+UT?`A083B>Q_y5sdZ{_oiQi0>ivL2j0G8X;Pa$0vz<ja$JNN_#
Wp>&nsR%D+50000<MNUMnLSTYciFuv?

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/jungle_hanging_wall_sign.png b/viewer/images/icon/jungle_hanging_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..fba8629adc57caa9b892c4089cfb1b027619638b
GIT binary patch
literal 335
zcmV-V0kHmwP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H0003NNkl<Zc$}4w
zy-ve06otQpNEsMdh$4Z+z$0Yg4HyC=Vn<@j1C%$&R;KQq7!YHXqAs0S*jf20EWxeh
z7^P||Rbg^)(ng|Zx!3;gxjweW-KZ2I<!OEhfRvK6gB;KE0ocT5nZ&xeI4M(+k?tPj
zc^*Ot{QMPDP3C)hHBK0YB`s<)TQ@-vlx8)xiP`2rk|b8!i%n($jJr_@P!t6KuIsKD
zHB(A*89!K#zKrkgiOx^g44wXvqy3$V%`*8HRVm42x}wt`R>Qr)s4`EctLpsm{Zo%B
zMB4Vfn)1b*tJ}n~&HQ?6Z!oI$W?d9Z0301v$JEjEu<muOMSYB~OQqyiQ5}G{&-Z_s
hOgRA0FJD_5e*w08oZWym*lhp+002ovPDHLkV1hHflyCq5

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/jungle_sign.png b/viewer/images/icon/jungle_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..4853e08bdac6ae8becb5f1ddc609d13f7662eb1b
GIT binary patch
literal 315
zcmV-B0mS}^P)<h;3K|Lk000e1NJLTq000dD000gM1^@s6^naGp00033Nkl<Zc$}S%
zJxjw-7=@pNU=Xxqc5qbmzqt7)q(7jmTel8EW(z`v&VfRfI(HR8!9k-SHL={je&v?L
zILHkx-a_?EFNbs9^Eks!vjWgs10bR>YBT}>eBVcFjfmo9s&KW|9G{*cq817OM<?gB
zdwtS$OuN^weOE-0WF@Wc0Dx9^Kp4e!AjwL?C??5D0Pde(afY2{m8N4>)qDQ&g9p^#
z!zf-@n)d;6J;M`GHJZUOA#>0B|HkvKZ*NvE7<r?s$3K@Gn|XM!RTWa8J_{~JlV2Iv
zR@w_TSogi<csBDgQB0;K?wY-1UE0|V*x%mdYi6alFFoA7@uc#lOW&@Rh~`*ZtU~|*
N002ovPDHLkV1lFsiWdL?

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/jungle_wall_sign.png b/viewer/images/icon/jungle_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3d72d2c7a712a0daa162ee8cec727e36394feb2
GIT binary patch
literal 238
zcmeAS@N?(olHy`uVBq!ia0vp@K+MU(1|(lrEz1H@TRmMILn`LX?c2!JlpxY-?_4lB
z&bX@Knwfd~0ZT=L3^A7J-@YwapqgpO`!7%Au0u{oeAeo7B^Gmv-#^zmoXEXk6+?%_
znwtIm4bLlAXeqT_zIh=y^w?!drDw?u1~blZPGSuW6;kQed*3P1wJT91ouTJZkH*>E
zPJ!kwnSO!h3~&0y=cHQXtX}mbI`;i`ak&ez{g?hczFf^$aGiZ!$IA;keY%nV=l$<}
mo>z8zJ$u-@tlA%yUs!~W6zqG$T9OC!0E4HipUXO@geCy8nPJZW

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/mangrove_hanging_sign.png b/viewer/images/icon/mangrove_hanging_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..f53bf222da33086ace8342d24d0d0a592f3cf0eb
GIT binary patch
literal 276
zcmV+v0qg#WP)<h;3K|Lk000e1NJLTq000gE000aK1^@s6Qh<!w0002nNkl<Zc$}4v
zJqp4=5QV>lXrql?z&0lcR+g3l&txsRi3i9P1d-SXHYscZDa5E4^9RO4ceC*iea-C7
zn>X`;BFAwmKIqxg#lyDkO0BBidAd5_d7k#^;<Kj#xZ`03a83#Ux}Ek*P<UAi)A>>}
zL~|WPSbg(h7BVo~Zm?Uu+B@boYL<du#>}=GIUIzM4Etp)|4DIaqV9I}m2bLcI__$r
z=_<e28iY~ft=1w>0Wburz_c*&%lN)Nykm-<h1o=%j0RPf{zNKK4S++G|CUl@0PIi4
azk@fuMtB$BaVD_<0000<MNUMnLSTa1k9cGN

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/mangrove_hanging_wall_sign.png b/viewer/images/icon/mangrove_hanging_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..79a010a955d2cc46923b311be3bb3cfaf04c2855
GIT binary patch
literal 337
zcmV-X0j~auP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H0003PNkl<Zc$}4v
z!AiqG6h%)$S_Rz{8VI<}7X)!pcP<P4CfCwG=?C-|1SxT&1T~97sYDxXD%MOAXk65p
zOlm9jZr;qh@4k18ey>x;agI1U2OvojoX30G?Ir-*Jh8~I9)cG#QSjD!!nSQ@vl*+&
zE6)>@Hob$x1~qlN-I5*J^i28iJg?NNu5F&F4-AJxW7ow^&j9H6Iwip8G6&%JsQD`>
zJ(0rI^~kVf^Dc~VPn;h!SAoGez-zQBZ;@4~A_c#gGZ+VIIGjc*>=$$OU*=zR)HtrL
z{H2vJ>EGTMrp_<7hSR9_)@z=n09X=LV!Al^#eBVfy2g|}7pIPTd2w2bbT3kcY5^os
jwqHt<1@Qi{_;>Idv6iKaZ^;r{00000NkvXXu0mjfDzuY_

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/mangrove_sign.png b/viewer/images/icon/mangrove_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..467c922f098c01aac3f08f2166f05fa46d3bf2c8
GIT binary patch
literal 299
zcmV+`0o4A9P)<h;3K|Lk000e1NJLTq000dD000gM1^@s6^naGp0002;Nkl<Zc$}S%
zu};G<6h%*>q-sOO+=T`D3oM;k`(^zL#(oC_Q>03jvba)(h{zBc3W@F7h%iJoMKw~(
zTb_0FuI~wE(@6_ZHwFN$aMK@jdw9{KZVXz1-tGwN#_+g!>cBw&;6BS(ih{B<EJfjX
zs1>BPV!qA*n6EQL{&SGp3XvD2wgR9rl3+HSv}I{Hb-r}i=>hI{kr%(34mp6?DI%?K
zYGX!DgB<tX^D(3U>qXD2kCOxYi8k-svqOOo-rZieNfNVp`{ZG<I=Tscp(KeJ4r2Pf
x*01M-Qd$7C@rwAHZmurRZ+dxENNN9U`UXQfhXr`0QHTHl002ovPDHLkV1lsSgggKM

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/mangrove_wall_sign.png b/viewer/images/icon/mangrove_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1cadce413b2240ff80e6ba8f99e6e8f1020db1a
GIT binary patch
literal 234
zcmV<G02Tj<P)<h;3K|Lk000e1NJLTq000dD000RH1^@s6>3XJW00027Nkl<Zc$}S%
zK?;IE6ox-VqNoFS08il^JXyDB=}B4%fiRm1BobUmVresukS)Z?cGka{$H)Bdea=1#
z2Y{wE0BD8HdNaPe?TV%~Xa&0NaGTa}JY7aGD*zmXAe9AWX-H*ZxvLc<eMOuJ0OCv_
z^UsH*uaJ2`(pLbq=83b9!l5h;OY_q1s0Y~XGB3U^%{hSS6rNUCwE*90kYneG2l)T%
kdDrt}abb#gyVpOL-db*O#O=j^0ssI207*qoM6N<$f}|B-M*si-

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/oak_hanging_sign.png b/viewer/images/icon/oak_hanging_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..060c4e20a43c0984e6b751e2089706c7e48fb398
GIT binary patch
literal 289
zcmV++0p9+JP)<h;3K|Lk000e1NJLTq000gE000aK1^@s6Qh<!w0002!Nkl<Zc$}4v
zziPrz6vltCanMkQ2+bz6TZazK3%E))U%@x<fqa4vZo$FD?j@8AE~Q97R1|U0dxs$D
z;=Q>>Q}J8Qx!<3AJ}?jjK}HFRT173s?`P&TaZRh3hA<4RvWrE{0{9&CG5{fu0Mu&_
z7eS@TRM72zShgaE<1aex*OQnBqBvo-J!ow)-{e(gD)3x~C{DC_G@0tK=Q{em+zJ3}
zfM(;7_qUcdmhAw~FHiYJ)nENOnoQ4jbIRR5zbI2d6eoDDqpK-%kvpqetJeRmXL72l
n4e&clE{wNe1APCi?+*R}C`(~`{oRq)00000NkvXXu0mjfhOK@N

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/oak_hanging_wall_sign.png b/viewer/images/icon/oak_hanging_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..2bb9dff4474e0a9c3206ee8e0883638ccda22954
GIT binary patch
literal 345
zcmV-f0jB<mP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H0003XNkl<Zc$}4y
zy-LGi6o#MFD72*=T4F%3pqqoBT^wB{liot^z#H&RdIb({A%lbIE<rM65h;;UOKJ#e
z6EH|z{PNdE@m<czdCvQt7b1;EdiwhI&fR1OfG`X>KZ@vgI{>U>v*`lqN<T^G!IJ0C
z0g9sF`#!r{9z|7|+H03Mnx>`HsLC3m84ibOu@<$CHHr&{VMuist4snIkMtBEioXD8
zH8)m_g2hS1#pSgmi{Z`fJ!hu}KQK4gj>kM$W^6WH<Wb`!LhZG&9WPrpEjKf(y>|Bf
z5<~#V0R3)<<HJF=Sl0vW?QiE7MSk(BX}P7oSmW>`zZfSGwv+!@QBBKTnU$h8H(S5P
rE6zkz8Q^K+tt|c}8Q|g3|F`iQJ6ws~TX2!D00000NkvXXu0mjfja!!`

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/oak_sign.png b/viewer/images/icon/oak_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..41b46a58a2b11ae8efdc0309192c26b857636321
GIT binary patch
literal 298
zcmV+_0oDGAP)<h;3K|Lk000e1NJLTq000dD000gM1^@s6^naGp0002-Nkl<Zc$}S%
z!AiqW6hu$r>!MYIAi-6C!;f*<Z}4}zcHNbbRVhXaf}td8R}oT*71|QgdY|wJ=|U2$
zrqVi_3&Wf{V-32U0zh;QfHp#@W}^i_t9gXz9BqWR=^R^h&du!zZDb1oxPKhe>qjiI
z6}^5``L;HK>nMUS0U!tyJU^}iuA}h$7}rq%%$9;R=yr-lwqjqUAD>_Ifa<&F$6HO`
zeE^-VQQ8PWm{j%UEhqi-|2<DdFRyz8rPRao^kB%UGq0~Mi}567zRVat&3<L<I;eed
w!ue@qXHzW%;GP{H4*jKCX!5@1Zj|hVHaVeqt=oX4{{R3007*qoM6N<$f}5FyA^-pY

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/oak_wall_sign.png b/viewer/images/icon/oak_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfb9ff755c54070520133aa10c64a9e545a8c396
GIT binary patch
literal 237
zcmV<J022R+P)<h;3K|Lk000e1NJLTq000dD000RH1^@s6>3XJW0002ANkl<Zc$}S%
zu?m7<6otR)Z>Yh|7wo;9o0|fs2y6+GP^!s5h#E3P>)zl;YzU>As<T`;oO93DnR}xe
zK(qott<Y%D9|ABO^boC3D;y7Jx}p{1=^C~2RsdM6c1&h5Sy3{X#jW2}E4Yp!j8Xu?
zD8&zwHsCr2KS*#L1HkDbbmrcu&We(6mEZ19JfQvV2g%#gs}G?06{A)NqqLoGZiDpc
n|BYwj?f&aRBeUEbel9%#ZXRgZ+BSI(00000NkvXXu0mjfQaWTP

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/spruce_hanging_sign.png b/viewer/images/icon/spruce_hanging_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf3c6d0adb720bd08a998b36b649b6f09e0295ad
GIT binary patch
literal 274
zcmV+t0qy>YP)<h;3K|Lk000e1NJLTq000gE000aK1^@s6Qh<!w0002lNkl<Zc$}4w
zu?~VT6h$xC_yx|6ZZ2%<AMh6r{)mHd^ebd@WHU@`OkzU9VnR$v3=2j{TO~M1O94sb
zF0Xy}-S#{{k!hL*I@I)ZaWD*{P^+q6o~{nqwykyj*z`02*sf*;0Py$M8<IA$@F?Th
z>^+T$=FvN2F`blV6|kHD<IzBRamp)H$~dAVhvfuv*!4phj*?v78O!RZ_vfo?y_z!0
zu{)eJUF8?Ax_($Yt2Hgxkf@duAWCwHCh*i=3w6Dm7nJc{s008mx5r;0RRjR8QQSND
Y0a#>x*woQNr2qf`07*qoM6N<$f-B#28UO$Q

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/spruce_hanging_wall_sign.png b/viewer/images/icon/spruce_hanging_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1c872b0fd748cb55781b3d82c822b2fd7768c96
GIT binary patch
literal 332
zcmV-S0ki&zP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H0003KNkl<Zc$}4w
zzfOZt6o)^Mx|rx9Iv5?@T-a*gfVXhyi#V8$K80+KY=)^@r&dGKr4fxpVSq*&xJYoY
z&`Vnq`&;gx@0@$TqYV1pa-QTQdJljoia5((I6UY8u#Ne#KpW2jg3p-F`3btN69fSt
zZ?DK%XZq<;gJYUzNlVt5T5Sx&DCJeoHm1r2wrwkIKdv(cV9@WD0OIG5?Q5IH6-zV0
z-NQ)Hs>`R*Grg<JC0sRFj?2aIUd{YitW?uX;DrU2<JQH)$+T|v!lFKB*`ldBPx7|$
z8d;=*`^T}O%Kp`>!^yO<m)CeXMy+Z&E?!vFYL%XRx1oA_b6uvH*hy6bn0<Z!t4WRq
e@b39LH~s>*8>SY%<xJNA0000<MNUMnLSTabt(<WH

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/spruce_sign.png b/viewer/images/icon/spruce_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..faff40514b68d5166f112250dadf2be5506ff679
GIT binary patch
literal 289
zcmV++0p9+JP)<h;3K|Lk000e1NJLTq000dD000gM1^@s6^naGp0002!Nkl<Zc$}q<
zJ8r^26h+TCBOsra4zY)ni1n}+c9D`LBn_gnL_w372*ss^Kq78HF`9XJ7#eJWVj@s(
zdG*eHNA-Ih4<NY$z*wP3qh14`rah7?j1`t^A&^}0I{w61IRgM*-rgBbrfjku!^yPl
z17n3Gbqq!`00yHOVHB4KN$Lorm?U)oSi42_dmX>Yc3hjSIqCuBdKkrLpH6##wFPag
zlxp3h4ge=gMc@68p8i^7R|7@#JXzihsjBk1{pj7^gY5ZOnO`?S71U}zaTiqXU4{T2
n?i;s5e??c7^Y0&=aTlQjmE?l0{sXrk00000NkvXXu0mjf%?ovl

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/spruce_wall_sign.png b/viewer/images/icon/spruce_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..69a9ad95ac48bba261dc08e3325ae69aaf95102a
GIT binary patch
literal 233
zcmV<F02cp=P)<h;3K|Lk000e1NJLTq000dD000RH1^@s6>3XJW00026Nkl<Zc$}q<
zF%E)25JlgTjd~@*dAy6au;d8Z5GoQ28iU42xiQ+%KmyqvAlL|z4&yI>=KXnUxAg}A
z=@bCg31c?v6#y$eAf3WG;Z+Krbc)02ighvr0QSc-QF@`OTcY$b^`3QtDSE>A20$3!
zNV0r7Fhx(2<(Q%ez_|vs+xkOQw=7L#KYGBlo@Dv#({~S0I?&e1q!xU10QgcG``{lv
jeSg-Afie1FUOz)`xeIfTX8BKf00000NkvXXu0mjf9}HgU

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/warped_hanging_sign.png b/viewer/images/icon/warped_hanging_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..80dd99e650d28dce790437d0c2602479d2fffb63
GIT binary patch
literal 296
zcmV+@0oVSCP)<h;3K|Lk000e1NJLTq000gE000aK1^@s6Qh<!w0002*Nkl<Zc$|%n
zzfQtX6vlrSN)vJD<N#CCje(GM@FBVoA4uQ92XK_NVd*Q#L}@y7Ffqo&K@uelZH!8;
z1G#@%AmLl?Ip;gyJwLD%$Fbyu+FnN$Q4~r0wROzv*b8Zzic=Tco&dOhxR(IV_7{LZ
zuXhkso~&w~ZtsMnhO5~llj#ir-O2>YBID=fRePJycY`Xc8aMDMi%c))^F)W;z}LOI
zS?>t|c0-R5p<Wz~Ll}pq2HkJJg}JEs)vx(HY1H<6F}N}pWmQua8E)WfG_~BGHBiN6
u-yj{qvu6s`0r+}*=3F&UKNicggG&Fo`CaWs)!nK90000<MNUMnLSTY`VuH;8

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/warped_hanging_wall_sign.png b/viewer/images/icon/warped_hanging_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..1519d0bbde0bacb25b71457a259ceb4a1a44b030
GIT binary patch
literal 353
zcmV-n0iOPeP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H0003fNkl<Zc$|%n
zze>YU6vlsPV?Z5>LI#UMiGp+}k`8%@EaC&{JM;lM>RP&F78jkYrC_Xrh+3i6+Ga>7
zYPk+_Z~mA<zvZ5DzVqGl)0}2Q6yE}zk1+t#>6H7uUFPKy0D0bIJV2jaob%FuWn<IC
zG)+dM5qJGtlFE8J``alW*L4L8l=TX-sMqTv`6iX;6_N{{=V^;BW<3qSX*L9a9()7v
zQ(E~Kl%5D9E{{(%T@G)~PB}O{0-zYi0l(Mb>+wl>lkp%%6=8&7Rq%TqwcKsDRM@a8
zsy8O@e*^&Ya)~OoTCCP=sM&E1st;ybd{OetU%TyAs!qPETV{Mwgb{wPgJD$^nq1D#
zQmEScT8xx~mz+sd9pLl%fn}9K9bR289hCY7XKIA#?efzh00000NkvXXu0mjfaXXsB

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/warped_sign.png b/viewer/images/icon/warped_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c3530b4bbd0d36439cd7b429c01b0a4fe11999a
GIT binary patch
literal 327
zcmV-N0l5B&P)<h;3K|Lk000e1NJLTq000dD000gM1^@s6^naGp0003FNkl<Zc$}S%
zu}Z^G6o$W>UIXeN9TZ$71RQkfqQ%#66c>E~-=!{21($XWnVlR2hd>fin!&AL20=o^
zL`a0|5EHH5A$pd3?tjjA{$C8oBLyI{3ILTCG$q#80C?Y6L1q;yFG!ysF=SRTyShf@
z#S#E8zrQ1xPUs~W!F1B<hRO>}+aiv90OH6ebe(p=v@Jr{!L+UVpFSam<B{qm8C@%x
z1$8{2y&k&GlGAq`V0C*Fsq%t2^1tjq-zL&e{onEAOEm8cH1S0L=urKM0)$T7IzLqd
zPf%tdw~Of4j-i7Fp1`}<BR)IPI!T?_R|^g<>;9%Il!_h9@`2a4LO0gO3y=3H&0Q@3
Z@Btdga>hhx^~L}I002ovPDHLkV1m@KiY@>E

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/warped_wall_sign.png b/viewer/images/icon/warped_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..59614c66b1631a307595245cd6d526d7d9fb39a2
GIT binary patch
literal 244
zcmV<Q01N+#P)<h;3K|Lk000e1NJLTq000dD000RH1^@s6>3XJW0002HNkl<Zc$}S%
zzY2m-6vltrO{j)wXlN7PA?Y=nnt~Qv#fJ#mR1|%J9D;}&+`Aau2Gjmb*0&ta$NA3p
zv;6Ja00>zFV3eknH5mhNpAHeS#wgA8a>5p}Cg1EZN`C|ZisOM~A26sS$v)_O+bE6W
zxs+K9K$*p)QP>?go=X~qIG)?=*E5#CU7JBA>8mPF8a$x;o<`wE)4LBaTFenfY04~q
u)jwy8^zHwRCvI8MJJ8};v(?i4lmZ^6w_6<enp&Lz0000<MNUMnLSTa3JZWG6

literal 0
HcmV?d00001


From 43d7dc751ea289229cfff7c7260568c5c6ca857d Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 6 Jan 2024 23:46:32 +0100
Subject: [PATCH 344/460] viewer: allow zooming to level 5

Allow zooming in far enough so neighboring signs don't overlap.
---
 viewer/MinedMap.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/viewer/MinedMap.js b/viewer/MinedMap.js
index 0e9abe0..03c3649 100644
--- a/viewer/MinedMap.js
+++ b/viewer/MinedMap.js
@@ -231,7 +231,7 @@ window.createMap = function () {
 			center: [-z, x],
 			zoom: zoom,
 			minZoom: -(mipmaps.length-1),
-			maxZoom: 3,
+			maxZoom: 5,
 			crs: L.CRS.Simple,
 			maxBounds: [
 				[-512*(mipmaps[0].bounds.maxZ+1), 512*mipmaps[0].bounds.minX],

From 989428f78dfedbb18cad647944a6b48d9d4e7501 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 6 Jan 2024 23:47:02 +0100
Subject: [PATCH 345/460] viewer: use sign icons instead of default markers

---
 viewer/MinedMap.js | 51 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/viewer/MinedMap.js b/viewer/MinedMap.js
index 03c3649..c9ae2d3 100644
--- a/viewer/MinedMap.js
+++ b/viewer/MinedMap.js
@@ -17,6 +17,44 @@ function contains(array, elem) {
 	return false;
 }
 
+const signKinds = {
+	sign: {
+		iconSize: [26, 28],
+		popupAnchor: [0, -20],
+	},
+	wall_sign: {
+		iconSize: [26, 18],
+		popupAnchor: [0, -15],
+	},
+	hanging_sign: {
+		iconSize: [28, 24],
+		popupAnchor: [0, -18],
+	},
+	hanging_wall_sign: {
+		iconSize: [28, 28],
+		popupAnchor: [0, -20],
+	},
+}
+
+const signIcons = {};
+
+function signIcon(material, kind) {
+	function createSignIcon(material, kind) {
+		const params = signKinds[kind];
+
+		return L.icon({
+			iconUrl: `images/icon/${material}_${kind}.png`,
+			iconSize: params.iconSize,
+			popupAnchor: params.popupAnchor,
+			className: 'overzoomed',
+		});
+	}
+
+
+	let icons = signIcons[material] ??= {};
+	return icons[kind] ??= createSignIcon(material, kind);
+}
+
 const MinedMapLayer = L.TileLayer.extend({
 	initialize: function (mipmaps, layer) {
 		L.TileLayer.prototype.initialize.call(this, '', {
@@ -167,6 +205,9 @@ function loadSigns(signLayer) {
 			const el = document.createElement('span');
 			const [x, z] = key.split(',').map((i) => +i);
 
+			let material = 'oak'; /* Default material */
+			let kind = 'sign';
+
 			group.forEach((sign) => {
 				if (sign.front_text) {
 					for (const line of sign.front_text) {
@@ -185,13 +226,21 @@ function loadSigns(signLayer) {
 
 					el.appendChild(document.createElement('hr'));
 				}
+
+				if (sign.material)
+					material = sign.material;
+				if (sign.kind)
+					kind = sign.kind;
 			});
 
 			const lastChild = el.lastChild;
 			if (lastChild)
 				lastChild.remove();
 
-			L.marker([-z-0.5, x+0.5]).addTo(signLayer).bindPopup(el);
+			L.marker([-z-0.5, x+0.5], {
+				icon: signIcon(material, kind),
+
+			}).addTo(signLayer).bindPopup(el);
 		}
 	}
 

From ac0fd06b169b9356da0317c7a50943f3a3964b83 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 7 Jan 2024 01:56:03 +0100
Subject: [PATCH 346/460] viewer: add icon shadows

---
 viewer/MinedMap.js                              |   8 +++++---
 viewer/images/icon/shadow_hanging_sign.png      | Bin 0 -> 213 bytes
 viewer/images/icon/shadow_hanging_wall_sign.png | Bin 0 -> 200 bytes
 viewer/images/icon/shadow_sign.png              | Bin 0 -> 194 bytes
 viewer/images/icon/shadow_wall_sign.png         | Bin 0 -> 152 bytes
 5 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 viewer/images/icon/shadow_hanging_sign.png
 create mode 100644 viewer/images/icon/shadow_hanging_wall_sign.png
 create mode 100644 viewer/images/icon/shadow_sign.png
 create mode 100644 viewer/images/icon/shadow_wall_sign.png

diff --git a/viewer/MinedMap.js b/viewer/MinedMap.js
index c9ae2d3..e4c8203 100644
--- a/viewer/MinedMap.js
+++ b/viewer/MinedMap.js
@@ -40,12 +40,14 @@ const signIcons = {};
 
 function signIcon(material, kind) {
 	function createSignIcon(material, kind) {
-		const params = signKinds[kind];
+		const {iconSize, popupAnchor} = signKinds[kind];
 
 		return L.icon({
 			iconUrl: `images/icon/${material}_${kind}.png`,
-			iconSize: params.iconSize,
-			popupAnchor: params.popupAnchor,
+			iconSize,
+			popupAnchor,
+			shadowUrl: `images/icon/shadow_${kind}.png`,
+			shadowSize: [iconSize[0]+8, iconSize[1]+8],
 			className: 'overzoomed',
 		});
 	}
diff --git a/viewer/images/icon/shadow_hanging_sign.png b/viewer/images/icon/shadow_hanging_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..dbd19a61cfc2912c0444f322b9891d69233e0bd8
GIT binary patch
literal 213
zcmeAS@N?(olHy`uVBq!ia0vp^LO?9Q!3HFy+4N(86lZ})WHAE+w=f7ZGR&GI0TgWa
zba4!^IQ@3AB42|6kE?u6R+SXDn8|m0=5~oPsml{DF)%hYtNBj<_jax5{f)gGCJyW@
zFQ0NtopZ2SFkPzAORrs6m$`yDt1<AL=dY!5nV$Y4Pq#ZBbMKYE;uUuK08h$#2i2RA
z)0x+%>|)xq*H*w(|0w@2lM~wKefaPBAI-ieQM`{c%6B)z$pk6QmJIiGKqoPHy85}S
Ib4q9e0I7yV82|tP

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/shadow_hanging_wall_sign.png b/viewer/images/icon/shadow_hanging_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..771cef5bf4605223e1160b1f6ca9f614f555258d
GIT binary patch
literal 200
zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+1|-AI^@Rf|&H|6fVg?3oVGw3ym^DWNC|Kp`
z;uvCa`t1}$z6J#z*ZHTOypeq(aId~3?b_Bm2bW5yOgwUGnZ2T_L%h?^rOeB6B2*eI
zSkE+=H!(RdRVEx<cjK}Lv%#x9Jum;wKDK+W=#A>wj++mcxArxtOxVLPcfH$DCe!Gc
uqFJK9*=wbq7`3xK7FSZ`cq{GQUBD2$NKQZBYK|_@6%3xPelF{r5}E)qaYkDJ

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/shadow_sign.png b/viewer/images/icon/shadow_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..9bf1cde2756964c656657607876999f26bbadbaf
GIT binary patch
literal 194
zcmeAS@N?(olHy`uVBq!ia0vp^f<P?9!3HGv{xl5%Qk(@Ik;M!Q+`=Ht$S`Y;1W>TV
z)5S5w;`G}o2RRQY@VLfzE0?rewLC8G*x`I<p?Isnmjzz}yzHL{om8&*bhqK~l{F$4
z0^0o*^c+|gI4Vtu2)<eAVE^RvgaH5WnEm3crm6a2&6#4KZzMfXWO@=;W^*_1@!@HW
qukRk~`^Wk6NL;$&y*Crf?=0RUd-m{`C)q&z89ZJ6T-G@yGywq0L`lg2

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/shadow_wall_sign.png b/viewer/images/icon/shadow_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe467659ceef284130fa24bf161c6762e15b7669
GIT binary patch
literal 152
zcmeAS@N?(olHy`uVBq!ia0vp^f*>{r8<6y`Y?T61oCO|{#S9GG!XV7ZFl&wkP|(ZM
z#W6(Vd~!-cf`H?pB~9i$JUsak3uaxFl#nnvVeo{F83@h@@UpS7Nwa-A5Us|h)ez|1
twpUT-!jkG{pTFh_C;##4Je@eZoT0mlhrfHJ|16-X44$rjF6*2UngFtWD0Bb-

literal 0
HcmV?d00001


From 31de0dc0bdff094cb237b068572eb2892bd5b9d8 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 7 Jan 2024 16:01:29 +0100
Subject: [PATCH 347/460] viewer: sign popup styling

---
 viewer/MinedMap.js | 110 +++++++++++++++++++++++++++++++++++----------
 viewer/index.html  |  46 ++++++++++++++++++-
 2 files changed, 131 insertions(+), 25 deletions(-)

diff --git a/viewer/MinedMap.js b/viewer/MinedMap.js
index e4c8203..47aefff 100644
--- a/viewer/MinedMap.js
+++ b/viewer/MinedMap.js
@@ -160,7 +160,6 @@ const colors = {
 function formatSignLine(line) {
 	const el = document.createElement('span');
 	el.style.whiteSpace = 'pre';
-	el.style.fontFamily = 'sans';
 
 	for (const span of line) {
 		const child = document.createElement('span');
@@ -190,6 +189,86 @@ function formatSignLine(line) {
 	return el;
 }
 
+function createSign(sign, back) {
+	// standing signs
+	function px(base) {
+		const scale = 11;
+		return (base*scale)+'px';
+	}
+	// hanging signs
+	function pxh(base) {
+		const scale = 16;
+		return (base*scale)+'px';
+	}
+
+	const sizes = {
+		sign: {
+			width: px(24),
+			height: px(12),
+			paddingTop: px(0),
+			paddingBottom: px(14),
+		},
+		wall_sign: {
+			width: px(24),
+			height: px(12),
+			paddingTop: px(0),
+			paddingBottom: px(0),
+		},
+		hanging_sign: {
+			width: pxh(16),
+			height: pxh(10),
+			paddingTop: pxh(4),
+			paddingBottom: pxh(0),
+		},
+		hanging_wall_sign: {
+			width: pxh(16),
+			height: pxh(10),
+			paddingTop: pxh(6),
+			paddingBottom: pxh(0),
+		},
+	};
+	const size = sizes[sign.kind];
+
+	const wrapper = document.createElement('div');
+	wrapper.classList = 'sign-wrapper';
+
+	const title = document.createElement('div');
+	title.classList = 'sign-title'
+	title.textContent = `Sign at ${sign.x}/${sign.y}/${sign.z}`;
+	if (back)
+		title.textContent += ' (back)';
+	title.textContent += ':';
+
+	wrapper.appendChild(title);
+
+	const container = document.createElement('div');
+	container.style.width = size.width;
+	container.style.height = size.height;
+	container.style.paddingTop = size.paddingTop;
+	container.style.paddingBottom = size.paddingBottom;
+	container.style.backgroundImage = `url(images/bg/${sign.material}_${sign.kind}.png)`;
+	container.classList = 'sign-container overzoomed';
+
+	const content = document.createElement('div');
+	content.classList = 'sign-content';
+
+	let text = [];
+	if (!back && sign.front_text)
+		text = sign.front_text;
+	else if (back && sign.back_text)
+		text = sign.back_text;
+
+	for (const line of text) {
+		content.appendChild(formatSignLine(line));
+		content.appendChild(document.createElement('br'));
+	}
+
+	container.appendChild(content);
+	wrapper.appendChild(container);
+
+	return wrapper;
+}
+
 function loadSigns(signLayer) {
 	const xhr = new XMLHttpRequest();
 	xhr.onload = function () {
@@ -204,30 +283,16 @@ function loadSigns(signLayer) {
 		}
 
 		for (const [key, group] of Object.entries(groups)) {
-			const el = document.createElement('span');
-			const [x, z] = key.split(',').map((i) => +i);
+			const popup = document.createElement('div');
 
 			let material = 'oak'; /* Default material */
 			let kind = 'sign';
 
 			group.forEach((sign) => {
-				if (sign.front_text) {
-					for (const line of sign.front_text) {
-						el.appendChild(formatSignLine(line));
-						el.appendChild(document.createElement('br'));
-					}
+				popup.appendChild(createSign(sign, false));
 
-					el.appendChild(document.createElement('hr'));
-				}
-
-				if (sign.back_text) {
-					for (let line of sign.back_text) {
-						el.appendChild(formatSignLine(line));
-						el.appendChild(document.createElement('br'));
-					}
-
-					el.appendChild(document.createElement('hr'));
-				}
+				if (sign.back_text)
+					popup.appendChild(createSign(sign, true));
 
 				if (sign.material)
 					material = sign.material;
@@ -235,14 +300,11 @@ function loadSigns(signLayer) {
 					kind = sign.kind;
 			});
 
-			const lastChild = el.lastChild;
-			if (lastChild)
-				lastChild.remove();
+			const [x, z] = key.split(',').map((i) => +i);
 
 			L.marker([-z-0.5, x+0.5], {
 				icon: signIcon(material, kind),
-
-			}).addTo(signLayer).bindPopup(el);
+			}).addTo(signLayer).bindPopup(popup);
 		}
 	}
 
diff --git a/viewer/index.html b/viewer/index.html
index 8327600..caf32a0 100644
--- a/viewer/index.html
+++ b/viewer/index.html
@@ -22,7 +22,19 @@
         background: #333;
       }
 
-      img.overzoomed {
+      .leaflet-container a.leaflet-popup-close-button {
+        color: #ccc;
+      }
+
+      .leaflet-container a.leaflet-popup-close-button:hover {
+        color: #fff;
+      }
+
+      .leaflet-popup-content-wrapper, .leaflet-popup-tip {
+        background: rgba(64, 64, 64, 0.5);
+      }
+
+      .overzoomed {
         image-rendering: -moz-crisp-edges;
         image-rendering: -o-crisp-edges;
         image-rendering: -webkit-optimize-contrast;
@@ -31,6 +43,38 @@
         -ms-interpolation-mode: nearest-neighbor;
       }
 
+      .sign-wrapper {
+        padding: 0;
+        padding-left: 4px;
+        margin-bottom: 2em;
+      }
+
+      .sign-wrapper:last-child {
+        margin-bottom: 0;
+      }
+
+      .sign-title {
+        color: #fff;
+        font-weight: bold;
+        margin-bottom: 0.5em;
+      }
+
+      .sign-container {
+        padding: 0;
+        background-size: cover;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+
+      .sign-content {
+        padding: 0;
+        font-size: 18px;
+        line-height: 1.5;
+        text-align: center;
+        font-family: sans;
+      }
+
       span.obfuscated:hover {
         background-color: transparent !important;
       }

From 76df56c9ce41376b999b1da6acb2b415751bb007 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 7 Jan 2024 16:11:54 +0100
Subject: [PATCH 348/460] viewer: sort signs at the same x/z coordinates from
 top to bottom

---
 viewer/MinedMap.js | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/viewer/MinedMap.js b/viewer/MinedMap.js
index 47aefff..c1fd1c4 100644
--- a/viewer/MinedMap.js
+++ b/viewer/MinedMap.js
@@ -279,26 +279,30 @@ function loadSigns(signLayer) {
 		for (const sign of res.signs) {
 			const key = `${sign.x},${sign.z}`;
 			const group = groups[key] ??= [];
-			group[sign.y] = sign;
+			group.push(sign);
 		}
 
 		for (const [key, group] of Object.entries(groups)) {
 			const popup = document.createElement('div');
 
-			let material = 'oak'; /* Default material */
-			let kind = 'sign';
+			let material;
+			let kind;
 
-			group.forEach((sign) => {
+			// Sort from top to bottom
+			group.sort((a, b) => b.y - a.y);
+
+			for (const sign of group) {
 				popup.appendChild(createSign(sign, false));
 
 				if (sign.back_text)
 					popup.appendChild(createSign(sign, true));
 
-				if (sign.material)
-					material = sign.material;
-				if (sign.kind)
-					kind = sign.kind;
-			});
+				material ??= sign.material;
+				kind ??= sign.kind;
+			}
+
+			// Default material
+			material ??= 'oak';
 
 			const [x, z] = key.split(',').map((i) => +i);
 

From 7b3ac8647ef3730b4a81cbf4b90b433937a6b7c8 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 7 Jan 2024 19:03:22 +0100
Subject: [PATCH 349/460] viewer: store URL paramters in a 'params' variable

---
 viewer/MinedMap.js | 54 +++++++++++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/viewer/MinedMap.js b/viewer/MinedMap.js
index c1fd1c4..882691f 100644
--- a/viewer/MinedMap.js
+++ b/viewer/MinedMap.js
@@ -36,6 +36,7 @@ const signKinds = {
 	},
 }
 
+const params = {};
 const signIcons = {};
 
 function signIcon(material, kind) {
@@ -323,30 +324,28 @@ window.createMap = function () {
 		    mipmaps = res.mipmaps,
 		    spawn = res.spawn;
 
-		let x, z, zoom, light, signs;
-
 		const updateParams = function () {
 			const args = parseHash();
 
-			zoom = parseInt(args['zoom']);
-			x = parseFloat(args['x']);
-			z = parseFloat(args['z']);
-			light = parseInt(args['light']);
-			signs = parseInt(args['signs'] ?? '1');
+			params.zoom = parseInt(args['zoom']);
+			params.x = parseFloat(args['x']);
+			params.z = parseFloat(args['z']);
+			params.light = parseInt(args['light']);
+			params.signs = parseInt(args['signs'] ?? '1');
 
-			if (isNaN(zoom))
-				zoom = 0;
-			if (isNaN(x))
-				x = spawn.x;
-			if (isNaN(z))
-				z = spawn.z;
+			if (isNaN(params.zoom))
+				params.zoom = 0;
+			if (isNaN(params.x))
+				params.x = spawn.x;
+			if (isNaN(params.z))
+				params.z = spawn.z;
 		};
 
 		updateParams();
 
 		const map = L.map('map', {
-			center: [-z, x],
-			zoom: zoom,
+			center: [-params.z, params.x],
+			zoom: params.zoom,
 			minZoom: -(mipmaps.length-1),
 			maxZoom: 5,
 			crs: L.CRS.Simple,
@@ -364,9 +363,9 @@ window.createMap = function () {
 
 		mapLayer.addTo(map);
 
-		if (light)
+		if (params.light)
 			map.addLayer(lightLayer);
-		if (signs)
+		if (params.signs)
 			map.addLayer(signLayer);
 
 		const overlayMaps = {
@@ -384,10 +383,10 @@ window.createMap = function () {
 		});
 
 		const makeHash = function () {
-			let ret = '#x='+x+'&z='+z;
+			let ret = '#x='+params.x+'&z='+params.z;
 
-			if (zoom != 0)
-				ret += '&zoom='+zoom;
+			if (params.zoom != 0)
+				ret += '&zoom='+params.zoom;
 
 			if (map.hasLayer(lightLayer))
 				ret += '&light=1';
@@ -407,10 +406,11 @@ window.createMap = function () {
 					return;
 			}
 
-			zoom = map.getZoom();
-			center = map.getCenter();
-			x = Math.round(center.lng);
-			z = Math.round(-center.lat);
+			const center = map.getCenter();
+
+			params.zoom = map.getZoom();
+			params.x = Math.round(center.lng);
+			params.z = Math.round(-center.lat);
 
 			updateHash();
 		}
@@ -428,13 +428,13 @@ window.createMap = function () {
 
 			updateParams();
 
-			map.setView([-z, x], zoom);
+			map.setView([-params.z, params.x], params.zoom);
 
-			if (light)
+			if (params.light)
 				map.addLayer(lightLayer);
 			else
 				map.removeLayer(lightLayer);
-			if (signs)
+			if (params.signs)
 				map.addLayer(signLayer);
 			else
 				map.removeLayer(signLayer);

From 7daddd6bbc4f685cc52af48bcfafdbea309b381b Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 7 Jan 2024 19:22:56 +0100
Subject: [PATCH 350/460] viewer: include open marker in URL

Allow sharing URLs that reference a marker.
---
 viewer/MinedMap.js | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/viewer/MinedMap.js b/viewer/MinedMap.js
index 882691f..7dda976 100644
--- a/viewer/MinedMap.js
+++ b/viewer/MinedMap.js
@@ -39,6 +39,8 @@ const signKinds = {
 const params = {};
 const signIcons = {};
 
+let updateHash = () => {};
+
 function signIcon(material, kind) {
 	function createSignIcon(material, kind) {
 		const {iconSize, popupAnchor} = signKinds[kind];
@@ -284,7 +286,7 @@ function loadSigns(signLayer) {
 		}
 
 		for (const [key, group] of Object.entries(groups)) {
-			const popup = document.createElement('div');
+			const el = document.createElement('div');
 
 			let material;
 			let kind;
@@ -293,10 +295,10 @@ function loadSigns(signLayer) {
 			group.sort((a, b) => b.y - a.y);
 
 			for (const sign of group) {
-				popup.appendChild(createSign(sign, false));
+				el.appendChild(createSign(sign, false));
 
 				if (sign.back_text)
-					popup.appendChild(createSign(sign, true));
+					el.appendChild(createSign(sign, true));
 
 				material ??= sign.material;
 				kind ??= sign.kind;
@@ -307,9 +309,23 @@ function loadSigns(signLayer) {
 
 			const [x, z] = key.split(',').map((i) => +i);
 
-			L.marker([-z-0.5, x+0.5], {
+			const popup = L.popup().setContent(el);
+
+			popup.on('add', () => {
+				params.marker = [x, z];
+				updateHash();
+			});
+			popup.on('remove', () => {
+				params.marker = null;
+				updateHash();
+			});
+
+			const marker = L.marker([-z-0.5, x+0.5], {
 				icon: signIcon(material, kind),
 			}).addTo(signLayer).bindPopup(popup);
+
+			if (params.marker && x === params.marker[0] && z === params.marker[1])
+				marker.openPopup();
 		}
 	}
 
@@ -332,6 +348,7 @@ window.createMap = function () {
 			params.z = parseFloat(args['z']);
 			params.light = parseInt(args['light']);
 			params.signs = parseInt(args['signs'] ?? '1');
+			params.marker = (args['marker'] ?? '').split(',').map((i) => +i);
 
 			if (isNaN(params.zoom))
 				params.zoom = 0;
@@ -339,6 +356,8 @@ window.createMap = function () {
 				params.x = spawn.x;
 			if (isNaN(params.z))
 				params.z = spawn.z;
+			if (isNaN(params.marker[0]) || isNaN(params.marker[1]))
+				params.marker = null;
 		};
 
 		updateParams();
@@ -392,11 +411,14 @@ window.createMap = function () {
 				ret += '&light=1';
 			if (!map.hasLayer(signLayer))
 				ret += '&signs=0';
+			if (params.marker) {
+				ret += `&marker=${params.marker[0]},${params.marker[1]}`;
+			}
 
 			return ret;
 		};
 
-		const updateHash = function () {
+		updateHash = function () {
 			window.location.hash = makeHash();
 		};
 

From 625f2a13a3028cc6cec21d964a409bd715e1f635 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 7 Jan 2024 20:05:39 +0100
Subject: [PATCH 351/460] core/metadata_writer: add enabled features to
 metadata

Only consider sign support enabled when at least one pattern is
configured.
---
 src/core/metadata_writer.rs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/core/metadata_writer.rs b/src/core/metadata_writer.rs
index 03aac70..b051b69 100644
--- a/src/core/metadata_writer.rs
+++ b/src/core/metadata_writer.rs
@@ -44,6 +44,13 @@ struct Spawn {
 	z: i32,
 }
 
+/// Keeps track of enabled MinedMap features
+#[derive(Debug, Serialize)]
+struct Features {
+	/// Sign layer
+	signs: bool,
+}
+
 /// Viewer metadata JSON data structure
 #[derive(Debug, Serialize)]
 struct Metadata<'t> {
@@ -51,6 +58,8 @@ struct Metadata<'t> {
 	mipmaps: Vec<Mipmap<'t>>,
 	/// Initial spawn point for new players
 	spawn: Spawn,
+	/// Enabled MinedMap features
+	features: Features,
 }
 
 /// Viewer entity JSON data structure
@@ -159,9 +168,14 @@ impl<'a> MetadataWriter<'a> {
 	pub fn run(self) -> Result<()> {
 		let level_dat = self.read_level_dat()?;
 
+		let features = Features {
+			signs: !self.config.sign_patterns.is_empty(),
+		};
+
 		let mut metadata = Metadata {
 			mipmaps: Vec::new(),
 			spawn: Self::spawn(&level_dat),
+			features,
 		};
 
 		for tile_map in self.tiles.iter() {

From 08f84fa339066c56b61f734e119f99c9fd4bc1b6 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 7 Jan 2024 20:14:00 +0100
Subject: [PATCH 352/460] viewer: do not show sign layer when the feature is
 disabled

---
 viewer/MinedMap.js | 41 +++++++++++++++++++++++------------------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/viewer/MinedMap.js b/viewer/MinedMap.js
index 7dda976..f32485e 100644
--- a/viewer/MinedMap.js
+++ b/viewer/MinedMap.js
@@ -338,7 +338,8 @@ window.createMap = function () {
 	xhr.onload = function () {
 		const res = JSON.parse(this.responseText),
 		    mipmaps = res.mipmaps,
-		    spawn = res.spawn;
+		    spawn = res.spawn,
+		    features = res.features || {};
 
 		const updateParams = function () {
 			const args = parseHash();
@@ -356,7 +357,7 @@ window.createMap = function () {
 				params.x = spawn.x;
 			if (isNaN(params.z))
 				params.z = spawn.z;
-			if (isNaN(params.marker[0]) || isNaN(params.marker[1]))
+			if (!features.signs || isNaN(params.marker[0]) || isNaN(params.marker[1]))
 				params.marker = null;
 		};
 
@@ -374,23 +375,25 @@ window.createMap = function () {
 			],
 		});
 
+		const overlayMaps = {};
+
 		const mapLayer = new MinedMapLayer(mipmaps, 'map');
-		const lightLayer = new MinedMapLayer(mipmaps, 'light');
-		const signLayer = L.layerGroup();
-
-		loadSigns(signLayer);
-
 		mapLayer.addTo(map);
 
+		const lightLayer = new MinedMapLayer(mipmaps, 'light');
+		overlayMaps['Illumination'] = lightLayer;
 		if (params.light)
 			map.addLayer(lightLayer);
-		if (params.signs)
-			map.addLayer(signLayer);
 
-		const overlayMaps = {
-			"Illumination": lightLayer,
-			"Signs": signLayer,
-		};
+		let signLayer;
+		if (features.signs) {
+			signLayer = L.layerGroup();
+			loadSigns(signLayer);
+			if (params.signs)
+				map.addLayer(signLayer);
+
+			overlayMaps['Signs'] = signLayer;
+		}
 
 		L.control.layers({}, overlayMaps).addTo(map);
 
@@ -409,7 +412,7 @@ window.createMap = function () {
 
 			if (map.hasLayer(lightLayer))
 				ret += '&light=1';
-			if (!map.hasLayer(signLayer))
+			if (features.signs && !map.hasLayer(signLayer))
 				ret += '&signs=0';
 			if (params.marker) {
 				ret += `&marker=${params.marker[0]},${params.marker[1]}`;
@@ -456,10 +459,12 @@ window.createMap = function () {
 				map.addLayer(lightLayer);
 			else
 				map.removeLayer(lightLayer);
-			if (params.signs)
-				map.addLayer(signLayer);
-			else
-				map.removeLayer(signLayer);
+			if (features.signs) {
+				if (params.signs)
+					map.addLayer(signLayer);
+				else
+					map.removeLayer(signLayer);
+			}
 
 			updateHash();
 		};

From 3d024c6cd884ac22c9e5ddc92778c0deecce8413 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 7 Jan 2024 20:32:56 +0100
Subject: [PATCH 353/460] viewer: update opened marker popup on URL hash change

---
 viewer/MinedMap.js | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/viewer/MinedMap.js b/viewer/MinedMap.js
index f32485e..3abcaf6 100644
--- a/viewer/MinedMap.js
+++ b/viewer/MinedMap.js
@@ -38,9 +38,21 @@ const signKinds = {
 
 const params = {};
 const signIcons = {};
+const markers = {};
 
 let updateHash = () => {};
 
+function coordKey(coords) {
+	if (!coords)
+		return null;
+
+	return `${coords[0]},${coords[1]}`;
+}
+
+function getMarker(coords) {
+	return markers[coordKey(coords)];
+}
+
 function signIcon(material, kind) {
 	function createSignIcon(material, kind) {
 		const {iconSize, popupAnchor} = signKinds[kind];
@@ -280,7 +292,7 @@ function loadSigns(signLayer) {
 
 		// Group signs by x,z coordinates
 		for (const sign of res.signs) {
-			const key = `${sign.x},${sign.z}`;
+			const key = coordKey([sign.x, sign.z]);
 			const group = groups[key] ??= [];
 			group.push(sign);
 		}
@@ -324,6 +336,8 @@ function loadSigns(signLayer) {
 				icon: signIcon(material, kind),
 			}).addTo(signLayer).bindPopup(popup);
 
+			markers[coordKey([x, z])] = marker;
+
 			if (params.marker && x === params.marker[0] && z === params.marker[1])
 				marker.openPopup();
 		}
@@ -451,21 +465,27 @@ window.createMap = function () {
 			if (window.location.hash === makeHash())
 				return;
 
-			updateParams();
+			const prevMarkerCoords = params.marker;
 
-			map.setView([-params.z, params.x], params.zoom);
+			updateParams();
 
 			if (params.light)
 				map.addLayer(lightLayer);
 			else
 				map.removeLayer(lightLayer);
+
 			if (features.signs) {
 				if (params.signs)
 					map.addLayer(signLayer);
 				else
 					map.removeLayer(signLayer);
+
+				if (coordKey(prevMarkerCoords) !== coordKey(params.marker))
+					getMarker(params.marker)?.openPopup();
 			}
 
+			map.setView([-params.z, params.x], params.zoom);
+
 			updateHash();
 		};
 

From 643035eaed96dfa5e99badba8dff02ab557bd207 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 7 Jan 2024 20:49:36 +0100
Subject: [PATCH 354/460] viewer: switch to modern fetch API, do not cache
 metadata and entity files

---
 viewer/MinedMap.js | 126 +++++++++++++++++++++------------------------
 1 file changed, 59 insertions(+), 67 deletions(-)

diff --git a/viewer/MinedMap.js b/viewer/MinedMap.js
index 3abcaf6..e784eec 100644
--- a/viewer/MinedMap.js
+++ b/viewer/MinedMap.js
@@ -284,76 +284,71 @@ function createSign(sign, back) {
 	return wrapper;
 }
 
-function loadSigns(signLayer) {
-	const xhr = new XMLHttpRequest();
-	xhr.onload = function () {
-		const res = JSON.parse(this.responseText);
-		const groups = {};
+async function loadSigns(signLayer) {
+	const response = await fetch('data/entities.json', {cache: 'no-store'});
+	const res = await response.json();
 
-		// Group signs by x,z coordinates
-		for (const sign of res.signs) {
-			const key = coordKey([sign.x, sign.z]);
-			const group = groups[key] ??= [];
-			group.push(sign);
-		}
+	const groups = {};
 
-		for (const [key, group] of Object.entries(groups)) {
-			const el = document.createElement('div');
-
-			let material;
-			let kind;
-
-			// Sort from top to bottom
-			group.sort((a, b) => b.y - a.y);
-
-			for (const sign of group) {
-				el.appendChild(createSign(sign, false));
-
-				if (sign.back_text)
-					el.appendChild(createSign(sign, true));
-
-				material ??= sign.material;
-				kind ??= sign.kind;
-			}
-
-			// Default material
-			material ??= 'oak';
-
-			const [x, z] = key.split(',').map((i) => +i);
-
-			const popup = L.popup().setContent(el);
-
-			popup.on('add', () => {
-				params.marker = [x, z];
-				updateHash();
-			});
-			popup.on('remove', () => {
-				params.marker = null;
-				updateHash();
-			});
-
-			const marker = L.marker([-z-0.5, x+0.5], {
-				icon: signIcon(material, kind),
-			}).addTo(signLayer).bindPopup(popup);
-
-			markers[coordKey([x, z])] = marker;
-
-			if (params.marker && x === params.marker[0] && z === params.marker[1])
-				marker.openPopup();
-		}
+	// Group signs by x,z coordinates
+	for (const sign of res.signs) {
+		const key = coordKey([sign.x, sign.z]);
+		const group = groups[key] ??= [];
+		group.push(sign);
 	}
 
-	xhr.open('GET', 'data/entities.json', true);
-	xhr.send();
+	for (const [key, group] of Object.entries(groups)) {
+		const el = document.createElement('div');
+
+		let material;
+		let kind;
+
+		// Sort from top to bottom
+		group.sort((a, b) => b.y - a.y);
+
+		for (const sign of group) {
+			el.appendChild(createSign(sign, false));
+
+			if (sign.back_text)
+				el.appendChild(createSign(sign, true));
+
+			material ??= sign.material;
+			kind ??= sign.kind;
+		}
+
+		// Default material
+		material ??= 'oak';
+
+		const [x, z] = key.split(',').map((i) => +i);
+
+		const popup = L.popup().setContent(el);
+
+		popup.on('add', () => {
+			params.marker = [x, z];
+			updateHash();
+		});
+		popup.on('remove', () => {
+			params.marker = null;
+			updateHash();
+		});
+
+		const marker = L.marker([-z-0.5, x+0.5], {
+			icon: signIcon(material, kind),
+		}).addTo(signLayer).bindPopup(popup);
+
+		markers[coordKey([x, z])] = marker;
+
+		if (params.marker && x === params.marker[0] && z === params.marker[1])
+			marker.openPopup();
+	}
 }
 
 window.createMap = function () {
-	const xhr = new XMLHttpRequest();
-	xhr.onload = function () {
-		const res = JSON.parse(this.responseText),
-		    mipmaps = res.mipmaps,
-		    spawn = res.spawn,
-		    features = res.features || {};
+	(async function () {
+		const response = await fetch('data/info.json', {cache: 'no-store'});
+		const res = await response.json();
+		const {mipmaps, spawn} = res;
+		const features = res.features || {};
 
 		const updateParams = function () {
 			const args = parseHash();
@@ -489,8 +484,5 @@ window.createMap = function () {
 			updateHash();
 		};
 
-	};
-
-	xhr.open('GET', 'data/info.json', true);
-	xhr.send();
+	})();
 }

From 03521684b9851f1380470245b846fca981ede1a0 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 10 Jan 2024 23:57:23 +0100
Subject: [PATCH 355/460] README.md: add description of sign feature

---
 README.md | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index be09c47..824b670 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ based on [Leaflet](https://leafletjs.com/). The map renderer is heavily inspired
 ## How to use
 
 Minecraft stores its save data in a directory `~/.minecraft/saves` on Linux,
-and `C:\Users\<username>\AppData\Roaming\.minecraft\saves`. To generate minedmap
+and `C:\Users\<username>\AppData\Roaming\.minecraft\saves`. To generate MinedMap
 tile data from a save game called "World", use the a command like the following
 (replacing the first argument with the path to your save data; `viewer` refers
 to the directory where you unpacked the MinedMap viewer):
@@ -47,6 +47,34 @@ This test server is very slow and cannot handle multiple requests concurrently,
 a proper webserver like [nginx](https://nginx.org/) or upload the viewer together with
 the generated map files to public webspace to make the map available to others.
 
+### Signs
+
+![Sign screenshot](https://raw.githubusercontent.com/neocturne/MinedMap/e5d9c813ba3118d04dc7e52e3dc6f48808a69120/docs/images/signs.png)
+
+MinedMap can display sign markers on the map, which will open a popup showing
+the sign text when clicked.
+
+Generation of the sign layer is disabled by default. It can be enabled by passing
+the `--sign-prefix` or `--sign-filter` options to MinedMap. The options allow
+to configure which signs should be displayed, and they can be passed multiple
+times to show every sign that matches at least one prefix or filter.
+
+`--sign-prefix` will make all signs visible the text of which starts with the
+given prefix, so something like `--sign-prefix '[Map]'` would allow to put up
+signs that start with "\[Map\]" in Minecraft to add markers to the map. An
+empty prefix (`--sign-prefix ''`) can be used to make *all* signs visible on
+the map.
+
+`--sign-filter` can be used for more advanced filters based on regular expressions.
+`--sign-filter '\[Map\]'` would show all signs that contain "\[Map\]"
+anywhere in their text, and `--sign-filter '.'` makes all non-empty signs (signs
+containing at least one character) visible. See the documentation of the
+[regex crate](https://docs.rs/regex) for more information on the supported syntax.
+
+All prefixes and filters are applied to the front and back text separately, but
+both the front and the back text will be shown in the popup when one of them
+matches.
+
 ## Installation
 
 Binary builds of the map generator for Linux and Windows, as well as an archive

From 6299c871a94a407382d4f17fa1eb23a15799dd4e Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 11 Jan 2024 00:02:25 +0100
Subject: [PATCH 356/460] CHANGELOG.md: add sign layer

---
 CHANGELOG.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fccf759..b702c8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 ## [Unreleased] - ReleaseDate
 
+### Added
+
+- Added sign layer
+
+  This feature is disabled by default. Use the `--sign-prefix` and `--sign-filter` options to
+  configure which signs to show on the map.
+
 ### Changed
 
 - Without `--verbose`, only a single warning is printed at the end of

From 05d8faeb5cfc249917d456089df581ed6779bfaf Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 11 Jan 2024 12:39:53 +0100
Subject: [PATCH 357/460] resource: README.md: sign-related updates

---
 resource/README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/resource/README.md b/resource/README.md
index 08857ad..65caa08 100644
--- a/resource/README.md
+++ b/resource/README.md
@@ -11,6 +11,7 @@ work.
 - `extract.py`: Takes the block type information from `blocks.json` and texture data
   from an unpacked Minecraft JAR, storing the result in `colors.json`
 - `generate.py`: Generates `block_types.rs` from `colors.json`
+- `sign_textures.py`: Generates all needed sign graphics from Minecraft assets
 
 In addition to these scripts, the JSON processor *jq* is a useful tool to work
 with MinedMap's resource metadata.
@@ -47,7 +48,8 @@ with MinedMap's resource metadata.
 
    If possible, the top texture of blocks should be used where different sides
    exist. Block types that should not be visible on the map are just set to
-   `null` in the JSON.
+   `null` in the JSON (or have a `null` `texture` field when other flags need
+   to be set, like for sign blocks).
 
    The `water`, `grass` and `foliage` flags control biome-dependent texture color modifiers.
 

From e18761a3e410e72b65301701aa157104b2bf9dbd Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 11 Jan 2024 12:42:25 +0100
Subject: [PATCH 358/460] resource: extract.py: pass directory of unpacked
 Minecraft JAR, not full path to assets

Make the script easier to use, and more consistent with sign_textures.py.
---
 resource/README.md  | 2 +-
 resource/extract.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resource/README.md b/resource/README.md
index 65caa08..ab9d5ea 100644
--- a/resource/README.md
+++ b/resource/README.md
@@ -43,7 +43,7 @@ with MinedMap's resource metadata.
 5. Edit `blocks.json` until the following command passes without errors:
 
      ```sh
-     ./extract.py blocks.json data/new/assets/minecraft/textures/block colors.json
+     ./extract.py blocks.json data/new colors.json
      ```
 
    If possible, the top texture of blocks should be used where different sides
diff --git a/resource/extract.py b/resource/extract.py
index 9621b95..31c1e97 100755
--- a/resource/extract.py
+++ b/resource/extract.py
@@ -11,7 +11,7 @@ if len(sys.argv) != 4:
 	sys.exit('Usage: extract.py <blocks.json> <asset directory> <colors.json>')
 
 def mean_color(texture):
-	path = os.path.join(sys.argv[2], texture + '.png')
+	path = os.path.join(sys.argv[2], 'assets/minecraft/textures/block', texture + '.png')
 	im = Image.open(path)
 
 	data = im.convert('RGBA').getdata()

From a99a734df89c22d176698115508c5db4e3ec8c95 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 25 Jan 2024 19:44:37 +0100
Subject: [PATCH 359/460] Update dependencies

---
 Cargo.lock | 90 +++++++++++++++++++++++-------------------------------
 1 file changed, 39 insertions(+), 51 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e50f306..55deb2d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -46,9 +46,9 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
 
 [[package]]
 name = "anstream"
-version = "0.6.5"
+version = "0.6.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6"
+checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -136,15 +136,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.1"
+version = "2.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
 
 [[package]]
 name = "bytemuck"
-version = "1.14.0"
+version = "1.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
+checksum = "ed2490600f404f2b94c167e31d3ed1d5f3c225a0f3b80230053b3e0b7b962bd9"
 
 [[package]]
 name = "byteorder"
@@ -176,9 +176,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.4.14"
+version = "4.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33e92c5c1a78c62968ec57dbc2440366a2d6e5a23faf829970ff1585dc6b18e2"
+checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -186,9 +186,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.14"
+version = "4.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4323769dc8a61e2c39ad7dc26f6f2800524691a44d74fe3d1071a5c24db6370"
+checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7"
 dependencies = [
  "anstream",
  "anstyle",
@@ -327,9 +327,9 @@ dependencies = [
 
 [[package]]
 name = "fdeflate"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "209098dd6dfc4445aa6111f0e98653ac323eaa4dfd212c9ca3931bf9955c31bd"
+checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
 dependencies = [
  "simd-adler32",
 ]
@@ -432,20 +432,19 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
+checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f"
 
 [[package]]
 name = "image"
-version = "0.24.7"
+version = "0.24.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711"
+checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23"
 dependencies = [
  "bytemuck",
  "byteorder",
  "color_quant",
- "num-rational",
  "num-traits",
  "png",
 ]
@@ -499,9 +498,9 @@ checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
 
 [[package]]
 name = "libz-ng-sys"
-version = "1.1.14"
+version = "1.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81157dde2fd4ad2b45ea3a4bb47b8193b52a6346b678840d91d80d3c2cd166c5"
+checksum = "c6409efc61b12687963e602df8ecf70e8ddacf95bc6576bcf16e3ac6328083c5"
 dependencies = [
  "cmake",
  "libc",
@@ -509,9 +508,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
 
 [[package]]
 name = "lock_api"
@@ -633,17 +632,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "num-rational"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
 [[package]]
 name = "num-traits"
 version = "0.2.17"
@@ -721,15 +709,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.28"
+version = "0.3.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a"
+checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb"
 
 [[package]]
 name = "png"
-version = "0.17.10"
+version = "0.17.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64"
+checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a"
 dependencies = [
  "bitflags 1.3.2",
  "crc32fast",
@@ -740,9 +728,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.76"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
 dependencies = [
  "unicode-ident",
 ]
@@ -758,9 +746,9 @@ dependencies = [
 
 [[package]]
 name = "rayon"
-version = "1.8.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
+checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051"
 dependencies = [
  "either",
  "rayon-core",
@@ -768,9 +756,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.12.0"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
 dependencies = [
  "crossbeam-deque",
  "crossbeam-utils",
@@ -787,9 +775,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.2"
+version = "1.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -799,9 +787,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.3"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -828,11 +816,11 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustix"
-version = "0.38.28"
+version = "0.38.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
+checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.4.2",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -917,9 +905,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.2"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
+checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
 
 [[package]]
 name = "strsim"

From 8a1a26c13c93c6ea48d4c7ade4e0bcbd087b074a Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 26 Jan 2024 22:34:41 +0100
Subject: [PATCH 360/460] core: add support for sign text transformations

Add support for regexp replacement patterns, which can be useful when
the text matched by --sign-filter or --sign-prefix should not be
displayed.
---
 README.md                   |  6 ++++++
 src/core/common.rs          | 30 +++++++++++++++++++++++++++++-
 src/core/metadata_writer.rs | 31 ++++++++++++++++++++++++++++++-
 src/core/mod.rs             |  6 ++++++
 4 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 824b670..b857454 100644
--- a/README.md
+++ b/README.md
@@ -75,6 +75,12 @@ All prefixes and filters are applied to the front and back text separately, but
 both the front and the back text will be shown in the popup when one of them
 matches.
 
+Finally, `--sign-transform` allows to specify sed-style replacement patterns to
+modify the text displayed on the map. This can be used if the text matched by
+`--sign-prefix` or `--sign-filter` should not be displayed:
+`--sign-filter 's/\[Map\]//'` would replace each occurence of "\[Map\]" with
+the empty string.
+
 ## Installation
 
 Binary builds of the map generator for Linux and Windows, as well as an archive
diff --git a/src/core/common.rs b/src/core/common.rs
index 92d0019..9a94496 100644
--- a/src/core/common.rs
+++ b/src/core/common.rs
@@ -8,7 +8,7 @@ use std::{
 
 use anyhow::{Context, Result};
 use indexmap::IndexSet;
-use regex::RegexSet;
+use regex::{Regex, RegexSet};
 use serde::{Deserialize, Serialize};
 
 use crate::{
@@ -130,6 +130,7 @@ pub enum TileKind {
 }
 
 /// Common configuration based on command line arguments
+#[derive(Debug)]
 pub struct Config {
 	/// Number of threads for parallel processing
 	pub num_threads: usize,
@@ -151,6 +152,8 @@ pub struct Config {
 	pub viewer_entities_path: PathBuf,
 	/// Sign text filter patterns
 	pub sign_patterns: RegexSet,
+	/// Sign text transformation pattern
+	pub sign_transforms: Vec<(Regex, String)>,
 }
 
 impl Config {
@@ -173,6 +176,8 @@ impl Config {
 			.collect();
 
 		let sign_patterns = Self::sign_patterns(args).context("Failed to parse sign patterns")?;
+		let sign_transforms =
+			Self::sign_transforms(args).context("Failed to parse sign transforms")?;
 
 		Ok(Config {
 			num_threads,
@@ -185,6 +190,7 @@ impl Config {
 			viewer_info_path,
 			viewer_entities_path,
 			sign_patterns,
+			sign_transforms,
 		})
 	}
 
@@ -200,6 +206,28 @@ impl Config {
 		)?)
 	}
 
+	/// Parses the sign transform argument into a vector of [Regex] and
+	/// corresponding replacement strings
+	fn sign_transforms(args: &super::Args) -> Result<Vec<(Regex, String)>> {
+		let splitter = Regex::new(r"^s/((?:[^\\/]|\\.)*)/((?:[^\\/]|\\.)*)/$").unwrap();
+
+		args.sign_transform
+			.iter()
+			.map(|t| Self::sign_transform(&splitter, t))
+			.collect()
+	}
+
+	/// Parses the sign transform argument into a [Regex] and its corresponding
+	/// replacement string
+	fn sign_transform(splitter: &Regex, transform: &str) -> Result<(Regex, String)> {
+		let captures = splitter
+			.captures(transform)
+			.with_context(|| format!("Invalid transform pattern '{}'", transform))?;
+		let regexp = Regex::new(&captures[1])?;
+		let replacement = captures[2].to_string();
+		Ok((regexp, replacement))
+	}
+
 	/// Constructs the path to an input region file
 	pub fn region_path(&self, coords: TileCoords) -> PathBuf {
 		let filename = coord_filename(coords, "mca");
diff --git a/src/core/metadata_writer.rs b/src/core/metadata_writer.rs
index b051b69..0ea1f65 100644
--- a/src/core/metadata_writer.rs
+++ b/src/core/metadata_writer.rs
@@ -1,6 +1,7 @@
 //! The [MetadataWriter] and related types
 
 use anyhow::{Context, Result};
+use regex::Regex;
 use serde::Serialize;
 
 use crate::{
@@ -8,7 +9,7 @@ use crate::{
 	io::{fs, storage},
 	world::{
 		block_entity::{self, BlockEntity, BlockEntityData},
-		de,
+		de, sign,
 	},
 };
 
@@ -145,6 +146,28 @@ impl<'a> MetadataWriter<'a> {
 		false
 	}
 
+	/// Applies a single transform to a [sign::SignText]
+	///
+	/// The regular expression is applied for each line of the sign text
+	/// separately (actually for each element when JSON text is used)
+	fn sign_text_transform(sign_text: &mut sign::SignText, transform: &(Regex, String)) {
+		let (regexp, replacement) = transform;
+
+		for line in &mut sign_text.0 {
+			for text in &mut line.0 {
+				text.text = regexp.replace_all(&text.text, replacement).into_owned()
+			}
+		}
+	}
+
+	/// Applies the configured transforms to the text of a sign
+	fn sign_transform(&self, sign: &mut block_entity::Sign) {
+		for transform in &self.config.sign_transforms {
+			Self::sign_text_transform(&mut sign.front_text, transform);
+			Self::sign_text_transform(&mut sign.back_text, transform);
+		}
+	}
+
 	/// Generates [Entities] data from collected entity lists
 	fn entities(&self) -> Result<Entities> {
 		let data: ProcessedEntities =
@@ -158,6 +181,12 @@ impl<'a> MetadataWriter<'a> {
 				.filter(|entity| match &entity.data {
 					BlockEntityData::Sign(sign) => self.sign_filter(sign),
 				})
+				.map(|mut entity| {
+					match &mut entity.data {
+						BlockEntityData::Sign(sign) => self.sign_transform(sign),
+					};
+					entity
+				})
 				.collect(),
 		};
 
diff --git a/src/core/mod.rs b/src/core/mod.rs
index 274bae8..f552ffa 100644
--- a/src/core/mod.rs
+++ b/src/core/mod.rs
@@ -59,6 +59,12 @@ pub struct Args {
 	/// To make all signs visible, pass an empty string to either option.
 	#[arg(long)]
 	pub sign_filter: Vec<String>,
+	/// Regular expression replacement pattern for sign texts
+	///
+	/// Accepts patterns of the form 's/regexp/replacement/'. Transforms
+	/// are applied to each line of sign texts separately.
+	#[arg(long)]
+	pub sign_transform: Vec<String>,
 	/// Minecraft save directory
 	pub input_dir: PathBuf,
 	/// MinedMap data directory

From 3d84e9c9e465ffece461ed6670d2e1aecb15bbd1 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 27 Jan 2024 14:08:42 +0100
Subject: [PATCH 361/460] CHANGELOG.md: mention --sign-transform

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b702c8c..1e5f4b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,8 @@
 - Added sign layer
 
   This feature is disabled by default. Use the `--sign-prefix` and `--sign-filter` options to
-  configure which signs to show on the map.
+  configure which signs to show on the map. `--sign-transform` allows to modify the displayed
+  sign text.
 
 ### Changed
 

From f186681b416f7ef24d329875723d0524dbd7afb3 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 27 Jan 2024 14:14:48 +0100
Subject: [PATCH 362/460] release: move commit message configuration to
 workspace

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 5442162..6654e5c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,6 +9,7 @@ repository = "https://github.com/neocturne/MinedMap"
 
 [workspace.metadata.release]
 consolidate-commits = false
+pre-release-commit-message = "{{crate_name}} {{version}}"
 
 [package]
 name = "minedmap"
@@ -26,7 +27,6 @@ exclude = [
 ]
 
 [package.metadata.release]
-pre-release-commit-message = "{{crate_name}} {{version}}"
 tag-message = "{{crate_name}} {{version}}"
 pre-release-replacements = [
   {file="CHANGELOG.md", search="Unreleased", replace="{{version}}"},

From d6716a598badf82d6d73ca017ffbe1eb26592a54 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 27 Jan 2024 14:15:28 +0100
Subject: [PATCH 363/460] minedmap-resource 0.3.0

---
 Cargo.lock                 | 2 +-
 Cargo.toml                 | 2 +-
 crates/resource/Cargo.toml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 55deb2d..f32b324 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -587,7 +587,7 @@ dependencies = [
 
 [[package]]
 name = "minedmap-resource"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "enumflags2",
  "glam",
diff --git a/Cargo.toml b/Cargo.toml
index 6654e5c..e6a5113 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -47,7 +47,7 @@ image = { version = "0.24.5", default-features = false, features = ["png"] }
 indexmap = { version = "2.0.0", features = ["serde"] }
 lru = "0.12.0"
 minedmap-nbt = { version = "0.1.1", path = "crates/nbt", default-features = false }
-minedmap-resource = { version = "0.2.0", path = "crates/resource" }
+minedmap-resource = { version = "0.3.0", path = "crates/resource" }
 minedmap-types = { version = "0.1.2", path = "crates/types" }
 num-integer = "0.1.45"
 num_cpus = "1.16.0"
diff --git a/crates/resource/Cargo.toml b/crates/resource/Cargo.toml
index 5bed687..364ac85 100644
--- a/crates/resource/Cargo.toml
+++ b/crates/resource/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "minedmap-resource"
-version = "0.2.0"
+version = "0.3.0"
 description = "Data describing Minecraft biomes and block types"
 edition.workspace = true
 license.workspace = true

From 9fd3989a95fa6d446c9a36398b1996e99d7cb4e7 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 27 Jan 2024 14:16:03 +0100
Subject: [PATCH 364/460] minedmap 2.1.0

---
 CHANGELOG.md | 5 ++++-
 Cargo.lock   | 2 +-
 Cargo.toml   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e5f4b4..b3b134e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased] - ReleaseDate
 
+## [2.1.0] - 2024-01-27
+
 ### Added
 
 - Added sign layer
@@ -74,7 +76,8 @@ intermediate data.
   Full support for custom biomes datapacks might be added in a future release.
 
 <!-- next-url -->
-[Unreleased]: https://github.com/neocturne/MinedMap/compare/v2.0.2...HEAD
+[Unreleased]: https://github.com/neocturne/MinedMap/compare/v2.1.0...HEAD
+[2.1.0]: https://github.com/neocturne/MinedMap/compare/v2.0.2...v2.1.0
 [2.0.2]: https://github.com/neocturne/MinedMap/compare/v2.0.1...v2.0.2
 [2.0.1]: https://github.com/neocturne/MinedMap/compare/v2.0.0...v2.0.1
 [2.0.0]: https://github.com/neocturne/MinedMap/compare/v1.19.1...v2.0.0
diff --git a/Cargo.lock b/Cargo.lock
index f32b324..2a88179 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -545,7 +545,7 @@ checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
 
 [[package]]
 name = "minedmap"
-version = "2.0.2"
+version = "2.1.0"
 dependencies = [
  "anyhow",
  "bincode",
diff --git a/Cargo.toml b/Cargo.toml
index e6a5113..082c5b6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@ pre-release-commit-message = "{{crate_name}} {{version}}"
 
 [package]
 name = "minedmap"
-version = "2.0.2"
+version = "2.1.0"
 description = "Generate browsable maps from Minecraft save data"
 edition.workspace = true
 license.workspace = true

From 00eea4537501b1679873900d6470c7d8df0ed631 Mon Sep 17 00:00:00 2001
From: Myrddin Emrys <myrddin@gmail.com>
Date: Wed, 14 Feb 2024 18:01:25 -0600
Subject: [PATCH 365/460] Improve README.md instructions.

Added instructions that would have made my initial attempts to use the tool less confusing.
---
 README.md | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b857454..402c7b2 100644
--- a/README.md
+++ b/README.md
@@ -22,13 +22,18 @@ based on [Leaflet](https://leafletjs.com/). The map renderer is heavily inspired
 
 ## How to use
 
+Download both the release that matches your platform, as well as the platform-
+independant viewer archive. Extract the viewer archive. This directory will be made
+publicly accessible on a web server and will contain both the html and javascript to
+operate the viewer, as well as the image data generated by MinedMap.
+
 Minecraft stores its save data in a directory `~/.minecraft/saves` on Linux,
 and `C:\Users\<username>\AppData\Roaming\.minecraft\saves`. To generate MinedMap
 tile data from a save game called "World", use the a command like the following
-(replacing the first argument with the path to your save data; `viewer` refers
+(replacing the first argument with the path to your save data; `<viewer>` refers
 to the directory where you unpacked the MinedMap viewer):
 ```shell
-minedmap ~/.minecraft/saves/World viewer/data
+minedmap ~/.minecraft/saves/World <viewer>/data
 ```
 
 The first map generation might take a while for big worlds, but subsequent calls will
@@ -47,6 +52,10 @@ This test server is very slow and cannot handle multiple requests concurrently,
 a proper webserver like [nginx](https://nginx.org/) or upload the viewer together with
 the generated map files to public webspace to make the map available to others.
 
+If you are uploading the directory to a remote webserver, you do not need to upload the 
+`<viewer>/data/processed` directory, as that is only used locally to make updates
+process more quickly.
+
 ### Signs
 
 ![Sign screenshot](https://raw.githubusercontent.com/neocturne/MinedMap/e5d9c813ba3118d04dc7e52e3dc6f48808a69120/docs/images/signs.png)

From bccd6d6cb4fad4a7d6bd8a7d3669ac4706428d6d Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 3 Mar 2024 23:43:42 +0100
Subject: [PATCH 366/460] README.md: some rewording

---
 README.md | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 402c7b2..8f7867f 100644
--- a/README.md
+++ b/README.md
@@ -22,10 +22,12 @@ based on [Leaflet](https://leafletjs.com/). The map renderer is heavily inspired
 
 ## How to use
 
-Download both the release that matches your platform, as well as the platform-
-independant viewer archive. Extract the viewer archive. This directory will be made
-publicly accessible on a web server and will contain both the html and javascript to
-operate the viewer, as well as the image data generated by MinedMap.
+Download the binary release that matches your platform from the Github release
+page (or install from source using `cargo`), as well as the platform-independent
+viewer archive. Extract the viewer archive. The extracted directory contains the
+HTML and JavaScript to operate the viewer and will be made publicly accessible
+on a web server. The image data generated by MinedMap will be stored in the
+`data` subdirectory of the extracted viewer.
 
 Minecraft stores its save data in a directory `~/.minecraft/saves` on Linux,
 and `C:\Users\<username>\AppData\Roaming\.minecraft\saves`. To generate MinedMap
@@ -52,9 +54,9 @@ This test server is very slow and cannot handle multiple requests concurrently,
 a proper webserver like [nginx](https://nginx.org/) or upload the viewer together with
 the generated map files to public webspace to make the map available to others.
 
-If you are uploading the directory to a remote webserver, you do not need to upload the 
-`<viewer>/data/processed` directory, as that is only used locally to make updates
-process more quickly.
+If you are uploading the directory to a remote webserver, you do not need to upload the
+`<viewer>/data/processed` directory, as that is only used locally to allow processing
+updates more quickly.
 
 ### Signs
 

From 44e914599b1d6a2ab43fc32a960fa0a5e9b0b028 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 3 Mar 2024 23:48:49 +0100
Subject: [PATCH 367/460] types: fix new clippy lint

---
 crates/types/src/lib.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/crates/types/src/lib.rs b/crates/types/src/lib.rs
index e219a97..b4f12c2 100644
--- a/crates/types/src/lib.rs
+++ b/crates/types/src/lib.rs
@@ -47,8 +47,7 @@ macro_rules! coord_type {
 
 			/// Returns an iterator over all possible values of the type
 			#[inline]
-			pub fn iter() -> impl Iterator<Item = $t<AXIS>>
-			       + DoubleEndedIterator
+			pub fn iter() -> impl DoubleEndedIterator<Item = $t<AXIS>>
 			       + ExactSizeIterator
 			       + FusedIterator
 			       + Clone

From 39b073f24b8837cec00f4b554271930a6bbd2a04 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 3 Mar 2024 23:48:42 +0100
Subject: [PATCH 368/460] Update dependencies

---
 Cargo.lock | 197 ++++++++++++++++++++++++++---------------------------
 1 file changed, 98 insertions(+), 99 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2a88179..b87c678 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "ahash"
-version = "0.8.7"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -46,9 +46,9 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
 
 [[package]]
 name = "anstream"
-version = "0.6.11"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
+checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -60,9 +60,9 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.4"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
+checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
 
 [[package]]
 name = "anstyle-parse"
@@ -94,9 +94,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.79"
+version = "1.0.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca"
+checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1"
 
 [[package]]
 name = "autocfg"
@@ -142,9 +142,9 @@ checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
 
 [[package]]
 name = "bytemuck"
-version = "1.14.1"
+version = "1.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed2490600f404f2b94c167e31d3ed1d5f3c225a0f3b80230053b3e0b7b962bd9"
+checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f"
 
 [[package]]
 name = "byteorder"
@@ -176,9 +176,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.4.18"
+version = "4.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
+checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -186,9 +186,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.18"
+version = "4.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7"
+checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb"
 dependencies = [
  "anstream",
  "anstyle",
@@ -199,9 +199,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.4.7"
+version = "4.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
+checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -211,9 +211,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
+checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
 
 [[package]]
 name = "cmake"
@@ -238,9 +238,9 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
 [[package]]
 name = "crc32fast"
-version = "1.3.2"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
 dependencies = [
  "cfg-if",
 ]
@@ -272,15 +272,15 @@ checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
 
 [[package]]
 name = "either"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
 
 [[package]]
 name = "enumflags2"
-version = "0.7.8"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939"
+checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d"
 dependencies = [
  "enumflags2_derive",
  "serde",
@@ -288,9 +288,9 @@ dependencies = [
 
 [[package]]
 name = "enumflags2_derive"
-version = "0.7.8"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246"
+checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -315,9 +315,9 @@ dependencies = [
 
 [[package]]
 name = "fastnbt"
-version = "2.4.4"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3369bd70629bccfda7e344883c9ae3ab7f3b10a357bcf8b0f69caa7256bcf188"
+checksum = "7d4a73a95dc65551ccd98e1ecd1adb5d1ba5361146963b31f481ca42fc0520a3"
 dependencies = [
  "byteorder",
  "cesu8",
@@ -432,15 +432,15 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.4"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "image"
-version = "0.24.8"
+version = "0.24.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "034bbe799d1909622a74d1193aa50147769440040ff36cb2baa947609b0a4e23"
+checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
 dependencies = [
  "bytemuck",
  "byteorder",
@@ -451,9 +451,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.1.0"
+version = "2.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
+checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -462,9 +462,9 @@ dependencies = [
 
 [[package]]
 name = "itertools"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
 dependencies = [
  "either",
 ]
@@ -477,9 +477,9 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
 
 [[package]]
 name = "jobserver"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d"
+checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6"
 dependencies = [
  "libc",
 ]
@@ -492,9 +492,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.152"
+version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
 [[package]]
 name = "libz-ng-sys"
@@ -524,15 +524,15 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.20"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "lru"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7"
+checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc"
 dependencies = [
  "hashbrown",
 ]
@@ -604,9 +604,9 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
 dependencies = [
  "adler",
  "simd-adler32",
@@ -624,19 +624,18 @@ dependencies = [
 
 [[package]]
 name = "num-integer"
-version = "0.1.45"
+version = "0.1.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
 dependencies = [
- "autocfg",
  "num-traits",
 ]
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
 dependencies = [
  "autocfg",
 ]
@@ -709,15 +708,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "png"
-version = "0.17.11"
+version = "0.17.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f6c3c3e617595665b8ea2ff95a86066be38fb121ff920a9c0eb282abcd1da5a"
+checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
 dependencies = [
  "bitflags 1.3.2",
  "crc32fast",
@@ -746,9 +745,9 @@ dependencies = [
 
 [[package]]
 name = "rayon"
-version = "1.8.1"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051"
+checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd"
 dependencies = [
  "either",
  "rayon-core",
@@ -816,9 +815,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustix"
-version = "0.38.30"
+version = "0.38.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca"
+checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
 dependencies = [
  "bitflags 2.4.2",
  "errno",
@@ -829,9 +828,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
+checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
 
 [[package]]
 name = "scopeguard"
@@ -841,9 +840,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "serde"
-version = "1.0.195"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
 dependencies = [
  "serde_derive",
 ]
@@ -859,9 +858,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.195"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -870,9 +869,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.111"
+version = "1.0.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4"
+checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
 dependencies = [
  "itoa",
  "ryu",
@@ -911,15 +910,15 @@ checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
 
 [[package]]
 name = "strsim"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -938,9 +937,9 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "1.1.7"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -948,9 +947,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.35.1"
+version = "1.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
+checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
 dependencies = [
  "backtrace",
  "parking_lot",
@@ -1075,7 +1074,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.0",
+ "windows-targets 0.52.4",
 ]
 
 [[package]]
@@ -1095,17 +1094,17 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.0",
- "windows_aarch64_msvc 0.52.0",
- "windows_i686_gnu 0.52.0",
- "windows_i686_msvc 0.52.0",
- "windows_x86_64_gnu 0.52.0",
- "windows_x86_64_gnullvm 0.52.0",
- "windows_x86_64_msvc 0.52.0",
+ "windows_aarch64_gnullvm 0.52.4",
+ "windows_aarch64_msvc 0.52.4",
+ "windows_i686_gnu 0.52.4",
+ "windows_i686_msvc 0.52.4",
+ "windows_x86_64_gnu 0.52.4",
+ "windows_x86_64_gnullvm 0.52.4",
+ "windows_x86_64_msvc 0.52.4",
 ]
 
 [[package]]
@@ -1116,9 +1115,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -1128,9 +1127,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -1140,9 +1139,9 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -1152,9 +1151,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -1164,9 +1163,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -1176,9 +1175,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -1188,9 +1187,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.0"
+version = "0.52.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
 
 [[package]]
 name = "zerocopy"

From 66189d279cd27c7df9f4fee8a5fa8e30fffd453e Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 14 Jun 2024 16:02:56 +0200
Subject: [PATCH 369/460] core: region_processor: fix crash due to incorrect
 counting in info message

Fixes #52
---
 CHANGELOG.md                 |  7 +++++
 Cargo.lock                   | 21 +++++++++++++++
 Cargo.toml                   |  1 +
 src/core/region_processor.rs | 52 +++++++++++++-----------------------
 4 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3b134e..efcf8d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 ## [Unreleased] - ReleaseDate
 
+### Fixed
+
+- Fix crash due to incorrect counting in info message
+
+  The calculation of the number of skipped regions could underflow when more invalid than valid
+  regions were encountered.
+
 ## [2.1.0] - 2024-01-27
 
 ### Added
diff --git a/Cargo.lock b/Cargo.lock
index b87c678..1780b1f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -276,6 +276,26 @@ version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
 
+[[package]]
+name = "enum-map"
+version = "2.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9"
+dependencies = [
+ "enum-map-derive",
+]
+
+[[package]]
+name = "enum-map-derive"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "enumflags2"
 version = "0.7.9"
@@ -550,6 +570,7 @@ dependencies = [
  "anyhow",
  "bincode",
  "clap",
+ "enum-map",
  "fastnbt",
  "futures-util",
  "git-version",
diff --git a/Cargo.toml b/Cargo.toml
index 082c5b6..f8bb35f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,6 +40,7 @@ pre-release-replacements = [
 anyhow = "1.0.68"
 bincode = "1.3.3"
 clap = { version = "4.1.4", features = ["derive", "wrap_help"] }
+enum-map = "2.7.3"
 fastnbt = "2.3.2"
 futures-util = "0.3.28"
 git-version = "0.3.5"
diff --git a/src/core/region_processor.rs b/src/core/region_processor.rs
index 63d5c09..9778061 100644
--- a/src/core/region_processor.rs
+++ b/src/core/region_processor.rs
@@ -1,16 +1,9 @@
 //! The [RegionProcessor] and related functions
 
-use std::{
-	ffi::OsStr,
-	path::PathBuf,
-	sync::{
-		atomic::{AtomicBool, Ordering},
-		mpsc,
-	},
-	time::SystemTime,
-};
+use std::{ffi::OsStr, path::PathBuf, sync::mpsc, time::SystemTime};
 
 use anyhow::{Context, Result};
+use enum_map::{Enum, EnumMap};
 use rayon::prelude::*;
 use tracing::{debug, info, warn};
 
@@ -36,7 +29,7 @@ fn parse_region_filename(file_name: &OsStr) -> Option<TileCoords> {
 }
 
 /// [RegionProcessor::process_region] return values
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Enum)]
 enum RegionProcessorStatus {
 	/// Region was processed
 	Ok,
@@ -363,6 +356,8 @@ impl<'a> RegionProcessor<'a> {
 	///
 	/// Returns a list of the coordinates of all processed regions
 	pub fn run(self) -> Result<Vec<TileCoords>> {
+		use RegionProcessorStatus as Status;
+
 		fs::create_dir_all(&self.config.processed_dir)?;
 		fs::create_dir_all(&self.config.tile_dir(TileKind::Lightmap, 0))?;
 		fs::create_dir_all(&self.config.entities_dir(0))?;
@@ -370,31 +365,18 @@ impl<'a> RegionProcessor<'a> {
 		info!("Processing region files...");
 
 		let (region_send, region_recv) = mpsc::channel();
-		let (processed_send, processed_recv) = mpsc::channel();
-		let (error_send, error_recv) = mpsc::channel();
-
-		let has_unknown = AtomicBool::new(false);
+		let (status_send, status_recv) = mpsc::channel();
 
 		self.collect_regions()?.par_iter().try_for_each(|&coords| {
 			let ret = self
 				.process_region(coords)
 				.with_context(|| format!("Failed to process region {:?}", coords))?;
 
-			if ret != RegionProcessorStatus::ErrorMissing {
+			if ret != Status::ErrorMissing {
 				region_send.send(coords).unwrap();
 			}
 
-			match ret {
-				RegionProcessorStatus::Ok => processed_send.send(()).unwrap(),
-				RegionProcessorStatus::OkWithUnknown => {
-					has_unknown.store(true, Ordering::Relaxed);
-					processed_send.send(()).unwrap();
-				}
-				RegionProcessorStatus::Skipped => {}
-				RegionProcessorStatus::ErrorOk | RegionProcessorStatus::ErrorMissing => {
-					error_send.send(()).unwrap()
-				}
-			}
+			status_send.send(ret).unwrap();
 
 			anyhow::Ok(())
 		})?;
@@ -402,19 +384,21 @@ impl<'a> RegionProcessor<'a> {
 		drop(region_send);
 		let mut regions: Vec<_> = region_recv.into_iter().collect();
 
-		drop(processed_send);
-		let processed = processed_recv.into_iter().count();
-		drop(error_send);
-		let errors = error_recv.into_iter().count();
+		drop(status_send);
+
+		let mut status = EnumMap::<_, usize>::default();
+		for ret in status_recv {
+			status[ret] += 1;
+		}
 
 		info!(
 			"Processed region files ({} processed, {} unchanged, {} errors)",
-			processed,
-			regions.len() - processed - errors,
-			errors,
+			status[Status::Ok] + status[Status::OkWithUnknown],
+			status[Status::Skipped],
+			status[Status::ErrorOk] + status[Status::ErrorMissing],
 		);
 
-		if has_unknown.into_inner() {
+		if status[Status::OkWithUnknown] > 0 {
 			warn!("Unknown block or biome types found during processing");
 			eprint!(concat!(
 				"\n",

From e74e7be68667f7562e57b1ed14bce25a796be336 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 14 Jun 2024 16:15:56 +0200
Subject: [PATCH 370/460] core: region_processor: ignore empty region files

Minecraft generates empty region files in some cases. Just ignore these
files instead of printing an error message for each.
---
 CHANGELOG.md                 |  4 ++++
 src/core/region_processor.rs | 19 ++++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index efcf8d5..c010654 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@
 
   The calculation of the number of skipped regions could underflow when more invalid than valid
   regions were encountered.
+- Ignore empty region files instead of treating them as invalid
+
+  Minecraft generates empty region files in some cases. Just ignore them instead of printing an
+  error message every time.
 
 ## [2.1.0] - 2024-01-27
 
diff --git a/src/core/region_processor.rs b/src/core/region_processor.rs
index 9778061..ce2d060 100644
--- a/src/core/region_processor.rs
+++ b/src/core/region_processor.rs
@@ -337,11 +337,20 @@ impl<'a> RegionProcessor<'a> {
 			})?
 			.filter_map(|entry| entry.ok())
 			.filter(|entry| {
-				// We are only interested in regular files
-				matches!(
-					entry.file_type().map(|file_type| file_type.is_file()),
-					Ok(true)
-				)
+				(|| {
+					// We are only interested in regular files
+					let file_type = entry.file_type().ok()?;
+					if !file_type.is_file() {
+						return None;
+					}
+
+					let metadata = entry.metadata().ok()?;
+					if metadata.len() == 0 {
+						return None;
+					}
+					Some(())
+				})()
+				.is_some()
 			})
 			.filter_map(|entry| parse_region_filename(&entry.file_name()))
 			.collect())

From e9abe6b502b0a77b2429e99f829c29ccb664edec Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 14 Jun 2024 16:31:18 +0200
Subject: [PATCH 371/460] minedmap 2.1.1

---
 CHANGELOG.md | 5 ++++-
 Cargo.lock   | 2 +-
 Cargo.toml   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c010654..d877117 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased] - ReleaseDate
 
+## [2.1.1] - 2024-06-14
+
 ### Fixed
 
 - Fix crash due to incorrect counting in info message
@@ -87,7 +89,8 @@ intermediate data.
   Full support for custom biomes datapacks might be added in a future release.
 
 <!-- next-url -->
-[Unreleased]: https://github.com/neocturne/MinedMap/compare/v2.1.0...HEAD
+[Unreleased]: https://github.com/neocturne/MinedMap/compare/v2.1.1...HEAD
+[2.1.1]: https://github.com/neocturne/MinedMap/compare/v2.1.0...v2.1.1
 [2.1.0]: https://github.com/neocturne/MinedMap/compare/v2.0.2...v2.1.0
 [2.0.2]: https://github.com/neocturne/MinedMap/compare/v2.0.1...v2.0.2
 [2.0.1]: https://github.com/neocturne/MinedMap/compare/v2.0.0...v2.0.1
diff --git a/Cargo.lock b/Cargo.lock
index 1780b1f..890b515 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -565,7 +565,7 @@ checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
 
 [[package]]
 name = "minedmap"
-version = "2.1.0"
+version = "2.1.1"
 dependencies = [
  "anyhow",
  "bincode",
diff --git a/Cargo.toml b/Cargo.toml
index f8bb35f..ac9d456 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@ pre-release-commit-message = "{{crate_name}} {{version}}"
 
 [package]
 name = "minedmap"
-version = "2.1.0"
+version = "2.1.1"
 description = "Generate browsable maps from Minecraft save data"
 edition.workspace = true
 license.workspace = true

From 661da4698dfeab11cb5d57a17696b13886d2597c Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 19 Jun 2024 19:38:52 +0200
Subject: [PATCH 372/460] workflows: update MacOS jobs to macos-13

---
 .github/workflows/MinedMap.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/MinedMap.yml b/.github/workflows/MinedMap.yml
index b09d620..c2e9961 100644
--- a/.github/workflows/MinedMap.yml
+++ b/.github/workflows/MinedMap.yml
@@ -91,9 +91,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - os: 'macos-11'
+        - os: 'macos-13'
           target: 'aarch64-apple-darwin'
-        - os: 'macos-11'
+        - os: 'macos-13'
           target: 'x86_64-apple-darwin'
         - os: 'windows-2019'
           target: 'x86_64-pc-windows-msvc'

From bc8219772fc0ef0b69e4050ac6ff3988b1b2954e Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 23 Jun 2024 01:16:27 +0200
Subject: [PATCH 373/460] README.md: mention argument quoting difference on
 Windows

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 8f7867f..efa6573 100644
--- a/README.md
+++ b/README.md
@@ -92,6 +92,11 @@ modify the text displayed on the map. This can be used if the text matched by
 `--sign-filter 's/\[Map\]//'` would replace each occurence of "\[Map\]" with
 the empty string.
 
+**Note:** On Windows, double quotes (`"`) must be used for arguments instead
+of single quotes (`'`), and all backslashes in the arguments must be escaped
+by doubling them. This can make regular expressions somewhat difficult to
+write and to read.
+
 ## Installation
 
 Binary builds of the map generator for Linux and Windows, as well as an archive

From 7f3e47fcb4b5f7a05c3bab878e0bc17e595b8894 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 23 Jun 2024 01:17:33 +0200
Subject: [PATCH 374/460] treewide: update dependencies

---
 Cargo.lock                 | 358 +++++++++++++++++++------------------
 Cargo.toml                 |   4 +-
 crates/resource/Cargo.toml |   2 +-
 crates/types/Cargo.toml    |   2 +-
 4 files changed, 187 insertions(+), 179 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 890b515..2ae562a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,9 +4,9 @@ version = 3
 
 [[package]]
 name = "addr2line"
-version = "0.21.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
 dependencies = [
  "gimli",
 ]
@@ -31,62 +31,63 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.16"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
 
 [[package]]
 name = "anstream"
-version = "0.6.13"
+version = "0.6.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
+checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
  "anstyle-wincon",
  "colorchoice",
+ "is_terminal_polyfill",
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
+checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
+checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.2"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
 dependencies = [
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.2"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
+checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
 dependencies = [
  "anstyle",
  "windows-sys 0.52.0",
@@ -94,21 +95,21 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.80"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "backtrace"
-version = "0.3.69"
+version = "0.3.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
 dependencies = [
  "addr2line",
  "cc",
@@ -136,15 +137,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "bytemuck"
-version = "1.14.3"
+version = "1.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f"
+checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
 
 [[package]]
 name = "byteorder"
@@ -154,12 +155,13 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
 dependencies = [
  "jobserver",
  "libc",
+ "once_cell",
 ]
 
 [[package]]
@@ -176,9 +178,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.5.1"
+version = "4.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da"
+checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -186,9 +188,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.1"
+version = "4.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb"
+checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f"
 dependencies = [
  "anstream",
  "anstyle",
@@ -199,9 +201,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.0"
+version = "4.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47"
+checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -211,9 +213,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
 
 [[package]]
 name = "cmake"
@@ -224,23 +226,17 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "color_quant"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
-
 [[package]]
 name = "colorchoice"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
 
 [[package]]
 name = "crc32fast"
-version = "1.4.0"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
  "cfg-if",
 ]
@@ -266,15 +262,15 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
 [[package]]
 name = "either"
-version = "1.10.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
+checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
 
 [[package]]
 name = "enum-map"
@@ -298,9 +294,9 @@ dependencies = [
 
 [[package]]
 name = "enumflags2"
-version = "0.7.9"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d"
+checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d"
 dependencies = [
  "enumflags2_derive",
  "serde",
@@ -308,9 +304,9 @@ dependencies = [
 
 [[package]]
 name = "enumflags2_derive"
-version = "0.7.9"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4"
+checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -325,9 +321,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -356,9 +352,9 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.28"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
+checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
 dependencies = [
  "crc32fast",
  "libz-ng-sys",
@@ -404,9 +400,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.28.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
 
 [[package]]
 name = "git-version"
@@ -430,15 +426,15 @@ dependencies = [
 
 [[package]]
 name = "glam"
-version = "0.25.0"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3"
+checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.3"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -446,9 +442,9 @@ dependencies = [
 
 [[package]]
 name = "heck"
-version = "0.4.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hermit-abi"
@@ -458,22 +454,21 @@ checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "image"
-version = "0.24.9"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d"
+checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11"
 dependencies = [
  "bytemuck",
  "byteorder",
- "color_quant",
  "num-traits",
  "png",
 ]
 
 [[package]]
 name = "indexmap"
-version = "2.2.5"
+version = "2.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -481,40 +476,46 @@ dependencies = [
 ]
 
 [[package]]
-name = "itertools"
-version = "0.12.1"
+name = "is_terminal_polyfill"
+version = "1.70.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
 dependencies = [
  "either",
 ]
 
 [[package]]
 name = "itoa"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "jobserver"
-version = "0.1.28"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6"
+checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "libz-ng-sys"
@@ -528,15 +529,15 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
 name = "lock_api"
-version = "0.4.11"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -559,9 +560,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.1"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "minedmap"
@@ -625,9 +626,9 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.2"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
 dependencies = [
  "adler",
  "simd-adler32",
@@ -654,9 +655,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
@@ -673,9 +674,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.2"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434"
 dependencies = [
  "memchr",
 ]
@@ -694,9 +695,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -704,22 +705,22 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.9"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 
 [[package]]
 name = "pin-utils"
@@ -748,27 +749,27 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.35"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "rayon"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
 dependencies = [
  "either",
  "rayon-core",
@@ -786,18 +787,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.4.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.5.0",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.3"
+version = "1.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -807,9 +808,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.5"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -818,29 +819,29 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
-version = "1.1.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
 
 [[package]]
 name = "rustix"
-version = "0.38.31"
+version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.5.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -849,9 +850,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "scopeguard"
@@ -861,9 +862,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "serde"
-version = "1.0.197"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
 dependencies = [
  "serde_derive",
 ]
@@ -879,9 +880,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.197"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -890,9 +891,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.114"
+version = "1.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
+checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
 dependencies = [
  "itoa",
  "ryu",
@@ -925,21 +926,21 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "strsim"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "syn"
-version = "2.0.52"
+version = "2.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07"
+checksum = "ff8655ed1d86f3af4ee3fd3263786bc14245ad17c4c7e85ba7187fb3ae028c90"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -968,9 +969,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.36.0"
+version = "1.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
 dependencies = [
  "backtrace",
  "parking_lot",
@@ -1042,9 +1043,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "utf8parse"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "valuable"
@@ -1095,7 +1096,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.4",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
@@ -1115,17 +1116,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.4",
- "windows_aarch64_msvc 0.52.4",
- "windows_i686_gnu 0.52.4",
- "windows_i686_msvc 0.52.4",
- "windows_x86_64_gnu 0.52.4",
- "windows_x86_64_gnullvm 0.52.4",
- "windows_x86_64_msvc 0.52.4",
+ "windows_aarch64_gnullvm 0.52.5",
+ "windows_aarch64_msvc 0.52.5",
+ "windows_i686_gnu 0.52.5",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.5",
+ "windows_x86_64_gnu 0.52.5",
+ "windows_x86_64_gnullvm 0.52.5",
+ "windows_x86_64_msvc 0.52.5",
 ]
 
 [[package]]
@@ -1136,9 +1138,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -1148,9 +1150,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -1160,9 +1162,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -1172,9 +1180,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -1184,9 +1192,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -1196,9 +1204,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -1208,24 +1216,24 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.4"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.32"
+version = "0.7.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.32"
+version = "0.7.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1234,27 +1242,27 @@ dependencies = [
 
 [[package]]
 name = "zstd"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110"
+checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a"
 dependencies = [
  "zstd-safe",
 ]
 
 [[package]]
 name = "zstd-safe"
-version = "7.0.0"
+version = "7.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e"
+checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a"
 dependencies = [
  "zstd-sys",
 ]
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.9+zstd.1.5.5"
+version = "2.0.11+zstd.1.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656"
+checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4"
 dependencies = [
  "cc",
  "pkg-config",
diff --git a/Cargo.toml b/Cargo.toml
index ac9d456..6fa4cdf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -44,7 +44,7 @@ enum-map = "2.7.3"
 fastnbt = "2.3.2"
 futures-util = "0.3.28"
 git-version = "0.3.5"
-image = { version = "0.24.5", default-features = false, features = ["png"] }
+image = { version = "0.25.1", default-features = false, features = ["png"] }
 indexmap = { version = "2.0.0", features = ["serde"] }
 lru = "0.12.0"
 minedmap-nbt = { version = "0.1.1", path = "crates/nbt", default-features = false }
@@ -54,7 +54,7 @@ num-integer = "0.1.45"
 num_cpus = "1.16.0"
 rayon = "1.7.0"
 regex = "1.10.2"
-rustc-hash = "1.1.0"
+rustc-hash = "2.0.0"
 serde = { version = "1.0.152", features = ["rc", "derive"] }
 serde_json = "1.0.99"
 tokio = { version = "1.31.0", features = ["rt", "parking_lot", "sync"] }
diff --git a/crates/resource/Cargo.toml b/crates/resource/Cargo.toml
index 364ac85..326e269 100644
--- a/crates/resource/Cargo.toml
+++ b/crates/resource/Cargo.toml
@@ -9,5 +9,5 @@ repository.workspace = true
 
 [dependencies]
 enumflags2 = { version = "0.7.7", features = ["serde"] }
-glam = "0.25.0"
+glam = "0.28.0"
 serde = { version = "1.0.183", features = ["derive"] }
diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml
index e67d824..c294466 100644
--- a/crates/types/Cargo.toml
+++ b/crates/types/Cargo.toml
@@ -8,5 +8,5 @@ readme.workspace = true
 repository.workspace = true
 
 [dependencies]
-itertools = "0.12.0"
+itertools = "0.13.0"
 serde = { version = "1.0.183", features = ["derive"] }

From 414ad5a49374f8a20fc53f3c24baf30dbf1171df Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 19 Jun 2024 19:15:20 +0200
Subject: [PATCH 375/460] resource: add Minecraft 1.21 block types

---
 CHANGELOG.md                       |   4 +
 README.md                          |   2 +-
 crates/resource/src/block_types.rs | 570 +++++++++++++++++++++++++++++
 resource/blocks.json               | 131 +++++++
 src/core/common.rs                 |   4 +-
 5 files changed, 708 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d877117..318ee9a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased] - ReleaseDate
 
+### Added
+
+- Added support for Minecraft 1.21 block types
+
 ## [2.1.1] - 2024-06-14
 
 ### Fixed
diff --git a/README.md b/README.md
index efa6573..9a07aed 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 * Render beautiful maps of your [Minecraft](https://minecraft.net/) worlds!
 * Put them on a webserver and view them in your browser!
-* Compatible with unmodified Minecraft Java Edition 1.8 up to 1.20 (no mod installation necessary!)
+* Compatible with unmodified Minecraft Java Edition 1.8 up to 1.21 (no mod installation necessary!)
 * Illumination layer: the world at night
 * Fast: create a full map for a huge 3GB savegame in less than 5 minutes in single-threaded operation
 * Multi-threading support: pass `-j N` to the renderer to use `N` parallel threads for generation
diff --git a/crates/resource/src/block_types.rs b/crates/resource/src/block_types.rs
index 6229016..cbfe1b7 100644
--- a/crates/resource/src/block_types.rs
+++ b/crates/resource/src/block_types.rs
@@ -1843,6 +1843,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"chiseled_copper",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([184, 100, 73]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"chiseled_deepslate",
 		ConstBlockType {
@@ -1913,6 +1923,26 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"chiseled_tuff",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([89, 94, 86]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"chiseled_tuff_bricks",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([110, 113, 106]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"chorus_flower",
 		ConstBlockType {
@@ -2123,6 +2153,36 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"copper_bulb",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([156, 86, 57]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"copper_door",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([192, 109, 82]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"copper_grate",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([191, 107, 79]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"copper_ore",
 		ConstBlockType {
@@ -2133,6 +2193,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"copper_trapdoor",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([190, 106, 79]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"cornflower",
 		ConstBlockType {
@@ -2193,6 +2263,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"crafter",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([112, 98, 99]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"crafting_table",
 		ConstBlockType {
@@ -3533,6 +3613,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"exposed_chiseled_copper",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([154, 119, 100]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"exposed_copper",
 		ConstBlockType {
@@ -3543,6 +3633,46 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"exposed_copper_bulb",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([135, 107, 89]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"exposed_copper_door",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([164, 123, 106]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"exposed_copper_grate",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([161, 125, 104]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"exposed_copper_trapdoor",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([161, 125, 104]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"exposed_cut_copper",
 		ConstBlockType {
@@ -4183,6 +4313,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"heavy_core",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([82, 86, 94]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"heavy_weighted_pressure_plate",
 		ConstBlockType {
@@ -6273,6 +6413,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"oxidized_chiseled_copper",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([83, 161, 132]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"oxidized_copper",
 		ConstBlockType {
@@ -6283,6 +6433,46 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"oxidized_copper_bulb",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([70, 132, 109]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"oxidized_copper_door",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([82, 160, 132]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"oxidized_copper_grate",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([82, 161, 131]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"oxidized_copper_trapdoor",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([83, 161, 132]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"oxidized_cut_copper",
 		ConstBlockType {
@@ -6863,6 +7053,46 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"polished_tuff",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([97, 104, 99]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"polished_tuff_slab",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([97, 104, 99]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"polished_tuff_stairs",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([97, 104, 99]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"polished_tuff_wall",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([97, 104, 99]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"poppy",
 		ConstBlockType {
@@ -9153,6 +9383,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"trial_spawner",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([56, 82, 98]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"tripwire",
 		ConstBlockType {
@@ -9223,6 +9463,76 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"tuff_brick_slab",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([98, 102, 95]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"tuff_brick_stairs",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([98, 102, 95]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"tuff_brick_wall",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([98, 102, 95]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"tuff_bricks",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([98, 102, 95]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"tuff_slab",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([108, 109, 102]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"tuff_stairs",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([108, 109, 102]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"tuff_wall",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([108, 109, 102]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"turtle_egg",
 		ConstBlockType {
@@ -9253,6 +9563,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"vault",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([54, 69, 79]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"verdant_froglight",
 		ConstBlockType {
@@ -9513,6 +9833,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"waxed_chiseled_copper",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([184, 100, 73]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"waxed_copper_block",
 		ConstBlockType {
@@ -9523,6 +9853,46 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"waxed_copper_bulb",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([156, 86, 57]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"waxed_copper_door",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([192, 109, 82]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"waxed_copper_grate",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([191, 107, 79]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"waxed_copper_trapdoor",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([190, 106, 79]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"waxed_cut_copper",
 		ConstBlockType {
@@ -9553,6 +9923,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"waxed_exposed_chiseled_copper",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([154, 119, 100]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"waxed_exposed_copper",
 		ConstBlockType {
@@ -9563,6 +9943,46 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"waxed_exposed_copper_bulb",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([135, 107, 89]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"waxed_exposed_copper_door",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([164, 123, 106]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"waxed_exposed_copper_grate",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([161, 125, 104]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"waxed_exposed_copper_trapdoor",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([161, 125, 104]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"waxed_exposed_cut_copper",
 		ConstBlockType {
@@ -9593,6 +10013,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"waxed_oxidized_chiseled_copper",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([83, 161, 132]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"waxed_oxidized_copper",
 		ConstBlockType {
@@ -9603,6 +10033,46 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"waxed_oxidized_copper_bulb",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([70, 132, 109]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"waxed_oxidized_copper_door",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([82, 160, 132]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"waxed_oxidized_copper_grate",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([82, 161, 131]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"waxed_oxidized_copper_trapdoor",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([83, 161, 132]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"waxed_oxidized_cut_copper",
 		ConstBlockType {
@@ -9633,6 +10103,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"waxed_weathered_chiseled_copper",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([104, 150, 111]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"waxed_weathered_copper",
 		ConstBlockType {
@@ -9643,6 +10123,46 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"waxed_weathered_copper_bulb",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([92, 126, 99]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"waxed_weathered_copper_door",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([110, 150, 109]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"waxed_weathered_copper_grate",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([106, 152, 110]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"waxed_weathered_copper_trapdoor",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([108, 153, 110]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"waxed_weathered_cut_copper",
 		ConstBlockType {
@@ -9673,6 +10193,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"weathered_chiseled_copper",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([104, 150, 111]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"weathered_copper",
 		ConstBlockType {
@@ -9683,6 +10213,46 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"weathered_copper_bulb",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([92, 126, 99]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"weathered_copper_door",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([110, 150, 109]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"weathered_copper_grate",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([106, 152, 110]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"weathered_copper_trapdoor",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([108, 153, 110]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"weathered_cut_copper",
 		ConstBlockType {
diff --git a/resource/blocks.json b/resource/blocks.json
index f8b0165..9d70f96 100644
--- a/resource/blocks.json
+++ b/resource/blocks.json
@@ -408,6 +408,7 @@
 	"chiseled_bookshelf": {
 		"texture": "chiseled_bookshelf_top"
 	},
+	"chiseled_copper": {},
 	"chiseled_deepslate": {},
 	"chiseled_nether_bricks": {},
 	"chiseled_polished_blackstone": {},
@@ -419,6 +420,10 @@
 		"texture": "sandstone_top"
 	},
 	"chiseled_stone_bricks": {},
+	"chiseled_tuff": {},
+	"chiseled_tuff_bricks": {
+		"texture": "chiseled_tuff_bricks_top"
+	},
 	"chorus_flower": {},
 	"chorus_plant": {},
 	"clay": {},
@@ -458,13 +463,22 @@
 	},
 	"conduit": {},
 	"copper_block": {},
+	"copper_bulb": {},
+	"copper_door": {
+		"texture": "copper_door_top"
+	},
+	"copper_grate": {},
 	"copper_ore": {},
+	"copper_trapdoor": {},
 	"cornflower": null,
 	"cracked_deepslate_bricks": {},
 	"cracked_deepslate_tiles": {},
 	"cracked_nether_bricks": {},
 	"cracked_polished_blackstone_bricks": {},
 	"cracked_stone_bricks": {},
+	"crafter": {
+		"texture": "crafter_top"
+	},
 	"crafting_table": {
 		"texture": "crafting_table_top"
 	},
@@ -733,7 +747,14 @@
 	"ender_chest": {
 		"texture": "obsidian"
 	},
+	"exposed_chiseled_copper": {},
 	"exposed_copper": {},
+	"exposed_copper_bulb": {},
+	"exposed_copper_door": {
+		"texture": "exposed_copper_door_top"
+	},
+	"exposed_copper_grate": {},
+	"exposed_copper_trapdoor": {},
 	"exposed_cut_copper": {},
 	"exposed_cut_copper_slab": {
 		"texture": "exposed_cut_copper"
@@ -843,6 +864,7 @@
 	"hay_block": {
 		"texture": "hay_block_top"
 	},
+	"heavy_core": {},
 	"heavy_weighted_pressure_plate": {
 		"texture": "iron_block"
 	},
@@ -1269,7 +1291,14 @@
 	"orange_wall_banner": null,
 	"orange_wool": {},
 	"oxeye_daisy": null,
+	"oxidized_chiseled_copper": {},
 	"oxidized_copper": {},
+	"oxidized_copper_bulb": {},
+	"oxidized_copper_door": {
+		"texture": "oxidized_copper_door_top"
+	},
+	"oxidized_copper_grate": {},
+	"oxidized_copper_trapdoor": {},
 	"oxidized_cut_copper": {},
 	"oxidized_cut_copper_slab": {
 		"texture": "oxidized_cut_copper"
@@ -1390,6 +1419,16 @@
 	"polished_granite_stairs": {
 		"texture": "polished_granite"
 	},
+	"polished_tuff": {},
+	"polished_tuff_slab": {
+		"texture": "polished_tuff"
+	},
+	"polished_tuff_stairs": {
+		"texture": "polished_tuff"
+	},
+	"polished_tuff_wall": {
+		"texture": "polished_tuff"
+	},
 	"poppy": null,
 	"potatoes": {
 		"texture": "potatoes_stage3"
@@ -1912,6 +1951,9 @@
 	"trapped_chest": {
 		"texture": "oak_planks"
 	},
+	"trial_spawner": {
+		"texture": "trial_spawner_top_inactive"
+	},
 	"tripwire": null,
 	"tripwire_hook": null,
 	"tube_coral": null,
@@ -1919,9 +1961,31 @@
 	"tube_coral_fan": null,
 	"tube_coral_wall_fan": null,
 	"tuff": {},
+	"tuff_brick_slab": {
+		"texture": "tuff_bricks"
+	},
+	"tuff_brick_stairs": {
+		"texture": "tuff_bricks"
+	},
+	"tuff_brick_wall": {
+		"texture": "tuff_bricks"
+	},
+	"tuff_bricks": {},
+	"tuff_slab": {
+		"texture": "tuff"
+	},
+	"tuff_stairs": {
+		"texture": "tuff"
+	},
+	"tuff_wall": {
+		"texture": "tuff"
+	},
 	"turtle_egg": {},
 	"twisting_vines": {},
 	"twisting_vines_plant": {},
+	"vault": {
+		"texture": "vault_top"
+	},
 	"verdant_froglight": {
 		"texture": "verdant_froglight_top"
 	},
@@ -1991,9 +2055,24 @@
 	"water_cauldron": {
 		"texture": "cauldron_top"
 	},
+	"waxed_chiseled_copper": {
+		"texture": "chiseled_copper"
+	},
 	"waxed_copper_block": {
 		"texture": "copper_block"
 	},
+	"waxed_copper_bulb": {
+		"texture": "copper_bulb"
+	},
+	"waxed_copper_door": {
+		"texture": "copper_door_top"
+	},
+	"waxed_copper_grate": {
+		"texture": "copper_grate"
+	},
+	"waxed_copper_trapdoor": {
+		"texture": "copper_trapdoor"
+	},
 	"waxed_cut_copper": {
 		"texture": "cut_copper"
 	},
@@ -2003,9 +2082,24 @@
 	"waxed_cut_copper_stairs": {
 		"texture": "cut_copper"
 	},
+	"waxed_exposed_chiseled_copper": {
+		"texture": "exposed_chiseled_copper"
+	},
 	"waxed_exposed_copper": {
 		"texture": "exposed_copper"
 	},
+	"waxed_exposed_copper_bulb": {
+		"texture": "exposed_copper_bulb"
+	},
+	"waxed_exposed_copper_door": {
+		"texture": "exposed_copper_door_top"
+	},
+	"waxed_exposed_copper_grate": {
+		"texture": "exposed_copper_grate"
+	},
+	"waxed_exposed_copper_trapdoor": {
+		"texture": "exposed_copper_trapdoor"
+	},
 	"waxed_exposed_cut_copper": {
 		"texture": "exposed_cut_copper"
 	},
@@ -2015,9 +2109,24 @@
 	"waxed_exposed_cut_copper_stairs": {
 		"texture": "exposed_cut_copper"
 	},
+	"waxed_oxidized_chiseled_copper": {
+		"texture": "oxidized_chiseled_copper"
+	},
 	"waxed_oxidized_copper": {
 		"texture": "oxidized_copper"
 	},
+	"waxed_oxidized_copper_bulb": {
+		"texture": "oxidized_copper_bulb"
+	},
+	"waxed_oxidized_copper_door": {
+		"texture": "oxidized_copper_door_top"
+	},
+	"waxed_oxidized_copper_grate": {
+		"texture": "oxidized_copper_grate"
+	},
+	"waxed_oxidized_copper_trapdoor": {
+		"texture": "oxidized_copper_trapdoor"
+	},
 	"waxed_oxidized_cut_copper": {
 		"texture": "oxidized_cut_copper"
 	},
@@ -2027,9 +2136,24 @@
 	"waxed_oxidized_cut_copper_stairs": {
 		"texture": "oxidized_cut_copper"
 	},
+	"waxed_weathered_chiseled_copper": {
+		"texture": "weathered_chiseled_copper"
+	},
 	"waxed_weathered_copper": {
 		"texture": "weathered_copper"
 	},
+	"waxed_weathered_copper_bulb": {
+		"texture": "weathered_copper_bulb"
+	},
+	"waxed_weathered_copper_door": {
+		"texture": "weathered_copper_door_top"
+	},
+	"waxed_weathered_copper_grate": {
+		"texture": "weathered_copper_grate"
+	},
+	"waxed_weathered_copper_trapdoor": {
+		"texture": "weathered_copper_trapdoor"
+	},
 	"waxed_weathered_cut_copper": {
 		"texture": "weathered_cut_copper"
 	},
@@ -2039,7 +2163,14 @@
 	"waxed_weathered_cut_copper_stairs": {
 		"texture": "weathered_cut_copper"
 	},
+	"weathered_chiseled_copper": {},
 	"weathered_copper": {},
+	"weathered_copper_bulb": {},
+	"weathered_copper_door": {
+		"texture": "weathered_copper_door_top"
+	},
+	"weathered_copper_grate": {},
+	"weathered_copper_trapdoor": {},
 	"weathered_cut_copper": {},
 	"weathered_cut_copper_slab": {
 		"texture": "weathered_cut_copper"
diff --git a/src/core/common.rs b/src/core/common.rs
index 9a94496..4241ebc 100644
--- a/src/core/common.rs
+++ b/src/core/common.rs
@@ -24,7 +24,7 @@ use crate::{
 ///
 /// Increase when the generation of processed regions from region data changes
 /// (usually because of updated resource data)
-pub const REGION_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(1);
+pub const REGION_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(2);
 
 /// MinedMap map tile data version number
 ///
@@ -36,7 +36,7 @@ pub const MAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
 ///
 /// Increase when the generation of lightmap tiles from region data changes
 /// (usually because of updated resource data)
-pub const LIGHTMAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(1);
+pub const LIGHTMAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(2);
 
 /// MinedMap mipmap data version number
 ///

From f1bc18add1e0e86f5b98612d5e6d9d689877643f Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 23 Jun 2024 11:30:20 +0200
Subject: [PATCH 376/460] minedmap-types 0.1.3

---
 Cargo.lock              | 2 +-
 crates/types/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2ae562a..5c8d051 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -618,7 +618,7 @@ dependencies = [
 
 [[package]]
 name = "minedmap-types"
-version = "0.1.2"
+version = "0.1.3"
 dependencies = [
  "itertools",
  "serde",
diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml
index c294466..6a81414 100644
--- a/crates/types/Cargo.toml
+++ b/crates/types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "minedmap-types"
-version = "0.1.2"
+version = "0.1.3"
 description = "Common types used by several MinedMap crates"
 edition.workspace = true
 license.workspace = true

From 269f08d3561e267d6843a361dc4aef50ab4528b9 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 23 Jun 2024 11:30:41 +0200
Subject: [PATCH 377/460] minedmap-resource 0.4.0

---
 Cargo.lock                 | 2 +-
 Cargo.toml                 | 2 +-
 crates/resource/Cargo.toml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5c8d051..4a7bb19 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -609,7 +609,7 @@ dependencies = [
 
 [[package]]
 name = "minedmap-resource"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "enumflags2",
  "glam",
diff --git a/Cargo.toml b/Cargo.toml
index 6fa4cdf..a8bfc58 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -48,7 +48,7 @@ image = { version = "0.25.1", default-features = false, features = ["png"] }
 indexmap = { version = "2.0.0", features = ["serde"] }
 lru = "0.12.0"
 minedmap-nbt = { version = "0.1.1", path = "crates/nbt", default-features = false }
-minedmap-resource = { version = "0.3.0", path = "crates/resource" }
+minedmap-resource = { version = "0.4.0", path = "crates/resource" }
 minedmap-types = { version = "0.1.2", path = "crates/types" }
 num-integer = "0.1.45"
 num_cpus = "1.16.0"
diff --git a/crates/resource/Cargo.toml b/crates/resource/Cargo.toml
index 326e269..ea4bc95 100644
--- a/crates/resource/Cargo.toml
+++ b/crates/resource/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "minedmap-resource"
-version = "0.3.0"
+version = "0.4.0"
 description = "Data describing Minecraft biomes and block types"
 edition.workspace = true
 license.workspace = true

From f43e84eb2b4d1594333eca73cdb7b99bacae5851 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 23 Jun 2024 11:31:45 +0200
Subject: [PATCH 378/460] minedmap 2.2.0

---
 CHANGELOG.md | 5 ++++-
 Cargo.lock   | 2 +-
 Cargo.toml   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 318ee9a..ef41795 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased] - ReleaseDate
 
+## [2.2.0] - 2024-06-23
+
 ### Added
 
 - Added support for Minecraft 1.21 block types
@@ -93,7 +95,8 @@ intermediate data.
   Full support for custom biomes datapacks might be added in a future release.
 
 <!-- next-url -->
-[Unreleased]: https://github.com/neocturne/MinedMap/compare/v2.1.1...HEAD
+[Unreleased]: https://github.com/neocturne/MinedMap/compare/v2.2.0...HEAD
+[2.2.0]: https://github.com/neocturne/MinedMap/compare/v2.1.1...v2.2.0
 [2.1.1]: https://github.com/neocturne/MinedMap/compare/v2.1.0...v2.1.1
 [2.1.0]: https://github.com/neocturne/MinedMap/compare/v2.0.2...v2.1.0
 [2.0.2]: https://github.com/neocturne/MinedMap/compare/v2.0.1...v2.0.2
diff --git a/Cargo.lock b/Cargo.lock
index 4a7bb19..28eb4e8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -566,7 +566,7 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "minedmap"
-version = "2.1.1"
+version = "2.2.0"
 dependencies = [
  "anyhow",
  "bincode",
diff --git a/Cargo.toml b/Cargo.toml
index a8bfc58..ddf24ba 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@ pre-release-commit-message = "{{crate_name}} {{version}}"
 
 [package]
 name = "minedmap"
-version = "2.1.1"
+version = "2.2.0"
 description = "Generate browsable maps from Minecraft save data"
 edition.workspace = true
 license.workspace = true

From f9a03b332ca9f347c74a1cabb375b1d52280cfad Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 18 Jul 2024 23:22:05 +0200
Subject: [PATCH 379/460] README.md: fix incorrect `--sign-transform` example

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9a07aed..2312c03 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,7 @@ matches.
 Finally, `--sign-transform` allows to specify sed-style replacement patterns to
 modify the text displayed on the map. This can be used if the text matched by
 `--sign-prefix` or `--sign-filter` should not be displayed:
-`--sign-filter 's/\[Map\]//'` would replace each occurence of "\[Map\]" with
+`--sign-transform 's/\[Map\]//'` would replace each occurence of "\[Map\]" with
 the empty string.
 
 **Note:** On Windows, double quotes (`"`) must be used for arguments instead

From 7b44ee30d6ffe631379508952e534abac36a1716 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 20 Nov 2024 14:27:30 +0100
Subject: [PATCH 380/460] Add LICENSE file again

It can be useful for Github to show the license next to the repo, and
it's clearer that the license applies both to the Rust code and the
viewer this way.

The project was relicensed from BSD-2-Clause to MIT in 2023, but the
first year of the copyright is when the project started in 2015.
---
 LICENSE | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..2f9ad3f
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2015 Matthias Schiffer
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

From 2156bff59af32c11850ad94dd21c116925c63141 Mon Sep 17 00:00:00 2001
From: "kek.rs" <189154018+kekrs@users.noreply.github.com>
Date: Tue, 17 Dec 2024 00:05:12 +0100
Subject: [PATCH 381/460] Add Dockerfiles (#56)

---
 Dockerfile        | 14 ++++++++++++++
 Dockerfile.viewer |  3 +++
 2 files changed, 17 insertions(+)
 create mode 100644 Dockerfile
 create mode 100644 Dockerfile.viewer

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..fa3627c
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,14 @@
+FROM docker.io/library/rust:alpine AS BUILDER
+
+WORKDIR /build
+RUN apk update && apk add cmake build-base
+
+COPY src /build/src
+COPY crates /build/crates
+COPY Cargo.toml Cargo.lock /build
+RUN cargo build -r 
+
+FROM scratch AS RUNNER
+
+COPY --from=BUILDER /build/target/release/minedmap /minedmap
+ENTRYPOINT [ "/minedmap" ]
diff --git a/Dockerfile.viewer b/Dockerfile.viewer
new file mode 100644
index 0000000..82d50bb
--- /dev/null
+++ b/Dockerfile.viewer
@@ -0,0 +1,3 @@
+FROM docker.io/library/nginx:alpine
+COPY viewer /usr/share/nginx/html
+# datadir should be mounted to: /usr/share/nginx/html/data

From 4933d8e15f73234717ca4eb381cbce7bab16b361 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 17 Dec 2024 00:23:57 +0100
Subject: [PATCH 382/460] treewide: clippy fixes

Fix all clippy warnings as of Rust 1.83.0.
---
 src/core/common.rs           |  2 +-
 src/core/entity_collector.rs |  4 ++--
 src/core/tile_mipmapper.rs   |  4 ++--
 src/world/chunk.rs           |  6 +++---
 src/world/layer.rs           |  2 +-
 src/world/section.rs         | 12 ++++++------
 src/world/sign.rs            |  2 +-
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/core/common.rs b/src/core/common.rs
index 4241ebc..5f518e0 100644
--- a/src/core/common.rs
+++ b/src/core/common.rs
@@ -18,7 +18,7 @@ use crate::{
 	world::{block_entity::BlockEntity, layer},
 };
 
-/// Increase to force regeneration of all output files
+// Increase to force regeneration of all output files
 
 /// MinedMap processed region data version number
 ///
diff --git a/src/core/entity_collector.rs b/src/core/entity_collector.rs
index 3d9b6ab..30b3a86 100644
--- a/src/core/entity_collector.rs
+++ b/src/core/entity_collector.rs
@@ -16,7 +16,7 @@ pub struct EntityCollector<'a> {
 	regions: &'a [TileCoords],
 }
 
-impl<'a> TileMerger for EntityCollector<'a> {
+impl TileMerger for EntityCollector<'_> {
 	fn file_meta_version(&self) -> fs::FileMetaVersion {
 		ENTITIES_FILE_META_VERSION
 	}
@@ -34,7 +34,7 @@ impl<'a> TileMerger for EntityCollector<'a> {
 	}
 }
 
-impl<'a> TileCollector for EntityCollector<'a> {
+impl TileCollector for EntityCollector<'_> {
 	type CollectOutput = ();
 
 	fn tiles(&self) -> &[TileCoords] {
diff --git a/src/core/tile_mipmapper.rs b/src/core/tile_mipmapper.rs
index cd90e20..d7e54a9 100644
--- a/src/core/tile_mipmapper.rs
+++ b/src/core/tile_mipmapper.rs
@@ -74,7 +74,7 @@ impl<'a, P> MapMerger<'a, P> {
 	}
 }
 
-impl<'a, P: image::PixelWithColorType> TileMerger for MapMerger<'a, P>
+impl<P: image::PixelWithColorType> TileMerger for MapMerger<'_, P>
 where
 	[P::Subpixel]: image::EncodableLayout,
 	image::ImageBuffer<P, Vec<P::Subpixel>>: Into<image::DynamicImage>,
@@ -157,7 +157,7 @@ pub struct TileMipmapper<'a> {
 	regions: &'a [TileCoords],
 }
 
-impl<'a> TileCollector for TileMipmapper<'a> {
+impl TileCollector for TileMipmapper<'_> {
 	type CollectOutput = MipmapStat;
 
 	fn tiles(&self) -> &[TileCoords] {
diff --git a/src/world/chunk.rs b/src/world/chunk.rs
index bf1d78b..daee023 100644
--- a/src/world/chunk.rs
+++ b/src/world/chunk.rs
@@ -416,13 +416,13 @@ impl<'a> Iterator for SectionIter<'a> {
 	}
 }
 
-impl<'a> DoubleEndedIterator for SectionIter<'a> {
+impl DoubleEndedIterator for SectionIter<'_> {
 	fn next_back(&mut self) -> Option<Self::Item> {
 		self.with_iter(|iter| iter.next_back())
 	}
 }
 
-impl<'a> ExactSizeIterator for SectionIter<'a> {
+impl ExactSizeIterator for SectionIter<'_> {
 	fn len(&self) -> usize {
 		match &self.inner {
 			SectionIterInner::V1_18 { iter } => iter.len(),
@@ -433,4 +433,4 @@ impl<'a> ExactSizeIterator for SectionIter<'a> {
 	}
 }
 
-impl<'a> FusedIterator for SectionIter<'a> {}
+impl FusedIterator for SectionIter<'_> {}
diff --git a/src/world/layer.rs b/src/world/layer.rs
index 576dfa4..0764711 100644
--- a/src/world/layer.rs
+++ b/src/world/layer.rs
@@ -58,7 +58,7 @@ struct LayerEntry<'a> {
 	depth: &'a mut Option<BlockHeight>,
 }
 
-impl<'a> LayerEntry<'a> {
+impl LayerEntry<'_> {
 	/// Returns true if the entry has not been filled yet (no opaque block has been encountered)
 	///
 	/// The depth value is filled separately when a non-water block is encountered after the block type
diff --git a/src/world/section.rs b/src/world/section.rs
index 62b510b..7988fd5 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -81,7 +81,7 @@ impl<'a> SectionV1_13<'a> {
 		if let Some(block_states) = block_states {
 			let expected_length = if aligned_blocks {
 				let blocks_per_word = 64 / bits as usize;
-				(4096 + blocks_per_word - 1) / blocks_per_word
+				4096usize.div_ceil(blocks_per_word)
 			} else {
 				64 * bits as usize
 			};
@@ -145,7 +145,7 @@ impl<'a> SectionV1_13<'a> {
 	}
 }
 
-impl<'a> Section for SectionV1_13<'a> {
+impl Section for SectionV1_13<'_> {
 	fn block_at(&self, coords: SectionBlockCoords) -> Result<Option<&BlockType>> {
 		let index = self.palette_index_at(coords);
 		Ok(*self
@@ -188,7 +188,7 @@ impl<'a> SectionV0<'a> {
 	}
 }
 
-impl<'a> Section for SectionV0<'a> {
+impl Section for SectionV0<'_> {
 	fn block_at(&self, coords: SectionBlockCoords) -> Result<Option<&BlockType>> {
 		let offset = coords.offset();
 		let block = self.blocks[offset] as u8;
@@ -242,7 +242,7 @@ impl<'a> BiomesV1_18<'a> {
 
 		if let Some(biomes) = biomes {
 			let biomes_per_word = 64 / bits as usize;
-			let expected_length = (64 + biomes_per_word - 1) / biomes_per_word;
+			let expected_length = 64usize.div_ceil(biomes_per_word);
 			if biomes.len() != expected_length {
 				bail!("Invalid section biome data");
 			}
@@ -294,7 +294,7 @@ impl<'a> BiomesV1_18<'a> {
 	}
 }
 
-impl<'a> Biomes for BiomesV1_18<'a> {
+impl Biomes for BiomesV1_18<'_> {
 	fn biome_at(&self, _section: SectionY, coords: SectionBlockCoords) -> Result<Option<&Biome>> {
 		let index = self.palette_index_at(coords);
 		Ok(*self
@@ -349,7 +349,7 @@ impl<'a> BiomesV0<'a> {
 	}
 }
 
-impl<'a> Biomes for BiomesV0<'a> {
+impl Biomes for BiomesV0<'_> {
 	fn biome_at(&self, section: SectionY, coords: SectionBlockCoords) -> Result<Option<&Biome>> {
 		let id = match self.data {
 			BiomesV0Data::IntArrayV15(data) => {
diff --git a/src/world/sign.rs b/src/world/sign.rs
index 616f7fa..57b741a 100644
--- a/src/world/sign.rs
+++ b/src/world/sign.rs
@@ -23,7 +23,7 @@ pub struct RawSignText<'a> {
 	pub color: Option<&'a str>,
 }
 
-impl<'a> RawSignText<'a> {
+impl RawSignText<'_> {
 	/// Decodes the [RawSignText] into a [SignText]
 	pub fn decode(&self) -> SignText {
 		let color = self.color.map(|c| Arc::new(c.to_owned()));

From feaf90c96c5bfb01df112f6f13ac42ca5928dbd9 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 17 Dec 2024 00:31:38 +0100
Subject: [PATCH 383/460] Update dependencies

---
 Cargo.lock                 | 498 +++++++++++++++----------------------
 crates/resource/Cargo.toml |   2 +-
 2 files changed, 208 insertions(+), 292 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 28eb4e8..d32985d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,33 +1,21 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
-version = "0.22.0"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "ahash"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
-dependencies = [
- "cfg-if",
- "once_cell",
- "version_check",
- "zerocopy",
-]
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "aho-corasick"
@@ -40,15 +28,15 @@ dependencies = [
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.18"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "anstream"
-version = "0.6.14"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -61,63 +49,63 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.7"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.4"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.0"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.3"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.86"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7"
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets",
 ]
 
 [[package]]
@@ -137,15 +125,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "bytemuck"
-version = "1.16.1"
+version = "1.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
+checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a"
 
 [[package]]
 name = "byteorder"
@@ -154,14 +142,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
-name = "cc"
-version = "1.0.99"
+name = "byteorder-lite"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
+checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
+
+[[package]]
+name = "cc"
+version = "1.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9157bbaa6b165880c27a4293a474c91cdcf265cc68cc829bf10be0964a391caf"
 dependencies = [
  "jobserver",
  "libc",
- "once_cell",
+ "shlex",
 ]
 
 [[package]]
@@ -178,9 +172,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.5.7"
+version = "4.5.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f"
+checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -188,9 +182,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.7"
+version = "4.5.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f"
+checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838"
 dependencies = [
  "anstream",
  "anstyle",
@@ -201,9 +195,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.5"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -213,24 +207,24 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.1"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
 
 [[package]]
 name = "cmake"
-version = "0.1.50"
+version = "0.1.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130"
+checksum = "c682c223677e0e5b6b7f63a64b9351844c3f1b1678a68b7ee617e30fb082620e"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "colorchoice"
-version = "1.0.1"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "crc32fast"
@@ -243,9 +237,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
 dependencies = [
  "crossbeam-epoch",
  "crossbeam-utils",
@@ -262,15 +256,15 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.20"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "either"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "enum-map"
@@ -321,12 +315,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.9"
+version = "0.3.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -343,18 +337,18 @@ dependencies = [
 
 [[package]]
 name = "fdeflate"
-version = "0.3.4"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
+checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c"
 dependencies = [
  "simd-adler32",
 ]
 
 [[package]]
 name = "flate2"
-version = "1.0.30"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
 dependencies = [
  "crc32fast",
  "libz-ng-sys",
@@ -362,16 +356,22 @@ dependencies = [
 ]
 
 [[package]]
-name = "futures-core"
-version = "0.3.30"
+name = "foldhash"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -380,15 +380,15 @@ dependencies = [
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-core",
  "futures-macro",
@@ -400,9 +400,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.29.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "git-version"
@@ -426,18 +426,19 @@ dependencies = [
 
 [[package]]
 name = "glam"
-version = "0.28.0"
+version = "0.29.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94"
+checksum = "dc46dd3ec48fdd8e693a98d2b8bafae273a2d54c1de02a2a7e3d57d501f39677"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 dependencies = [
- "ahash",
  "allocator-api2",
+ "equivalent",
+ "foldhash",
 ]
 
 [[package]]
@@ -454,21 +455,21 @@ checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "image"
-version = "0.25.1"
+version = "0.25.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11"
+checksum = "cd6f44aed642f18953a158afeb30206f4d50da59fbc66ecb53c66488de73563b"
 dependencies = [
  "bytemuck",
- "byteorder",
+ "byteorder-lite",
  "num-traits",
  "png",
 ]
 
 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -477,9 +478,9 @@ dependencies = [
 
 [[package]]
 name = "is_terminal_polyfill"
-version = "1.70.0"
+version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
 [[package]]
 name = "itertools"
@@ -492,15 +493,15 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "jobserver"
-version = "0.1.31"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
 dependencies = [
  "libc",
 ]
@@ -513,15 +514,15 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.155"
+version = "0.2.168"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d"
 
 [[package]]
 name = "libz-ng-sys"
-version = "1.1.15"
+version = "1.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6409efc61b12687963e602df8ecf70e8ddacf95bc6576bcf16e3ac6328083c5"
+checksum = "8f0f7295a34685977acb2e8cc8b08ee4a8dffd6cf278eeccddbe1ed55ba815d5"
 dependencies = [
  "cmake",
  "libc",
@@ -545,15 +546,15 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "lru"
-version = "0.12.3"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc"
+checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
 dependencies = [
  "hashbrown",
 ]
@@ -626,11 +627,11 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.4"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
 dependencies = [
- "adler",
+ "adler2",
  "simd-adler32",
 ]
 
@@ -674,18 +675,18 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.0"
+version = "0.36.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "overload"
@@ -713,14 +714,14 @@ dependencies = [
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets 0.52.5",
+ "windows-targets",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "pin-utils"
@@ -730,15 +731,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "png"
-version = "0.17.13"
+version = "0.17.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
+checksum = "b67582bd5b65bdff614270e2ea89a1cf15bef71245cc1e5f7ea126977144211d"
 dependencies = [
  "bitflags 1.3.2",
  "crc32fast",
@@ -749,18 +750,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -787,18 +788,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.2"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.5"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -808,9 +809,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -819,9 +820,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "rustc-demangle"
@@ -831,21 +832,21 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
 
 [[package]]
 name = "rustix"
-version = "0.38.34"
+version = "0.38.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.52.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -862,27 +863,27 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "serde"
-version = "1.0.203"
+version = "1.0.216"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_bytes"
-version = "0.11.14"
+version = "0.11.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734"
+checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.203"
+version = "1.0.216"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -891,11 +892,12 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.117"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
 dependencies = [
  "itoa",
+ "memchr",
  "ryu",
  "serde",
 ]
@@ -909,6 +911,12 @@ dependencies = [
  "lazy_static",
 ]
 
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
 [[package]]
 name = "simd-adler32"
 version = "0.3.7"
@@ -938,9 +946,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "syn"
-version = "2.0.67"
+version = "2.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff8655ed1d86f3af4ee3fd3263786bc14245ad17c4c7e85ba7187fb3ae028c90"
+checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -949,12 +957,12 @@ dependencies = [
 
 [[package]]
 name = "terminal_size"
-version = "0.3.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
+checksum = "5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9"
 dependencies = [
  "rustix",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -969,9 +977,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.38.0"
+version = "1.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
+checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
 dependencies = [
  "backtrace",
  "parking_lot",
@@ -980,9 +988,9 @@ dependencies = [
 
 [[package]]
 name = "tracing"
-version = "0.1.40"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
 dependencies = [
  "pin-project-lite",
  "tracing-attributes",
@@ -991,9 +999,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.27"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1002,9 +1010,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
  "valuable",
@@ -1023,9 +1031,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.18"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
+checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
 dependencies = [
  "nu-ansi-term",
  "sharded-slab",
@@ -1037,9 +1045,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
 
 [[package]]
 name = "utf8parse"
@@ -1053,12 +1061,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -1083,186 +1085,100 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows-sys"
-version = "0.48.0"
+version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets",
 ]
 
 [[package]]
 name = "windows-targets"
-version = "0.48.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
-dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
  "windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
 ]
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.48.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.48.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.48.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.48.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.48.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.48.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.48.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
-
-[[package]]
-name = "zerocopy"
-version = "0.7.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
-dependencies = [
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "zstd"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a"
+checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9"
 dependencies = [
  "zstd-safe",
 ]
 
 [[package]]
 name = "zstd-safe"
-version = "7.1.0"
+version = "7.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a"
+checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059"
 dependencies = [
  "zstd-sys",
 ]
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.11+zstd.1.5.6"
+version = "2.0.13+zstd.1.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4"
+checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa"
 dependencies = [
  "cc",
  "pkg-config",
diff --git a/crates/resource/Cargo.toml b/crates/resource/Cargo.toml
index ea4bc95..de9b577 100644
--- a/crates/resource/Cargo.toml
+++ b/crates/resource/Cargo.toml
@@ -9,5 +9,5 @@ repository.workspace = true
 
 [dependencies]
 enumflags2 = { version = "0.7.7", features = ["serde"] }
-glam = "0.28.0"
+glam = "0.29.2"
 serde = { version = "1.0.183", features = ["derive"] }

From 11e25106cfd466478b2aeec60c50d51e2b321e47 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 31 Dec 2024 03:05:06 +0100
Subject: [PATCH 384/460] Update dependencies

---
 Cargo.lock | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d32985d..ff64b60 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -83,9 +83,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.94"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7"
+checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
 
 [[package]]
 name = "autocfg"
@@ -131,9 +131,9 @@ checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "bytemuck"
-version = "1.20.0"
+version = "1.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b37c88a63ffd85d15b406896cc343916d7cf57838a847b3a6f2ca5d39a5695a"
+checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3"
 
 [[package]]
 name = "byteorder"
@@ -149,9 +149,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
 [[package]]
 name = "cc"
-version = "1.2.4"
+version = "1.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9157bbaa6b165880c27a4293a474c91cdcf265cc68cc829bf10be0964a391caf"
+checksum = "8d6dbb628b8f8555f86d0323c2eb39e3ec81901f4b83e091db8a6a76d316a333"
 dependencies = [
  "jobserver",
  "libc",
@@ -357,9 +357,9 @@ dependencies = [
 
 [[package]]
 name = "foldhash"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
+checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
 
 [[package]]
 name = "futures-core"
@@ -514,9 +514,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.168"
+version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d"
+checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "libz-ng-sys"
@@ -627,9 +627,9 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394"
 dependencies = [
  "adler2",
  "simd-adler32",
@@ -675,9 +675,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.5"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "memchr",
 ]
@@ -737,9 +737,9 @@ checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "png"
-version = "0.17.15"
+version = "0.17.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67582bd5b65bdff614270e2ea89a1cf15bef71245cc1e5f7ea126977144211d"
+checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526"
 dependencies = [
  "bitflags 1.3.2",
  "crc32fast",
@@ -759,9 +759,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
 dependencies = [
  "proc-macro2",
 ]
@@ -863,9 +863,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "serde"
-version = "1.0.216"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
+checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
 dependencies = [
  "serde_derive",
 ]
@@ -881,9 +881,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.216"
+version = "1.0.217"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
+checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -892,9 +892,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.133"
+version = "1.0.134"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
+checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d"
 dependencies = [
  "itoa",
  "memchr",
@@ -946,9 +946,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "syn"
-version = "2.0.90"
+version = "2.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
+checksum = "9c786062daee0d6db1132800e623df74274a0a87322d8e183338e01b3d98d058"
 dependencies = [
  "proc-macro2",
  "quote",

From 9b3b345318623b889f4905f1982d3ab3f6763bfa Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 31 Dec 2024 03:03:06 +0100
Subject: [PATCH 385/460] resource: update block types and biomes for 1.21.4

---
 CHANGELOG.md                       |   3 +
 crates/resource/src/biomes.rs      |   7 +
 crates/resource/src/block_types.rs | 352 ++++++++++++++++++++++++++++-
 resource/blocks.json               |  83 +++++++
 src/core/common.rs                 |   4 +-
 5 files changed, 446 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef41795..4837f71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## [Unreleased] - ReleaseDate
 
+- Added support for Minecraft 1.21.4 block types
+- Added support for Minecraft 1.21.4 Pale Garden biome
+
 ## [2.2.0] - 2024-06-23
 
 ### Added
diff --git a/crates/resource/src/biomes.rs b/crates/resource/src/biomes.rs
index 61f8339..4a0dee0 100644
--- a/crates/resource/src/biomes.rs
+++ b/crates/resource/src/biomes.rs
@@ -188,6 +188,13 @@ pub const BIOMES: &[(&str, Biome)] = {
 		("old_growth_birch_forest", Biome::new(0_60, 0_60)),
 		("old_growth_pine_taiga", Biome::new(0_30, 0_80)),
 		("old_growth_spruce_taiga", Biome::new(0_25, 0_80)),
+		(
+			"pale_garden",
+			Biome::new(0_70, 0_80)
+				.water([118, 136, 157])
+				.foliage([135, 141, 118])
+				.grass([119, 130, 114]),
+		),
 		("plains", Biome::new(0_80, 0_40)),
 		("river", Biome::new(0_50, 0_50)),
 		("savanna", Biome::new(2_00, 0_00)),
diff --git a/crates/resource/src/block_types.rs b/crates/resource/src/block_types.rs
index cbfe1b7..4cdc55c 100644
--- a/crates/resource/src/block_types.rs
+++ b/crates/resource/src/block_types.rs
@@ -1868,7 +1868,7 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		ConstBlockType {
 			block_color: BlockColor {
 				flags: make_bitflags!(BlockFlag::{Opaque}),
-				color: Color([47, 23, 28]),
+				color: Color([45, 22, 27]),
 			},
 			sign_material: None,
 		},
@@ -1903,6 +1903,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"chiseled_resin_bricks",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([200, 84, 24]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"chiseled_sandstone",
 		ConstBlockType {
@@ -1973,6 +1983,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"closed_eyeblossom",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"coal_block",
 		ConstBlockType {
@@ -2283,6 +2303,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"creaking_heart",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([73, 59, 54]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"creeper_head",
 		ConstBlockType {
@@ -6253,6 +6283,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"open_eyeblossom",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"orange_banner",
 		ConstBlockType {
@@ -6523,6 +6563,206 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"pale_hanging_moss",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_moss_block",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([106, 112, 104]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_moss_carpet",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([106, 112, 104]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_oak_button",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_oak_door",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([216, 208, 206]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_oak_fence",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([227, 217, 216]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_oak_fence_gate",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([227, 217, 216]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_oak_hanging_sign",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
+			sign_material: Some("pale_oak"),
+		},
+	),
+	(
+		"pale_oak_leaves",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([116, 121, 114]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_oak_log",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([198, 189, 187]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_oak_planks",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([227, 217, 216]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_oak_pressure_plate",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([227, 217, 216]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_oak_sapling",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([109, 105, 99]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_oak_sign",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
+			sign_material: Some("pale_oak"),
+		},
+	),
+	(
+		"pale_oak_slab",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([227, 217, 216]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_oak_stairs",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([227, 217, 216]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_oak_trapdoor",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([229, 220, 218]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"pale_oak_wall_hanging_sign",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{WallSign}),
+				color: Color([0, 0, 0]),
+			},
+			sign_material: Some("pale_oak"),
+		},
+	),
+	(
+		"pale_oak_wall_sign",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{WallSign}),
+				color: Color([0, 0, 0]),
+			},
+			sign_material: Some("pale_oak"),
+		},
+	),
+	(
+		"pale_oak_wood",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([87, 77, 75]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"pearlescent_froglight",
 		ConstBlockType {
@@ -7213,6 +7453,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"potted_closed_eyeblossom",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([108, 98, 101]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"potted_cornflower",
 		ConstBlockType {
@@ -7333,6 +7583,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"potted_open_eyeblossom",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([133, 124, 127]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"potted_orange_tulip",
 		ConstBlockType {
@@ -7353,6 +7613,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"potted_pale_oak_sapling",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([109, 105, 99]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"potted_pink_tulip",
 		ConstBlockType {
@@ -8193,6 +8463,66 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"resin_block",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([217, 99, 25]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"resin_brick_slab",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([205, 88, 24]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"resin_brick_stairs",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([205, 88, 24]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"resin_brick_wall",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([205, 88, 24]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"resin_bricks",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([205, 88, 24]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"resin_clump",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"respawn_anchor",
 		ConstBlockType {
@@ -9173,6 +9503,26 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"stripped_pale_oak_log",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([235, 226, 225]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"stripped_pale_oak_wood",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([245, 238, 236]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"stripped_spruce_log",
 		ConstBlockType {
diff --git a/resource/blocks.json b/resource/blocks.json
index 9d70f96..a88aa34 100644
--- a/resource/blocks.json
+++ b/resource/blocks.json
@@ -416,6 +416,7 @@
 	"chiseled_red_sandstone": {
 		"texture": "red_sandstone_top"
 	},
+	"chiseled_resin_bricks": {},
 	"chiseled_sandstone": {
 		"texture": "sandstone_top"
 	},
@@ -427,6 +428,7 @@
 	"chorus_flower": {},
 	"chorus_plant": {},
 	"clay": {},
+	"closed_eyeblossom": null,
 	"coal_block": {},
 	"coal_ore": {},
 	"coarse_dirt": {},
@@ -482,6 +484,9 @@
 	"crafting_table": {
 		"texture": "crafting_table_top"
 	},
+	"creaking_heart": {
+		"texture": "creaking_heart_top"
+	},
 	"creeper_head": null,
 	"creeper_wall_head": null,
 	"crimson_button": null,
@@ -1269,6 +1274,7 @@
 	"ochre_froglight": {
 		"texture": "ochre_froglight_top"
 	},
+	"open_eyeblossom": null,
 	"orange_banner": null,
 	"orange_bed": null,
 	"orange_candle": null,
@@ -1308,6 +1314,56 @@
 	},
 	"packed_ice": {},
 	"packed_mud": {},
+	"pale_hanging_moss": null,
+	"pale_moss_block": {},
+	"pale_moss_carpet": {},
+	"pale_oak_button": null,
+	"pale_oak_door": {
+		"texture": "pale_oak_door_top"
+	},
+	"pale_oak_fence": {
+		"texture": "pale_oak_planks"
+	},
+	"pale_oak_fence_gate": {
+		"texture": "pale_oak_planks"
+	},
+	"pale_oak_hanging_sign": {
+		"sign_material": "pale_oak",
+		"texture": null
+	},
+	"pale_oak_leaves": {},
+	"pale_oak_log": {
+		"texture": "pale_oak_log_top"
+	},
+	"pale_oak_planks": {},
+	"pale_oak_pressure_plate": {
+		"texture": "pale_oak_planks"
+	},
+	"pale_oak_sapling": {},
+	"pale_oak_sign": {
+		"sign_material": "pale_oak",
+		"texture": null
+	},
+	"pale_oak_slab": {
+		"texture": "pale_oak_planks"
+	},
+	"pale_oak_stairs": {
+		"texture": "pale_oak_planks"
+	},
+	"pale_oak_trapdoor": {},
+	"pale_oak_wall_hanging_sign": {
+		"sign_material": "pale_oak",
+		"texture": null,
+		"wall_sign": true
+	},
+	"pale_oak_wall_sign": {
+		"sign_material": "pale_oak",
+		"texture": null,
+		"wall_sign": true
+	},
+	"pale_oak_wood": {
+		"texture": "pale_oak_log"
+	},
 	"pearlescent_froglight": {
 		"texture": "pearlescent_froglight_top"
 	},
@@ -1463,6 +1519,9 @@
 	"potted_cherry_sapling": {
 		"texture": "cherry_sapling"
 	},
+	"potted_closed_eyeblossom": {
+		"texture": "closed_eyeblossom"
+	},
 	"potted_cornflower": {
 		"texture": "cornflower"
 	},
@@ -1500,12 +1559,18 @@
 	"potted_oak_sapling": {
 		"texture": "oak_sapling"
 	},
+	"potted_open_eyeblossom": {
+		"texture": "open_eyeblossom"
+	},
 	"potted_orange_tulip": {
 		"texture": "orange_tulip"
 	},
 	"potted_oxeye_daisy": {
 		"texture": "oxeye_daisy"
 	},
+	"potted_pale_oak_sapling": {
+		"texture": "pale_oak_sapling"
+	},
 	"potted_pink_tulip": {
 		"texture": "pink_tulip"
 	},
@@ -1668,6 +1733,18 @@
 	"repeating_command_block": {
 		"texture": "repeating_command_block_front"
 	},
+	"resin_block": {},
+	"resin_brick_slab": {
+		"texture": "resin_bricks"
+	},
+	"resin_brick_stairs": {
+		"texture": "resin_bricks"
+	},
+	"resin_brick_wall": {
+		"texture": "resin_bricks"
+	},
+	"resin_bricks": {},
+	"resin_clump": null,
 	"respawn_anchor": {
 		"texture": "respawn_anchor_top"
 	},
@@ -1903,6 +1980,12 @@
 	"stripped_oak_wood": {
 		"texture": "stripped_oak_log"
 	},
+	"stripped_pale_oak_log": {
+		"texture": "stripped_pale_oak_log_top"
+	},
+	"stripped_pale_oak_wood": {
+		"texture": "stripped_pale_oak_log"
+	},
 	"stripped_spruce_log": {
 		"texture": "stripped_spruce_log_top"
 	},
diff --git a/src/core/common.rs b/src/core/common.rs
index 5f518e0..3dd01cf 100644
--- a/src/core/common.rs
+++ b/src/core/common.rs
@@ -24,7 +24,7 @@ use crate::{
 ///
 /// Increase when the generation of processed regions from region data changes
 /// (usually because of updated resource data)
-pub const REGION_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(2);
+pub const REGION_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(3);
 
 /// MinedMap map tile data version number
 ///
@@ -36,7 +36,7 @@ pub const MAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
 ///
 /// Increase when the generation of lightmap tiles from region data changes
 /// (usually because of updated resource data)
-pub const LIGHTMAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(2);
+pub const LIGHTMAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(3);
 
 /// MinedMap mipmap data version number
 ///

From 83bd936f8073477aa5bae6e059ac84f3430b7623 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 31 Dec 2024 03:54:45 +0100
Subject: [PATCH 386/460] viewer: add images for pale oak signs

---
 CHANGELOG.md                                      |   1 +
 resource/sign_textures.py                         |   1 +
 viewer/images/bg/pale_oak_hanging_sign.png        | Bin 0 -> 318 bytes
 viewer/images/bg/pale_oak_hanging_wall_sign.png   | Bin 0 -> 222 bytes
 viewer/images/bg/pale_oak_sign.png                | Bin 0 -> 419 bytes
 viewer/images/bg/pale_oak_wall_sign.png           | Bin 0 -> 317 bytes
 viewer/images/icon/pale_oak_hanging_sign.png      | Bin 0 -> 258 bytes
 viewer/images/icon/pale_oak_hanging_wall_sign.png | Bin 0 -> 320 bytes
 viewer/images/icon/pale_oak_sign.png              | Bin 0 -> 281 bytes
 viewer/images/icon/pale_oak_wall_sign.png         | Bin 0 -> 223 bytes
 10 files changed, 2 insertions(+)
 create mode 100644 viewer/images/bg/pale_oak_hanging_sign.png
 create mode 100644 viewer/images/bg/pale_oak_hanging_wall_sign.png
 create mode 100644 viewer/images/bg/pale_oak_sign.png
 create mode 100644 viewer/images/bg/pale_oak_wall_sign.png
 create mode 100644 viewer/images/icon/pale_oak_hanging_sign.png
 create mode 100644 viewer/images/icon/pale_oak_hanging_wall_sign.png
 create mode 100644 viewer/images/icon/pale_oak_sign.png
 create mode 100644 viewer/images/icon/pale_oak_wall_sign.png

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4837f71..8c7c159 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Added support for Minecraft 1.21.4 block types
 - Added support for Minecraft 1.21.4 Pale Garden biome
+- viewer: added images for pale oak signs
 
 ## [2.2.0] - 2024-06-23
 
diff --git a/resource/sign_textures.py b/resource/sign_textures.py
index e0b548d..846ab3e 100755
--- a/resource/sign_textures.py
+++ b/resource/sign_textures.py
@@ -15,6 +15,7 @@ MATERIALS = [
 	'jungle',
 	'mangrove',
 	'oak',
+	'pale_oak',
 	'spruce',
 	'warped',
 ]
diff --git a/viewer/images/bg/pale_oak_hanging_sign.png b/viewer/images/bg/pale_oak_hanging_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..972a1198913ddf65b573328cfc63307d83262971
GIT binary patch
literal 318
zcmV-E0m1%>P)<h;3K|Lk000e1NJLTq000mG000gM1^@s6CNG?d00036Nkl<Zc$|%q
zK}!QM5QV>%F3FNDE~wzKhYBA23wrV&`1=Jf#Zp$WuwfH&STD|)#6tT{GcPl5-b~;Z
z_m5BW^ULeZ8Ps)43AWpZbG;|)mU;5AKU^e|*QtOXzb<O7>lOfW3iEOJ#I_FOEYSzT
z<hi=J1|a$XfN>UpVYdh1cC%Tm0CsQh7;8!K8{_T>lh?*Dc~VTQ`(AT^<1myfG^Q!k
z#f`u?OPD;ib;SxQU|Yw!?={YO5l=A{!&D%QqgrcBqmyO#Q+KdkS2{>B{j(^d!iht1
zq5`5O5Bah3srik<IF=6Tsi%1To$$As-XJGyo3ek-308R`e_O+Lom#H(10@`gCk3vj
QSpWb407*qoM6N<$f~sDNJ^%m!

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/pale_oak_hanging_wall_sign.png b/viewer/images/bg/pale_oak_hanging_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..cf98cb20b26d645e9169a5afe649b169dee6c51b
GIT binary patch
literal 222
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa3-AeX1=9b2|M>CY!-wZjUq5*8
z<i?FVXU=#Aq}sUztLoU^FJ1N$sDiO1$S;_|;n|HeASch$#WAGfmguRCyoU@#Trd8f
zcjxn5){dB9mV+D{ls6wRN@L7%aTj#Y^eZjdx!+-XdXZl59QBF=eJdG6l^GJ56egVe
z`or#zpWoyVlk>~;d-IRiu=z4;&+546`%Y^0hY3j=S`-zs?ORwl<24`cXFQcBBdbx(
RSqQY5!PC{xWt~$(696plRpI~u

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/pale_oak_sign.png b/viewer/images/bg/pale_oak_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ea5a7e6992dee3775bc146224c071b067bf3150
GIT binary patch
literal 419
zcmV;U0bKrxP)<h;3K|Lk000e1NJLTq000;O000^Y1^@s6t-qY}0004MNkl<Zc%02s
zT}y;O6g{Svi{PjTMeUCXdXJ#@e&_y!p4wl~$LedMjUY`fVh?$3l+ksTgwBg_?>%$w
zoHH6(5;u^LrzwIc!l7ER-va<@&U?M#tdS*gL&KhJcjTILn2e$39Hpq>I;Suh>&*?t
zRD3H>(_eJ}CS&ky8%2AV$rvEsdt1rd_in1-8;_e!&mw~BF_Z;YwPwvw&&ZOvneupO
zhYC}CD^F9DqC(IX>A<0%1j>cJ04DiX5Jf<ngJ;{L{!+lQ2ml=7D>HDtpTkuC&drAS
zhWsC>yj0ca&H;c$R|5Jr(DS95Os1O59pf7>+oy(_<XiWa+ki_^VZFZW4jtw*#UK3-
z2;?WA&g4&Vdvo19+}}+uG{lL{a4Ejv2cgzdS^}R!;3LnL6IeM8o_Fzb0>?m0;OgRh
zS%G8lzXbds#L97&6VQF4+5&zM!gbD;6953;_m>sWg{3pRdwbOu_y!nc>6`7lvb6vJ
N002ovPDHLkV1isf#y$W5

literal 0
HcmV?d00001

diff --git a/viewer/images/bg/pale_oak_wall_sign.png b/viewer/images/bg/pale_oak_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..f52f32a7d94663cf290959191ca6fdc025ff461d
GIT binary patch
literal 317
zcmV-D0mA-?P)<h;3K|Lk000e1NJLTq000;O000aK1^@s6crbl+00035Nkl<Zc$|%s
zO^Spt5QV>>83qJ{;A-gmpP_HitC<`0Lbnr?2!hy%vlz=xB>ucjpsHR~<-J5Tbv5Im
zwU(kRIg53#7XXuUL2g^Cn!1{$IM;e5PtK7T!{i+OFp_<KkQfuxZHLA9X>09!I*=Gc
zt~K4#EHMU#-(V|$`{1S#zIxp6fkc8VH}sv0r7qP-PBnEkA8EXmBZeb>+FDCLj1)^y
z8gBIzh%a&ihy1iCOIUo!wcgcN4EBcrobjU`Wch!yn7&uN5x(;OK}^e7{AwLQDp!I~
z26?^`^T`tPxqE!|{P~_GDY~t1c`>*jMsBySwdvNMBmV9`5Qv@-_v8$JT5!{^Nq>~0
P00000NkvXXu0mjf7T1hl

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/pale_oak_hanging_sign.png b/viewer/images/icon/pale_oak_hanging_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd61dd1dcfbfa1a2e9c06ba831b0a0e61d4f3c5e
GIT binary patch
literal 258
zcmV+d0sa1oP)<h;3K|Lk000e1NJLTq000gE000aK1^@s6Qh<!w0002VNkl<Zc$}4x
zu?oU45Qe{&f`W@fponkL%}sGBecn=BL|>s~sIMSIs6%PQAx??cYC*r{F8AN%{saU?
zQ8*?TYq3wVEORnSzG<;+sH!TO+BnuC0Qa;G;L%wCW{dg9px12Qv0SaA#1{``$#%aB
zqNk}fS7U;9KAzrIZQqe9MN{k0>>B`5rNa55_0a0w+@_v4ps6*RJda}O-`{#Zo(8#$
zS7QK3yw#@Gq)G*AzIj|5Sha2I<cIuXH32x3<xfMBM6Umb7i4B|E`Z|j8~^|S07*qo
IM6N<$f}Rv{#sB~S

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/pale_oak_hanging_wall_sign.png b/viewer/images/icon/pale_oak_hanging_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..fefd31ac3bd74b67af2ec4830cb6031dff9bb57d
GIT binary patch
literal 320
zcmV-G0l)r<P)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00038Nkl<Zc$}4y
zv1)`s5QaZRNFYT5S&@*puuGSa=J2J`g(ID1-b3UX(K4-UVZbL4_rNRUHe9i(R#q><
z<!@$ozS-S>XFYS$=AibxZ9f1QhJkeZ&aJoyV97qy6nz{CzKV)YDcZIr3`6?9rz%QZ
zxonqZL_*9sNs<^=v}C?b;y5;LboCeW-G)5Ry|o*c%mXkdZ2*2o4ZzjS_1Q+t^l{|w
z;n53hahGL0zrIY+s;MQNQWLX-^KD}!1WhfcW_PlY5Yzfw%DL5p+OIutrlyuWZ8o0o
z`nRW6MLEme*eL}-V68T_oIcjZswmHDGpl+Sj60A^tOfwPEW2ovtH8bfKl%k9Xq~a<
Sohjh}0000<MNUMnLSTZ1osS3r

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/pale_oak_sign.png b/viewer/images/icon/pale_oak_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..3684f5da4d1d2aa9265cd5842afbf1adc829babb
GIT binary patch
literal 281
zcmV+!0p|XRP)<h;3K|Lk000e1NJLTq000dD000gM1^@s6^naGp0002sNkl<Zc$}S%
zv5LY#6h%)$U=`VAi-B}2_!qL}eyw05OpzuerQI5)nAiwzw~z!ZhKyK@g=ARQDC%t<
z-1pAAH*g2*0QSZLU|U0{!Egk?%V^;DiIjwUV_D4R*w&l@0N=|ciInWBnnX&!4{d9R
zg+Lby09`2ZH1l9A1bLbf3jsi>6oETfx2tOIl`hn&9^k*{X?B+M*9Z8mDk9q&bfJ8F
zH@iyz{io|ii`o2cpi@*T^)M9lnO~n%2T(T+E4{wB3HzYQ_~T|$F9h)Z_WC$<OHrS>
f+5S*B%~j|KBPVsS?i`Z{00000NkvXXu0mjfpwD|G

literal 0
HcmV?d00001

diff --git a/viewer/images/icon/pale_oak_wall_sign.png b/viewer/images/icon/pale_oak_wall_sign.png
new file mode 100644
index 0000000000000000000000000000000000000000..32257e320475d351df1607727cd8a1774fa5b26a
GIT binary patch
literal 223
zcmV<503iQ~P)<h;3K|Lk000e1NJLTq000dD000RH1^@s6>3XJW0001{Nkl<Zc$}S%
zu?mAQ7=%AXsKqtl`;UT)kikWCbSoi4e1$?B9D)&tbSQ?}$@Z2X?)d(@B<wx_Y|aDV
zSI43JUI1__@|d?$l5Wn^R5gBeCjj6vj<iy;*qK(!n5TYqltN&X2EZuI(De~4g<$A<
zN+AH4v?d9=4~w0-Dx>s!9uU6|U4Lr&^Z}mMlKItPl#cbsJtlqof6vRBs=f>y$|kLU
ZhF(rdXtH}uT$%s?002ovPDHLkV1i-1UO@l=

literal 0
HcmV?d00001


From 00216341ca27d297697014a255642e88d703dd6c Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 31 Dec 2024 12:58:47 +0100
Subject: [PATCH 387/460] resource: separate current biome data from
 aliases/legacy IDs

Prepare for automatic generation of current biome data.
---
 crates/resource/src/biomes.rs        | 311 +--------------------------
 crates/resource/src/legacy_biomes.rs | 202 +++++++++++++++++
 crates/resource/src/lib.rs           | 110 +++++++++-
 3 files changed, 311 insertions(+), 312 deletions(-)
 create mode 100644 crates/resource/src/legacy_biomes.rs

diff --git a/crates/resource/src/biomes.rs b/crates/resource/src/biomes.rs
index 4a0dee0..d81a069 100644
--- a/crates/resource/src/biomes.rs
+++ b/crates/resource/src/biomes.rs
@@ -1,112 +1,6 @@
-//! Biome data structures
+//! Biome data
 
-use serde::{Deserialize, Serialize};
-
-use super::Color;
-
-/// Grass color modifier used by a biome
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
-pub enum BiomeGrassColorModifier {
-	/// Grass color modifier used by the dark forest biome
-	DarkForest,
-	/// Grass color modifier used by swamp biomes
-	Swamp,
-}
-
-/// A biome specification
-///
-/// A Biome contains all information about a biome necessary to compute a block
-/// color given a block type and depth
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
-pub struct Biome {
-	/// Temperature value
-	///
-	/// For more efficient storage, the temperature is stored as an integer
-	/// after mutiplying the raw value by 20
-	pub temp: i8,
-	/// Downfall value
-	///
-	/// For more efficient storage, the downfall is stored as an integer
-	/// after mutiplying the raw value by 20
-	pub downfall: i8,
-	/// Water color override
-	pub water_color: Option<Color>,
-	/// Foliage color override
-	pub foliage_color: Option<Color>,
-	/// Grass color override
-	pub grass_color: Option<Color>,
-	/// Grass color modifier
-	pub grass_color_modifier: Option<BiomeGrassColorModifier>,
-}
-
-impl Biome {
-	/// Constructs a new Biome
-	const fn new(temp: i16, downfall: i16) -> Biome {
-		/// Helper to encode temperature and downfall values
-		///
-		/// Converts temperatue and downfall from the input format
-		/// (mutiplied by 100) to i8 range for more efficient storage.
-		const fn encode(v: i16) -> i8 {
-			(v / 5) as i8
-		}
-		Biome {
-			temp: encode(temp),
-			downfall: encode(downfall),
-			grass_color_modifier: None,
-			water_color: None,
-			foliage_color: None,
-			grass_color: None,
-		}
-	}
-
-	/// Builder function to override the biome water color
-	const fn water(self, water_color: [u8; 3]) -> Biome {
-		Biome {
-			water_color: Some(Color(water_color)),
-			..self
-		}
-	}
-
-	/// Builder function to override the biome foliage color
-	const fn foliage(self, foliage_color: [u8; 3]) -> Biome {
-		Biome {
-			foliage_color: Some(Color(foliage_color)),
-			..self
-		}
-	}
-
-	/// Builder function to override the biome grass color
-	const fn grass(self, grass_color: [u8; 3]) -> Biome {
-		Biome {
-			grass_color: Some(Color(grass_color)),
-			..self
-		}
-	}
-
-	/// Builder function to set a grass color modifier
-	const fn modify(self, grass_color_modifier: BiomeGrassColorModifier) -> Biome {
-		Biome {
-			grass_color_modifier: Some(grass_color_modifier),
-			..self
-		}
-	}
-
-	/// Decodes a temperature or downfall value from the storage format to
-	/// f32 for further calculation
-	fn decode(val: i8) -> f32 {
-		f32::from(val) / 20.0
-	}
-
-	/// Returns the biome's temperature decoded to its original float value
-	pub fn temp(&self) -> f32 {
-		Self::decode(self.temp)
-	}
-
-	/// Returns the biome's downfall decoded to its original float value
-	pub fn downfall(&self) -> f32 {
-		Self::decode(self.downfall)
-	}
-}
+use super::*;
 
 /// Standard biome specifications
 pub const BIOMES: &[(&str, Biome)] = {
@@ -241,204 +135,3 @@ pub const BIOMES: &[(&str, Biome)] = {
 		("the_end", Biome::new(0_50, 0_50)),
 	]
 };
-
-/// Biome ID aliases
-///
-/// Some biomes have been renamed or merged in recent Minecraft versions.
-/// Maintain a list of aliases to support chunks saved by older versions.
-pub const BIOME_ALIASES: &[(&str, &str)] = &[
-	// Biomes fix
-	("beaches", "beach"),
-	("cold_beach", "snowy_beach"),
-	("cold_deep_ocean", "deep_cold_ocean"),
-	("extreme_hills", "mountains"),
-	("extreme_hills_with_trees", "wooded_mountains"),
-	("forest_hills", "wooded_hills"),
-	("frozen_deep_ocean", "deep_frozen_ocean"),
-	("hell", "nether_wastes"),
-	("ice_flats", "snowy_tundra"),
-	("ice_mountains", "snowy_mountains"),
-	("lukewarm_deep_ocean", "deep_lukewarm_ocean"),
-	("mesa", "badlands"),
-	("mesa_clear_rock", "badlands_plateau"),
-	("mesa_rock", "wooded_badlands_plateau"),
-	("mushroom_island", "mushroom_fields"),
-	("mushroom_island_shore", "mushroom_field_shore"),
-	("mutated_birch_forest", "tall_birch_forest"),
-	("mutated_birch_forest_hills", "tall_birch_hills"),
-	("mutated_desert", "desert_lakes"),
-	("mutated_extreme_hills", "gravelly_mountains"),
-	(
-		"mutated_extreme_hills_with_trees",
-		"modified_gravelly_mountains",
-	),
-	("mutated_forest", "flower_forest"),
-	("mutated_ice_flats", "ice_spikes"),
-	("mutated_jungle", "modified_jungle"),
-	("mutated_jungle_edge", "modified_jungle_edge"),
-	("mutated_mesa", "eroded_badlands"),
-	("mutated_mesa_clear_rock", "modified_badlands_plateau"),
-	("mutated_mesa_rock", "modified_wooded_badlands_plateau"),
-	("mutated_plains", "sunflower_plains"),
-	("mutated_redwood_taiga", "giant_spruce_taiga"),
-	("mutated_redwood_taiga_hills", "giant_spruce_taiga_hills"),
-	("mutated_roofed_forest", "dark_forest_hills"),
-	("mutated_savanna", "shattered_savanna"),
-	("mutated_savanna_rock", "shattered_savanna_plateau"),
-	("mutated_swampland", "swamp_hills"),
-	("mutated_taiga", "taiga_mountains"),
-	("mutated_taiga_cold", "snowy_taiga_mountains"),
-	("redwood_taiga", "giant_tree_taiga"),
-	("redwood_taiga_hills", "giant_tree_taiga_hills"),
-	("roofed_forest", "dark_forest"),
-	("savanna_rock", "savanna_plateau"),
-	("sky", "the_end"),
-	("sky_island_barren", "end_barrens"),
-	("sky_island_high", "end_highlands"),
-	("sky_island_low", "small_end_islands"),
-	("sky_island_medium", "end_midlands"),
-	("smaller_extreme_hills", "mountain_edge"),
-	("stone_beach", "stone_shore"),
-	("swampland", "swamp"),
-	("taiga_cold", "snowy_taiga"),
-	("taiga_cold_hills", "snowy_taiga_hills"),
-	("void", "the_void"),
-	("warm_deep_ocean", "deep_warm_ocean"),
-	// Nether biome rename
-	("nether", "nether_wastes"),
-	// Caves and Cliffs biome renames
-	("badlands_plateau", "badlands"),
-	("bamboo_jungle_hills", "bamboo_jungle"),
-	("birch_forest_hills", "birch_forest"),
-	("dark_forest_hills", "dark_forest"),
-	("desert_hills", "desert"),
-	("desert_lakes", "desert"),
-	("giant_spruce_taiga", "old_growth_spruce_taiga"),
-	("giant_spruce_taiga_hills", "old_growth_spruce_taiga"),
-	("giant_tree_taiga", "old_growth_pine_taiga"),
-	("giant_tree_taiga_hills", "old_growth_pine_taiga"),
-	("gravelly_mountains", "windswept_gravelly_hills"),
-	("jungle_edge", "sparse_jungle"),
-	("jungle_hills", "jungle"),
-	("lofty_peaks", "jagged_peaks"),
-	("modified_badlands_plateau", "badlands"),
-	("modified_gravelly_mountains", "windswept_gravelly_hills"),
-	("modified_jungle", "jungle"),
-	("modified_jungle_edge", "sparse_jungle"),
-	("modified_wooded_badlands_plateau", "wooded_badlands"),
-	("mountain_edge", "windswept_hills"),
-	("mountains", "windswept_hills"),
-	("mushroom_field_shore", "mushroom_fields"),
-	("shattered_savanna", "windswept_savanna"),
-	("shattered_savanna_plateau", "windswept_savanna"),
-	("snowcapped_peaks", "frozen_peaks"),
-	("snowy_mountains", "snowy_plains"),
-	("snowy_taiga_hills", "snowy_taiga"),
-	("snowy_taiga_mountains", "snowy_taiga"),
-	("snowy_tundra", "snowy_plains"),
-	("stone_shore", "stony_shore"),
-	("swamp_hills", "swamp"),
-	("taiga_hills", "taiga"),
-	("taiga_mountains", "taiga"),
-	("tall_birch_forest", "old_growth_birch_forest"),
-	("tall_birch_hills", "old_growth_birch_forest"),
-	("wooded_badlands_plateau", "wooded_badlands"),
-	("wooded_hills", "forest"),
-	("wooded_mountains", "windswept_forest"),
-	// Remove Deep Warm Ocean
-	("deep_warm_ocean", "warm_ocean"),
-];
-
-/// Maps old numeric biome IDs to new string IDs
-pub fn legacy_biome(index: u8) -> &'static str {
-	match index {
-		0 => "ocean",
-		1 => "plains",
-		2 => "desert",
-		3 => "mountains",
-		4 => "forest",
-		5 => "taiga",
-		6 => "swamp",
-		7 => "river",
-		8 => "nether_wastes",
-		9 => "the_end",
-		10 => "frozen_ocean",
-		11 => "frozen_river",
-		12 => "snowy_tundra",
-		13 => "snowy_mountains",
-		14 => "mushroom_fields",
-		15 => "mushroom_field_shore",
-		16 => "beach",
-		17 => "desert_hills",
-		18 => "wooded_hills",
-		19 => "taiga_hills",
-		20 => "mountain_edge",
-		21 => "jungle",
-		22 => "jungle_hills",
-		23 => "jungle_edge",
-		24 => "deep_ocean",
-		25 => "stone_shore",
-		26 => "snowy_beach",
-		27 => "birch_forest",
-		28 => "birch_forest_hills",
-		29 => "dark_forest",
-		30 => "snowy_taiga",
-		31 => "snowy_taiga_hills",
-		32 => "giant_tree_taiga",
-		33 => "giant_tree_taiga_hills",
-		34 => "wooded_mountains",
-		35 => "savanna",
-		36 => "savanna_plateau",
-		37 => "badlands",
-		38 => "wooded_badlands_plateau",
-		39 => "badlands_plateau",
-		40 => "small_end_islands",
-		41 => "end_midlands",
-		42 => "end_highlands",
-		43 => "end_barrens",
-		44 => "warm_ocean",
-		45 => "lukewarm_ocean",
-		46 => "cold_ocean",
-		47 => "deep_warm_ocean",
-		48 => "deep_lukewarm_ocean",
-		49 => "deep_cold_ocean",
-		50 => "deep_frozen_ocean",
-		127 => "the_void",
-		129 => "sunflower_plains",
-		130 => "desert_lakes",
-		131 => "gravelly_mountains",
-		132 => "flower_forest",
-		133 => "taiga_mountains",
-		134 => "swamp_hills",
-		140 => "ice_spikes",
-		149 => "modified_jungle",
-		151 => "modified_jungle_edge",
-		155 => "tall_birch_forest",
-		156 => "tall_birch_hills",
-		157 => "dark_forest_hills",
-		158 => "snowy_taiga_mountains",
-		160 => "giant_spruce_taiga",
-		161 => "giant_spruce_taiga_hills",
-		162 => "modified_gravelly_mountains",
-		163 => "shattered_savanna",
-		164 => "shattered_savanna_plateau",
-		165 => "eroded_badlands",
-		166 => "modified_wooded_badlands_plateau",
-		167 => "modified_badlands_plateau",
-		168 => "bamboo_jungle",
-		169 => "bamboo_jungle_hills",
-		170 => "soul_sand_valley",
-		171 => "crimson_forest",
-		172 => "warped_forest",
-		173 => "basalt_deltas",
-		174 => "dripstone_caves",
-		175 => "lush_caves",
-		177 => "meadow",
-		178 => "grove",
-		179 => "snowy_slopes",
-		180 => "snowcapped_peaks",
-		181 => "lofty_peaks",
-		182 => "stony_peaks",
-		_ => "ocean",
-	}
-}
diff --git a/crates/resource/src/legacy_biomes.rs b/crates/resource/src/legacy_biomes.rs
new file mode 100644
index 0000000..d980823
--- /dev/null
+++ b/crates/resource/src/legacy_biomes.rs
@@ -0,0 +1,202 @@
+//! Manually maintained biome data (aliases and legacy biome IDs)
+
+/// Biome ID aliases
+///
+/// Some biomes have been renamed or merged in recent Minecraft versions.
+/// Maintain a list of aliases to support chunks saved by older versions.
+pub const BIOME_ALIASES: &[(&str, &str)] = &[
+	// Biomes fix
+	("beaches", "beach"),
+	("cold_beach", "snowy_beach"),
+	("cold_deep_ocean", "deep_cold_ocean"),
+	("extreme_hills", "mountains"),
+	("extreme_hills_with_trees", "wooded_mountains"),
+	("forest_hills", "wooded_hills"),
+	("frozen_deep_ocean", "deep_frozen_ocean"),
+	("hell", "nether_wastes"),
+	("ice_flats", "snowy_tundra"),
+	("ice_mountains", "snowy_mountains"),
+	("lukewarm_deep_ocean", "deep_lukewarm_ocean"),
+	("mesa", "badlands"),
+	("mesa_clear_rock", "badlands_plateau"),
+	("mesa_rock", "wooded_badlands_plateau"),
+	("mushroom_island", "mushroom_fields"),
+	("mushroom_island_shore", "mushroom_field_shore"),
+	("mutated_birch_forest", "tall_birch_forest"),
+	("mutated_birch_forest_hills", "tall_birch_hills"),
+	("mutated_desert", "desert_lakes"),
+	("mutated_extreme_hills", "gravelly_mountains"),
+	(
+		"mutated_extreme_hills_with_trees",
+		"modified_gravelly_mountains",
+	),
+	("mutated_forest", "flower_forest"),
+	("mutated_ice_flats", "ice_spikes"),
+	("mutated_jungle", "modified_jungle"),
+	("mutated_jungle_edge", "modified_jungle_edge"),
+	("mutated_mesa", "eroded_badlands"),
+	("mutated_mesa_clear_rock", "modified_badlands_plateau"),
+	("mutated_mesa_rock", "modified_wooded_badlands_plateau"),
+	("mutated_plains", "sunflower_plains"),
+	("mutated_redwood_taiga", "giant_spruce_taiga"),
+	("mutated_redwood_taiga_hills", "giant_spruce_taiga_hills"),
+	("mutated_roofed_forest", "dark_forest_hills"),
+	("mutated_savanna", "shattered_savanna"),
+	("mutated_savanna_rock", "shattered_savanna_plateau"),
+	("mutated_swampland", "swamp_hills"),
+	("mutated_taiga", "taiga_mountains"),
+	("mutated_taiga_cold", "snowy_taiga_mountains"),
+	("redwood_taiga", "giant_tree_taiga"),
+	("redwood_taiga_hills", "giant_tree_taiga_hills"),
+	("roofed_forest", "dark_forest"),
+	("savanna_rock", "savanna_plateau"),
+	("sky", "the_end"),
+	("sky_island_barren", "end_barrens"),
+	("sky_island_high", "end_highlands"),
+	("sky_island_low", "small_end_islands"),
+	("sky_island_medium", "end_midlands"),
+	("smaller_extreme_hills", "mountain_edge"),
+	("stone_beach", "stone_shore"),
+	("swampland", "swamp"),
+	("taiga_cold", "snowy_taiga"),
+	("taiga_cold_hills", "snowy_taiga_hills"),
+	("void", "the_void"),
+	("warm_deep_ocean", "deep_warm_ocean"),
+	// Nether biome rename
+	("nether", "nether_wastes"),
+	// Caves and Cliffs biome renames
+	("badlands_plateau", "badlands"),
+	("bamboo_jungle_hills", "bamboo_jungle"),
+	("birch_forest_hills", "birch_forest"),
+	("dark_forest_hills", "dark_forest"),
+	("desert_hills", "desert"),
+	("desert_lakes", "desert"),
+	("giant_spruce_taiga", "old_growth_spruce_taiga"),
+	("giant_spruce_taiga_hills", "old_growth_spruce_taiga"),
+	("giant_tree_taiga", "old_growth_pine_taiga"),
+	("giant_tree_taiga_hills", "old_growth_pine_taiga"),
+	("gravelly_mountains", "windswept_gravelly_hills"),
+	("jungle_edge", "sparse_jungle"),
+	("jungle_hills", "jungle"),
+	("lofty_peaks", "jagged_peaks"),
+	("modified_badlands_plateau", "badlands"),
+	("modified_gravelly_mountains", "windswept_gravelly_hills"),
+	("modified_jungle", "jungle"),
+	("modified_jungle_edge", "sparse_jungle"),
+	("modified_wooded_badlands_plateau", "wooded_badlands"),
+	("mountain_edge", "windswept_hills"),
+	("mountains", "windswept_hills"),
+	("mushroom_field_shore", "mushroom_fields"),
+	("shattered_savanna", "windswept_savanna"),
+	("shattered_savanna_plateau", "windswept_savanna"),
+	("snowcapped_peaks", "frozen_peaks"),
+	("snowy_mountains", "snowy_plains"),
+	("snowy_taiga_hills", "snowy_taiga"),
+	("snowy_taiga_mountains", "snowy_taiga"),
+	("snowy_tundra", "snowy_plains"),
+	("stone_shore", "stony_shore"),
+	("swamp_hills", "swamp"),
+	("taiga_hills", "taiga"),
+	("taiga_mountains", "taiga"),
+	("tall_birch_forest", "old_growth_birch_forest"),
+	("tall_birch_hills", "old_growth_birch_forest"),
+	("wooded_badlands_plateau", "wooded_badlands"),
+	("wooded_hills", "forest"),
+	("wooded_mountains", "windswept_forest"),
+	// Remove Deep Warm Ocean
+	("deep_warm_ocean", "warm_ocean"),
+];
+
+/// Maps old numeric biome IDs to new string IDs
+pub fn legacy_biome(index: u8) -> &'static str {
+	match index {
+		0 => "ocean",
+		1 => "plains",
+		2 => "desert",
+		3 => "mountains",
+		4 => "forest",
+		5 => "taiga",
+		6 => "swamp",
+		7 => "river",
+		8 => "nether_wastes",
+		9 => "the_end",
+		10 => "frozen_ocean",
+		11 => "frozen_river",
+		12 => "snowy_tundra",
+		13 => "snowy_mountains",
+		14 => "mushroom_fields",
+		15 => "mushroom_field_shore",
+		16 => "beach",
+		17 => "desert_hills",
+		18 => "wooded_hills",
+		19 => "taiga_hills",
+		20 => "mountain_edge",
+		21 => "jungle",
+		22 => "jungle_hills",
+		23 => "jungle_edge",
+		24 => "deep_ocean",
+		25 => "stone_shore",
+		26 => "snowy_beach",
+		27 => "birch_forest",
+		28 => "birch_forest_hills",
+		29 => "dark_forest",
+		30 => "snowy_taiga",
+		31 => "snowy_taiga_hills",
+		32 => "giant_tree_taiga",
+		33 => "giant_tree_taiga_hills",
+		34 => "wooded_mountains",
+		35 => "savanna",
+		36 => "savanna_plateau",
+		37 => "badlands",
+		38 => "wooded_badlands_plateau",
+		39 => "badlands_plateau",
+		40 => "small_end_islands",
+		41 => "end_midlands",
+		42 => "end_highlands",
+		43 => "end_barrens",
+		44 => "warm_ocean",
+		45 => "lukewarm_ocean",
+		46 => "cold_ocean",
+		47 => "deep_warm_ocean",
+		48 => "deep_lukewarm_ocean",
+		49 => "deep_cold_ocean",
+		50 => "deep_frozen_ocean",
+		127 => "the_void",
+		129 => "sunflower_plains",
+		130 => "desert_lakes",
+		131 => "gravelly_mountains",
+		132 => "flower_forest",
+		133 => "taiga_mountains",
+		134 => "swamp_hills",
+		140 => "ice_spikes",
+		149 => "modified_jungle",
+		151 => "modified_jungle_edge",
+		155 => "tall_birch_forest",
+		156 => "tall_birch_hills",
+		157 => "dark_forest_hills",
+		158 => "snowy_taiga_mountains",
+		160 => "giant_spruce_taiga",
+		161 => "giant_spruce_taiga_hills",
+		162 => "modified_gravelly_mountains",
+		163 => "shattered_savanna",
+		164 => "shattered_savanna_plateau",
+		165 => "eroded_badlands",
+		166 => "modified_wooded_badlands_plateau",
+		167 => "modified_badlands_plateau",
+		168 => "bamboo_jungle",
+		169 => "bamboo_jungle_hills",
+		170 => "soul_sand_valley",
+		171 => "crimson_forest",
+		172 => "warped_forest",
+		173 => "basalt_deltas",
+		174 => "dripstone_caves",
+		175 => "lush_caves",
+		177 => "meadow",
+		178 => "grove",
+		179 => "snowy_slopes",
+		180 => "snowcapped_peaks",
+		181 => "lofty_peaks",
+		182 => "stony_peaks",
+		_ => "ocean",
+	}
+}
diff --git a/crates/resource/src/lib.rs b/crates/resource/src/lib.rs
index 1baffda..b499fbf 100644
--- a/crates/resource/src/lib.rs
+++ b/crates/resource/src/lib.rs
@@ -4,6 +4,7 @@
 
 mod biomes;
 mod block_color;
+mod legacy_biomes;
 mod legacy_block_types;
 
 #[allow(clippy::missing_docs_in_private_items)] // Generated module
@@ -135,9 +136,112 @@ impl BlockTypes {
 	}
 }
 
-pub use biomes::{Biome, BiomeGrassColorModifier};
 pub use block_color::{block_color, needs_biome};
 
+/// Grass color modifier used by a biome
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+pub enum BiomeGrassColorModifier {
+	/// Grass color modifier used by the dark forest biome
+	DarkForest,
+	/// Grass color modifier used by swamp biomes
+	Swamp,
+}
+
+/// A biome specification
+///
+/// A Biome contains all information about a biome necessary to compute a block
+/// color given a block type and depth
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+pub struct Biome {
+	/// Temperature value
+	///
+	/// For more efficient storage, the temperature is stored as an integer
+	/// after mutiplying the raw value by 20
+	pub temp: i8,
+	/// Downfall value
+	///
+	/// For more efficient storage, the downfall is stored as an integer
+	/// after mutiplying the raw value by 20
+	pub downfall: i8,
+	/// Water color override
+	pub water_color: Option<Color>,
+	/// Foliage color override
+	pub foliage_color: Option<Color>,
+	/// Grass color override
+	pub grass_color: Option<Color>,
+	/// Grass color modifier
+	pub grass_color_modifier: Option<BiomeGrassColorModifier>,
+}
+
+impl Biome {
+	/// Constructs a new Biome
+	const fn new(temp: i16, downfall: i16) -> Biome {
+		/// Helper to encode temperature and downfall values
+		///
+		/// Converts temperatue and downfall from the input format
+		/// (mutiplied by 100) to i8 range for more efficient storage.
+		const fn encode(v: i16) -> i8 {
+			(v / 5) as i8
+		}
+		Biome {
+			temp: encode(temp),
+			downfall: encode(downfall),
+			grass_color_modifier: None,
+			water_color: None,
+			foliage_color: None,
+			grass_color: None,
+		}
+	}
+
+	/// Builder function to override the biome water color
+	const fn water(self, water_color: [u8; 3]) -> Biome {
+		Biome {
+			water_color: Some(Color(water_color)),
+			..self
+		}
+	}
+
+	/// Builder function to override the biome foliage color
+	const fn foliage(self, foliage_color: [u8; 3]) -> Biome {
+		Biome {
+			foliage_color: Some(Color(foliage_color)),
+			..self
+		}
+	}
+
+	/// Builder function to override the biome grass color
+	const fn grass(self, grass_color: [u8; 3]) -> Biome {
+		Biome {
+			grass_color: Some(Color(grass_color)),
+			..self
+		}
+	}
+
+	/// Builder function to set a grass color modifier
+	const fn modify(self, grass_color_modifier: BiomeGrassColorModifier) -> Biome {
+		Biome {
+			grass_color_modifier: Some(grass_color_modifier),
+			..self
+		}
+	}
+
+	/// Decodes a temperature or downfall value from the storage format to
+	/// f32 for further calculation
+	fn decode(val: i8) -> f32 {
+		f32::from(val) / 20.0
+	}
+
+	/// Returns the biome's temperature decoded to its original float value
+	pub fn temp(&self) -> f32 {
+		Self::decode(self.temp)
+	}
+
+	/// Returns the biome's downfall decoded to its original float value
+	pub fn downfall(&self) -> f32 {
+		Self::decode(self.downfall)
+	}
+}
+
 /// Used to look up standard Minecraft biome types
 #[derive(Debug)]
 pub struct BiomeTypes {
@@ -154,7 +258,7 @@ impl Default for BiomeTypes {
 			.map(|(k, v)| (String::from(*k), v))
 			.collect();
 
-		for &(old, new) in biomes::BIOME_ALIASES.iter().rev() {
+		for &(old, new) in legacy_biomes::BIOME_ALIASES.iter().rev() {
 			let biome = biome_map
 				.get(new)
 				.copied()
@@ -164,7 +268,7 @@ impl Default for BiomeTypes {
 
 		let legacy_biomes = (0..=255)
 			.map(|index| {
-				let id = biomes::legacy_biome(index);
+				let id = legacy_biomes::legacy_biome(index);
 				*biome_map.get(id).expect("Unknown legacy biome")
 			})
 			.collect::<Box<[_]>>()

From 7b98954c8092ac150a21f8c2073c33b1a2f422e0 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 31 Dec 2024 13:05:47 +0100
Subject: [PATCH 388/460] resource: add comments to generated file

---
 crates/resource/src/block_types.rs | 5 +++++
 crates/resource/src/lib.rs         | 4 +---
 resource/generate.py               | 5 +++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/crates/resource/src/block_types.rs b/crates/resource/src/block_types.rs
index 4cdc55c..53abd54 100644
--- a/crates/resource/src/block_types.rs
+++ b/crates/resource/src/block_types.rs
@@ -1,7 +1,12 @@
+//! Block type information
+//!
+//! This file is generated using resource/generate.py, do not edit
+
 use enumflags2::make_bitflags;
 
 use super::*;
 
+/// List if known block types and their properties
 pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 	(
 		"acacia_button",
diff --git a/crates/resource/src/lib.rs b/crates/resource/src/lib.rs
index b499fbf..1afcc62 100644
--- a/crates/resource/src/lib.rs
+++ b/crates/resource/src/lib.rs
@@ -4,12 +4,10 @@
 
 mod biomes;
 mod block_color;
+mod block_types;
 mod legacy_biomes;
 mod legacy_block_types;
 
-#[allow(clippy::missing_docs_in_private_items)] // Generated module
-mod block_types;
-
 use std::collections::HashMap;
 
 use enumflags2::{bitflags, BitFlags};
diff --git a/resource/generate.py b/resource/generate.py
index 8064482..ab91324 100755
--- a/resource/generate.py
+++ b/resource/generate.py
@@ -14,10 +14,15 @@ with open(sys.argv[1]) as f:
 output = {}
 
 with open(sys.argv[2], 'w') as f:
+	print('//! Block type information', file=f);
+	print('//!', file=f);
+	print('//! This file is generated using resource/generate.py, do not edit', file=f);
+	print('', file=f)
 	print('use enumflags2::make_bitflags;', file=f);
 	print('', file=f)
 	print('use super::*;', file=f)
 	print('', file=f)
+	print('/// List if known block types and their properties', file=f);
 	print('pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[', file=f)
 
 	for name, info in colors.items():

From 8f408e78a0dabcb2cc0b0aa0295bdb6d24f1705f Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 31 Dec 2024 13:51:55 +0100
Subject: [PATCH 389/460] resource: codegen biome list

---
 crates/resource/src/biomes.rs | 246 ++++++++++++++++------------------
 resource/README.md            |  15 ++-
 resource/biomes.py            |  70 ++++++++++
 3 files changed, 197 insertions(+), 134 deletions(-)
 create mode 100755 resource/biomes.py

diff --git a/crates/resource/src/biomes.rs b/crates/resource/src/biomes.rs
index d81a069..55c5e74 100644
--- a/crates/resource/src/biomes.rs
+++ b/crates/resource/src/biomes.rs
@@ -1,137 +1,117 @@
 //! Biome data
+//!
+//! This file is generated using resource/biomes.py, do not edit
 
 use super::*;
+use BiomeGrassColorModifier::*;
 
-/// Standard biome specifications
-pub const BIOMES: &[(&str, Biome)] = {
-	use BiomeGrassColorModifier::*;
-
-	// Data extracted from Minecraft code decompiled using https://github.com/Hexeption/MCP-Reborn
-
-	// We can't use floats in const functions, to temperature and downfall values
-	// are specified multipled by 100. The underscore is used in place of the decimal point
-	// of the original values.
-
-	#[allow(clippy::zero_prefixed_literal)]
-	&[
-		// Overworld
-		(
-			"badlands",
-			Biome::new(2_00, 0_00)
-				.foliage([158, 129, 77])
-				.grass([144, 129, 77]),
-		),
-		("bamboo_jungle", Biome::new(0_95, 0_90)),
-		("beach", Biome::new(0_80, 0_40)),
-		("birch_forest", Biome::new(0_60, 0_60)),
-		(
-			"cherry_grove",
-			Biome::new(0_50, 0_80)
-				.water([93, 183, 239])
-				.grass([182, 219, 97])
-				.foliage([182, 219, 97]),
-		),
-		("cold_ocean", Biome::new(0_50, 0_50).water([61, 87, 214])),
-		("dark_forest", Biome::new(0_70, 0_80).modify(DarkForest)),
-		(
-			"deep_cold_ocean",
-			Biome::new(0_50, 0_50).water([61, 87, 214]),
-		),
-		("deep_dark", Biome::new(0_80, 0_40)),
-		(
-			"deep_frozen_ocean",
-			Biome::new(0_50, 0_50).water([57, 56, 201]),
-		),
-		(
-			"deep_lukewarm_ocean",
-			Biome::new(0_50, 0_50).water([69, 173, 242]),
-		),
-		("deep_ocean", Biome::new(0_50, 0_50)),
-		("desert", Biome::new(2_00, 0_00)),
-		("dripstone_caves", Biome::new(0_80, 0_40)),
-		(
-			"eroded_badlands",
-			Biome::new(2_00, 0_00)
-				.foliage([158, 129, 77])
-				.grass([144, 129, 77]),
-		),
-		("flower_forest", Biome::new(0_70, 0_80)),
-		("forest", Biome::new(0_70, 0_80)),
-		("frozen_ocean", Biome::new(0_00, 0_50).water([57, 56, 201])),
-		("frozen_peaks", Biome::new(-0_70, 0_90)),
-		("frozen_river", Biome::new(0_00, 0_50).water([57, 56, 201])),
-		("grove", Biome::new(-0_20, 0_80)),
-		("ice_spikes", Biome::new(0_00, 0_50)),
-		("jagged_peaks", Biome::new(-0_70, 0_90)),
-		("jungle", Biome::new(0_95, 0_90)),
-		(
-			"lukewarm_ocean",
-			Biome::new(0_50, 0_50).water([69, 173, 242]),
-		),
-		("lush_caves", Biome::new(0_50, 0_50)),
-		(
-			"mangrove_swamp",
-			Biome::new(0_80, 0_90)
-				.water([58, 122, 106])
-				.foliage([141, 177, 39])
-				.modify(Swamp),
-		),
-		("meadow", Biome::new(0_50, 0_80).water([14, 78, 207])),
-		("mushroom_fields", Biome::new(0_90, 1_00)),
-		("ocean", Biome::new(0_50, 0_50)),
-		("old_growth_birch_forest", Biome::new(0_60, 0_60)),
-		("old_growth_pine_taiga", Biome::new(0_30, 0_80)),
-		("old_growth_spruce_taiga", Biome::new(0_25, 0_80)),
-		(
-			"pale_garden",
-			Biome::new(0_70, 0_80)
-				.water([118, 136, 157])
-				.foliage([135, 141, 118])
-				.grass([119, 130, 114]),
-		),
-		("plains", Biome::new(0_80, 0_40)),
-		("river", Biome::new(0_50, 0_50)),
-		("savanna", Biome::new(2_00, 0_00)),
-		("savanna_plateau", Biome::new(2_00, 0_00)),
-		("snowy_beach", Biome::new(0_05, 0_30).water([61, 87, 214])),
-		("snowy_plains", Biome::new(0_00, 0_50)),
-		("snowy_slopes", Biome::new(-0_30, 0_90)),
-		("snowy_taiga", Biome::new(-0_50, 0_40).water([61, 87, 214])),
-		("sparse_jungle", Biome::new(0_95, 0_80)),
-		("stony_peaks", Biome::new(1_00, 0_30)),
-		("stony_shore", Biome::new(0_20, 0_30)),
-		("sunflower_plains", Biome::new(0_80, 0_40)),
-		(
-			"swamp",
-			Biome::new(0_80, 0_90)
-				.water([97, 123, 100])
-				.foliage([106, 112, 57])
-				.modify(Swamp),
-		),
-		("taiga", Biome::new(0_25, 0_80)),
-		("the_void", Biome::new(0_50, 0_50)),
-		("warm_ocean", Biome::new(0_50, 0_50).water([67, 213, 238])),
-		("windswept_forest", Biome::new(0_20, 0_30)),
-		("windswept_gravelly_hills", Biome::new(0_20, 0_30)),
-		("windswept_hills", Biome::new(0_20, 0_30)),
-		("windswept_savanna", Biome::new(2_00, 0_00)),
-		(
-			"wooded_badlands",
-			Biome::new(2_00, 0_00)
-				.foliage([158, 129, 77])
-				.grass([144, 129, 77]),
-		),
-		// Nether
-		("basalt_deltas", Biome::new(2_00, 0_00)),
-		("crimson_forest", Biome::new(2_00, 0_00)),
-		("nether_wastes", Biome::new(2_00, 0_00)),
-		("soul_sand_valley", Biome::new(2_00, 0_00)),
-		("warped_forest", Biome::new(2_00, 0_00)),
-		// End
-		("end_barrens", Biome::new(0_50, 0_50)),
-		("end_highlands", Biome::new(0_50, 0_50)),
-		("end_midlands", Biome::new(0_50, 0_50)),
-		("small_end_islands", Biome::new(0_50, 0_50)),
-		("the_end", Biome::new(0_50, 0_50)),
-	]
-};
+/// List if known biomes and their properties
+pub const BIOMES: &[(&str, Biome)] = &[
+	(
+		"badlands",
+		Biome::new(200, 0)
+			.foliage([158, 129, 77])
+			.grass([144, 129, 77]),
+	),
+	("bamboo_jungle", Biome::new(95, 90)),
+	("basalt_deltas", Biome::new(200, 0)),
+	("beach", Biome::new(80, 40)),
+	("birch_forest", Biome::new(60, 60)),
+	(
+		"cherry_grove",
+		Biome::new(50, 80)
+			.foliage([182, 219, 97])
+			.grass([182, 219, 97])
+			.water([93, 183, 239]),
+	),
+	("cold_ocean", Biome::new(50, 50).water([61, 87, 214])),
+	("crimson_forest", Biome::new(200, 0)),
+	("dark_forest", Biome::new(70, 80).modify(DarkForest)),
+	("deep_cold_ocean", Biome::new(50, 50).water([61, 87, 214])),
+	("deep_dark", Biome::new(80, 40)),
+	("deep_frozen_ocean", Biome::new(50, 50).water([57, 56, 201])),
+	(
+		"deep_lukewarm_ocean",
+		Biome::new(50, 50).water([69, 173, 242]),
+	),
+	("deep_ocean", Biome::new(50, 50)),
+	("desert", Biome::new(200, 0)),
+	("dripstone_caves", Biome::new(80, 40)),
+	("end_barrens", Biome::new(50, 50)),
+	("end_highlands", Biome::new(50, 50)),
+	("end_midlands", Biome::new(50, 50)),
+	(
+		"eroded_badlands",
+		Biome::new(200, 0)
+			.foliage([158, 129, 77])
+			.grass([144, 129, 77]),
+	),
+	("flower_forest", Biome::new(70, 80)),
+	("forest", Biome::new(70, 80)),
+	("frozen_ocean", Biome::new(0, 50).water([57, 56, 201])),
+	("frozen_peaks", Biome::new(-70, 90)),
+	("frozen_river", Biome::new(0, 50).water([57, 56, 201])),
+	("grove", Biome::new(-20, 80)),
+	("ice_spikes", Biome::new(0, 50)),
+	("jagged_peaks", Biome::new(-70, 90)),
+	("jungle", Biome::new(95, 90)),
+	("lukewarm_ocean", Biome::new(50, 50).water([69, 173, 242])),
+	("lush_caves", Biome::new(50, 50)),
+	(
+		"mangrove_swamp",
+		Biome::new(80, 90)
+			.foliage([141, 177, 39])
+			.modify(Swamp)
+			.water([58, 122, 106]),
+	),
+	("meadow", Biome::new(50, 80).water([14, 78, 207])),
+	("mushroom_fields", Biome::new(90, 100)),
+	("nether_wastes", Biome::new(200, 0)),
+	("ocean", Biome::new(50, 50)),
+	("old_growth_birch_forest", Biome::new(60, 60)),
+	("old_growth_pine_taiga", Biome::new(30, 80)),
+	("old_growth_spruce_taiga", Biome::new(25, 80)),
+	(
+		"pale_garden",
+		Biome::new(70, 80)
+			.foliage([135, 141, 118])
+			.grass([119, 130, 114])
+			.water([118, 136, 157]),
+	),
+	("plains", Biome::new(80, 40)),
+	("river", Biome::new(50, 50)),
+	("savanna", Biome::new(200, 0)),
+	("savanna_plateau", Biome::new(200, 0)),
+	("small_end_islands", Biome::new(50, 50)),
+	("snowy_beach", Biome::new(5, 30).water([61, 87, 214])),
+	("snowy_plains", Biome::new(0, 50)),
+	("snowy_slopes", Biome::new(-30, 90)),
+	("snowy_taiga", Biome::new(-50, 40).water([61, 87, 214])),
+	("soul_sand_valley", Biome::new(200, 0)),
+	("sparse_jungle", Biome::new(95, 80)),
+	("stony_peaks", Biome::new(100, 30)),
+	("stony_shore", Biome::new(20, 30)),
+	("sunflower_plains", Biome::new(80, 40)),
+	(
+		"swamp",
+		Biome::new(80, 90)
+			.foliage([106, 112, 57])
+			.modify(Swamp)
+			.water([97, 123, 100]),
+	),
+	("taiga", Biome::new(25, 80)),
+	("the_end", Biome::new(50, 50)),
+	("the_void", Biome::new(50, 50)),
+	("warm_ocean", Biome::new(50, 50).water([67, 213, 238])),
+	("warped_forest", Biome::new(200, 0)),
+	("windswept_forest", Biome::new(20, 30)),
+	("windswept_gravelly_hills", Biome::new(20, 30)),
+	("windswept_hills", Biome::new(20, 30)),
+	("windswept_savanna", Biome::new(200, 0)),
+	(
+		"wooded_badlands",
+		Biome::new(200, 0)
+			.foliage([158, 129, 77])
+			.grass([144, 129, 77]),
+	),
+];
diff --git a/resource/README.md b/resource/README.md
index ab9d5ea..12302ec 100644
--- a/resource/README.md
+++ b/resource/README.md
@@ -11,13 +11,15 @@ work.
 - `extract.py`: Takes the block type information from `blocks.json` and texture data
   from an unpacked Minecraft JAR, storing the result in `colors.json`
 - `generate.py`: Generates `block_types.rs` from `colors.json`
+- `biomes.py`: Generates `biomes.rs` from biome JSON files of an unpacked
+  Minecraft JAR
 - `sign_textures.py`: Generates all needed sign graphics from Minecraft assets
 
 In addition to these scripts, the JSON processor *jq* is a useful tool to work
 with MinedMap's resource metadata.
 
 
-## How to add support for block IDs of a new Minecraft version
+## How to add support for block IDs and biomes of a new Minecraft version
 
 1. Download the Minecraft version you want to support as well as the previous
    version currently supported by MinedMap. You can use the Minecraft launcher
@@ -69,6 +71,17 @@ with MinedMap's resource metadata.
      cargo fmt --all
      ```
 
+8. Update the source code for new biome data:
+
+     ```sh
+     ./biomes.py data/new ../crates/resource/src/biomes.rs
+     cargo fmt --all
+     ```
+
+    After regenerating, check if only new biomes were added. If entries
+    got removed, biomes may have been renamed or merged, requiring updates
+    to the alias list in `crates/resource/src/legacy_biomes.rs`.
+
 After the update, the new version should be tested with old savegames (both
 before and after migration by the new version) as well as newly generated
 worlds. Use creative mode to add the new block types to your test world.
diff --git a/resource/biomes.py b/resource/biomes.py
new file mode 100755
index 0000000..4e3bc51
--- /dev/null
+++ b/resource/biomes.py
@@ -0,0 +1,70 @@
+#!/usr/bin/env python3
+
+import json
+import os
+import sys
+
+
+if len(sys.argv) != 3:
+	sys.exit('Usage: biomes.py <data directory> <biomes.rs>')
+
+biomes = {}
+
+for file in os.scandir(os.path.join(sys.argv[1], 'data/minecraft/worldgen/biome')):
+	(name, ext) = os.path.splitext(file.name)
+	if ext != '.json':
+		continue
+	with open(file) as f:
+		data = json.load(f)
+	biomes[name] = {
+		'downfall': data['downfall'],
+		'temperature': data['temperature'],
+		'foliage_color': data['effects'].get('foliage_color'),
+		'grass_color': data['effects'].get('grass_color'),
+		'grass_color_modifier': data['effects'].get('grass_color_modifier'),
+		'water_color': data['effects'].get('water_color'),
+	}
+
+def color(v):
+	return f'[{v>>16}, {(v>>8)&0xff}, {v&0xff}]'
+
+# Converts the snake_case grass color modifier to CamelCase
+def modify(v):
+	return ''.join([s.capitalize() for s in v.split('_')])
+
+def gen_biome(name, info, f):
+	temp = round(100*info['temperature'])
+	downfall = round(100*info['downfall'])
+	foliage_color = info['foliage_color']
+	grass_color = info['grass_color']
+	grass_color_modifier = info['grass_color_modifier']
+	water_color = info['water_color']
+
+	print(f'\t("{name}", Biome::new({temp}, {downfall})', file=f)
+
+	if foliage_color is not None:
+		print(f'\t\t.foliage({color(foliage_color)})', file=f)
+	if grass_color is not None:
+		print(f'\t\t.grass({color(grass_color)})', file=f)
+	if grass_color_modifier is not None:
+		print(f'\t\t.modify({modify(grass_color_modifier)})', file=f)
+	if water_color is not None and water_color != 0x3f76e4:
+		print(f'\t\t.water({color(water_color)})', file=f)
+
+	print('\t),', file=f)
+
+with open(sys.argv[2], 'w') as f:
+	print('//! Biome data', file=f);
+	print('//!', file=f);
+	print('//! This file is generated using resource/biomes.py, do not edit', file=f);
+	print('', file=f)
+	print('use super::*;', file=f)
+	print('use BiomeGrassColorModifier::*;', file=f)
+	print('', file=f)
+	print('/// List if known biomes and their properties', file=f);
+	print('pub const BIOMES: &[(&str, Biome)] = &[', file=f)
+
+	for name in sorted(biomes):
+		gen_biome(name, biomes[name], f)
+
+	print('];', file=f)

From 00237101f26407f4d29fd497aa621f27cad1833c Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 31 Dec 2024 12:15:45 +0100
Subject: [PATCH 390/460] README.md: update for 1.21.4 support

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2312c03..4c684f9 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 * Render beautiful maps of your [Minecraft](https://minecraft.net/) worlds!
 * Put them on a webserver and view them in your browser!
-* Compatible with unmodified Minecraft Java Edition 1.8 up to 1.21 (no mod installation necessary!)
+* Compatible with unmodified Minecraft Java Edition 1.8 up to 1.21.4 (no mod installation required!)
 * Illumination layer: the world at night
 * Fast: create a full map for a huge 3GB savegame in less than 5 minutes in single-threaded operation
 * Multi-threading support: pass `-j N` to the renderer to use `N` parallel threads for generation

From 941cd16337ee153407139fec73d78f964339a0d7 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 2 Jan 2025 13:41:56 +0100
Subject: [PATCH 391/460] minedmap-resource 0.5.0

---
 Cargo.lock                 | 2 +-
 Cargo.toml                 | 2 +-
 crates/resource/Cargo.toml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ff64b60..b7a3740 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -610,7 +610,7 @@ dependencies = [
 
 [[package]]
 name = "minedmap-resource"
-version = "0.4.0"
+version = "0.5.0"
 dependencies = [
  "enumflags2",
  "glam",
diff --git a/Cargo.toml b/Cargo.toml
index ddf24ba..ad65c83 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -48,7 +48,7 @@ image = { version = "0.25.1", default-features = false, features = ["png"] }
 indexmap = { version = "2.0.0", features = ["serde"] }
 lru = "0.12.0"
 minedmap-nbt = { version = "0.1.1", path = "crates/nbt", default-features = false }
-minedmap-resource = { version = "0.4.0", path = "crates/resource" }
+minedmap-resource = { version = "0.5.0", path = "crates/resource" }
 minedmap-types = { version = "0.1.2", path = "crates/types" }
 num-integer = "0.1.45"
 num_cpus = "1.16.0"
diff --git a/crates/resource/Cargo.toml b/crates/resource/Cargo.toml
index de9b577..58e1da2 100644
--- a/crates/resource/Cargo.toml
+++ b/crates/resource/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "minedmap-resource"
-version = "0.4.0"
+version = "0.5.0"
 description = "Data describing Minecraft biomes and block types"
 edition.workspace = true
 license.workspace = true

From 650cd23198db1ba38d84510519e9cc3a82ae6b1f Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 2 Jan 2025 13:42:11 +0100
Subject: [PATCH 392/460] minedmap 2.3.0

---
 CHANGELOG.md | 5 ++++-
 Cargo.lock   | 2 +-
 Cargo.toml   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c7c159..ab33e93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased] - ReleaseDate
 
+## [2.3.0] - 2025-01-02
+
 - Added support for Minecraft 1.21.4 block types
 - Added support for Minecraft 1.21.4 Pale Garden biome
 - viewer: added images for pale oak signs
@@ -99,7 +101,8 @@ intermediate data.
   Full support for custom biomes datapacks might be added in a future release.
 
 <!-- next-url -->
-[Unreleased]: https://github.com/neocturne/MinedMap/compare/v2.2.0...HEAD
+[Unreleased]: https://github.com/neocturne/MinedMap/compare/v2.3.0...HEAD
+[2.3.0]: https://github.com/neocturne/MinedMap/compare/v2.2.0...v2.3.0
 [2.2.0]: https://github.com/neocturne/MinedMap/compare/v2.1.1...v2.2.0
 [2.1.1]: https://github.com/neocturne/MinedMap/compare/v2.1.0...v2.1.1
 [2.1.0]: https://github.com/neocturne/MinedMap/compare/v2.0.2...v2.1.0
diff --git a/Cargo.lock b/Cargo.lock
index b7a3740..c18929f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -567,7 +567,7 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "minedmap"
-version = "2.2.0"
+version = "2.3.0"
 dependencies = [
  "anyhow",
  "bincode",
diff --git a/Cargo.toml b/Cargo.toml
index ad65c83..e2f36b6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@ pre-release-commit-message = "{{crate_name}} {{version}}"
 
 [package]
 name = "minedmap"
-version = "2.2.0"
+version = "2.3.0"
 description = "Generate browsable maps from Minecraft save data"
 edition.workspace = true
 license.workspace = true

From 7f329ac8e73ef7f7d13ff842026b5397b7fa8f0a Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 6 Jan 2025 20:30:17 +0100
Subject: [PATCH 393/460] CHANGELOG.md: fix heading for previous release

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab33e93..4c9847e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 ## [2.3.0] - 2025-01-02
 
+### Added
+
 - Added support for Minecraft 1.21.4 block types
 - Added support for Minecraft 1.21.4 Pale Garden biome
 - viewer: added images for pale oak signs

From 9375af8d54d13f40932579ba0e11fbabc0375bb8 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 6 Jan 2025 20:27:01 +0100
Subject: [PATCH 394/460] resource: impl Ord for Color

Allow using Color in FormattedText.
---
 crates/resource/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/resource/src/lib.rs b/crates/resource/src/lib.rs
index 1afcc62..fed9514 100644
--- a/crates/resource/src/lib.rs
+++ b/crates/resource/src/lib.rs
@@ -38,7 +38,7 @@ pub enum BlockFlag {
 }
 
 /// An RGB color with u8 components
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
 pub struct Color(pub [u8; 3]);
 
 /// An RGB color with f32 components

From ff6e28d381574fecc0a10466faf35c60a9efd756 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 6 Jan 2025 21:16:41 +0100
Subject: [PATCH 395/460] world, viewer: fix sign text colors

- Fix text colors for signs modified using dye
- Fix text colors specified using `#rrggbb` CSS syntax in JSON text

Only named colors specified via JSON text were working as intended. Dyed signs use different
color names.

The mapping of color names to values is now handled by the generator. Both the generator and the
viewer must be updated for sign text colors to work.
---
 CHANGELOG.md           | 11 ++++++
 Cargo.lock             | 64 ++++++++++++++++++++++++++++++
 Cargo.toml             |  1 +
 src/core/common.rs     |  2 +-
 src/world/json_text.rs | 89 ++++++++++++++++++++++++++++++++++++++++--
 src/world/sign.rs      | 29 +++++++++++++-
 viewer/MinedMap.js     | 23 ++---------
 7 files changed, 192 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c9847e..aabf1f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
 
 ## [Unreleased] - ReleaseDate
 
+### Fixed
+
+- Fix text colors for signs modified using dye
+- Fix text colors specified using `#rrggbb` CSS syntax in JSON text
+
+Only named colors specified via JSON text were working as intended. Dyed signs use different
+color names.
+
+The mapping of color names to values is now handled by the generator. Both the generator and the
+viewer must be updated for sign text colors to work.
+
 ## [2.3.0] - 2025-01-02
 
 ### Added
diff --git a/Cargo.lock b/Cargo.lock
index c18929f..90a9b7a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -584,6 +584,7 @@ dependencies = [
  "minedmap-types",
  "num-integer",
  "num_cpus",
+ "phf",
  "rayon",
  "regex",
  "rustc-hash",
@@ -717,6 +718,48 @@ dependencies = [
  "windows-targets",
 ]
 
+[[package]]
+name = "phf"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
+dependencies = [
+ "phf_macros",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
+dependencies = [
+ "phf_shared",
+ "rand",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
+dependencies = [
+ "siphasher",
+]
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.15"
@@ -766,6 +809,21 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+
 [[package]]
 name = "rayon"
 version = "1.10.0"
@@ -923,6 +981,12 @@ version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
 
+[[package]]
+name = "siphasher"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+
 [[package]]
 name = "slab"
 version = "0.4.9"
diff --git a/Cargo.toml b/Cargo.toml
index e2f36b6..287ac4c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -52,6 +52,7 @@ minedmap-resource = { version = "0.5.0", path = "crates/resource" }
 minedmap-types = { version = "0.1.2", path = "crates/types" }
 num-integer = "0.1.45"
 num_cpus = "1.16.0"
+phf = { version = "0.11.2", features = ["macros"] }
 rayon = "1.7.0"
 regex = "1.10.2"
 rustc-hash = "2.0.0"
diff --git a/src/core/common.rs b/src/core/common.rs
index 3dd01cf..be6d28a 100644
--- a/src/core/common.rs
+++ b/src/core/common.rs
@@ -46,7 +46,7 @@ pub const MIPMAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
 /// MinedMap processed entity data version number
 ///
 /// Increase when entity collection changes bacause of code changes.
-pub const ENTITIES_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
+pub const ENTITIES_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(1);
 
 /// Coordinate pair of a generated tile
 ///
diff --git a/src/world/json_text.rs b/src/world/json_text.rs
index a153179..fa18527 100644
--- a/src/world/json_text.rs
+++ b/src/world/json_text.rs
@@ -1,7 +1,8 @@
 //! Newtype and helper methods for handling Minecraft Raw JSON Text
 
-use std::{collections::VecDeque, fmt::Display, sync::Arc};
+use std::{collections::VecDeque, fmt::Display};
 
+use minedmap_resource::Color;
 use serde::{Deserialize, Serialize};
 
 /// A span of formatted text
@@ -17,8 +18,8 @@ pub struct FormattedText {
 	/// Text content
 	pub text: String,
 	/// Text color
-	#[serde(skip_serializing_if = "Option::is_none")]
-	pub color: Option<Arc<String>>,
+	#[serde(skip_serializing_if = "Option::is_none", with = "json_color")]
+	pub color: Option<Color>,
 	/// Bold formatting
 	#[serde(skip_serializing_if = "Option::is_none")]
 	pub bold: Option<bool>,
@@ -41,7 +42,7 @@ impl FormattedText {
 	pub fn inherit(self, parent: &Self) -> Self {
 		FormattedText {
 			text: self.text,
-			color: self.color.or_else(|| parent.color.clone()),
+			color: self.color.or(parent.color),
 			bold: self.bold.or(parent.bold),
 			italic: self.italic.or(parent.italic),
 			underlined: self.underlined.or(parent.underlined),
@@ -175,3 +176,83 @@ impl JSONText {
 		serde_json::from_str(&self.0).unwrap_or_default()
 	}
 }
+
+mod json_color {
+	//! Helpers for serializing and deserializing [FormattedText](super::FormattedText) colors
+
+	use minedmap_resource::Color;
+	use serde::{
+		de::{self, Visitor},
+		ser::Error as _,
+		Deserializer, Serializer,
+	};
+
+	/// Named JSON text colors
+	static COLORS: phf::Map<&'static str, Color> = phf::phf_map! {
+		"black" => Color([0x00, 0x00, 0x00]),
+		"dark_blue" => Color([0x00, 0x00, 0xAA]),
+		"dark_green" => Color([0x00, 0xAA, 0x00]),
+		"dark_aqua" => Color([0x00, 0xAA, 0xAA]),
+		"dark_red" => Color([0xAA, 0x00, 0x00]),
+		"dark_purple" => Color([0xAA, 0x00, 0xAA]),
+		"gold" => Color([0xFF, 0xAA, 0x00]),
+		"gray" => Color([0xAA, 0xAA, 0xAA]),
+		"dark_gray" => Color([0x55, 0x55, 0x55]),
+		"blue" => Color([0x55, 0x55, 0xFF]),
+		"green" => Color([0x55, 0xFF, 0x55]),
+		"aqua" => Color([0x55, 0xFF, 0xFF]),
+		"red" => Color([0xFF, 0x55, 0x55]),
+		"light_purple" => Color([0xFF, 0x55, 0xFF]),
+		"yellow" => Color([0xFF, 0xFF, 0x55]),
+		"white" => Color([0xFF, 0xFF, 0xFF]),
+	};
+
+	/// serde serialize function for [FormattedText::color](super::FormattedText::color)
+	pub fn serialize<S>(color: &Option<Color>, serializer: S) -> Result<S::Ok, S::Error>
+	where
+		S: Serializer,
+	{
+		let &Some(color) = color else {
+			return Err(S::Error::custom("serialize called for None sign color"));
+		};
+
+		let text = format!("#{:02x}{:02x}{:02x}", color.0[0], color.0[1], color.0[2]);
+		serializer.serialize_str(&text)
+	}
+
+	/// serde [Visitor] for use by [deserialize]
+	struct ColorVisitor;
+
+	impl Visitor<'_> for ColorVisitor {
+		type Value = Option<Color>;
+
+		fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
+			formatter.write_str("a string representing a color")
+		}
+
+		fn visit_str<E>(self, color: &str) -> Result<Self::Value, E>
+		where
+			E: de::Error,
+		{
+			if let Some(hex) = color.strip_prefix("#") {
+				if let Ok(value) = u32::from_str_radix(hex, 16) {
+					return Ok(Some(Color([
+						(value >> 16) as u8,
+						(value >> 8) as u8,
+						value as u8,
+					])));
+				}
+			}
+
+			Ok(COLORS.get(color).copied())
+		}
+	}
+
+	/// serde deserialize function for [FormattedText::color](super::FormattedText::color)
+	pub fn deserialize<'de, D>(deserializer: D) -> Result<Option<Color>, D::Error>
+	where
+		D: Deserializer<'de>,
+	{
+		deserializer.deserialize_str(ColorVisitor)
+	}
+}
diff --git a/src/world/sign.rs b/src/world/sign.rs
index 57b741a..eff319f 100644
--- a/src/world/sign.rs
+++ b/src/world/sign.rs
@@ -1,7 +1,8 @@
 //! Processing of sign text
 
-use std::{fmt::Display, sync::Arc};
+use std::fmt::Display;
 
+use minedmap_resource::Color;
 use serde::{Deserialize, Serialize};
 
 use super::{
@@ -23,10 +24,34 @@ pub struct RawSignText<'a> {
 	pub color: Option<&'a str>,
 }
 
+/// The color to use for signs without a color attribute ("black")
+const DEFAULT_COLOR: Color = Color([0, 0, 0]);
+
+/// Map of text colors associated with dyes (except for black)
+static DYE_COLORS: phf::Map<&'static str, Color> = phf::phf_map! {
+	"white" => Color([255, 255, 255]),
+	"orange" => Color([255, 104, 31]),
+	"magenta" => Color([255, 0, 255]),
+	"light_blue" => Color([154, 192, 205]),
+	"yellow" => Color([255, 255, 0]),
+	"lime" => Color([191, 255, 0]),
+	"pink" => Color([255, 105, 180]),
+	"gray" => Color([128, 128, 128]),
+	"light_gray" => Color([211, 211, 211]),
+	"cyan" => Color([0, 255, 255]),
+	"purple" => Color([160, 32, 240]),
+	"blue" => Color([0, 0, 255]),
+	"brown" => Color([139, 69, 19]),
+	"green" => Color([0, 255, 0]),
+	"red" => Color([255, 0, 0]),
+};
+
 impl RawSignText<'_> {
 	/// Decodes the [RawSignText] into a [SignText]
 	pub fn decode(&self) -> SignText {
-		let color = self.color.map(|c| Arc::new(c.to_owned()));
+		let color = self
+			.color
+			.map(|c| DYE_COLORS.get(c).copied().unwrap_or(DEFAULT_COLOR));
 		let parent = FormattedText {
 			color,
 			..Default::default()
diff --git a/viewer/MinedMap.js b/viewer/MinedMap.js
index e784eec..cfcccf1 100644
--- a/viewer/MinedMap.js
+++ b/viewer/MinedMap.js
@@ -153,25 +153,6 @@ const parseHash = function () {
 	return args;
 }
 
-const colors = {
-	black: '#000000',
-	dark_blue: '#0000AA',
-	dark_green: '#00AA00',
-	dark_aqua: '#00AAAA',
-	dark_red: '#AA0000',
-	dark_purple: '#AA00AA',
-	gold: '#FFAA00',
-	gray: '#AAAAAA',
-	dark_gray: '#555555',
-	blue: '#5555FF',
-	green: '#55FF55',
-	aqua: '#55FFFF',
-	red: '#FF5555',
-	light_purple: '#FF55FF',
-	yellow: '#FFFF55',
-	white: '#FFFFFF',
-};
-
 function formatSignLine(line) {
 	const el = document.createElement('span');
 	el.style.whiteSpace = 'pre';
@@ -180,7 +161,9 @@ function formatSignLine(line) {
 		const child = document.createElement('span');
 		child.textContent = span.text;
 
-		const color = colors[span.color ?? 'black'] || colors['black'];
+		let color = span.color ?? '';
+		if (color[0] !== '#')
+			color = '#000000';
 
 		if (span.bold)
 			child.style.fontWeight = 'bold';

From a67bdb3b67dc1b576b9aeb77bd93605955da21ab Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 6 Jan 2025 21:25:20 +0100
Subject: [PATCH 396/460] minedmap-resource 0.6.0

---
 Cargo.lock                 | 2 +-
 Cargo.toml                 | 2 +-
 crates/resource/Cargo.toml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 90a9b7a..e616496 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -611,7 +611,7 @@ dependencies = [
 
 [[package]]
 name = "minedmap-resource"
-version = "0.5.0"
+version = "0.6.0"
 dependencies = [
  "enumflags2",
  "glam",
diff --git a/Cargo.toml b/Cargo.toml
index 287ac4c..f3a3798 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -48,7 +48,7 @@ image = { version = "0.25.1", default-features = false, features = ["png"] }
 indexmap = { version = "2.0.0", features = ["serde"] }
 lru = "0.12.0"
 minedmap-nbt = { version = "0.1.1", path = "crates/nbt", default-features = false }
-minedmap-resource = { version = "0.5.0", path = "crates/resource" }
+minedmap-resource = { version = "0.6.0", path = "crates/resource" }
 minedmap-types = { version = "0.1.2", path = "crates/types" }
 num-integer = "0.1.45"
 num_cpus = "1.16.0"
diff --git a/crates/resource/Cargo.toml b/crates/resource/Cargo.toml
index 58e1da2..4e0d512 100644
--- a/crates/resource/Cargo.toml
+++ b/crates/resource/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "minedmap-resource"
-version = "0.5.0"
+version = "0.6.0"
 description = "Data describing Minecraft biomes and block types"
 edition.workspace = true
 license.workspace = true

From f9954d1ce4e8dd25802c64bd36b6baccad0e8a42 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 6 Jan 2025 21:25:29 +0100
Subject: [PATCH 397/460] minedmap 2.3.1

---
 CHANGELOG.md | 5 ++++-
 Cargo.lock   | 2 +-
 Cargo.toml   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aabf1f1..4a18819 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased] - ReleaseDate
 
+## [2.3.1] - 2025-01-06
+
 ### Fixed
 
 - Fix text colors for signs modified using dye
@@ -114,7 +116,8 @@ intermediate data.
   Full support for custom biomes datapacks might be added in a future release.
 
 <!-- next-url -->
-[Unreleased]: https://github.com/neocturne/MinedMap/compare/v2.3.0...HEAD
+[Unreleased]: https://github.com/neocturne/MinedMap/compare/v2.3.1...HEAD
+[2.3.1]: https://github.com/neocturne/MinedMap/compare/v2.3.0...v2.3.1
 [2.3.0]: https://github.com/neocturne/MinedMap/compare/v2.2.0...v2.3.0
 [2.2.0]: https://github.com/neocturne/MinedMap/compare/v2.1.1...v2.2.0
 [2.1.1]: https://github.com/neocturne/MinedMap/compare/v2.1.0...v2.1.1
diff --git a/Cargo.lock b/Cargo.lock
index e616496..cbd4110 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -567,7 +567,7 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "minedmap"
-version = "2.3.0"
+version = "2.3.1"
 dependencies = [
  "anyhow",
  "bincode",
diff --git a/Cargo.toml b/Cargo.toml
index f3a3798..6a6a300 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@ pre-release-commit-message = "{{crate_name}} {{version}}"
 
 [package]
 name = "minedmap"
-version = "2.3.0"
+version = "2.3.1"
 description = "Generate browsable maps from Minecraft save data"
 edition.workspace = true
 license.workspace = true

From b9cd94b235523d982d5a35895aa27f2b8d54a7f5 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 6 Jan 2025 22:31:56 +0100
Subject: [PATCH 398/460] CHANGELOG.md: remove reference to Minecraft internals

Remove a sentence that refers to internal color names, as the
information is more confusing than helpful in a user-facing changlog.
---
 CHANGELOG.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a18819..1b5dd97 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,8 +9,7 @@
 - Fix text colors for signs modified using dye
 - Fix text colors specified using `#rrggbb` CSS syntax in JSON text
 
-Only named colors specified via JSON text were working as intended. Dyed signs use different
-color names.
+Only named colors specified via JSON text were working as intended.
 
 The mapping of color names to values is now handled by the generator. Both the generator and the
 viewer must be updated for sign text colors to work.

From 52572a9e81cef19d8427a54a538aaf55891e2af0 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 9 Jan 2025 20:55:37 +0100
Subject: [PATCH 399/460] Update dependencies

---
 Cargo.lock              | 68 ++++++++++++++++++++---------------------
 crates/types/Cargo.toml |  2 +-
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cbd4110..87d4135 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -149,9 +149,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
 [[package]]
 name = "cc"
-version = "1.2.6"
+version = "1.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d6dbb628b8f8555f86d0323c2eb39e3ec81901f4b83e091db8a6a76d316a333"
+checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7"
 dependencies = [
  "jobserver",
  "libc",
@@ -172,9 +172,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.5.23"
+version = "4.5.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84"
+checksum = "a8eb5e908ef3a6efbe1ed62520fb7287959888c88485abe072543190ecc66783"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -182,9 +182,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.23"
+version = "4.5.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838"
+checksum = "96b01801b5fc6a0a232407abc821660c9c6d25a1cafc0d4f85f29fb8d9afc121"
 dependencies = [
  "anstream",
  "anstyle",
@@ -195,9 +195,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.18"
+version = "4.5.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
+checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -484,9 +484,9 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
 [[package]]
 name = "itertools"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
 dependencies = [
  "either",
 ]
@@ -520,9 +520,9 @@ checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "libz-ng-sys"
-version = "1.1.20"
+version = "1.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f0f7295a34685977acb2e8cc8b08ee4a8dffd6cf278eeccddbe1ed55ba815d5"
+checksum = "7cee1488e961a80d172564fd6fcda11d8a4ac6672c06fe008e9213fa60520c2b"
 dependencies = [
  "cmake",
  "libc",
@@ -530,9 +530,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.14"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
 [[package]]
 name = "lock_api"
@@ -720,9 +720,9 @@ dependencies = [
 
 [[package]]
 name = "phf"
-version = "0.11.2"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
+checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
 dependencies = [
  "phf_macros",
  "phf_shared",
@@ -730,9 +730,9 @@ dependencies = [
 
 [[package]]
 name = "phf_generator"
-version = "0.11.2"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
+checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
 dependencies = [
  "phf_shared",
  "rand",
@@ -740,9 +740,9 @@ dependencies = [
 
 [[package]]
 name = "phf_macros"
-version = "0.11.2"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
+checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
 dependencies = [
  "phf_generator",
  "phf_shared",
@@ -753,18 +753,18 @@ dependencies = [
 
 [[package]]
 name = "phf_shared"
-version = "0.11.2"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
+checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
 dependencies = [
  "siphasher",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.15"
+version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
 [[package]]
 name = "pin-utils"
@@ -896,9 +896,9 @@ checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
 
 [[package]]
 name = "rustix"
-version = "0.38.42"
+version = "0.38.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
+checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6"
 dependencies = [
  "bitflags 2.6.0",
  "errno",
@@ -950,9 +950,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.134"
+version = "1.0.135"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d"
+checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9"
 dependencies = [
  "itoa",
  "memchr",
@@ -983,9 +983,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
 
 [[package]]
 name = "siphasher"
-version = "0.3.11"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
 [[package]]
 name = "slab"
@@ -1010,9 +1010,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "syn"
-version = "2.0.93"
+version = "2.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c786062daee0d6db1132800e623df74274a0a87322d8e183338e01b3d98d058"
+checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1041,9 +1041,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.42.0"
+version = "1.43.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
+checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
 dependencies = [
  "backtrace",
  "parking_lot",
diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml
index 6a81414..1146195 100644
--- a/crates/types/Cargo.toml
+++ b/crates/types/Cargo.toml
@@ -8,5 +8,5 @@ readme.workspace = true
 repository.workspace = true
 
 [dependencies]
-itertools = "0.13.0"
+itertools = "0.14.0"
 serde = { version = "1.0.183", features = ["derive"] }

From 28a191a23af16a6e82c62a4ac4a58051203ef900 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 9 Jan 2025 21:09:48 +0100
Subject: [PATCH 400/460] resource: ignore array size clippy warning

The const is used only once, so there is no reason not to inline it.
---
 crates/resource/src/legacy_block_types.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/resource/src/legacy_block_types.rs b/crates/resource/src/legacy_block_types.rs
index c027ac3..0c4814d 100644
--- a/crates/resource/src/legacy_block_types.rs
+++ b/crates/resource/src/legacy_block_types.rs
@@ -13,6 +13,7 @@ const DEF: &str = "air";
 const EMPTY: [&str; 16] = simple(DEF);
 
 /// Mapping from each numeric block type and damage/subtype ID to new string ID
+#[allow(clippy::large_const_arrays)]
 pub const LEGACY_BLOCK_TYPES: [[&str; 16]; 256] = [
 	/* 0 */
 	simple("air"),

From c23b53a8c3de7c0eefb6a3b0775ea15b8c24bbcc Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 11 Jan 2025 01:24:58 +0100
Subject: [PATCH 401/460] core, viewer: add support for WebP output

WebP can be selected by passing `--image-format webp` on the command
line. For typical Minecraft worlds, this results in a size reduction of
10-15% without increasing processing time.
---
 CHANGELOG.md                 |  4 ++++
 Cargo.lock                   | 17 +++++++++++++++++
 Cargo.toml                   |  2 +-
 README.md                    | 11 ++++++++++-
 src/core/common.rs           | 31 ++++++++++++++++++++++++++++++-
 src/core/metadata_writer.rs  |  3 +++
 src/core/mod.rs              |  5 ++++-
 src/core/region_processor.rs |  5 ++++-
 src/core/tile_mipmapper.rs   |  2 +-
 src/core/tile_renderer.rs    |  2 +-
 viewer/MinedMap.js           | 10 ++++++----
 11 files changed, 81 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b5dd97..dbd71f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [Unreleased] - ReleaseDate
 
+### Added
+
+- Added support for rendering tiles WebP format using the `--image-format` option
+
 ## [2.3.1] - 2025-01-06
 
 ### Fixed
diff --git a/Cargo.lock b/Cargo.lock
index 87d4135..970c1be 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -461,10 +461,21 @@ checksum = "cd6f44aed642f18953a158afeb30206f4d50da59fbc66ecb53c66488de73563b"
 dependencies = [
  "bytemuck",
  "byteorder-lite",
+ "image-webp",
  "num-traits",
  "png",
 ]
 
+[[package]]
+name = "image-webp"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e031e8e3d94711a9ccb5d6ea357439ef3dcbed361798bd4071dc4d9793fbe22f"
+dependencies = [
+ "byteorder-lite",
+ "quick-error",
+]
+
 [[package]]
 name = "indexmap"
 version = "2.7.0"
@@ -800,6 +811,12 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "quick-error"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
+
 [[package]]
 name = "quote"
 version = "1.0.38"
diff --git a/Cargo.toml b/Cargo.toml
index 6a6a300..c4bfdcb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -44,7 +44,7 @@ enum-map = "2.7.3"
 fastnbt = "2.3.2"
 futures-util = "0.3.28"
 git-version = "0.3.5"
-image = { version = "0.25.1", default-features = false, features = ["png"] }
+image = { version = "0.25.1", default-features = false, features = ["png", "webp"] }
 indexmap = { version = "2.0.0", features = ["serde"] }
 lru = "0.12.0"
 minedmap-nbt = { version = "0.1.1", path = "crates/nbt", default-features = false }
diff --git a/README.md b/README.md
index 4c684f9..1ea4856 100644
--- a/README.md
+++ b/README.md
@@ -55,9 +55,18 @@ a proper webserver like [nginx](https://nginx.org/) or upload the viewer togethe
 the generated map files to public webspace to make the map available to others.
 
 If you are uploading the directory to a remote webserver, you do not need to upload the
-`<viewer>/data/processed` directory, as that is only used locally to allow processing
+`<viewer>/data/processed` directory, as it is only used locally to allow processing
 updates more quickly.
 
+### Image formats
+
+MinedMap renders map tiles as PNG by default. Pass `--image-format webp` to select
+WebP instead. For typical Minecraft worlds, using WebP reduces file sizes by 10-15%
+without increasing processing time.
+
+MinedMap always uses lossless compression for tile images, regardless of the
+image format.
+
 ### Signs
 
 ![Sign screenshot](https://raw.githubusercontent.com/neocturne/MinedMap/e5d9c813ba3118d04dc7e52e3dc6f48808a69120/docs/images/signs.png)
diff --git a/src/core/common.rs b/src/core/common.rs
index be6d28a..b933dcd 100644
--- a/src/core/common.rs
+++ b/src/core/common.rs
@@ -7,6 +7,7 @@ use std::{
 };
 
 use anyhow::{Context, Result};
+use clap::ValueEnum;
 use indexmap::IndexSet;
 use regex::{Regex, RegexSet};
 use serde::{Deserialize, Serialize};
@@ -150,6 +151,8 @@ pub struct Config {
 	pub viewer_info_path: PathBuf,
 	/// Path of viewer entities file
 	pub viewer_entities_path: PathBuf,
+	/// Format of generated map tiles
+	pub image_format: ImageFormat,
 	/// Sign text filter patterns
 	pub sign_patterns: RegexSet,
 	/// Sign text transformation pattern
@@ -189,6 +192,7 @@ impl Config {
 			entities_path_final,
 			viewer_info_path,
 			viewer_entities_path,
+			image_format: args.image_format,
 			sign_patterns,
 			sign_transforms,
 		})
@@ -264,14 +268,39 @@ impl Config {
 		[&self.output_dir, Path::new(&dir)].iter().collect()
 	}
 
+	/// Returns the file extension for the configured image format
+	pub fn tile_extension(&self) -> &'static str {
+		match self.image_format {
+			ImageFormat::Png => "png",
+			ImageFormat::Webp => "webp",
+		}
+	}
+	/// Returns the configurured image format for the image library
+	pub fn tile_image_format(&self) -> image::ImageFormat {
+		match self.image_format {
+			ImageFormat::Png => image::ImageFormat::Png,
+			ImageFormat::Webp => image::ImageFormat::WebP,
+		}
+	}
+
 	/// Constructs the path of an output tile image
 	pub fn tile_path(&self, kind: TileKind, level: usize, coords: TileCoords) -> PathBuf {
-		let filename = coord_filename(coords, "png");
+		let filename = coord_filename(coords, self.tile_extension());
 		let dir = self.tile_dir(kind, level);
 		[Path::new(&dir), Path::new(&filename)].iter().collect()
 	}
 }
 
+/// Format of generated map tiles
+#[derive(Debug, Clone, Copy, Default, ValueEnum)]
+pub enum ImageFormat {
+	/// Generate PNG images
+	#[default]
+	Png,
+	/// Generate WebP images
+	Webp,
+}
+
 /// Copies a chunk image into a region tile
 pub fn overlay_chunk<I, J>(image: &mut I, chunk: &J, coords: ChunkCoords)
 where
diff --git a/src/core/metadata_writer.rs b/src/core/metadata_writer.rs
index 0ea1f65..92d8566 100644
--- a/src/core/metadata_writer.rs
+++ b/src/core/metadata_writer.rs
@@ -61,6 +61,8 @@ struct Metadata<'t> {
 	spawn: Spawn,
 	/// Enabled MinedMap features
 	features: Features,
+	/// Format of generated map tiles
+	tile_extension: &'static str,
 }
 
 /// Viewer entity JSON data structure
@@ -205,6 +207,7 @@ impl<'a> MetadataWriter<'a> {
 			mipmaps: Vec::new(),
 			spawn: Self::spawn(&level_dat),
 			features,
+			tile_extension: self.config.tile_extension(),
 		};
 
 		for tile_map in self.tiles.iter() {
diff --git a/src/core/mod.rs b/src/core/mod.rs
index f552ffa..5832379 100644
--- a/src/core/mod.rs
+++ b/src/core/mod.rs
@@ -16,7 +16,7 @@ use anyhow::{Context, Result};
 use clap::Parser;
 use git_version::git_version;
 
-use common::Config;
+use common::{Config, ImageFormat};
 use metadata_writer::MetadataWriter;
 use region_processor::RegionProcessor;
 use tile_mipmapper::TileMipmapper;
@@ -47,6 +47,9 @@ pub struct Args {
 	/// Enable verbose messages
 	#[arg(short, long)]
 	pub verbose: bool,
+	/// Format of generated map tiles
+	#[arg(long, value_enum, default_value_t)]
+	pub image_format: ImageFormat,
 	/// Prefix for text of signs to show on the map
 	#[arg(long)]
 	pub sign_prefix: Vec<String>,
diff --git a/src/core/region_processor.rs b/src/core/region_processor.rs
index ce2d060..e448f5e 100644
--- a/src/core/region_processor.rs
+++ b/src/core/region_processor.rs
@@ -79,6 +79,8 @@ struct SingleRegionProcessor<'a> {
 	lightmap: image::GrayAlphaImage,
 	/// Processed entity intermediate data
 	entities: ProcessedEntities,
+	/// Format of generated map tiles
+	image_format: image::ImageFormat,
 	/// True if any unknown block or biome types were encountered during processing
 	has_unknown: bool,
 }
@@ -127,6 +129,7 @@ impl<'a> SingleRegionProcessor<'a> {
 			processed_region,
 			lightmap,
 			entities,
+			image_format: processor.config.tile_image_format(),
 			has_unknown: false,
 		})
 	}
@@ -179,7 +182,7 @@ impl<'a> SingleRegionProcessor<'a> {
 			self.input_timestamp,
 			|file| {
 				self.lightmap
-					.write_to(file, image::ImageFormat::Png)
+					.write_to(file, self.image_format)
 					.context("Failed to save image")
 			},
 		)
diff --git a/src/core/tile_mipmapper.rs b/src/core/tile_mipmapper.rs
index d7e54a9..2eda0e9 100644
--- a/src/core/tile_mipmapper.rs
+++ b/src/core/tile_mipmapper.rs
@@ -144,7 +144,7 @@ where
 		}
 
 		image
-			.write_to(file, image::ImageFormat::Png)
+			.write_to(file, self.config.tile_image_format())
 			.context("Failed to save image")
 	}
 }
diff --git a/src/core/tile_renderer.rs b/src/core/tile_renderer.rs
index 09ad8a1..a972b78 100644
--- a/src/core/tile_renderer.rs
+++ b/src/core/tile_renderer.rs
@@ -304,7 +304,7 @@ impl<'a> TileRenderer<'a> {
 			processed_timestamp,
 			|file| {
 				image
-					.write_to(file, image::ImageFormat::Png)
+					.write_to(file, self.config.tile_image_format())
 					.context("Failed to save image")
 			},
 		)?;
diff --git a/viewer/MinedMap.js b/viewer/MinedMap.js
index cfcccf1..61188b1 100644
--- a/viewer/MinedMap.js
+++ b/viewer/MinedMap.js
@@ -73,7 +73,7 @@ function signIcon(material, kind) {
 }
 
 const MinedMapLayer = L.TileLayer.extend({
-	initialize: function (mipmaps, layer) {
+	initialize: function (mipmaps, layer, tile_extension) {
 		L.TileLayer.prototype.initialize.call(this, '', {
 			detectRetina: true,
 			tileSize: 512,
@@ -88,6 +88,7 @@ const MinedMapLayer = L.TileLayer.extend({
 
 		this.mipmaps = mipmaps;
 		this.layer = layer;
+		this.ext = tile_extension;
 	},
 
 	createTile: function (coords, done) {
@@ -112,7 +113,7 @@ const MinedMapLayer = L.TileLayer.extend({
 			return L.Util.emptyImageUrl;
 
 
-		return 'data/'+this.layer+'/'+z+'/r.'+coords.x+'.'+coords.y+'.png';
+		return `data/${this.layer}/${z}/r.${coords.x}.${coords.y}.${this.ext}`;
 	},
 });
 
@@ -332,6 +333,7 @@ window.createMap = function () {
 		const res = await response.json();
 		const {mipmaps, spawn} = res;
 		const features = res.features || {};
+		const tile_extension = res.tile_extension || 'png';
 
 		const updateParams = function () {
 			const args = parseHash();
@@ -369,10 +371,10 @@ window.createMap = function () {
 
 		const overlayMaps = {};
 
-		const mapLayer = new MinedMapLayer(mipmaps, 'map');
+		const mapLayer = new MinedMapLayer(mipmaps, 'map', tile_extension);
 		mapLayer.addTo(map);
 
-		const lightLayer = new MinedMapLayer(mipmaps, 'light');
+		const lightLayer = new MinedMapLayer(mipmaps, 'light', tile_extension);
 		overlayMaps['Illumination'] = lightLayer;
 		if (params.light)
 			map.addLayer(lightLayer);

From 6763e2b4ec8ac8c02f6256f9619983c01157ac05 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 11 Jan 2025 01:42:42 +0100
Subject: [PATCH 402/460] Update dependencies

---
 Cargo.lock | 160 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 151 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 970c1be..e902fc1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -125,9 +125,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "1be3f42a67d6d345ecd59f675f3f012d6974981560836e938c22b424b85ce1be"
 
 [[package]]
 name = "bytemuck"
@@ -313,6 +313,16 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
+[[package]]
+name = "erased-serde"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d"
+dependencies = [
+ "serde",
+ "typeid",
+]
+
 [[package]]
 name = "errno"
 version = "0.3.10"
@@ -557,9 +567,12 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.22"
+version = "0.4.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+checksum = "3d6ea2a48c204030ee31a7d7fc72c93294c92fe87ecb1789881c9543516e1a0d"
+dependencies = [
+ "value-bag",
+]
 
 [[package]]
 name = "lru"
@@ -867,7 +880,7 @@ version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
 ]
 
 [[package]]
@@ -917,7 +930,7 @@ version = "0.38.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6"
 dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -965,6 +978,15 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "serde_fmt"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1d4ddca14104cd60529e8c7f7ba71a2c8acd8f7f5cfcdc2faf97eeb7c3010a4"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_json"
 version = "1.0.135"
@@ -1026,10 +1048,88 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
-name = "syn"
-version = "2.0.95"
+name = "sval"
+version = "2.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46f71c0377baf4ef1cc3e3402ded576dccc315800fbc62dfc7fe04b009773b4a"
+checksum = "f6dc0f9830c49db20e73273ffae9b5240f63c42e515af1da1fceefb69fceafd8"
+
+[[package]]
+name = "sval_buffer"
+version = "2.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "429922f7ad43c0ef8fd7309e14d750e38899e32eb7e8da656ea169dd28ee212f"
+dependencies = [
+ "sval",
+ "sval_ref",
+]
+
+[[package]]
+name = "sval_dynamic"
+version = "2.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68f16ff5d839396c11a30019b659b0976348f3803db0626f736764c473b50ff4"
+dependencies = [
+ "sval",
+]
+
+[[package]]
+name = "sval_fmt"
+version = "2.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c01c27a80b6151b0557f9ccbe89c11db571dc5f68113690c1e028d7e974bae94"
+dependencies = [
+ "itoa",
+ "ryu",
+ "sval",
+]
+
+[[package]]
+name = "sval_json"
+version = "2.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0deef63c70da622b2a8069d8600cf4b05396459e665862e7bdb290fd6cf3f155"
+dependencies = [
+ "itoa",
+ "ryu",
+ "sval",
+]
+
+[[package]]
+name = "sval_nested"
+version = "2.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a39ce5976ae1feb814c35d290cf7cf8cd4f045782fe1548d6bc32e21f6156e9f"
+dependencies = [
+ "sval",
+ "sval_buffer",
+ "sval_ref",
+]
+
+[[package]]
+name = "sval_ref"
+version = "2.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb7c6ee3751795a728bc9316a092023529ffea1783499afbc5c66f5fabebb1fa"
+dependencies = [
+ "sval",
+]
+
+[[package]]
+name = "sval_serde"
+version = "2.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a5572d0321b68109a343634e3a5d576bf131b82180c6c442dee06349dfc652a"
+dependencies = [
+ "serde",
+ "sval",
+ "sval_nested",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.96"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1124,6 +1224,12 @@ dependencies = [
  "tracing-log",
 ]
 
+[[package]]
+name = "typeid"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.14"
@@ -1142,6 +1248,42 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
+[[package]]
+name = "value-bag"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ef4c4aa54d5d05a279399bfa921ec387b7aba77caf7a682ae8d86785b8fdad2"
+dependencies = [
+ "value-bag-serde1",
+ "value-bag-sval2",
+]
+
+[[package]]
+name = "value-bag-serde1"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bb773bd36fd59c7ca6e336c94454d9c66386416734817927ac93d81cb3c5b0b"
+dependencies = [
+ "erased-serde",
+ "serde",
+ "serde_fmt",
+]
+
+[[package]]
+name = "value-bag-sval2"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53a916a702cac43a88694c97657d449775667bcd14b70419441d05b7fea4a83a"
+dependencies = [
+ "sval",
+ "sval_buffer",
+ "sval_dynamic",
+ "sval_fmt",
+ "sval_json",
+ "sval_ref",
+ "sval_serde",
+]
+
 [[package]]
 name = "winapi"
 version = "0.3.9"

From a2f0ad401d967e2ab56f4ce7ee2c5cccf045dc40 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 11 Jan 2025 01:51:35 +0100
Subject: [PATCH 403/460] CHANGELOG.md: fix missing word

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbd71f8..c1bd945 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 ### Added
 
-- Added support for rendering tiles WebP format using the `--image-format` option
+- Added support for rendering tiles in WebP format using the `--image-format` option
 
 ## [2.3.1] - 2025-01-06
 

From 0bf1d46aad47fd184636f57b636104c91bd727b6 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 11 Jan 2025 01:53:05 +0100
Subject: [PATCH 404/460] minedmap-types 0.1.4

---
 Cargo.lock              | 2 +-
 Cargo.toml              | 2 +-
 crates/nbt/Cargo.toml   | 2 +-
 crates/types/Cargo.toml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e902fc1..9aeb667 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -644,7 +644,7 @@ dependencies = [
 
 [[package]]
 name = "minedmap-types"
-version = "0.1.3"
+version = "0.1.4"
 dependencies = [
  "itertools",
  "serde",
diff --git a/Cargo.toml b/Cargo.toml
index c4bfdcb..a143c78 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -49,7 +49,7 @@ indexmap = { version = "2.0.0", features = ["serde"] }
 lru = "0.12.0"
 minedmap-nbt = { version = "0.1.1", path = "crates/nbt", default-features = false }
 minedmap-resource = { version = "0.6.0", path = "crates/resource" }
-minedmap-types = { version = "0.1.2", path = "crates/types" }
+minedmap-types = { version = "0.1.4", path = "crates/types" }
 num-integer = "0.1.45"
 num_cpus = "1.16.0"
 phf = { version = "0.11.2", features = ["macros"] }
diff --git a/crates/nbt/Cargo.toml b/crates/nbt/Cargo.toml
index 2c817c6..9f815da 100644
--- a/crates/nbt/Cargo.toml
+++ b/crates/nbt/Cargo.toml
@@ -12,7 +12,7 @@ anyhow = "1.0.75"
 bytemuck = "1.13.1"
 fastnbt = "2.4.4"
 flate2 = "1.0.27"
-minedmap-types = { version = "0.1.2", path = "../types" }
+minedmap-types = { version = "0.1.4", path = "../types" }
 serde = "1.0.183"
 
 [features]
diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml
index 1146195..c5bd47e 100644
--- a/crates/types/Cargo.toml
+++ b/crates/types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "minedmap-types"
-version = "0.1.3"
+version = "0.1.4"
 description = "Common types used by several MinedMap crates"
 edition.workspace = true
 license.workspace = true

From 561a1e6577a48663224bd7c30352d324a4e91b83 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 11 Jan 2025 01:54:53 +0100
Subject: [PATCH 405/460] minedmap 2.4.0

---
 CHANGELOG.md | 5 ++++-
 Cargo.lock   | 2 +-
 Cargo.toml   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1bd945..e75a75b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased] - ReleaseDate
 
+## [2.4.0] - 2025-01-11
+
 ### Added
 
 - Added support for rendering tiles in WebP format using the `--image-format` option
@@ -119,7 +121,8 @@ intermediate data.
   Full support for custom biomes datapacks might be added in a future release.
 
 <!-- next-url -->
-[Unreleased]: https://github.com/neocturne/MinedMap/compare/v2.3.1...HEAD
+[Unreleased]: https://github.com/neocturne/MinedMap/compare/v2.4.0...HEAD
+[2.4.0]: https://github.com/neocturne/MinedMap/compare/v2.3.1...v2.4.0
 [2.3.1]: https://github.com/neocturne/MinedMap/compare/v2.3.0...v2.3.1
 [2.3.0]: https://github.com/neocturne/MinedMap/compare/v2.2.0...v2.3.0
 [2.2.0]: https://github.com/neocturne/MinedMap/compare/v2.1.1...v2.2.0
diff --git a/Cargo.lock b/Cargo.lock
index 9aeb667..5b6de78 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -591,7 +591,7 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "minedmap"
-version = "2.3.1"
+version = "2.4.0"
 dependencies = [
  "anyhow",
  "bincode",
diff --git a/Cargo.toml b/Cargo.toml
index a143c78..2412edb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@ pre-release-commit-message = "{{crate_name}} {{version}}"
 
 [package]
 name = "minedmap"
-version = "2.3.1"
+version = "2.4.0"
 description = "Generate browsable maps from Minecraft save data"
 edition.workspace = true
 license.workspace = true

From d7fc95c950e4f211785bdbfcd6364f60e9085763 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 11 Jan 2025 02:10:00 +0100
Subject: [PATCH 406/460] README.md: fix size reduction estimate for WebP tiles

I accidentally measured the output size including the `processed`
directory for the previous numbers.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1ea4856..7d60f78 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ updates more quickly.
 ### Image formats
 
 MinedMap renders map tiles as PNG by default. Pass `--image-format webp` to select
-WebP instead. For typical Minecraft worlds, using WebP reduces file sizes by 10-15%
+WebP instead. For typical Minecraft worlds, using WebP reduces file sizes by 20-25%
 without increasing processing time.
 
 MinedMap always uses lossless compression for tile images, regardless of the

From a10151a4f37775d76150f03cc94dd32bd4c4705c Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 11 Feb 2025 22:39:11 +0100
Subject: [PATCH 407/460] resource, world: implement fallback to plains for
 unknown biomes

Closes #63
---
 CHANGELOG.md               |  6 ++++++
 crates/resource/src/lib.rs | 11 +++++++++++
 src/core/common.rs         |  2 +-
 src/world/layer.rs         | 16 ++++++++--------
 src/world/section.rs       | 20 +++++++++++---------
 5 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e75a75b..7745ced 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## [Unreleased] - ReleaseDate
 
+### Changed
+
+- Unknown biome types (from not yet supported or modded versions of Minecraft)
+  will now use plains biome colors as a fallback instead of resulting in water,
+  grass and foliage blocks to be rendered as transparent pixels
+
 ## [2.4.0] - 2025-01-11
 
 ### Added
diff --git a/crates/resource/src/lib.rs b/crates/resource/src/lib.rs
index fed9514..a633d06 100644
--- a/crates/resource/src/lib.rs
+++ b/crates/resource/src/lib.rs
@@ -247,6 +247,8 @@ pub struct BiomeTypes {
 	biome_map: HashMap<String, &'static Biome>,
 	/// Array used to look up old numeric biome IDs
 	legacy_biomes: Box<[&'static Biome; 256]>,
+	/// Fallback for unknown (new/modded) biomes
+	fallback_biome: &'static Biome,
 }
 
 impl Default for BiomeTypes {
@@ -273,9 +275,12 @@ impl Default for BiomeTypes {
 			.try_into()
 			.unwrap();
 
+		let fallback_biome = *biome_map.get("plains").expect("Plains biome undefined");
+
 		Self {
 			biome_map,
 			legacy_biomes,
+			fallback_biome,
 		}
 	}
 }
@@ -293,4 +298,10 @@ impl BiomeTypes {
 	pub fn get_legacy(&self, id: u8) -> Option<&Biome> {
 		Some(self.legacy_biomes[id as usize])
 	}
+
+	/// Returns the fallback for unknown (new/modded) biomes
+	#[inline]
+	pub fn get_fallback(&self) -> &Biome {
+		self.fallback_biome
+	}
 }
diff --git a/src/core/common.rs b/src/core/common.rs
index b933dcd..edefcb3 100644
--- a/src/core/common.rs
+++ b/src/core/common.rs
@@ -25,7 +25,7 @@ use crate::{
 ///
 /// Increase when the generation of processed regions from region data changes
 /// (usually because of updated resource data)
-pub const REGION_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(3);
+pub const REGION_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(4);
 
 /// MinedMap map tile data version number
 ///
diff --git a/src/world/layer.rs b/src/world/layer.rs
index 0764711..e59593c 100644
--- a/src/world/layer.rs
+++ b/src/world/layer.rs
@@ -97,14 +97,14 @@ impl LayerEntry<'_> {
 
 		if self.is_empty() {
 			*self.block = Some(block_type.block_color);
-			if let Some(biome) = section.biomes.biome_at(section.y, coords)? {
-				let (biome_index, _) = biome_list.insert_full(*biome);
-				*self.biome = NonZeroU16::new(
-					(biome_index + 1)
-						.try_into()
-						.expect("biome index not in range"),
-				);
-			}
+
+			let biome = section.biomes.biome_at(section.y, coords)?;
+			let (biome_index, _) = biome_list.insert_full(*biome);
+			*self.biome = NonZeroU16::new(
+				(biome_index + 1)
+					.try_into()
+					.expect("biome index not in range"),
+			);
 		}
 
 		if block_type.block_color.is(BlockFlag::Water) {
diff --git a/src/world/section.rs b/src/world/section.rs
index 7988fd5..845ddae 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -208,7 +208,7 @@ impl Section for SectionV0<'_> {
 /// Trait for common functions of [BiomesV1_18] and [BiomesV0]
 pub trait Biomes: Debug {
 	/// Returns the [Biome] at a coordinate tuple inside the chunk
-	fn biome_at(&self, section: SectionY, coords: SectionBlockCoords) -> Result<Option<&Biome>>;
+	fn biome_at(&self, section: SectionY, coords: SectionBlockCoords) -> Result<&Biome>;
 }
 
 /// Minecraft v1.18+ section biome data
@@ -226,7 +226,7 @@ pub struct BiomesV1_18<'a> {
 	/// to whole i64 values.
 	biomes: Option<&'a [i64]>,
 	/// Biome palette indexed by entries encoded in *biomes*
-	palette: Vec<Option<&'a Biome>>,
+	palette: Vec<&'a Biome>,
 	/// Number of bits used for each entry in *biomes*
 	bits: u8,
 }
@@ -253,12 +253,11 @@ impl<'a> BiomesV1_18<'a> {
 		let palette_types = palette
 			.iter()
 			.map(|entry| {
-				let biome_type = biome_types.get(entry);
-				if biome_type.is_none() {
+				biome_types.get(entry).unwrap_or_else(|| {
 					debug!("Unknown biome type: {}", entry);
 					has_unknown = true;
-				}
-				biome_type
+					biome_types.get_fallback()
+				})
 			})
 			.collect();
 
@@ -295,7 +294,7 @@ impl<'a> BiomesV1_18<'a> {
 }
 
 impl Biomes for BiomesV1_18<'_> {
-	fn biome_at(&self, _section: SectionY, coords: SectionBlockCoords) -> Result<Option<&Biome>> {
+	fn biome_at(&self, _section: SectionY, coords: SectionBlockCoords) -> Result<&Biome> {
 		let index = self.palette_index_at(coords);
 		Ok(*self
 			.palette
@@ -350,7 +349,7 @@ impl<'a> BiomesV0<'a> {
 }
 
 impl Biomes for BiomesV0<'_> {
-	fn biome_at(&self, section: SectionY, coords: SectionBlockCoords) -> Result<Option<&Biome>> {
+	fn biome_at(&self, section: SectionY, coords: SectionBlockCoords) -> Result<&Biome> {
 		let id = match self.data {
 			BiomesV0Data::IntArrayV15(data) => {
 				let LayerBlockCoords { x, z } = coords.xz;
@@ -370,7 +369,10 @@ impl Biomes for BiomesV0<'_> {
 			}
 			BiomesV0Data::ByteArray(data) => data[coords.xz.offset()] as u8,
 		};
-		Ok(self.biome_types.get_legacy(id))
+		Ok(self
+			.biome_types
+			.get_legacy(id)
+			.unwrap_or(self.biome_types.get_fallback()))
 	}
 }
 

From 0dd36a409a84438afd1e7bc768d5619ae3ff6053 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 11 Feb 2025 23:03:33 +0100
Subject: [PATCH 408/460] Update dependencies

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
---
 Cargo.lock | 239 +++++++++++------------------------------------------
 Cargo.toml |   2 +-
 2 files changed, 50 insertions(+), 191 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5b6de78..317eb46 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -73,11 +73,12 @@ dependencies = [
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.6"
+version = "3.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
+checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
 dependencies = [
  "anstyle",
+ "once_cell",
  "windows-sys",
 ]
 
@@ -125,9 +126,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.7.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1be3f42a67d6d345ecd59f675f3f012d6974981560836e938c22b424b85ce1be"
+checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
 
 [[package]]
 name = "bytemuck"
@@ -149,9 +150,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
 [[package]]
 name = "cc"
-version = "1.2.7"
+version = "1.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7"
+checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda"
 dependencies = [
  "jobserver",
  "libc",
@@ -172,9 +173,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.5.26"
+version = "4.5.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8eb5e908ef3a6efbe1ed62520fb7287959888c88485abe072543190ecc66783"
+checksum = "8acebd8ad879283633b343856142139f2da2317c96b05b4dd6181c61e2480184"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -182,9 +183,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.26"
+version = "4.5.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96b01801b5fc6a0a232407abc821660c9c6d25a1cafc0d4f85f29fb8d9afc121"
+checksum = "f6ba32cbda51c7e1dfd49acc1457ba1a7dec5b64fe360e828acb13ca8dc9c2f9"
 dependencies = [
  "anstream",
  "anstyle",
@@ -195,9 +196,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.24"
+version = "4.5.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c"
+checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -213,9 +214,9 @@ checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
 
 [[package]]
 name = "cmake"
-version = "0.1.52"
+version = "0.1.54"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c682c223677e0e5b6b7f63a64b9351844c3f1b1678a68b7ee617e30fb082620e"
+checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
 dependencies = [
  "cc",
 ]
@@ -288,9 +289,9 @@ dependencies = [
 
 [[package]]
 name = "enumflags2"
-version = "0.7.10"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d"
+checksum = "ba2f4b465f5318854c6f8dd686ede6c0a9dc67d4b1ac241cf0eb51521a309147"
 dependencies = [
  "enumflags2_derive",
  "serde",
@@ -298,9 +299,9 @@ dependencies = [
 
 [[package]]
 name = "enumflags2_derive"
-version = "0.7.10"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
+checksum = "fc4caf64a58d7a6d65ab00639b046ff54399a39f5f2554728895ace4b297cd79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -313,16 +314,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
-[[package]]
-name = "erased-serde"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d"
-dependencies = [
- "serde",
- "typeid",
-]
-
 [[package]]
 name = "errno"
 version = "0.3.10"
@@ -478,9 +469,9 @@ dependencies = [
 
 [[package]]
 name = "image-webp"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e031e8e3d94711a9ccb5d6ea357439ef3dcbed361798bd4071dc4d9793fbe22f"
+checksum = "b77d01e822461baa8409e156015a1d91735549f0f2c17691bd2d996bef238f7f"
 dependencies = [
  "byteorder-lite",
  "quick-error",
@@ -488,9 +479,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.7.0"
+version = "2.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
+checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -567,18 +558,15 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.24"
+version = "0.4.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6ea2a48c204030ee31a7d7fc72c93294c92fe87ecb1789881c9543516e1a0d"
-dependencies = [
- "value-bag",
-]
+checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
 
 [[package]]
 name = "lru"
-version = "0.12.5"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
+checksum = "227748d55f2f0ab4735d87fd623798cb6b664512fe979705f829c9f81c934465"
 dependencies = [
  "hashbrown",
 ]
@@ -652,9 +640,9 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.2"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ffbe83022cedc1d264172192511ae958937694cd57ce297164951b8b3568394"
+checksum = "b3b1c9bd4fe1f0f8b387f6eb9eb3b4a1aa26185e5750efb9140301703f62cd1b"
 dependencies = [
  "adler2",
  "simd-adler32",
@@ -709,9 +697,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.20.2"
+version = "1.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
 
 [[package]]
 name = "overload"
@@ -817,9 +805,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.92"
+version = "1.0.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
+checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
 dependencies = [
  "unicode-ident",
 ]
@@ -880,7 +868,7 @@ version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
- "bitflags 2.7.0",
+ "bitflags 2.8.0",
 ]
 
 [[package]]
@@ -920,17 +908,17 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustix"
-version = "0.38.43"
+version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a78891ee6bf2340288408954ac787aa063d8e8817e9f53abb37c695c6d834ef6"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
- "bitflags 2.7.0",
+ "bitflags 2.8.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -939,9 +927,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.18"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
 
 [[package]]
 name = "scopeguard"
@@ -978,20 +966,11 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "serde_fmt"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d4ddca14104cd60529e8c7f7ba71a2c8acd8f7f5cfcdc2faf97eeb7c3010a4"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "serde_json"
-version = "1.0.135"
+version = "1.0.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9"
+checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
 dependencies = [
  "itoa",
  "memchr",
@@ -1047,89 +1026,11 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
-[[package]]
-name = "sval"
-version = "2.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6dc0f9830c49db20e73273ffae9b5240f63c42e515af1da1fceefb69fceafd8"
-
-[[package]]
-name = "sval_buffer"
-version = "2.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "429922f7ad43c0ef8fd7309e14d750e38899e32eb7e8da656ea169dd28ee212f"
-dependencies = [
- "sval",
- "sval_ref",
-]
-
-[[package]]
-name = "sval_dynamic"
-version = "2.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f16ff5d839396c11a30019b659b0976348f3803db0626f736764c473b50ff4"
-dependencies = [
- "sval",
-]
-
-[[package]]
-name = "sval_fmt"
-version = "2.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c01c27a80b6151b0557f9ccbe89c11db571dc5f68113690c1e028d7e974bae94"
-dependencies = [
- "itoa",
- "ryu",
- "sval",
-]
-
-[[package]]
-name = "sval_json"
-version = "2.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0deef63c70da622b2a8069d8600cf4b05396459e665862e7bdb290fd6cf3f155"
-dependencies = [
- "itoa",
- "ryu",
- "sval",
-]
-
-[[package]]
-name = "sval_nested"
-version = "2.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a39ce5976ae1feb814c35d290cf7cf8cd4f045782fe1548d6bc32e21f6156e9f"
-dependencies = [
- "sval",
- "sval_buffer",
- "sval_ref",
-]
-
-[[package]]
-name = "sval_ref"
-version = "2.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb7c6ee3751795a728bc9316a092023529ffea1783499afbc5c66f5fabebb1fa"
-dependencies = [
- "sval",
-]
-
-[[package]]
-name = "sval_serde"
-version = "2.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a5572d0321b68109a343634e3a5d576bf131b82180c6c442dee06349dfc652a"
-dependencies = [
- "serde",
- "sval",
- "sval_nested",
-]
-
 [[package]]
 name = "syn"
-version = "2.0.96"
+version = "2.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80"
+checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1224,17 +1125,11 @@ dependencies = [
  "tracing-log",
 ]
 
-[[package]]
-name = "typeid"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e"
-
 [[package]]
 name = "unicode-ident"
-version = "1.0.14"
+version = "1.0.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
 
 [[package]]
 name = "utf8parse"
@@ -1244,45 +1139,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "valuable"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-
-[[package]]
-name = "value-bag"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ef4c4aa54d5d05a279399bfa921ec387b7aba77caf7a682ae8d86785b8fdad2"
-dependencies = [
- "value-bag-serde1",
- "value-bag-sval2",
-]
-
-[[package]]
-name = "value-bag-serde1"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bb773bd36fd59c7ca6e336c94454d9c66386416734817927ac93d81cb3c5b0b"
-dependencies = [
- "erased-serde",
- "serde",
- "serde_fmt",
-]
-
-[[package]]
-name = "value-bag-sval2"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53a916a702cac43a88694c97657d449775667bcd14b70419441d05b7fea4a83a"
-dependencies = [
- "sval",
- "sval_buffer",
- "sval_dynamic",
- "sval_fmt",
- "sval_json",
- "sval_ref",
- "sval_serde",
-]
+checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
 
 [[package]]
 name = "winapi"
diff --git a/Cargo.toml b/Cargo.toml
index 2412edb..b821d83 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -46,7 +46,7 @@ futures-util = "0.3.28"
 git-version = "0.3.5"
 image = { version = "0.25.1", default-features = false, features = ["png", "webp"] }
 indexmap = { version = "2.0.0", features = ["serde"] }
-lru = "0.12.0"
+lru = "0.13.0"
 minedmap-nbt = { version = "0.1.1", path = "crates/nbt", default-features = false }
 minedmap-resource = { version = "0.6.0", path = "crates/resource" }
 minedmap-types = { version = "0.1.4", path = "crates/types" }

From d96bb727f72ed6536c183782dc8eb22df82ea7d3 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 11 Feb 2025 23:04:08 +0100
Subject: [PATCH 409/460] ci: upgrade to upload-artifact v4

---
 .github/workflows/MinedMap.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/MinedMap.yml b/.github/workflows/MinedMap.yml
index c2e9961..cf75b68 100644
--- a/.github/workflows/MinedMap.yml
+++ b/.github/workflows/MinedMap.yml
@@ -27,7 +27,7 @@ jobs:
           cp -r viewer/* "$pkgdir"/
 
       - name: 'Archive'
-        uses: 'actions/upload-artifact@v3'
+        uses: 'actions/upload-artifact@v4'
         with:
           name: 'MinedMap-${{ steps.tag.outputs.tag }}-viewer'
           path: 'build/pkg'
@@ -134,7 +134,7 @@ jobs:
           cp target/${{ matrix.target }}/release/minedmap${{ matrix.ext }} "$pkgdir"/
 
       - name: 'Archive'
-        uses: 'actions/upload-artifact@v3'
+        uses: 'actions/upload-artifact@v4'
         with:
           name: 'MinedMap-${{ steps.tag.outputs.tag }}-${{ matrix.target }}'
           path: 'target/pkg'

From 1d9be9a41cbfd665c41dbf5d7bfc2ba16584a224 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 12 Feb 2025 20:22:26 +0100
Subject: [PATCH 410/460] Add jemalloc and jemalloc-auto features

Introduce the new features jemalloc (set jemalloc global allocator
unconditionally) and jemalloc-auto (set jemalloc global allocator on
musl-based targets to fix multithreaded performance, see [1]).

Because cargo does not support target-specific features or feature
defaults, the default is handled using a helper crate
minedmap-default-alloc.

[1] https://nickb.dev/blog/default-musl-allocator-considered-harmful-to-performance/
---
 CHANGELOG.md                    | 22 ++++++++++++++++++++++
 Cargo.lock                      | 28 ++++++++++++++++++++++++++++
 Cargo.toml                      |  5 ++++-
 crates/default-alloc/Cargo.toml | 17 +++++++++++++++++
 crates/default-alloc/src/lib.rs |  3 +++
 src/main.rs                     |  3 +++
 6 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 crates/default-alloc/Cargo.toml
 create mode 100644 crates/default-alloc/src/lib.rs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7745ced..bec566e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,28 @@
 
 ## [Unreleased] - ReleaseDate
 
+### Added
+
+- Added jemalloc support to fix performace on musl targets
+
+  The global allocator can be switched to jemalloc by enabling the `jemalloc`
+  cargo feature now. This is not the default because it is not always faster
+  than the default system allocator; in particular, the glibc allocator has
+  slightly better performance in multithreaded mode. In addition, jemalloc
+  uses a bit more memory.
+
+  In addition, the `jemalloc-auto` feature has been introduced, which is enabled
+  by default and sets the global allocator to jemalloc on platforms where it is
+  clearly advantageous. For now, this is only done on musl-based targets, as
+  musl's default allocator is very slow in multithreaded operation (which was
+  making higher thread counts like `-j8` basically useless due to 7-8x
+  slowdowns). With the new default, performance on musl is basically identical
+  to glibc.
+
+  Note that some platforms like `msvc` are unsupported by jemalloc, and trying
+  to enable the `jemalloc` feature on these platforms may break the MinedMap
+  build or cause issues at runtime.
+
 ### Changed
 
 - Unknown biome types (from not yet supported or modded versions of Minecraft)
diff --git a/Cargo.lock b/Cargo.lock
index 317eb46..eeaede2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -591,6 +591,7 @@ dependencies = [
  "image",
  "indexmap",
  "lru",
+ "minedmap-default-alloc",
  "minedmap-nbt",
  "minedmap-resource",
  "minedmap-types",
@@ -608,6 +609,13 @@ dependencies = [
  "zstd",
 ]
 
+[[package]]
+name = "minedmap-default-alloc"
+version = "0.1.0"
+dependencies = [
+ "tikv-jemallocator",
+]
+
 [[package]]
 name = "minedmap-nbt"
 version = "0.1.1"
@@ -1057,6 +1065,26 @@ dependencies = [
  "once_cell",
 ]
 
+[[package]]
+name = "tikv-jemalloc-sys"
+version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "tikv-jemallocator"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cec5ff18518d81584f477e9bfdf957f5bb0979b0bac3af4ca30b5b3ae2d2865"
+dependencies = [
+ "libc",
+ "tikv-jemalloc-sys",
+]
+
 [[package]]
 name = "tokio"
 version = "1.43.0"
diff --git a/Cargo.toml b/Cargo.toml
index b821d83..998de6c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -47,6 +47,7 @@ git-version = "0.3.5"
 image = { version = "0.25.1", default-features = false, features = ["png", "webp"] }
 indexmap = { version = "2.0.0", features = ["serde"] }
 lru = "0.13.0"
+minedmap-default-alloc = { version = "0.1.0", path = "crates/default-alloc", optional = true }
 minedmap-nbt = { version = "0.1.1", path = "crates/nbt", default-features = false }
 minedmap-resource = { version = "0.6.0", path = "crates/resource" }
 minedmap-types = { version = "0.1.4", path = "crates/types" }
@@ -64,5 +65,7 @@ tracing-subscriber = "0.3.17"
 zstd = "0.13.0"
 
 [features]
-default = ["zlib-ng"]
+default = ["jemalloc-auto", "zlib-ng"]
+jemalloc-auto = ["dep:minedmap-default-alloc"]
+jemalloc = ["jemalloc-auto", "minedmap-default-alloc/jemalloc"]
 zlib-ng = ["minedmap-nbt/zlib-ng"]
diff --git a/crates/default-alloc/Cargo.toml b/crates/default-alloc/Cargo.toml
new file mode 100644
index 0000000..40f9e7e
--- /dev/null
+++ b/crates/default-alloc/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "minedmap-default-alloc"
+version = "0.1.0"
+description = "Helper crate for target-specific selection of global allocator default"
+edition.workspace = true
+license.workspace = true
+readme.workspace = true
+repository.workspace = true
+
+[dependencies]
+tikv-jemallocator = { version = "0.6.0", optional = true }
+
+[target.'cfg(target_env = "musl")'.dependencies]
+tikv-jemallocator = "*"
+
+[features]
+jemalloc = ["dep:tikv-jemallocator"]
diff --git a/crates/default-alloc/src/lib.rs b/crates/default-alloc/src/lib.rs
new file mode 100644
index 0000000..0797a5f
--- /dev/null
+++ b/crates/default-alloc/src/lib.rs
@@ -0,0 +1,3 @@
+#[cfg(any(target_env = "musl", feature = "jemalloc"))]
+#[global_allocator]
+static GLOBAL: tikv_jemallocator::Jemalloc = tikv_jemallocator::Jemalloc;
diff --git a/src/main.rs b/src/main.rs
index 31f2889..1f19a41 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,6 +2,9 @@
 #![warn(missing_docs)]
 #![warn(clippy::missing_docs_in_private_items)]
 
+#[cfg(feature = "jemalloc-auto")]
+extern crate minedmap_default_alloc;
+
 mod core;
 mod io;
 mod util;

From 971afea727210f9745a82b27a56d0c7fac2725d8 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 21 Feb 2025 10:55:36 +0100
Subject: [PATCH 411/460] Fix new clippy warnings

---
 src/core/tile_renderer.rs | 2 +-
 src/util.rs               | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/core/tile_renderer.rs b/src/core/tile_renderer.rs
index a972b78..24af234 100644
--- a/src/core/tile_renderer.rs
+++ b/src/core/tile_renderer.rs
@@ -134,7 +134,7 @@ impl<'a> TileRenderer<'a> {
 		/// Hashing the value as a single u32 is more efficient than hashing
 		/// the tuple elements separately.
 		fn biome_key((dx, dz, index): (i8, i8, u16)) -> u32 {
-			(dx as u8 as u32) | (dz as u8 as u32) << 8 | (index as u32) << 16
+			(dx as u8 as u32) | ((dz as u8 as u32) << 8) | ((index as u32) << 16)
 		}
 
 		/// One quadrant of the kernel used to smooth biome edges
diff --git a/src/util.rs b/src/util.rs
index a128ef9..ed07ba5 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -39,7 +39,9 @@ pub fn to_flat_coord<const AXIS: u8>(
 	chunk: ChunkCoord<AXIS>,
 	block: BlockCoord<AXIS>,
 ) -> i32 {
-	(region as i32) << (BLOCK_BITS + CHUNK_BITS) | ((chunk.0 as i32) << BLOCK_BITS | block.0 as i32)
+	((region as i32) << (BLOCK_BITS + CHUNK_BITS))
+		| ((chunk.0 as i32) << BLOCK_BITS)
+		| (block.0 as i32)
 }
 
 /// Splits a flat (linear) coordinate into region, chunk and block numbers

From 37126f69fcb9d6d5bbd31ad0a0b34fd522a733bb Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 13 Feb 2025 20:10:50 +0100
Subject: [PATCH 412/460] MetadataWriter: add fallback to level.dat_old

Looking at inotify dumps, it appears like because of bad implementation
choices, Minecraft's level.dat may not exist for a brief moment between
moving the old file to level.dat_old and moving a new version into place.

Add a fallback to level.dat_old, so generation will not fail if were
unlucky enough to hit this moment.
---
 src/core/common.rs          | 6 ++++++
 src/core/metadata_writer.rs | 9 ++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/core/common.rs b/src/core/common.rs
index edefcb3..d311773 100644
--- a/src/core/common.rs
+++ b/src/core/common.rs
@@ -139,6 +139,8 @@ pub struct Config {
 	pub region_dir: PathBuf,
 	/// Path of input `level.dat` file
 	pub level_dat_path: PathBuf,
+	/// Path of input `level.dat_old` file
+	pub level_dat_old_path: PathBuf,
 	/// Base path for storage of rendered tile data
 	pub output_dir: PathBuf,
 	/// Path for storage of intermediate processed data files
@@ -170,6 +172,9 @@ impl Config {
 
 		let region_dir = [&args.input_dir, Path::new("region")].iter().collect();
 		let level_dat_path = [&args.input_dir, Path::new("level.dat")].iter().collect();
+		let level_dat_old_path = [&args.input_dir, Path::new("level.dat_old")]
+			.iter()
+			.collect();
 		let processed_dir: PathBuf = [&args.output_dir, Path::new("processed")].iter().collect();
 		let entities_dir: PathBuf = [&processed_dir, Path::new("entities")].iter().collect();
 		let entities_path_final = [&entities_dir, Path::new("entities.bin")].iter().collect();
@@ -186,6 +191,7 @@ impl Config {
 			num_threads,
 			region_dir,
 			level_dat_path,
+			level_dat_old_path,
 			output_dir: args.output_dir.clone(),
 			processed_dir,
 			entities_dir,
diff --git a/src/core/metadata_writer.rs b/src/core/metadata_writer.rs
index 92d8566..eb5f59f 100644
--- a/src/core/metadata_writer.rs
+++ b/src/core/metadata_writer.rs
@@ -124,7 +124,14 @@ impl<'a> MetadataWriter<'a> {
 
 	/// Reads and deserializes the `level.dat` of the Minecraft save data
 	fn read_level_dat(&self) -> Result<de::LevelDat> {
-		crate::nbt::data::from_file(&self.config.level_dat_path).context("Failed to read level.dat")
+		let res = crate::nbt::data::from_file(&self.config.level_dat_path);
+		if res.is_err() {
+			if let Ok(level_dat_old) = crate::nbt::data::from_file(&self.config.level_dat_old_path)
+			{
+				return Ok(level_dat_old);
+			}
+		}
+		res.context("Failed to read level.dat")
 	}
 
 	/// Generates [Spawn] data from a [de::LevelDat]

From c10e9e490203356633aa6fccc9240bf925147776 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 13 Feb 2025 19:56:19 +0100
Subject: [PATCH 413/460] Implement watch mode

---
 CHANGELOG.md       |  16 +++++
 Cargo.lock         | 170 +++++++++++++++++++++++++++++++++++++++++++--
 Cargo.toml         |   2 +
 src/core/common.rs |   4 ++
 src/core/mod.rs    | 116 ++++++++++++++++++++++++++++---
 5 files changed, 292 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bec566e..e8fd052 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,22 @@
 
 ### Added
 
+- Added experimental watch mode
+
+  Passing `--watch` will cause MinedMap to run continuously instead of exiting
+  after map generation, regenerating tiles whenever they change.
+
+  `--watch-delay` can be used to configure the delay between detecting a change
+  and runing the map generation, also limiting how often the regeneration
+  happens. This defaults to `30s`; significantly smaller values probably don't
+  make sense because Minecraft writes out changes in batches anyways.
+
+  Finally, `--jobs-initial` can be used to configure the number of parallel
+  generation threads for the initial cycle separately from the value used for
+  subsequent cycles after a change is detected (`-j`/`--jobs`). Subsequent
+  cycles usually need to regenerate only a small number of tiles, so setting
+  `--jobs` to a smaller value than `--jobs-initial` may be advantageous.
+
 - Added jemalloc support to fix performace on musl targets
 
   The global allocator can be switched to jemalloc by enabling the `jemalloc`
diff --git a/Cargo.lock b/Cargo.lock
index eeaede2..039e940 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -68,7 +68,7 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -79,7 +79,7 @@ checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
 dependencies = [
  "anstyle",
  "once_cell",
- "windows-sys",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -321,7 +321,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
 dependencies = [
  "libc",
- "windows-sys",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -345,6 +345,18 @@ dependencies = [
  "simd-adler32",
 ]
 
+[[package]]
+name = "filetime"
+version = "0.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "libredox",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "flate2"
 version = "1.0.35"
@@ -362,6 +374,15 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
 
+[[package]]
+name = "fsevent-sys"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "futures-core"
 version = "0.3.31"
@@ -454,6 +475,12 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
 [[package]]
 name = "image"
 version = "0.25.5"
@@ -488,6 +515,26 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "inotify"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
+dependencies = [
+ "bitflags 2.8.0",
+ "inotify-sys",
+ "libc",
+]
+
+[[package]]
+name = "inotify-sys"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.1"
@@ -518,6 +565,26 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "kqueue"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
+dependencies = [
+ "kqueue-sys",
+ "libc",
+]
+
+[[package]]
+name = "kqueue-sys"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
+dependencies = [
+ "bitflags 1.3.2",
+ "libc",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -530,6 +597,17 @@ version = "0.2.169"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
+[[package]]
+name = "libredox"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+dependencies = [
+ "bitflags 2.8.0",
+ "libc",
+ "redox_syscall",
+]
+
 [[package]]
 name = "libz-ng-sys"
 version = "1.1.21"
@@ -588,6 +666,7 @@ dependencies = [
  "fastnbt",
  "futures-util",
  "git-version",
+ "humantime",
  "image",
  "indexmap",
  "lru",
@@ -595,6 +674,7 @@ dependencies = [
  "minedmap-nbt",
  "minedmap-resource",
  "minedmap-types",
+ "notify",
  "num-integer",
  "num_cpus",
  "phf",
@@ -656,6 +736,43 @@ dependencies = [
  "simd-adler32",
 ]
 
+[[package]]
+name = "mio"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+dependencies = [
+ "libc",
+ "log",
+ "wasi",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "notify"
+version = "8.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943"
+dependencies = [
+ "bitflags 2.8.0",
+ "filetime",
+ "fsevent-sys",
+ "inotify",
+ "kqueue",
+ "libc",
+ "log",
+ "mio",
+ "notify-types",
+ "walkdir",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "notify-types"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d"
+
 [[package]]
 name = "nu-ansi-term"
 version = "0.46.0"
@@ -930,7 +1047,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -939,6 +1056,15 @@ version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
 
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -1052,7 +1178,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9"
 dependencies = [
  "rustix",
- "windows-sys",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1171,6 +1297,22 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
 
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -1187,12 +1329,30 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
+[[package]]
+name = "winapi-util"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.59.0"
diff --git a/Cargo.toml b/Cargo.toml
index 998de6c..d213a56 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -44,6 +44,7 @@ enum-map = "2.7.3"
 fastnbt = "2.3.2"
 futures-util = "0.3.28"
 git-version = "0.3.5"
+humantime = "2.1.0"
 image = { version = "0.25.1", default-features = false, features = ["png", "webp"] }
 indexmap = { version = "2.0.0", features = ["serde"] }
 lru = "0.13.0"
@@ -51,6 +52,7 @@ minedmap-default-alloc = { version = "0.1.0", path = "crates/default-alloc", opt
 minedmap-nbt = { version = "0.1.1", path = "crates/nbt", default-features = false }
 minedmap-resource = { version = "0.6.0", path = "crates/resource" }
 minedmap-types = { version = "0.1.4", path = "crates/types" }
+notify = "8.0.0"
 num-integer = "0.1.45"
 num_cpus = "1.16.0"
 phf = { version = "0.11.2", features = ["macros"] }
diff --git a/src/core/common.rs b/src/core/common.rs
index d311773..a81dbf2 100644
--- a/src/core/common.rs
+++ b/src/core/common.rs
@@ -135,6 +135,8 @@ pub enum TileKind {
 pub struct Config {
 	/// Number of threads for parallel processing
 	pub num_threads: usize,
+	/// Number of threads for initial parallel processing
+	pub num_threads_initial: usize,
 	/// Path of input region directory
 	pub region_dir: PathBuf,
 	/// Path of input `level.dat` file
@@ -169,6 +171,7 @@ impl Config {
 			Some(threads) => threads,
 			None => 1,
 		};
+		let num_threads_initial = args.jobs_initial.unwrap_or(num_threads);
 
 		let region_dir = [&args.input_dir, Path::new("region")].iter().collect();
 		let level_dat_path = [&args.input_dir, Path::new("level.dat")].iter().collect();
@@ -189,6 +192,7 @@ impl Config {
 
 		Ok(Config {
 			num_threads,
+			num_threads_initial,
 			region_dir,
 			level_dat_path,
 			level_dat_old_path,
diff --git a/src/core/mod.rs b/src/core/mod.rs
index 5832379..202d017 100644
--- a/src/core/mod.rs
+++ b/src/core/mod.rs
@@ -10,7 +10,12 @@ mod tile_merger;
 mod tile_mipmapper;
 mod tile_renderer;
 
-use std::path::PathBuf;
+use std::{
+	path::PathBuf,
+	sync::mpsc::{self, Receiver},
+	thread,
+	time::Duration,
+};
 
 use anyhow::{Context, Result};
 use clap::Parser;
@@ -18,9 +23,13 @@ use git_version::git_version;
 
 use common::{Config, ImageFormat};
 use metadata_writer::MetadataWriter;
+use notify::{RecommendedWatcher, RecursiveMode, Watcher as _};
+use rayon::ThreadPool;
 use region_processor::RegionProcessor;
 use tile_mipmapper::TileMipmapper;
 use tile_renderer::TileRenderer;
+use tokio::runtime::Runtime;
+use tracing::{info, warn};
 
 use self::entity_collector::EntityCollector;
 
@@ -44,9 +53,26 @@ pub struct Args {
 	/// use one thread per logical CPU core.
 	#[arg(short, long)]
 	pub jobs: Option<usize>,
+	/// Number of parallel threads to use for initial processing
+	///
+	/// Passing this option only makes sense with --watch. The first run after
+	/// starting MinedMap will use as many parallel jobs as configured using
+	/// --job-initial, while subsequent regenerations of tiles will use the
+	/// the number configured using --jobs.
+	///
+	/// If not given, the value from the --jobs option is used.
+	#[arg(long)]
+	pub jobs_initial: Option<usize>,
 	/// Enable verbose messages
 	#[arg(short, long)]
 	pub verbose: bool,
+	/// Watch for file changes and regenerate tiles automatically instead of
+	/// exiting after generation
+	#[arg(long)]
+	pub watch: bool,
+	/// Minimum delay between map generation cycles in watch mode
+	#[arg(long, value_parser = humantime::parse_duration, default_value = "30s")]
+	pub watch_delay: Duration,
 	/// Format of generated map tiles
 	#[arg(long, value_enum, default_value_t)]
 	pub image_format: ImageFormat,
@@ -74,14 +100,73 @@ pub struct Args {
 	pub output_dir: PathBuf,
 }
 
-/// Configures the Rayon thread pool for parallel processing
-fn setup_threads(num_threads: usize) -> Result<()> {
+/// Configures a Rayon thread pool for parallel processing
+fn setup_threads(num_threads: usize) -> Result<ThreadPool> {
 	rayon::ThreadPoolBuilder::new()
 		.num_threads(num_threads)
-		.build_global()
+		.build()
 		.context("Failed to configure thread pool")
 }
 
+/// Runs all MinedMap generation steps, updating all tiles as needed
+fn generate(config: &Config, rt: &Runtime) -> Result<()> {
+	let regions = RegionProcessor::new(config).run()?;
+	TileRenderer::new(config, rt, &regions).run()?;
+	let tiles = TileMipmapper::new(config, &regions).run()?;
+	EntityCollector::new(config, &regions).run()?;
+	MetadataWriter::new(config, &tiles).run()
+}
+
+/// Creates a file watcher for the
+fn create_watcher(args: &Args) -> Result<(RecommendedWatcher, Receiver<()>)> {
+	let (tx, rx) = mpsc::sync_channel::<()>(1);
+	let mut watcher = notify::recommended_watcher(move |res| {
+		// Ignore errors - we already have a watch trigger queued if try_send() fails
+		let event: notify::Event = match res {
+			Ok(event) => event,
+			Err(err) => {
+				warn!("Watch error: {err}");
+				return;
+			}
+		};
+		let notify::EventKind::Modify(modify_kind) = event.kind else {
+			return;
+		};
+		if !matches!(
+			modify_kind,
+			notify::event::ModifyKind::Data(_)
+				| notify::event::ModifyKind::Name(notify::event::RenameMode::To)
+		) {
+			return;
+		}
+		if !event
+			.paths
+			.iter()
+			.any(|path| path.ends_with("level.dat") || path.extension() == Some("mcu".as_ref()))
+		{
+			return;
+		}
+		let _ = tx.try_send(());
+	})?;
+	watcher.watch(&args.input_dir, RecursiveMode::Recursive)?;
+	Ok((watcher, rx))
+}
+
+/// Watches the data directory for changes, returning when a change has happened
+fn wait_watcher(args: &Args, watch_channel: &Receiver<()>) -> Result<()> {
+	info!("Watching for changes...");
+	let () = watch_channel
+		.recv()
+		.context("Failed to read watch event channel")?;
+	info!("Change detected.");
+
+	thread::sleep(args.watch_delay);
+
+	let _ = watch_channel.try_recv();
+
+	Ok(())
+}
+
 /// MinedMap CLI main function
 pub fn cli() -> Result<()> {
 	let args = Args::parse();
@@ -96,17 +181,26 @@ pub fn cli() -> Result<()> {
 		.with_target(false)
 		.init();
 
-	setup_threads(config.num_threads)?;
+	let mut pool = setup_threads(config.num_threads_initial)?;
 
 	let rt = tokio::runtime::Builder::new_current_thread()
 		.build()
 		.unwrap();
 
-	let regions = RegionProcessor::new(&config).run()?;
-	TileRenderer::new(&config, &rt, &regions).run()?;
-	let tiles = TileMipmapper::new(&config, &regions).run()?;
-	EntityCollector::new(&config, &regions).run()?;
-	MetadataWriter::new(&config, &tiles).run()?;
+	let watch = args.watch.then(|| create_watcher(&args)).transpose()?;
 
-	Ok(())
+	pool.install(|| generate(&config, &rt))?;
+
+	let Some((_watcher, watch_channel)) = watch else {
+		// watch mode disabled
+		return Ok(());
+	};
+
+	if config.num_threads != config.num_threads_initial {
+		pool = setup_threads(config.num_threads)?;
+	}
+	pool.install(move || loop {
+		wait_watcher(&args, &watch_channel)?;
+		generate(&config, &rt)?;
+	})
 }

From d02ca9aea230b9ad387b21e7d911811ee67b6ab2 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 14 Feb 2025 17:28:47 +0100
Subject: [PATCH 414/460] ci: update OS

---
 .github/workflows/MinedMap.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/MinedMap.yml b/.github/workflows/MinedMap.yml
index cf75b68..502e663 100644
--- a/.github/workflows/MinedMap.yml
+++ b/.github/workflows/MinedMap.yml
@@ -7,7 +7,7 @@ env:
 
 jobs:
   viewer:
-    runs-on: 'ubuntu-20.04'
+    runs-on: 'ubuntu-latest'
 
     steps:
       - name: 'Checkout'
@@ -101,7 +101,7 @@ jobs:
         - os: 'windows-2019'
           target: 'i686-pc-windows-msvc'
           ext: '.exe'
-        - os: 'ubuntu-20.04'
+        - os: 'ubuntu-22.04'
           target: 'x86_64-unknown-linux-gnu'
 
     steps:

From cb0aa235db5055fda339d3a7f0d80a60b41d3599 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 14 Feb 2025 17:18:14 +0100
Subject: [PATCH 415/460] docker: move viewer Dockerfile to viewer subdirectory

---
 .github/workflows/MinedMap.yml         | 1 +
 viewer/.dockerignore                   | 1 +
 Dockerfile.viewer => viewer/Dockerfile | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 viewer/.dockerignore
 rename Dockerfile.viewer => viewer/Dockerfile (73%)

diff --git a/.github/workflows/MinedMap.yml b/.github/workflows/MinedMap.yml
index 502e663..198c472 100644
--- a/.github/workflows/MinedMap.yml
+++ b/.github/workflows/MinedMap.yml
@@ -25,6 +25,7 @@ jobs:
           pkgdir='build/pkg/MinedMap-${{ steps.tag.outputs.tag }}-viewer'
           mkdir -p "$pkgdir"
           cp -r viewer/* "$pkgdir"/
+          rm "$pkgdir"/Dockerfile
 
       - name: 'Archive'
         uses: 'actions/upload-artifact@v4'
diff --git a/viewer/.dockerignore b/viewer/.dockerignore
new file mode 100644
index 0000000..3af0ccb
--- /dev/null
+++ b/viewer/.dockerignore
@@ -0,0 +1 @@
+/data
diff --git a/Dockerfile.viewer b/viewer/Dockerfile
similarity index 73%
rename from Dockerfile.viewer
rename to viewer/Dockerfile
index 82d50bb..794bcf5 100644
--- a/Dockerfile.viewer
+++ b/viewer/Dockerfile
@@ -1,3 +1,3 @@
 FROM docker.io/library/nginx:alpine
-COPY viewer /usr/share/nginx/html
+COPY . /usr/share/nginx/html
 # datadir should be mounted to: /usr/share/nginx/html/data

From 3b5ce8287368881728b6af2a81568fdd90189f64 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 14 Feb 2025 16:49:42 +0100
Subject: [PATCH 416/460] docker: include Alpine base tools, tini

Including tini fixes forwarding signals to MinedMap, allowing to
interrupt it using Ctrl-C. The base tools may be used to add a wrapper
script to configure MinedMap with environment variables.

As the Alpine base is included now, we can switch from the rust:alpine
image to alpine:latest, resulting in MinedMap to be linked dynamically.
---
 .dockerignore |  4 ++++
 Dockerfile    | 17 +++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..cef6a14
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,4 @@
+*
+!/Cargo.*
+!/src
+!/crates
diff --git a/Dockerfile b/Dockerfile
index fa3627c..04ce466 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,15 @@
-FROM docker.io/library/rust:alpine AS BUILDER
+FROM docker.io/library/alpine:latest AS BUILDER
 
 WORKDIR /build
-RUN apk update && apk add cmake build-base
+RUN apk add --no-cache build-base cmake cargo
 
-COPY src /build/src
-COPY crates /build/crates
-COPY Cargo.toml Cargo.lock /build
+COPY . .
 RUN cargo build -r 
+RUN strip target/release/minedmap
 
-FROM scratch AS RUNNER
+FROM docker.io/library/alpine:latest
 
-COPY --from=BUILDER /build/target/release/minedmap /minedmap
-ENTRYPOINT [ "/minedmap" ]
+RUN apk add --no-cache libgcc tini
+
+COPY --from=BUILDER /build/target/release/minedmap /bin/minedmap
+ENTRYPOINT [ "/sbin/tini", "--", "/bin/minedmap" ]

From 850b1a668b49341e75ae17c7389a5e634383cdeb Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 21 Feb 2025 19:06:05 +0100
Subject: [PATCH 417/460] docker: use lowercase stage name

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 04ce466..e052309 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/alpine:latest AS BUILDER
+FROM docker.io/library/alpine:latest AS builder
 
 WORKDIR /build
 RUN apk add --no-cache build-base cmake cargo
@@ -11,5 +11,5 @@ FROM docker.io/library/alpine:latest
 
 RUN apk add --no-cache libgcc tini
 
-COPY --from=BUILDER /build/target/release/minedmap /bin/minedmap
+COPY --from=builder /build/target/release/minedmap /bin/minedmap
 ENTRYPOINT [ "/sbin/tini", "--", "/bin/minedmap" ]

From dba3dd551ecd504d81248db0855a510d479ab23d Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 21 Feb 2025 10:51:05 +0100
Subject: [PATCH 418/460] ci: build Docker images, publish to GHCR

---
 .github/workflows/MinedMap.yml | 86 +++++++++++++++++++++++++++++++++-
 1 file changed, 85 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/MinedMap.yml b/.github/workflows/MinedMap.yml
index 198c472..2aef1ec 100644
--- a/.github/workflows/MinedMap.yml
+++ b/.github/workflows/MinedMap.yml
@@ -1,5 +1,14 @@
 name: 'MinedMap'
-on: ['push', 'pull_request', 'workflow_dispatch']
+on:
+  push:
+    branches:
+      - 'main'
+    tags:
+      - 'v*'
+  pull_request:
+    branches:
+      - 'main'
+  workflow_dispatch: {}
 
 env:
   RUSTFLAGS: -Dwarnings
@@ -139,3 +148,78 @@ jobs:
         with:
           name: 'MinedMap-${{ steps.tag.outputs.tag }}-${{ matrix.target }}'
           path: 'target/pkg'
+
+  build-container:
+    runs-on: ubuntu-latest
+    needs:
+      - test
+    steps:
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ghcr.io/neocturne/minedmap/minedmap
+          tags: |
+            type=raw,value=latest,enable={{is_default_branch}}
+            type=ref,event=branch
+            type=ref,event=branch,suffix=-{{sha}}
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+
+      - name: Login to GHCR
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: docker/setup-buildx-action@v3
+
+      - name: Build
+        uses: docker/build-push-action@v6
+        with:
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+  viewer-container:
+    runs-on: ubuntu-latest
+    needs:
+      - test
+    steps:
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ghcr.io/neocturne/minedmap/viewer
+          tags: |
+            type=raw,value=latest,enable={{is_default_branch}}
+            type=ref,event=branch
+            type=ref,event=branch,suffix=-{{sha}}
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+
+      - name: Login to GHCR
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: docker/setup-buildx-action@v3
+
+      - name: Build
+        uses: docker/build-push-action@v6
+        with:
+          context: "{{defaultContext}}:viewer"
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

From 7bc15f97de13b08fc0372cddd281820bc0488b2b Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 22 Feb 2025 03:13:43 +0100
Subject: [PATCH 419/460] docker: viewer: use nginx:alpine-slim as base

---
 viewer/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/viewer/Dockerfile b/viewer/Dockerfile
index 794bcf5..524fd4c 100644
--- a/viewer/Dockerfile
+++ b/viewer/Dockerfile
@@ -1,3 +1,3 @@
-FROM docker.io/library/nginx:alpine
+FROM docker.io/library/nginx:alpine-slim
 COPY . /usr/share/nginx/html
 # datadir should be mounted to: /usr/share/nginx/html/data

From 282f62fc30352fa1ea801c2ae7652e538a922eb4 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 22 Feb 2025 04:02:10 +0100
Subject: [PATCH 420/460] docker: run minedmap as unpriviledged user

---
 Dockerfile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index e052309..bb0e0ad 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,12 @@ RUN strip target/release/minedmap
 
 FROM docker.io/library/alpine:latest
 
+RUN addgroup -g 1000 -S minedmap \
+    && adduser -S -D -H -u 1000 -h /output -s /sbin/nologin -G minedmap -g minedmap minedmap
+
 RUN apk add --no-cache libgcc tini
 
 COPY --from=builder /build/target/release/minedmap /bin/minedmap
 ENTRYPOINT [ "/sbin/tini", "--", "/bin/minedmap" ]
+
+USER minedmap:minedmap

From 8cb1eee60b82b0bfe00f3260ece281b269cd04fb Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 22 Feb 2025 11:06:46 +0100
Subject: [PATCH 421/460] docker, ci: fix --version output

When building the docker image manually, MINEDMAP_VERSION needs to be
set explicitly to get a proper version string.
---
 .github/workflows/MinedMap.yml | 12 ++++++++++++
 Dockerfile                     |  2 ++
 src/core/mod.rs                | 18 ++++++++++++------
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/MinedMap.yml b/.github/workflows/MinedMap.yml
index 2aef1ec..24895c9 100644
--- a/.github/workflows/MinedMap.yml
+++ b/.github/workflows/MinedMap.yml
@@ -154,6 +154,16 @@ jobs:
     needs:
       - test
     steps:
+      - name: 'Checkout'
+        uses: 'actions/checkout@v4'
+
+      - name: 'Get version'
+        id: 'tag'
+        run: |
+          set -o pipefail
+          git fetch --prune --unshallow --tags -f
+          echo "tag=$(git describe --abbrev=7 --match='v*' | sed 's/^v//')" >> $GITHUB_OUTPUT
+
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
@@ -182,6 +192,8 @@ jobs:
       - name: Build
         uses: docker/build-push-action@v6
         with:
+          build-args: |
+            MINEDMAP_VERSION=${{ steps.tag.outputs.tag }}
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/Dockerfile b/Dockerfile
index bb0e0ad..49965db 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,7 @@
 FROM docker.io/library/alpine:latest AS builder
 
+ARG MINEDMAP_VERSION
+
 WORKDIR /build
 RUN apk add --no-cache build-base cmake cargo
 
diff --git a/src/core/mod.rs b/src/core/mod.rs
index 202d017..a16f620 100644
--- a/src/core/mod.rs
+++ b/src/core/mod.rs
@@ -33,17 +33,23 @@ use tracing::{info, warn};
 
 use self::entity_collector::EntityCollector;
 
-/// MinedMap version number
-const VERSION: &str = git_version!(
-	args = ["--abbrev=7", "--match=v*", "--dirty=-modified"],
-	cargo_prefix = "v",
-);
+/// Returns the MinedMap version number
+fn version() -> &'static str {
+	option_env!("MINEDMAP_VERSION").unwrap_or(
+		git_version!(
+			args = ["--abbrev=7", "--match=v*", "--dirty=-modified"],
+			cargo_prefix = "v",
+		)
+		.strip_prefix("v")
+		.unwrap(),
+	)
+}
 
 /// Command line arguments for minedmap CLI
 #[derive(Debug, Parser)]
 #[command(
 	about,
-	version = VERSION.strip_prefix("v").unwrap(),
+	version = version(),
 	max_term_width = 100,
 )]
 pub struct Args {

From 90f2c5fdd05286037512380950a9fe076fe26600 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 22 Feb 2025 04:03:08 +0100
Subject: [PATCH 422/460] docker: add example docker-compose.yml

---
 docker-compose.yml | 51 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..5954ba7
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,51 @@
+# This is an example docker-compose configuration providing a Minecraft server,
+# map generator and webserver. Visit http://localhost:8080 to view the map.
+#
+# See https://docker-minecraft-server.readthedocs.io/ for more information on
+# the itzg/minecraft-server image and its configuration.
+
+services:
+  mc:
+    image: docker.io/itzg/minecraft-server
+    environment:
+      EULA: 'true'
+    ports:
+      - '25565:25565'
+    volumes:
+      - data:/data
+    stdin_open: true
+    tty: true
+    restart: unless-stopped
+
+  minedmap:
+    image: ghcr.io/neocturne/minedmap/minedmap
+    command:
+      - '--jobs-initial=2'
+      - '--image-format=webp'
+      - '--sign-filter=\[Map\]'
+      - '--sign-transform=s/\[Map\]//'
+      - '--watch'
+      - '/input/world'
+      - '/output'
+    volumes:
+      - data:/input
+      - output:/output
+      - processed:/output/processed
+    network_mode: 'none'
+    depends_on:
+      mc:
+        condition: service_healthy
+    restart: unless-stopped
+
+  viewer:
+    image: ghcr.io/neocturne/minedmap/viewer
+    ports:
+      - '8080:80'
+    volumes:
+      - output:/usr/share/nginx/html/data
+    restart: unless-stopped
+
+volumes:
+  data: {}
+  processed: {}
+  output: {}

From 24c266fc78db01115435c118c874d55a5a9f2d28 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 22 Feb 2025 11:27:40 +0100
Subject: [PATCH 423/460] docker: set ARG after apk add

Allow reusing apk add layer when MINEDMAP_VERSION has changed.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 49965db..389fb08 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
 FROM docker.io/library/alpine:latest AS builder
 
-ARG MINEDMAP_VERSION
-
 WORKDIR /build
 RUN apk add --no-cache build-base cmake cargo
 
+ARG MINEDMAP_VERSION
+
 COPY . .
 RUN cargo build -r 
 RUN strip target/release/minedmap

From 5ee8e493d4b85afa8f8090716bf04207e8425f3b Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 25 Feb 2025 18:23:54 +0100
Subject: [PATCH 424/460] docker-compose.yml: mount volumes read-only where
 appropriate

---
 docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 5954ba7..c725ae2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,7 +28,7 @@ services:
       - '/input/world'
       - '/output'
     volumes:
-      - data:/input
+      - data:/input:ro
       - output:/output
       - processed:/output/processed
     network_mode: 'none'
@@ -42,7 +42,7 @@ services:
     ports:
       - '8080:80'
     volumes:
-      - output:/usr/share/nginx/html/data
+      - output:/usr/share/nginx/html/data:ro
     restart: unless-stopped
 
 volumes:

From 40bc6cd2a9aaa5137561604c025edb5677d81b14 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 28 Feb 2025 11:54:20 +0100
Subject: [PATCH 425/460] Update dependencies

---
 Cargo.lock                 | 80 +++++++++++++++++++-------------------
 crates/resource/Cargo.toml |  2 +-
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 039e940..c8cbbe6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -84,9 +84,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.95"
+version = "1.0.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04"
+checksum = "6b964d184e89d9b6b67dd2715bc8e74cf3107fb2b529990c90cf517326150bf4"
 
 [[package]]
 name = "autocfg"
@@ -150,9 +150,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
 [[package]]
 name = "cc"
-version = "1.2.13"
+version = "1.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7777341816418c02e033934a09f20dc0ccaf65a5201ef8a450ae0105a573fda"
+checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
 dependencies = [
  "jobserver",
  "libc",
@@ -173,9 +173,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.5.29"
+version = "4.5.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acebd8ad879283633b343856142139f2da2317c96b05b4dd6181c61e2480184"
+checksum = "027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -183,9 +183,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.29"
+version = "4.5.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ba32cbda51c7e1dfd49acc1457ba1a7dec5b64fe360e828acb13ca8dc9c2f9"
+checksum = "5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863"
 dependencies = [
  "anstream",
  "anstyle",
@@ -263,9 +263,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "either"
-version = "1.13.0"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+checksum = "b7914353092ddf589ad78f25c5c1c21b7f80b0ff8621e7c814c3485b5306da9d"
 
 [[package]]
 name = "enum-map"
@@ -310,9 +310,9 @@ dependencies = [
 
 [[package]]
 name = "equivalent"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
@@ -359,9 +359,9 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.35"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
+checksum = "11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc"
 dependencies = [
  "crc32fast",
  "libz-ng-sys",
@@ -448,9 +448,9 @@ dependencies = [
 
 [[package]]
 name = "glam"
-version = "0.29.2"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc46dd3ec48fdd8e693a98d2b8bafae273a2d54c1de02a2a7e3d57d501f39677"
+checksum = "17fcdf9683c406c2fc4d124afd29c0d595e22210d633cbdb8695ba9935ab1dc6"
 
 [[package]]
 name = "hashbrown"
@@ -593,9 +593,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.169"
+version = "0.2.170"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
 
 [[package]]
 name = "libredox"
@@ -636,9 +636,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.25"
+version = "0.4.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f"
+checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
 
 [[package]]
 name = "lru"
@@ -728,9 +728,9 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3b1c9bd4fe1f0f8b387f6eb9eb3b4a1aa26185e5750efb9140301703f62cd1b"
+checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
 dependencies = [
  "adler2",
  "simd-adler32",
@@ -989,9 +989,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.8"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
+checksum = "82b568323e98e49e2a0899dcee453dd679fae22d69adf9b11dd508d1549b7e2f"
 dependencies = [
  "bitflags 2.8.0",
 ]
@@ -1073,9 +1073,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "serde"
-version = "1.0.217"
+version = "1.0.218"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
+checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60"
 dependencies = [
  "serde_derive",
 ]
@@ -1091,9 +1091,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.217"
+version = "1.0.218"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
+checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1102,9 +1102,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.138"
+version = "1.0.139"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949"
+checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6"
 dependencies = [
  "itoa",
  "memchr",
@@ -1150,9 +1150,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.13.2"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
+checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
 
 [[package]]
 name = "strsim"
@@ -1281,9 +1281,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.16"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034"
+checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe"
 
 [[package]]
 name = "utf8parse"
@@ -1428,27 +1428,27 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "zstd"
-version = "0.13.2"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9"
+checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a"
 dependencies = [
  "zstd-safe",
 ]
 
 [[package]]
 name = "zstd-safe"
-version = "7.2.1"
+version = "7.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059"
+checksum = "f3051792fbdc2e1e143244dc28c60f73d8470e93f3f9cbd0ead44da5ed802722"
 dependencies = [
  "zstd-sys",
 ]
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.13+zstd.1.5.6"
+version = "2.0.14+zstd.1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa"
+checksum = "8fb060d4926e4ac3a3ad15d864e99ceb5f343c6b34f5bd6d81ae6ed417311be5"
 dependencies = [
  "cc",
  "pkg-config",
diff --git a/crates/resource/Cargo.toml b/crates/resource/Cargo.toml
index 4e0d512..07b6d1f 100644
--- a/crates/resource/Cargo.toml
+++ b/crates/resource/Cargo.toml
@@ -9,5 +9,5 @@ repository.workspace = true
 
 [dependencies]
 enumflags2 = { version = "0.7.7", features = ["serde"] }
-glam = "0.29.2"
+glam = "0.30.0"
 serde = { version = "1.0.183", features = ["derive"] }

From f8c8ca78bad8e0c66b1429666442c958be1a33bf Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 28 Feb 2025 12:12:58 +0100
Subject: [PATCH 426/460] Switch from zlib-ng to zlib-rs

zlib-rs provides the same performance as zlib-ng with minedmap, while
reducing the amount of C code and avoiding the external build dependency
on CMake.
---
 CHANGELOG.md          |  4 ++++
 Cargo.lock            | 27 ++++++++++++---------------
 Cargo.toml            |  4 ++--
 Dockerfile            |  2 +-
 README.md             |  5 -----
 crates/nbt/Cargo.toml |  6 ++----
 6 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8fd052..1b84b15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,10 @@
 - Unknown biome types (from not yet supported or modded versions of Minecraft)
   will now use plains biome colors as a fallback instead of resulting in water,
   grass and foliage blocks to be rendered as transparent pixels
+- Switched from zlib-ng to zlib-rs
+
+  This should have no noticable effect on the usage of MinedMap, but avoids
+  an external build dependency on CMake.
 
 ## [2.4.0] - 2025-01-11
 
diff --git a/Cargo.lock b/Cargo.lock
index c8cbbe6..7bd83ee 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -212,15 +212,6 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
 
-[[package]]
-name = "cmake"
-version = "0.1.54"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "colorchoice"
 version = "1.0.3"
@@ -364,7 +355,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc"
 dependencies = [
  "crc32fast",
- "libz-ng-sys",
+ "libz-rs-sys",
  "miniz_oxide",
 ]
 
@@ -609,13 +600,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "libz-ng-sys"
-version = "1.1.21"
+name = "libz-rs-sys"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cee1488e961a80d172564fd6fcda11d8a4ac6672c06fe008e9213fa60520c2b"
+checksum = "902bc563b5d65ad9bba616b490842ef0651066a1a1dc3ce1087113ffcb873c8d"
 dependencies = [
- "cmake",
- "libc",
+ "zlib-rs",
 ]
 
 [[package]]
@@ -664,6 +654,7 @@ dependencies = [
  "clap",
  "enum-map",
  "fastnbt",
+ "flate2",
  "futures-util",
  "git-version",
  "humantime",
@@ -1426,6 +1417,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[package]]
+name = "zlib-rs"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b20717f0917c908dc63de2e44e97f1e6b126ca58d0e391cee86d504eb8fbd05"
+
 [[package]]
 name = "zstd"
 version = "0.13.3"
diff --git a/Cargo.toml b/Cargo.toml
index d213a56..812ad33 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -42,6 +42,7 @@ bincode = "1.3.3"
 clap = { version = "4.1.4", features = ["derive", "wrap_help"] }
 enum-map = "2.7.3"
 fastnbt = "2.3.2"
+flate2 = { version = "1.1.0", features = ["zlib-rs"] }
 futures-util = "0.3.28"
 git-version = "0.3.5"
 humantime = "2.1.0"
@@ -67,7 +68,6 @@ tracing-subscriber = "0.3.17"
 zstd = "0.13.0"
 
 [features]
-default = ["jemalloc-auto", "zlib-ng"]
+default = ["jemalloc-auto"]
 jemalloc-auto = ["dep:minedmap-default-alloc"]
 jemalloc = ["jemalloc-auto", "minedmap-default-alloc/jemalloc"]
-zlib-ng = ["minedmap-nbt/zlib-ng"]
diff --git a/Dockerfile b/Dockerfile
index 389fb08..818971d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM docker.io/library/alpine:latest AS builder
 
 WORKDIR /build
-RUN apk add --no-cache build-base cmake cargo
+RUN apk add --no-cache build-base cargo
 
 ARG MINEDMAP_VERSION
 
diff --git a/README.md b/README.md
index 7d60f78..952163f 100644
--- a/README.md
+++ b/README.md
@@ -117,11 +117,6 @@ or newer). The following command can be used to build the current development ve
 cargo install --git 'https://github.com/neocturne/MinedMap.git'
 ```
 
-In addition, CMake is needed to build the zlib-ng library. If you do not have
-CMake installed, you can disable the zlib-ng feature by passing `--no-default-features`
-to cargo. A pure-Rust zlib implementation will be used, which is more portable,
-but slower than zlib-ng.
-
 If you are looking for the older C++ implementation of the MinedMap tile renderer,
 see the [v1.19.1](https://github.com/neocturne/MinedMap/tree/v1.19.1) tag.
 
diff --git a/crates/nbt/Cargo.toml b/crates/nbt/Cargo.toml
index 9f815da..01bbd78 100644
--- a/crates/nbt/Cargo.toml
+++ b/crates/nbt/Cargo.toml
@@ -11,12 +11,10 @@ repository.workspace = true
 anyhow = "1.0.75"
 bytemuck = "1.13.1"
 fastnbt = "2.4.4"
-flate2 = "1.0.27"
+flate2 = "1.1.0"
 minedmap-types = { version = "0.1.4", path = "../types" }
 serde = "1.0.183"
 
-[features]
-zlib-ng = ["flate2/zlib-ng"]
-
 [dev-dependencies]
 clap = { version = "4.3.23", features = ["derive"] }
+flate2 = { version = "1.1.0", features = ["zlib-rs"] }

From 7686996fd3b538d3b5409fcb3c251b178ed693df Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 28 Feb 2025 16:16:29 +0100
Subject: [PATCH 427/460] resource: make seagrass opaque

See changelog for rationale.
---
 CHANGELOG.md                       | 7 +++++++
 crates/resource/src/block_types.rs | 4 ++--
 resource/blocks.json               | 2 +-
 src/core/common.rs                 | 4 ++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b84b15..14b7e35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,13 @@
 
   This should have no noticable effect on the usage of MinedMap, but avoids
   an external build dependency on CMake.
+- Small (1-block) seagrass is now visible on the map
+
+  1-block seagrass in 1-block deep water would previously result in the ground
+  to be shown instead of water, as MinedMap currently doesn't handle the
+  "waterlogged" block status. As 1-block seagrass is relatively big compared to
+  other "small" plants, just considering it opaque seems like a good enough
+  solution that avoids having to implement advanced block status flags.
 
 ## [2.4.0] - 2025-01-11
 
diff --git a/crates/resource/src/block_types.rs b/crates/resource/src/block_types.rs
index 53abd54..da556b8 100644
--- a/crates/resource/src/block_types.rs
+++ b/crates/resource/src/block_types.rs
@@ -8692,8 +8692,8 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 		"seagrass",
 		ConstBlockType {
 			block_color: BlockColor {
-				flags: make_bitflags!(BlockFlag::{}),
-				color: Color([0, 0, 0]),
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([50, 126, 8]),
 			},
 			sign_material: None,
 		},
diff --git a/resource/blocks.json b/resource/blocks.json
index a88aa34..a409abb 100644
--- a/resource/blocks.json
+++ b/resource/blocks.json
@@ -1781,7 +1781,7 @@
 	"sculk_vein": {},
 	"sea_lantern": {},
 	"sea_pickle": {},
-	"seagrass": null,
+	"seagrass": {},
 	"short_grass": null,
 	"shroomlight": {},
 	"shulker_box": {},
diff --git a/src/core/common.rs b/src/core/common.rs
index a81dbf2..8230a79 100644
--- a/src/core/common.rs
+++ b/src/core/common.rs
@@ -25,7 +25,7 @@ use crate::{
 ///
 /// Increase when the generation of processed regions from region data changes
 /// (usually because of updated resource data)
-pub const REGION_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(4);
+pub const REGION_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(5);
 
 /// MinedMap map tile data version number
 ///
@@ -37,7 +37,7 @@ pub const MAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
 ///
 /// Increase when the generation of lightmap tiles from region data changes
 /// (usually because of updated resource data)
-pub const LIGHTMAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(3);
+pub const LIGHTMAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(4);
 
 /// MinedMap mipmap data version number
 ///

From fbdd5ed457f2e5ca12bc7a7d6f6992f47494e062 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 13 Mar 2025 21:11:59 +0100
Subject: [PATCH 428/460] Dockerfile: switch back to
 docker.io/library/rust:alpine image

bincode 2 required Rust 1.85, so our options are to switch to Alpine
edge or to use the rust image. While using the rust image results in a
statically linked binary, this does not actually increase the size of
the image, as we were already using jemalloc, so almost nothing of libc
is actually used.
---
 Dockerfile | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 818971d..0f0eecd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
-FROM docker.io/library/alpine:latest AS builder
+FROM docker.io/library/rust:alpine AS builder
 
 WORKDIR /build
-RUN apk add --no-cache build-base cargo
+RUN apk add --no-cache build-base tini-static
 
 ARG MINEDMAP_VERSION
 
@@ -9,14 +9,9 @@ COPY . .
 RUN cargo build -r 
 RUN strip target/release/minedmap
 
-FROM docker.io/library/alpine:latest
+FROM scratch
 
-RUN addgroup -g 1000 -S minedmap \
-    && adduser -S -D -H -u 1000 -h /output -s /sbin/nologin -G minedmap -g minedmap minedmap
+COPY --from=builder /sbin/tini-static /build/target/release/minedmap /bin/
+ENTRYPOINT [ "/bin/tini-static", "--", "/bin/minedmap" ]
 
-RUN apk add --no-cache libgcc tini
-
-COPY --from=builder /build/target/release/minedmap /bin/minedmap
-ENTRYPOINT [ "/sbin/tini", "--", "/bin/minedmap" ]
-
-USER minedmap:minedmap
+USER 1000:1000

From deb232ddf356efd80a4658b0b0f8c329e420b244 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 13 Mar 2025 20:34:16 +0100
Subject: [PATCH 429/460] Update dependencies

---
 Cargo.lock | 118 ++++++++++++++++++++++++++---------------------------
 1 file changed, 59 insertions(+), 59 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7bd83ee..0142276 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -84,9 +84,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.96"
+version = "1.0.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b964d184e89d9b6b67dd2715bc8e74cf3107fb2b529990c90cf517326150bf4"
+checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
 
 [[package]]
 name = "autocfg"
@@ -126,15 +126,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.8.0"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36"
+checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
 
 [[package]]
 name = "bytemuck"
-version = "1.21.0"
+version = "1.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3"
+checksum = "b6b1fc10dbac614ebc03540c9dbd60e83887fda27794998c6528f1782047d540"
 
 [[package]]
 name = "byteorder"
@@ -173,9 +173,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.5.31"
+version = "4.5.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767"
+checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -183,9 +183,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.31"
+version = "4.5.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863"
+checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8"
 dependencies = [
  "anstream",
  "anstyle",
@@ -196,9 +196,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.28"
+version = "4.5.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed"
+checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -254,9 +254,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "either"
-version = "1.14.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7914353092ddf589ad78f25c5c1c21b7f80b0ff8621e7c814c3485b5306da9d"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "enum-map"
@@ -468,9 +468,9 @@ checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "humantime"
-version = "2.1.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f"
 
 [[package]]
 name = "image"
@@ -497,9 +497,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.7.1"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
+checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -512,7 +512,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
 dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
  "inotify-sys",
  "libc",
 ]
@@ -543,9 +543,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "jobserver"
@@ -584,9 +584,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.170"
+version = "0.2.171"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
+checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
 
 [[package]]
 name = "libredox"
@@ -594,7 +594,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
  "libc",
  "redox_syscall",
 ]
@@ -610,9 +610,9 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.15"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+checksum = "6db9c683daf087dc577b7506e9695b3d556a9f3849903fa28186283afd6809e9"
 
 [[package]]
 name = "lock_api"
@@ -745,7 +745,7 @@ version = "8.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943"
 dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
  "filetime",
  "fsevent-sys",
  "inotify",
@@ -813,9 +813,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.20.3"
+version = "1.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
+checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc"
 
 [[package]]
 name = "overload"
@@ -902,9 +902,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkg-config"
-version = "0.3.31"
+version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
 [[package]]
 name = "png"
@@ -921,9 +921,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.93"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
+checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
 dependencies = [
  "unicode-ident",
 ]
@@ -936,9 +936,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
 
 [[package]]
 name = "quote"
-version = "1.0.38"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 dependencies = [
  "proc-macro2",
 ]
@@ -980,11 +980,11 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.9"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82b568323e98e49e2a0899dcee453dd679fae22d69adf9b11dd508d1549b7e2f"
+checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1"
 dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
 ]
 
 [[package]]
@@ -1030,11 +1030,11 @@ checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustix"
-version = "0.38.44"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
+checksum = "f7178faa4b75a30e269c71e61c353ce2748cf3d76f0c44c393f4e60abf49b825"
 dependencies = [
- "bitflags 2.8.0",
+ "bitflags 2.9.0",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -1043,9 +1043,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.19"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "same-file"
@@ -1064,27 +1064,27 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "serde"
-version = "1.0.218"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_bytes"
-version = "0.11.15"
+version = "0.11.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a"
+checksum = "8437fd221bde2d4ca316d61b90e337e9e702b3820b87d63caa9ba6c02bd06d96"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.218"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1093,9 +1093,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.139"
+version = "1.0.140"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6"
+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
 dependencies = [
  "itoa",
  "memchr",
@@ -1153,9 +1153,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "syn"
-version = "2.0.98"
+version = "2.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
+checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1164,9 +1164,9 @@ dependencies = [
 
 [[package]]
 name = "terminal_size"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9"
+checksum = "45c6481c4829e4cc63825e62c49186a34538b7b2750b73b266581ffb612fb5ed"
 dependencies = [
  "rustix",
  "windows-sys 0.59.0",
@@ -1204,9 +1204,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.43.0"
+version = "1.44.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
+checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a"
 dependencies = [
  "backtrace",
  "parking_lot",
@@ -1272,9 +1272,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
 [[package]]
 name = "utf8parse"

From 404ad74235cc69935204ea50497a80f9acce6aad Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 12 Mar 2025 20:54:04 +0100
Subject: [PATCH 430/460] core: deserialize biome list into Vec

Only use IndexSet for deduplication while processing the biome; when
deserializing, no deduplication is required, so using a Vec is faster
(besides IndexSet missing non-serde support for bincode 2).
---
 src/core/common.rs           |  3 +--
 src/core/region_processor.rs | 12 ++++++++++--
 src/core/tile_renderer.rs    |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/core/common.rs b/src/core/common.rs
index 8230a79..b25d7b8 100644
--- a/src/core/common.rs
+++ b/src/core/common.rs
@@ -8,7 +8,6 @@ use std::{
 
 use anyhow::{Context, Result};
 use clap::ValueEnum;
-use indexmap::IndexSet;
 use regex::{Regex, RegexSet};
 use serde::{Deserialize, Serialize};
 
@@ -102,7 +101,7 @@ pub struct ProcessedRegion {
 	/// List of biomes used in the region
 	///
 	/// Indexed by [ProcessedChunk] biome data
-	pub biome_list: IndexSet<Biome>,
+	pub biome_list: Vec<Biome>,
 	/// Processed chunk data
 	pub chunks: ChunkArray<Option<Box<ProcessedChunk>>>,
 }
diff --git a/src/core/region_processor.rs b/src/core/region_processor.rs
index e448f5e..1dc50fb 100644
--- a/src/core/region_processor.rs
+++ b/src/core/region_processor.rs
@@ -1,9 +1,11 @@
 //! The [RegionProcessor] and related functions
 
-use std::{ffi::OsStr, path::PathBuf, sync::mpsc, time::SystemTime};
+use std::{ffi::OsStr, mem, path::PathBuf, sync::mpsc, time::SystemTime};
 
 use anyhow::{Context, Result};
 use enum_map::{Enum, EnumMap};
+use indexmap::IndexSet;
+use minedmap_resource::Biome;
 use rayon::prelude::*;
 use tracing::{debug, info, warn};
 
@@ -73,6 +75,8 @@ struct SingleRegionProcessor<'a> {
 	lightmap_needed: bool,
 	/// True if entity output file needs to be updated
 	entities_needed: bool,
+	/// [IndexSet] of biomes used by the processed region
+	biome_list: IndexSet<Biome>,
 	/// Processed region intermediate data
 	processed_region: ProcessedRegion,
 	/// Lightmap intermediate data
@@ -108,6 +112,7 @@ impl<'a> SingleRegionProcessor<'a> {
 		let entities_needed = Some(input_timestamp) > entities_timestamp;
 
 		let processed_region = ProcessedRegion::default();
+		let biome_list = IndexSet::default();
 		let lightmap = image::GrayAlphaImage::new(N, N);
 		let entities = ProcessedEntities::default();
 
@@ -127,6 +132,7 @@ impl<'a> SingleRegionProcessor<'a> {
 			lightmap_needed,
 			entities_needed,
 			processed_region,
+			biome_list,
 			lightmap,
 			entities,
 			image_format: processor.config.tile_image_format(),
@@ -220,7 +226,7 @@ impl<'a> SingleRegionProcessor<'a> {
 				biomes,
 				block_light,
 				depths,
-			}) = world::layer::top_layer(&mut self.processed_region.biome_list, &chunk)
+			}) = world::layer::top_layer(&mut self.biome_list, &chunk)
 				.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))?
 			{
 				if self.output_needed {
@@ -291,6 +297,8 @@ impl<'a> SingleRegionProcessor<'a> {
 			}
 		}
 
+		self.processed_region.biome_list = mem::take(&mut self.biome_list).into_iter().collect();
+
 		self.save_region()?;
 		self.save_lightmap()?;
 		self.save_entities()?;
diff --git a/src/core/tile_renderer.rs b/src/core/tile_renderer.rs
index 24af234..e47e20e 100644
--- a/src/core/tile_renderer.rs
+++ b/src/core/tile_renderer.rs
@@ -187,7 +187,7 @@ impl<'a> TileRenderer<'a> {
 
 		for ((region_x, region_z, index), w) in weights.into_values() {
 			let region = region_group.get(region_x, region_z)?;
-			let biome = region.biome_list.get_index(index.into())?;
+			let biome = region.biome_list.get(usize::from(index))?;
 
 			total += w;
 			color += w * block_color(block, Some(biome), depth.0 as f32);

From 53a0f2460006b89413feb80858a03673f2746b68 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 12 Mar 2025 20:34:26 +0100
Subject: [PATCH 431/460] treewide: update to bincode 2

Consistently use bincode's Encode/Decode to avoid issues with
incompatible serde features. Support for storing some temporary files as
JSON is removed.

The size of the "processed" directory is reduced by ~8% with the new
default encoding of bincode 2. Performance is more or less unaffected.
---
 Cargo.lock                   | 31 ++++++++++++++++++++---
 Cargo.toml                   |  2 +-
 crates/resource/Cargo.toml   |  2 +-
 crates/resource/src/lib.rs   | 49 +++++++++++++++++++++++++++++++-----
 crates/types/Cargo.toml      |  2 +-
 crates/types/src/lib.rs      |  6 ++---
 src/core/common.rs           | 14 ++++++-----
 src/core/entity_collector.rs | 25 +++++++++---------
 src/core/metadata_writer.rs  |  5 ++--
 src/core/region_processor.rs |  2 --
 src/core/tile_renderer.rs    |  3 +--
 src/io/storage.rs            | 46 +++++++++++++--------------------
 src/world/block_entity.rs    | 11 ++++----
 src/world/json_text.rs       |  7 ++++--
 src/world/layer.rs           |  4 +--
 src/world/sign.rs            |  5 ++--
 16 files changed, 133 insertions(+), 81 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0142276..5c5d477 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -111,11 +111,22 @@ dependencies = [
 
 [[package]]
 name = "bincode"
-version = "1.3.3"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
+checksum = "36eaf5d7b090263e8150820482d5d93cd964a81e4019913c972f4edcc6edb740"
 dependencies = [
+ "bincode_derive",
  "serde",
+ "unty",
+]
+
+[[package]]
+name = "bincode_derive"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf95709a440f45e986983918d0e8a1f30a9b1df04918fc828670606804ac3c09"
+dependencies = [
+ "virtue",
 ]
 
 [[package]]
@@ -704,17 +715,17 @@ dependencies = [
 name = "minedmap-resource"
 version = "0.6.0"
 dependencies = [
+ "bincode",
  "enumflags2",
  "glam",
- "serde",
 ]
 
 [[package]]
 name = "minedmap-types"
 version = "0.1.4"
 dependencies = [
+ "bincode",
  "itertools",
- "serde",
 ]
 
 [[package]]
@@ -1276,6 +1287,12 @@ version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
+[[package]]
+name = "unty"
+version = "0.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d49784317cd0d1ee7ec5c716dd598ec5b4483ea832a2dced265471cc0f690ae"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -1288,6 +1305,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
 
+[[package]]
+name = "virtue"
+version = "0.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "051eb1abcf10076295e815102942cc58f9d5e3b4560e46e53c21e8ff6f3af7b1"
+
 [[package]]
 name = "walkdir"
 version = "2.5.0"
diff --git a/Cargo.toml b/Cargo.toml
index 812ad33..4109bfd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -38,7 +38,7 @@ pre-release-replacements = [
 
 [dependencies]
 anyhow = "1.0.68"
-bincode = "1.3.3"
+bincode = "2.0.1"
 clap = { version = "4.1.4", features = ["derive", "wrap_help"] }
 enum-map = "2.7.3"
 fastnbt = "2.3.2"
diff --git a/crates/resource/Cargo.toml b/crates/resource/Cargo.toml
index 07b6d1f..c654f40 100644
--- a/crates/resource/Cargo.toml
+++ b/crates/resource/Cargo.toml
@@ -8,6 +8,6 @@ readme.workspace = true
 repository.workspace = true
 
 [dependencies]
+bincode = "2.0.1"
 enumflags2 = { version = "0.7.7", features = ["serde"] }
 glam = "0.30.0"
-serde = { version = "1.0.183", features = ["derive"] }
diff --git a/crates/resource/src/lib.rs b/crates/resource/src/lib.rs
index a633d06..01b460b 100644
--- a/crates/resource/src/lib.rs
+++ b/crates/resource/src/lib.rs
@@ -10,13 +10,13 @@ mod legacy_block_types;
 
 use std::collections::HashMap;
 
+use bincode::{BorrowDecode, Decode, Encode};
 use enumflags2::{bitflags, BitFlags};
-use serde::{Deserialize, Serialize};
 
 /// Flags describing special properties of [BlockType]s
 #[bitflags]
 #[repr(u8)]
-#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy, PartialEq)]
 pub enum BlockFlag {
 	/// The block type is opaque
 	Opaque,
@@ -38,14 +38,14 @@ pub enum BlockFlag {
 }
 
 /// An RGB color with u8 components
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Encode, Decode)]
 pub struct Color(pub [u8; 3]);
 
 /// An RGB color with f32 components
 pub type Colorf = glam::Vec3;
 
 /// A block type specification
-#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy)]
 pub struct BlockColor {
 	/// Bit set of [BlockFlag]s describing special properties of the block type
 	pub flags: BitFlags<BlockFlag>,
@@ -61,6 +61,43 @@ impl BlockColor {
 	}
 }
 
+impl Encode for BlockColor {
+	fn encode<E: bincode::enc::Encoder>(
+		&self,
+		encoder: &mut E,
+	) -> Result<(), bincode::error::EncodeError> {
+		bincode::Encode::encode(&self.flags.bits(), encoder)?;
+		bincode::Encode::encode(&self.color, encoder)?;
+		Ok(())
+	}
+}
+
+impl<Context> Decode<Context> for BlockColor {
+	fn decode<D: bincode::de::Decoder<Context = Context>>(
+		decoder: &mut D,
+	) -> Result<Self, bincode::error::DecodeError> {
+		Ok(BlockColor {
+			flags: BitFlags::from_bits(bincode::Decode::decode(decoder)?).or(Err(
+				bincode::error::DecodeError::Other("invalid block flags"),
+			))?,
+			color: bincode::Decode::decode(decoder)?,
+		})
+	}
+}
+
+impl<'de, Context> BorrowDecode<'de, Context> for BlockColor {
+	fn borrow_decode<D: bincode::de::BorrowDecoder<'de, Context = Context>>(
+		decoder: &mut D,
+	) -> Result<Self, bincode::error::DecodeError> {
+		Ok(BlockColor {
+			flags: BitFlags::from_bits(bincode::BorrowDecode::borrow_decode(decoder)?).or(Err(
+				bincode::error::DecodeError::Other("invalid block flags"),
+			))?,
+			color: bincode::BorrowDecode::borrow_decode(decoder)?,
+		})
+	}
+}
+
 /// A block type specification (for use in constants)
 #[derive(Debug, Clone)]
 struct ConstBlockType {
@@ -137,7 +174,7 @@ impl BlockTypes {
 pub use block_color::{block_color, needs_biome};
 
 /// Grass color modifier used by a biome
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Encode, Decode)]
 pub enum BiomeGrassColorModifier {
 	/// Grass color modifier used by the dark forest biome
 	DarkForest,
@@ -149,7 +186,7 @@ pub enum BiomeGrassColorModifier {
 ///
 /// A Biome contains all information about a biome necessary to compute a block
 /// color given a block type and depth
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Encode, Decode)]
 pub struct Biome {
 	/// Temperature value
 	///
diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml
index c5bd47e..2b83c39 100644
--- a/crates/types/Cargo.toml
+++ b/crates/types/Cargo.toml
@@ -8,5 +8,5 @@ readme.workspace = true
 repository.workspace = true
 
 [dependencies]
+bincode = "2.0.1"
 itertools = "0.14.0"
-serde = { version = "1.0.183", features = ["derive"] }
diff --git a/crates/types/src/lib.rs b/crates/types/src/lib.rs
index b4f12c2..e770f6a 100644
--- a/crates/types/src/lib.rs
+++ b/crates/types/src/lib.rs
@@ -8,8 +8,8 @@ use std::{
 	ops::{Index, IndexMut},
 };
 
+use bincode::{Decode, Encode};
 use itertools::iproduct;
-use serde::{Deserialize, Serialize};
 
 /// Const generic AXIS arguments for coordinate types
 pub mod axis {
@@ -110,7 +110,7 @@ impl LayerBlockCoords {
 /// Generic array for data stored per block of a chunk layer
 ///
 /// Includes various convenient iteration functions.
-#[derive(Debug, Clone, Copy, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy, Default, Encode, Decode)]
 pub struct LayerBlockArray<T>(pub [[T; BLOCKS_PER_CHUNK]; BLOCKS_PER_CHUNK]);
 
 impl<T> Index<LayerBlockCoords> for LayerBlockArray<T> {
@@ -196,7 +196,7 @@ impl Debug for ChunkCoords {
 /// Generic array for data stored per chunk of a region
 ///
 /// Includes various convenient iteration functions.
-#[derive(Debug, Clone, Copy, Default, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy, Default, Encode, Decode)]
 pub struct ChunkArray<T>(pub [[T; CHUNKS_PER_REGION]; CHUNKS_PER_REGION]);
 
 impl<T> ChunkArray<T> {
diff --git a/src/core/common.rs b/src/core/common.rs
index b25d7b8..06a3277 100644
--- a/src/core/common.rs
+++ b/src/core/common.rs
@@ -3,13 +3,15 @@
 use std::{
 	collections::{BTreeMap, BTreeSet},
 	fmt::Debug,
+	hash::Hash,
 	path::{Path, PathBuf},
 };
 
 use anyhow::{Context, Result};
+use bincode::{Decode, Encode};
 use clap::ValueEnum;
 use regex::{Regex, RegexSet};
-use serde::{Deserialize, Serialize};
+use serde::Serialize;
 
 use crate::{
 	io::fs::FileMetaVersion,
@@ -24,7 +26,7 @@ use crate::{
 ///
 /// Increase when the generation of processed regions from region data changes
 /// (usually because of updated resource data)
-pub const REGION_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(5);
+pub const REGION_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(6);
 
 /// MinedMap map tile data version number
 ///
@@ -46,7 +48,7 @@ pub const MIPMAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
 /// MinedMap processed entity data version number
 ///
 /// Increase when entity collection changes bacause of code changes.
-pub const ENTITIES_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(1);
+pub const ENTITIES_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(2);
 
 /// Coordinate pair of a generated tile
 ///
@@ -85,7 +87,7 @@ impl TileCoordMap {
 }
 
 /// Data structure for storing chunk data between processing and rendering steps
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Encode, Decode)]
 pub struct ProcessedChunk {
 	/// Block type data
 	pub blocks: Box<layer::BlockArray>,
@@ -96,7 +98,7 @@ pub struct ProcessedChunk {
 }
 
 /// Data structure for storing region data between processing and rendering steps
-#[derive(Debug, Default, Serialize, Deserialize)]
+#[derive(Debug, Default, Encode, Decode)]
 pub struct ProcessedRegion {
 	/// List of biomes used in the region
 	///
@@ -107,7 +109,7 @@ pub struct ProcessedRegion {
 }
 
 /// Data structure for storing entity data between processing and collection steps
-#[derive(Debug, Default, Serialize, Deserialize)]
+#[derive(Debug, Default, Encode, Decode)]
 pub struct ProcessedEntities {
 	/// List of block entities
 	pub block_entities: Vec<BlockEntity>,
diff --git a/src/core/entity_collector.rs b/src/core/entity_collector.rs
index 30b3a86..0d18090 100644
--- a/src/core/entity_collector.rs
+++ b/src/core/entity_collector.rs
@@ -78,23 +78,22 @@ impl<'a> EntityCollector<'a> {
 		let mut output = ProcessedEntities::default();
 
 		for source_path in sources {
-			let mut source: ProcessedEntities =
-				match storage::read_file(source_path.as_ref(), storage::Format::Json) {
-					Ok(source) => source,
-					Err(err) => {
-						warn!(
-							"Failed to read entity data file {}: {:?}",
-							source_path.as_ref().display(),
-							err,
-						);
-						continue;
-					}
-				};
+			let mut source: ProcessedEntities = match storage::read_file(source_path.as_ref()) {
+				Ok(source) => source,
+				Err(err) => {
+					warn!(
+						"Failed to read entity data file {}: {:?}",
+						source_path.as_ref().display(),
+						err,
+					);
+					continue;
+				}
+			};
 
 			output.block_entities.append(&mut source.block_entities);
 		}
 
-		storage::write(file, &output, storage::Format::Json).context("Failed to write entity data")
+		storage::write(file, &output).context("Failed to write entity data")
 	}
 
 	/// Runs the mipmap generation
diff --git a/src/core/metadata_writer.rs b/src/core/metadata_writer.rs
index eb5f59f..40c5796 100644
--- a/src/core/metadata_writer.rs
+++ b/src/core/metadata_writer.rs
@@ -179,9 +179,8 @@ impl<'a> MetadataWriter<'a> {
 
 	/// Generates [Entities] data from collected entity lists
 	fn entities(&self) -> Result<Entities> {
-		let data: ProcessedEntities =
-			storage::read_file(&self.config.entities_path_final, storage::Format::Json)
-				.context("Failed to read entity data file")?;
+		let data: ProcessedEntities = storage::read_file(&self.config.entities_path_final)
+			.context("Failed to read entity data file")?;
 
 		let ret = Entities {
 			signs: data
diff --git a/src/core/region_processor.rs b/src/core/region_processor.rs
index 1dc50fb..56f54ed 100644
--- a/src/core/region_processor.rs
+++ b/src/core/region_processor.rs
@@ -168,7 +168,6 @@ impl<'a> SingleRegionProcessor<'a> {
 		storage::write_file(
 			&self.output_path,
 			&self.processed_region,
-			storage::Format::Bincode,
 			REGION_FILE_META_VERSION,
 			self.input_timestamp,
 		)
@@ -207,7 +206,6 @@ impl<'a> SingleRegionProcessor<'a> {
 		storage::write_file(
 			&self.entities_path,
 			&self.entities,
-			storage::Format::Json,
 			ENTITIES_FILE_META_VERSION,
 			self.input_timestamp,
 		)
diff --git a/src/core/tile_renderer.rs b/src/core/tile_renderer.rs
index e47e20e..e990a63 100644
--- a/src/core/tile_renderer.rs
+++ b/src/core/tile_renderer.rs
@@ -105,8 +105,7 @@ impl<'a> TileRenderer<'a> {
 
 		region_loader
 			.get_or_try_init(|| async {
-				storage::read_file(&processed_path, storage::Format::Bincode)
-					.context("Failed to load processed region data")
+				storage::read_file(&processed_path).context("Failed to load processed region data")
 			})
 			.await
 			.cloned()
diff --git a/src/io/storage.rs b/src/io/storage.rs
index 9296166..ae311de 100644
--- a/src/io/storage.rs
+++ b/src/io/storage.rs
@@ -10,28 +10,16 @@ use std::{
 };
 
 use anyhow::{Context, Result};
-use serde::{de::DeserializeOwned, Serialize};
+use bincode::{Decode, Encode};
 
 use super::fs;
 
-/// Storage format
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub enum Format {
-	/// Encode as Bincode
-	///
-	/// Bincode is more efficient than JSON, but cannot handle many of
-	/// serde's features like flatten, conditional skipping, ...
-	Bincode,
-	/// Encode as JSON
-	Json,
-}
+/// Bincode configuration
+const BINCODE_CONFIG: bincode::config::Configuration = bincode::config::standard();
 
 /// Serializes data and writes it to a writer
-pub fn write<W: Write, T: Serialize>(writer: &mut W, value: &T, format: Format) -> Result<()> {
-	let data = match format {
-		Format::Bincode => bincode::serialize(value)?,
-		Format::Json => serde_json::to_vec(value)?,
-	};
+pub fn write<W: Write, T: Encode>(writer: &mut W, value: &T) -> Result<()> {
+	let data = bincode::encode_to_vec(value, BINCODE_CONFIG)?;
 	let len = u32::try_from(data.len())?;
 	let compressed = zstd::bulk::compress(&data, 1)?;
 	drop(data);
@@ -45,18 +33,21 @@ pub fn write<W: Write, T: Serialize>(writer: &mut W, value: &T, format: Format)
 /// Serializes data and stores it in a file
 ///
 /// A timestamp is stored in an assiciated metadata file.
-pub fn write_file<T: Serialize>(
+pub fn write_file<T: Encode>(
 	path: &Path,
 	value: &T,
-	format: Format,
 	version: fs::FileMetaVersion,
 	timestamp: SystemTime,
 ) -> Result<()> {
-	fs::create_with_timestamp(path, version, timestamp, |file| write(file, value, format))
+	fs::create_with_timestamp(path, version, timestamp, |file| write(file, value))
 }
 
 /// Reads data from a reader and deserializes it
-pub fn read<R: Read, T: DeserializeOwned>(reader: &mut R, format: Format) -> Result<T> {
+pub fn read<R, T>(reader: &mut R) -> Result<T>
+where
+	R: Read,
+	T: Decode<()>,
+{
 	let mut len_buf = [0u8; 4];
 	reader.read_exact(&mut len_buf)?;
 	let len = usize::try_from(u32::from_be_bytes(len_buf))?;
@@ -66,18 +57,17 @@ pub fn read<R: Read, T: DeserializeOwned>(reader: &mut R, format: Format) -> Res
 	let data = zstd::bulk::decompress(&compressed, len)?;
 	drop(compressed);
 
-	let value = match format {
-		Format::Bincode => bincode::deserialize(&data)?,
-		Format::Json => serde_json::from_slice(&data)?,
-	};
-	Ok(value)
+	Ok(bincode::decode_from_slice(&data, BINCODE_CONFIG)?.0)
 }
 
 /// Reads data from a file and deserializes it
-pub fn read_file<T: DeserializeOwned>(path: &Path, format: Format) -> Result<T> {
+pub fn read_file<T>(path: &Path) -> Result<T>
+where
+	T: Decode<()>,
+{
 	(|| -> Result<T> {
 		let mut file = File::open(path)?;
-		read(&mut file, format)
+		read(&mut file)
 	})()
 	.with_context(|| format!("Failed to read file {}", path.display()))
 }
diff --git a/src/world/block_entity.rs b/src/world/block_entity.rs
index 182ad50..6ad58a1 100644
--- a/src/world/block_entity.rs
+++ b/src/world/block_entity.rs
@@ -1,7 +1,8 @@
 //! Processing of block entity data
 
+use bincode::{Decode, Encode};
 use minedmap_resource::{BlockFlag, BlockType};
-use serde::{Deserialize, Serialize};
+use serde::Serialize;
 
 use super::{
 	de,
@@ -9,7 +10,7 @@ use super::{
 };
 
 /// Kind of sign block
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Encode, Decode, Serialize)]
 #[serde(rename_all = "snake_case")]
 pub enum SignKind {
 	/// Standing sign
@@ -23,7 +24,7 @@ pub enum SignKind {
 }
 
 /// Processed sign data
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Encode, Decode, Serialize)]
 pub struct Sign {
 	/// The kind of the sign
 	pub kind: SignKind,
@@ -54,7 +55,7 @@ impl Sign {
 }
 
 /// Data for different kinds of [BlockEntity]
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Encode, Decode, Serialize)]
 #[serde(tag = "type", rename_all = "snake_case")]
 pub enum BlockEntityData {
 	/// A sign block
@@ -62,7 +63,7 @@ pub enum BlockEntityData {
 }
 
 /// A processed block entity
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Encode, Decode, Serialize)]
 pub struct BlockEntity {
 	/// Global X coordinate
 	pub x: i32,
diff --git a/src/world/json_text.rs b/src/world/json_text.rs
index fa18527..6a2d8ba 100644
--- a/src/world/json_text.rs
+++ b/src/world/json_text.rs
@@ -2,6 +2,7 @@
 
 use std::{collections::VecDeque, fmt::Display};
 
+use bincode::{Decode, Encode};
 use minedmap_resource::Color;
 use serde::{Deserialize, Serialize};
 
@@ -12,7 +13,9 @@ use serde::{Deserialize, Serialize};
 /// is handled by [DeserializedText].
 ///
 /// Formatting that is not set in a node is inherited from the parent.
-#[derive(Debug, Serialize, Deserialize, Default, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(
+	Debug, Default, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize, Encode, Decode,
+)]
 pub struct FormattedText {
 	#[serde(default)]
 	/// Text content
@@ -84,7 +87,7 @@ impl From<String> for FormattedTextTree {
 }
 
 /// List of [FormattedText]
-#[derive(Debug, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Serialize, Encode, Decode)]
 pub struct FormattedTextList(pub Vec<FormattedText>);
 
 impl FormattedTextList {
diff --git a/src/world/layer.rs b/src/world/layer.rs
index e59593c..deb4b48 100644
--- a/src/world/layer.rs
+++ b/src/world/layer.rs
@@ -3,8 +3,8 @@
 use std::num::NonZeroU16;
 
 use anyhow::{Context, Result};
+use bincode::{Decode, Encode};
 use indexmap::IndexSet;
-use serde::{Deserialize, Serialize};
 
 use super::chunk::{Chunk, SectionIterItem};
 use crate::{
@@ -13,7 +13,7 @@ use crate::{
 };
 
 /// Height (Y coordinate) of a block
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Encode, Decode)]
 pub struct BlockHeight(pub i32);
 
 impl BlockHeight {
diff --git a/src/world/sign.rs b/src/world/sign.rs
index eff319f..579f5b3 100644
--- a/src/world/sign.rs
+++ b/src/world/sign.rs
@@ -2,8 +2,9 @@
 
 use std::fmt::Display;
 
+use bincode::{Decode, Encode};
 use minedmap_resource::Color;
-use serde::{Deserialize, Serialize};
+use serde::Serialize;
 
 use super::{
 	de,
@@ -104,7 +105,7 @@ impl BlockEntitySignExt for de::BlockEntitySign {
 	}
 }
 
-#[derive(Debug, Default, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Default, Serialize, PartialEq, Eq, PartialOrd, Ord, Encode, Decode)]
 /// Deserialized and linearized sign text
 pub struct SignText(pub Vec<FormattedTextList>);
 

From 708fb9645dc89f6e454f3564b81f8e9a265457d7 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 13 Mar 2025 20:27:51 +0100
Subject: [PATCH 432/460] core/region_processor: refactor

Separate configuration and mutable state, also allowing to avoid a few
mem::take().
---
 src/core/region_processor.rs | 115 ++++++++++++++++++++---------------
 1 file changed, 67 insertions(+), 48 deletions(-)

diff --git a/src/core/region_processor.rs b/src/core/region_processor.rs
index 56f54ed..e638342 100644
--- a/src/core/region_processor.rs
+++ b/src/core/region_processor.rs
@@ -1,6 +1,6 @@
 //! The [RegionProcessor] and related functions
 
-use std::{ffi::OsStr, mem, path::PathBuf, sync::mpsc, time::SystemTime};
+use std::{ffi::OsStr, path::PathBuf, sync::mpsc, time::SystemTime};
 
 use anyhow::{Context, Result};
 use enum_map::{Enum, EnumMap};
@@ -45,6 +45,37 @@ enum RegionProcessorStatus {
 	ErrorMissing,
 }
 
+/// Data of a region being processed by a [SingleRegionProcessor]
+#[derive(Debug)]
+struct SingleRegionData {
+	/// [IndexSet] of biomes used by the processed region
+	biome_list: IndexSet<Biome>,
+	/// Processed region chunk intermediate data
+	chunks: ChunkArray<Option<Box<ProcessedChunk>>>,
+	/// Lightmap intermediate data
+	lightmap: image::GrayAlphaImage,
+	/// Processed entity intermediate data
+	entities: ProcessedEntities,
+	/// True if any unknown block or biome types were encountered during processing
+	has_unknown: bool,
+}
+
+impl Default for SingleRegionData {
+	fn default() -> Self {
+		/// Width/height of the region data
+		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
+
+		let lightmap = image::GrayAlphaImage::new(N, N);
+		Self {
+			biome_list: Default::default(),
+			chunks: Default::default(),
+			lightmap,
+			entities: Default::default(),
+			has_unknown: false,
+		}
+	}
+}
+
 /// Handles processing for a single region
 struct SingleRegionProcessor<'a> {
 	/// Registry of known block types
@@ -75,26 +106,13 @@ struct SingleRegionProcessor<'a> {
 	lightmap_needed: bool,
 	/// True if entity output file needs to be updated
 	entities_needed: bool,
-	/// [IndexSet] of biomes used by the processed region
-	biome_list: IndexSet<Biome>,
-	/// Processed region intermediate data
-	processed_region: ProcessedRegion,
-	/// Lightmap intermediate data
-	lightmap: image::GrayAlphaImage,
-	/// Processed entity intermediate data
-	entities: ProcessedEntities,
 	/// Format of generated map tiles
 	image_format: image::ImageFormat,
-	/// True if any unknown block or biome types were encountered during processing
-	has_unknown: bool,
 }
 
 impl<'a> SingleRegionProcessor<'a> {
 	/// Initializes a [SingleRegionProcessor]
 	fn new(processor: &'a RegionProcessor<'a>, coords: TileCoords) -> Result<Self> {
-		/// Width/height of the region data
-		const N: u32 = (BLOCKS_PER_CHUNK * CHUNKS_PER_REGION) as u32;
-
 		let input_path = processor.config.region_path(coords);
 		let input_timestamp = fs::modified_timestamp(&input_path)?;
 
@@ -111,11 +129,6 @@ impl<'a> SingleRegionProcessor<'a> {
 		let lightmap_needed = Some(input_timestamp) > lightmap_timestamp;
 		let entities_needed = Some(input_timestamp) > entities_timestamp;
 
-		let processed_region = ProcessedRegion::default();
-		let biome_list = IndexSet::default();
-		let lightmap = image::GrayAlphaImage::new(N, N);
-		let entities = ProcessedEntities::default();
-
 		Ok(SingleRegionProcessor {
 			block_types: &processor.block_types,
 			biome_types: &processor.biome_types,
@@ -131,12 +144,7 @@ impl<'a> SingleRegionProcessor<'a> {
 			output_needed,
 			lightmap_needed,
 			entities_needed,
-			processed_region,
-			biome_list,
-			lightmap,
-			entities,
 			image_format: processor.config.tile_image_format(),
-			has_unknown: false,
 		})
 	}
 
@@ -160,14 +168,14 @@ impl<'a> SingleRegionProcessor<'a> {
 	/// Saves processed region data
 	///
 	/// The timestamp is the time of the last modification of the input region data.
-	fn save_region(&self) -> Result<()> {
+	fn save_region(&self, processed_region: &ProcessedRegion) -> Result<()> {
 		if !self.output_needed {
 			return Ok(());
 		}
 
 		storage::write_file(
 			&self.output_path,
-			&self.processed_region,
+			processed_region,
 			REGION_FILE_META_VERSION,
 			self.input_timestamp,
 		)
@@ -176,7 +184,7 @@ impl<'a> SingleRegionProcessor<'a> {
 	/// Saves a lightmap tile
 	///
 	/// The timestamp is the time of the last modification of the input region data.
-	fn save_lightmap(&self) -> Result<()> {
+	fn save_lightmap(&self, lightmap: &image::GrayAlphaImage) -> Result<()> {
 		if !self.lightmap_needed {
 			return Ok(());
 		}
@@ -186,7 +194,7 @@ impl<'a> SingleRegionProcessor<'a> {
 			LIGHTMAP_FILE_META_VERSION,
 			self.input_timestamp,
 			|file| {
-				self.lightmap
+				lightmap
 					.write_to(file, self.image_format)
 					.context("Failed to save image")
 			},
@@ -196,27 +204,32 @@ impl<'a> SingleRegionProcessor<'a> {
 	/// Saves processed entity data
 	///
 	/// The timestamp is the time of the last modification of the input region data.
-	fn save_entities(&mut self) -> Result<()> {
+	fn save_entities(&self, entities: &mut ProcessedEntities) -> Result<()> {
 		if !self.entities_needed {
 			return Ok(());
 		}
 
-		self.entities.block_entities.sort_unstable();
+		entities.block_entities.sort_unstable();
 
 		storage::write_file(
 			&self.entities_path,
-			&self.entities,
+			entities,
 			ENTITIES_FILE_META_VERSION,
 			self.input_timestamp,
 		)
 	}
 
 	/// Processes a single chunk
-	fn process_chunk(&mut self, chunk_coords: ChunkCoords, data: world::de::Chunk) -> Result<()> {
+	fn process_chunk(
+		&self,
+		data: &mut SingleRegionData,
+		chunk_coords: ChunkCoords,
+		chunk_data: world::de::Chunk,
+	) -> Result<()> {
 		let (chunk, has_unknown) =
-			world::chunk::Chunk::new(&data, self.block_types, self.biome_types)
+			world::chunk::Chunk::new(&chunk_data, self.block_types, self.biome_types)
 				.with_context(|| format!("Failed to decode chunk {:?}", chunk_coords))?;
-		self.has_unknown |= has_unknown;
+		data.has_unknown |= has_unknown;
 
 		if self.output_needed || self.lightmap_needed {
 			if let Some(layer::LayerData {
@@ -224,11 +237,11 @@ impl<'a> SingleRegionProcessor<'a> {
 				biomes,
 				block_light,
 				depths,
-			}) = world::layer::top_layer(&mut self.biome_list, &chunk)
+			}) = world::layer::top_layer(&mut data.biome_list, &chunk)
 				.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))?
 			{
 				if self.output_needed {
-					self.processed_region.chunks[chunk_coords] = Some(Box::new(ProcessedChunk {
+					data.chunks[chunk_coords] = Some(Box::new(ProcessedChunk {
 						blocks,
 						biomes,
 						depths,
@@ -237,7 +250,7 @@ impl<'a> SingleRegionProcessor<'a> {
 
 				if self.lightmap_needed {
 					let chunk_lightmap = Self::render_chunk_lightmap(block_light);
-					overlay_chunk(&mut self.lightmap, &chunk_lightmap, chunk_coords);
+					overlay_chunk(&mut data.lightmap, &chunk_lightmap, chunk_coords);
 				}
 			}
 		}
@@ -249,20 +262,21 @@ impl<'a> SingleRegionProcessor<'a> {
 					chunk_coords,
 				)
 			})?;
-			self.entities.block_entities.append(&mut block_entities);
+			data.entities.block_entities.append(&mut block_entities);
 		}
 
 		Ok(())
 	}
 
 	/// Processes the chunks of the region
-	fn process_chunks(&mut self) -> Result<()> {
-		crate::nbt::region::from_file(&self.input_path)?
-			.foreach_chunk(|chunk_coords, data| self.process_chunk(chunk_coords, data))
+	fn process_chunks(&self, data: &mut SingleRegionData) -> Result<()> {
+		crate::nbt::region::from_file(&self.input_path)?.foreach_chunk(
+			|chunk_coords, chunk_data| self.process_chunk(data, chunk_coords, chunk_data),
+		)
 	}
 
 	/// Processes the region
-	fn run(mut self) -> Result<RegionProcessorStatus> {
+	fn run(&self) -> Result<RegionProcessorStatus> {
 		if !self.output_needed && !self.lightmap_needed && !self.entities_needed {
 			debug!(
 				"Skipping unchanged region r.{}.{}.mca",
@@ -276,7 +290,9 @@ impl<'a> SingleRegionProcessor<'a> {
 			self.coords.x, self.coords.z
 		);
 
-		if let Err(err) = self.process_chunks() {
+		let mut data = SingleRegionData::default();
+
+		if let Err(err) = self.process_chunks(&mut data) {
 			if self.output_timestamp.is_some()
 				&& self.lightmap_timestamp.is_some()
 				&& self.entities_timestamp.is_some()
@@ -295,13 +311,16 @@ impl<'a> SingleRegionProcessor<'a> {
 			}
 		}
 
-		self.processed_region.biome_list = mem::take(&mut self.biome_list).into_iter().collect();
+		let processed_region = ProcessedRegion {
+			biome_list: data.biome_list.into_iter().collect(),
+			chunks: data.chunks,
+		};
 
-		self.save_region()?;
-		self.save_lightmap()?;
-		self.save_entities()?;
+		self.save_region(&processed_region)?;
+		self.save_lightmap(&data.lightmap)?;
+		self.save_entities(&mut data.entities)?;
 
-		Ok(if self.has_unknown {
+		Ok(if data.has_unknown {
 			RegionProcessorStatus::OkWithUnknown
 		} else {
 			RegionProcessorStatus::Ok

From 5c8568755441c8e91fc8bf2ea598a021a0bd5477 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 13 Mar 2025 20:40:23 +0100
Subject: [PATCH 433/460] Clean up dependency features

---
 Cargo.lock                 | 2 --
 Cargo.toml                 | 4 ++--
 crates/resource/Cargo.toml | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5c5d477..4f5bfa2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -296,7 +296,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba2f4b465f5318854c6f8dd686ede6c0a9dc67d4b1ac241cf0eb51521a309147"
 dependencies = [
  "enumflags2_derive",
- "serde",
 ]
 
 [[package]]
@@ -514,7 +513,6 @@ checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058"
 dependencies = [
  "equivalent",
  "hashbrown",
- "serde",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 4109bfd..da9f2ca 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -47,7 +47,7 @@ futures-util = "0.3.28"
 git-version = "0.3.5"
 humantime = "2.1.0"
 image = { version = "0.25.1", default-features = false, features = ["png", "webp"] }
-indexmap = { version = "2.0.0", features = ["serde"] }
+indexmap = "2.0.0"
 lru = "0.13.0"
 minedmap-default-alloc = { version = "0.1.0", path = "crates/default-alloc", optional = true }
 minedmap-nbt = { version = "0.1.1", path = "crates/nbt", default-features = false }
@@ -60,7 +60,7 @@ phf = { version = "0.11.2", features = ["macros"] }
 rayon = "1.7.0"
 regex = "1.10.2"
 rustc-hash = "2.0.0"
-serde = { version = "1.0.152", features = ["rc", "derive"] }
+serde = { version = "1.0.152", features = ["derive"] }
 serde_json = "1.0.99"
 tokio = { version = "1.31.0", features = ["rt", "parking_lot", "sync"] }
 tracing = "0.1.37"
diff --git a/crates/resource/Cargo.toml b/crates/resource/Cargo.toml
index c654f40..9fc157c 100644
--- a/crates/resource/Cargo.toml
+++ b/crates/resource/Cargo.toml
@@ -9,5 +9,5 @@ repository.workspace = true
 
 [dependencies]
 bincode = "2.0.1"
-enumflags2 = { version = "0.7.7", features = ["serde"] }
+enumflags2 = "0.7.7"
 glam = "0.30.0"

From 7bba5bae558780a30e0c3218fc41ff770230b4cc Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 13 Mar 2025 21:24:44 +0100
Subject: [PATCH 434/460] Update to Rust 2024

With bincode 2, we require rust 1.85 anyways, so we might as well
upgrade, too.
---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index da9f2ca..0051203 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 members = ["crates/*"]
 
 [workspace.package]
-edition = "2021"
+edition = "2024"
 license = "MIT"
 readme = "README.md"
 repository = "https://github.com/neocturne/MinedMap"

From 775fcb2d1b6adcd8aca3196ebdd1b2b0f16818cb Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 13 Mar 2025 21:44:10 +0100
Subject: [PATCH 435/460] treewide: cargo fmt with 1.85

---
 crates/nbt/src/region.rs   | 4 ++--
 crates/resource/src/lib.rs | 2 +-
 crates/types/src/lib.rs    | 8 ++++----
 src/core/mod.rs            | 8 +++++---
 src/core/tile_renderer.rs  | 2 +-
 src/world/chunk.rs         | 4 ++--
 src/world/json_text.rs     | 2 +-
 src/world/section.rs       | 8 ++------
 8 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/crates/nbt/src/region.rs b/crates/nbt/src/region.rs
index 8a52b9d..1325919 100644
--- a/crates/nbt/src/region.rs
+++ b/crates/nbt/src/region.rs
@@ -2,11 +2,11 @@
 
 use std::{
 	fs::File,
-	io::{prelude::*, SeekFrom},
+	io::{SeekFrom, prelude::*},
 	path::Path,
 };
 
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use flate2::read::ZlibDecoder;
 use serde::de::DeserializeOwned;
 
diff --git a/crates/resource/src/lib.rs b/crates/resource/src/lib.rs
index 01b460b..86cfb0f 100644
--- a/crates/resource/src/lib.rs
+++ b/crates/resource/src/lib.rs
@@ -11,7 +11,7 @@ mod legacy_block_types;
 use std::collections::HashMap;
 
 use bincode::{BorrowDecode, Decode, Encode};
-use enumflags2::{bitflags, BitFlags};
+use enumflags2::{BitFlags, bitflags};
 
 /// Flags describing special properties of [BlockType]s
 #[bitflags]
diff --git a/crates/types/src/lib.rs b/crates/types/src/lib.rs
index e770f6a..f2dc0e1 100644
--- a/crates/types/src/lib.rs
+++ b/crates/types/src/lib.rs
@@ -48,10 +48,10 @@ macro_rules! coord_type {
 			/// Returns an iterator over all possible values of the type
 			#[inline]
 			pub fn iter() -> impl DoubleEndedIterator<Item = $t<AXIS>>
-			       + ExactSizeIterator
-			       + FusedIterator
-			       + Clone
-			       + Debug {
+			+ ExactSizeIterator
+			+ FusedIterator
+			+ Clone
+			+ Debug {
 				(0..Self::MAX as u8).map($t)
 			}
 		}
diff --git a/src/core/mod.rs b/src/core/mod.rs
index a16f620..fce2cb5 100644
--- a/src/core/mod.rs
+++ b/src/core/mod.rs
@@ -205,8 +205,10 @@ pub fn cli() -> Result<()> {
 	if config.num_threads != config.num_threads_initial {
 		pool = setup_threads(config.num_threads)?;
 	}
-	pool.install(move || loop {
-		wait_watcher(&args, &watch_channel)?;
-		generate(&config, &rt)?;
+	pool.install(move || {
+		loop {
+			wait_watcher(&args, &watch_channel)?;
+			generate(&config, &rt)?;
+		}
 	})
 }
diff --git a/src/core/tile_renderer.rs b/src/core/tile_renderer.rs
index e990a63..9d7e188 100644
--- a/src/core/tile_renderer.rs
+++ b/src/core/tile_renderer.rs
@@ -16,7 +16,7 @@ use tracing::{debug, info};
 use super::{common::*, region_group::RegionGroup};
 use crate::{
 	io::{fs, storage},
-	resource::{block_color, needs_biome, Colorf},
+	resource::{Colorf, block_color, needs_biome},
 	types::*,
 	util::coord_offset,
 };
diff --git a/src/world/chunk.rs b/src/world/chunk.rs
index daee023..c4744d0 100644
--- a/src/world/chunk.rs
+++ b/src/world/chunk.rs
@@ -4,11 +4,11 @@
 //! over different data versions as much as possible.
 
 use std::{
-	collections::{btree_map, BTreeMap},
+	collections::{BTreeMap, btree_map},
 	iter::{self, FusedIterator},
 };
 
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 
 use super::{block_entity::BlockEntity, de, section::*};
 use crate::{
diff --git a/src/world/json_text.rs b/src/world/json_text.rs
index 6a2d8ba..7d3ff3a 100644
--- a/src/world/json_text.rs
+++ b/src/world/json_text.rs
@@ -185,9 +185,9 @@ mod json_color {
 
 	use minedmap_resource::Color;
 	use serde::{
+		Deserializer, Serializer,
 		de::{self, Visitor},
 		ser::Error as _,
-		Deserializer, Serializer,
 	};
 
 	/// Named JSON text colors
diff --git a/src/world/section.rs b/src/world/section.rs
index 845ddae..dc5c9a6 100644
--- a/src/world/section.rs
+++ b/src/world/section.rs
@@ -5,7 +5,7 @@
 
 use std::fmt::Debug;
 
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use num_integer::div_rem;
 use tracing::debug;
 
@@ -400,10 +400,6 @@ impl<'a> BlockLight<'a> {
 		let (offset, nibble) = div_rem(coords.offset(), 2);
 		let byte = block_light[offset] as u8;
 
-		if nibble == 1 {
-			byte >> 4
-		} else {
-			byte & 0xf
-		}
+		if nibble == 1 { byte >> 4 } else { byte & 0xf }
 	}
 }

From 5ee826a11b78905eeefdacfc78fced7592ec8962 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 13 Mar 2025 21:52:35 +0100
Subject: [PATCH 436/460] ci: set fixed Rust version 1.85

Avoid CI failure due to new warnings or fmt changes in new Rust version.
---
 .github/workflows/MinedMap.yml | 11 +++++------
 Dockerfile                     |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/MinedMap.yml b/.github/workflows/MinedMap.yml
index 24895c9..16a3047 100644
--- a/.github/workflows/MinedMap.yml
+++ b/.github/workflows/MinedMap.yml
@@ -48,7 +48,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: stable
+          toolchain: '1.85'
           components: rustfmt
       - run: cargo fmt --all -- --check
 
@@ -58,7 +58,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: stable
+          toolchain: '1.85'
           components: clippy
       - uses: swatinem/rust-cache@v2
       - uses: actions-rs/clippy-check@v1
@@ -72,7 +72,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: stable
+          toolchain: '1.85'
           components: rust-docs
       - uses: swatinem/rust-cache@v2
       - run: cargo doc --workspace --no-deps --document-private-items
@@ -83,12 +83,11 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
-        rust: [stable]
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: ${{ matrix.rust }}
+          toolchain: '1.85'
       - uses: swatinem/rust-cache@v2
       - run: cargo test --workspace
       - run: cargo test --workspace --no-default-features
@@ -128,7 +127,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: stable
+          toolchain: '1.85'
           targets: '${{ matrix.target }}'
 
       - uses: swatinem/rust-cache@v2
diff --git a/Dockerfile b/Dockerfile
index 0f0eecd..41d4c6c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/rust:alpine AS builder
+FROM docker.io/library/rust:1.85-alpine AS builder
 
 WORKDIR /build
 RUN apk add --no-cache build-base tini-static

From d6cd0fc53bd42209b204311eee0e334e80aaf970 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 14 Mar 2025 12:19:39 +0100
Subject: [PATCH 437/460] ci: include target in cache key

Avoid cache keys colliding between build jobs running on the same OS.
---
 .github/workflows/MinedMap.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/MinedMap.yml b/.github/workflows/MinedMap.yml
index 16a3047..40ea96a 100644
--- a/.github/workflows/MinedMap.yml
+++ b/.github/workflows/MinedMap.yml
@@ -131,6 +131,8 @@ jobs:
           targets: '${{ matrix.target }}'
 
       - uses: swatinem/rust-cache@v2
+        with:
+          key: '${{ matrix.target }}'
 
       - name: 'Build'
         shell: 'bash'

From e600a9dabb27857f729f97e89e7866b084fef72a Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 14 Mar 2025 16:24:22 +0100
Subject: [PATCH 438/460] CHANGELOG.md: mention Bincode update

While the update is an internal change, it does affect the MSRV, so it
should be mentioned in the changelog.
---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14b7e35..089e28a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,11 @@
   "waterlogged" block status. As 1-block seagrass is relatively big compared to
   other "small" plants, just considering it opaque seems like a good enough
   solution that avoids having to implement advanced block status flags.
+- Use Bincode 2 for storage of intermediate data
+
+  The update from Bincode 1 to 2 slightly reduces the size of the `processed`
+  directory used for intermediate data. At least Rust 1.85 is now required to
+  build MinedMap.
 
 ## [2.4.0] - 2025-01-11
 

From dca365f4e23f7427571bfe943437a65cd48fc864 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 14 Mar 2025 16:29:23 +0100
Subject: [PATCH 439/460] CHANGELOG.md: mention new Docker images and
 docker-compose example

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 089e28a..4f5c5bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,11 @@
   Note that some platforms like `msvc` are unsupported by jemalloc, and trying
   to enable the `jemalloc` feature on these platforms may break the MinedMap
   build or cause issues at runtime.
+- Docker images can be downloaded from the GitHub Container registry
+
+  Two images are provided, one for the tile renderer and one with the viewer
+  and a web server. A `docker-compose.yml` example can be found in the
+  repository as a starting point.
 
 ### Changed
 

From 6a54f57c509c6455371b0594b32a353920270fa2 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 14 Mar 2025 20:02:13 +0100
Subject: [PATCH 440/460] minedmap-types 0.2.0

---
 Cargo.lock              | 2 +-
 Cargo.toml              | 2 +-
 crates/nbt/Cargo.toml   | 2 +-
 crates/types/Cargo.toml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4f5bfa2..80766f4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -720,7 +720,7 @@ dependencies = [
 
 [[package]]
 name = "minedmap-types"
-version = "0.1.4"
+version = "0.2.0"
 dependencies = [
  "bincode",
  "itertools",
diff --git a/Cargo.toml b/Cargo.toml
index 0051203..854a955 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -52,7 +52,7 @@ lru = "0.13.0"
 minedmap-default-alloc = { version = "0.1.0", path = "crates/default-alloc", optional = true }
 minedmap-nbt = { version = "0.1.1", path = "crates/nbt", default-features = false }
 minedmap-resource = { version = "0.6.0", path = "crates/resource" }
-minedmap-types = { version = "0.1.4", path = "crates/types" }
+minedmap-types = { version = "0.2.0", path = "crates/types" }
 notify = "8.0.0"
 num-integer = "0.1.45"
 num_cpus = "1.16.0"
diff --git a/crates/nbt/Cargo.toml b/crates/nbt/Cargo.toml
index 01bbd78..6a4938e 100644
--- a/crates/nbt/Cargo.toml
+++ b/crates/nbt/Cargo.toml
@@ -12,7 +12,7 @@ anyhow = "1.0.75"
 bytemuck = "1.13.1"
 fastnbt = "2.4.4"
 flate2 = "1.1.0"
-minedmap-types = { version = "0.1.4", path = "../types" }
+minedmap-types = { version = "0.2.0", path = "../types" }
 serde = "1.0.183"
 
 [dev-dependencies]
diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml
index 2b83c39..34caa1c 100644
--- a/crates/types/Cargo.toml
+++ b/crates/types/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "minedmap-types"
-version = "0.1.4"
+version = "0.2.0"
 description = "Common types used by several MinedMap crates"
 edition.workspace = true
 license.workspace = true

From 54ea2b2f2898a272be3ea4841d68081f9d1ff53d Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 14 Mar 2025 20:02:36 +0100
Subject: [PATCH 441/460] minedmap-resource 0.7.0

---
 Cargo.lock                 | 2 +-
 Cargo.toml                 | 2 +-
 crates/resource/Cargo.toml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 80766f4..d5159bf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -711,7 +711,7 @@ dependencies = [
 
 [[package]]
 name = "minedmap-resource"
-version = "0.6.0"
+version = "0.7.0"
 dependencies = [
  "bincode",
  "enumflags2",
diff --git a/Cargo.toml b/Cargo.toml
index 854a955..33256e6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -51,7 +51,7 @@ indexmap = "2.0.0"
 lru = "0.13.0"
 minedmap-default-alloc = { version = "0.1.0", path = "crates/default-alloc", optional = true }
 minedmap-nbt = { version = "0.1.1", path = "crates/nbt", default-features = false }
-minedmap-resource = { version = "0.6.0", path = "crates/resource" }
+minedmap-resource = { version = "0.7.0", path = "crates/resource" }
 minedmap-types = { version = "0.2.0", path = "crates/types" }
 notify = "8.0.0"
 num-integer = "0.1.45"
diff --git a/crates/resource/Cargo.toml b/crates/resource/Cargo.toml
index 9fc157c..1257a90 100644
--- a/crates/resource/Cargo.toml
+++ b/crates/resource/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "minedmap-resource"
-version = "0.6.0"
+version = "0.7.0"
 description = "Data describing Minecraft biomes and block types"
 edition.workspace = true
 license.workspace = true

From 974a0f37df6dab8d0ca529a78bb6615e57ed05db Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 14 Mar 2025 20:02:49 +0100
Subject: [PATCH 442/460] minedmap-nbt 0.2.0

---
 Cargo.lock            | 2 +-
 Cargo.toml            | 2 +-
 crates/nbt/Cargo.toml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d5159bf..726fd48 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -698,7 +698,7 @@ dependencies = [
 
 [[package]]
 name = "minedmap-nbt"
-version = "0.1.1"
+version = "0.2.0"
 dependencies = [
  "anyhow",
  "bytemuck",
diff --git a/Cargo.toml b/Cargo.toml
index 33256e6..9b87ed1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -50,7 +50,7 @@ image = { version = "0.25.1", default-features = false, features = ["png", "webp
 indexmap = "2.0.0"
 lru = "0.13.0"
 minedmap-default-alloc = { version = "0.1.0", path = "crates/default-alloc", optional = true }
-minedmap-nbt = { version = "0.1.1", path = "crates/nbt", default-features = false }
+minedmap-nbt = { version = "0.2.0", path = "crates/nbt", default-features = false }
 minedmap-resource = { version = "0.7.0", path = "crates/resource" }
 minedmap-types = { version = "0.2.0", path = "crates/types" }
 notify = "8.0.0"
diff --git a/crates/nbt/Cargo.toml b/crates/nbt/Cargo.toml
index 6a4938e..07a5fd7 100644
--- a/crates/nbt/Cargo.toml
+++ b/crates/nbt/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "minedmap-nbt"
-version = "0.1.1"
+version = "0.2.0"
 description = "MinedMap's handling of Minecraft NBT data and region files"
 edition.workspace = true
 license.workspace = true

From 6e5b958912be6e8c3e64d94c8b30d565847ced7f Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 16 Mar 2025 12:17:07 +0100
Subject: [PATCH 443/460] default-alloc: fix wildcard dependency

---
 crates/default-alloc/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/default-alloc/Cargo.toml b/crates/default-alloc/Cargo.toml
index 40f9e7e..b03a871 100644
--- a/crates/default-alloc/Cargo.toml
+++ b/crates/default-alloc/Cargo.toml
@@ -11,7 +11,7 @@ repository.workspace = true
 tikv-jemallocator = { version = "0.6.0", optional = true }
 
 [target.'cfg(target_env = "musl")'.dependencies]
-tikv-jemallocator = "*"
+tikv-jemallocator = "0.6.0"
 
 [features]
 jemalloc = ["dep:tikv-jemallocator"]

From 3008203080e2ae44f2eea35121d8ae790f219dc0 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 16 Mar 2025 12:24:29 +0100
Subject: [PATCH 444/460] minedmap 2.5.0

---
 CHANGELOG.md | 5 ++++-
 Cargo.lock   | 2 +-
 Cargo.toml   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f5c5bd..482d462 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased] - ReleaseDate
 
+## [2.5.0] - 2025-03-16
+
 ### Added
 
 - Added experimental watch mode
@@ -186,7 +188,8 @@ intermediate data.
   Full support for custom biomes datapacks might be added in a future release.
 
 <!-- next-url -->
-[Unreleased]: https://github.com/neocturne/MinedMap/compare/v2.4.0...HEAD
+[Unreleased]: https://github.com/neocturne/MinedMap/compare/v2.5.0...HEAD
+[2.5.0]: https://github.com/neocturne/MinedMap/compare/v2.4.0...v2.5.0
 [2.4.0]: https://github.com/neocturne/MinedMap/compare/v2.3.1...v2.4.0
 [2.3.1]: https://github.com/neocturne/MinedMap/compare/v2.3.0...v2.3.1
 [2.3.0]: https://github.com/neocturne/MinedMap/compare/v2.2.0...v2.3.0
diff --git a/Cargo.lock b/Cargo.lock
index 726fd48..6b6d6ff 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -656,7 +656,7 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "minedmap"
-version = "2.4.0"
+version = "2.5.0"
 dependencies = [
  "anyhow",
  "bincode",
diff --git a/Cargo.toml b/Cargo.toml
index 9b87ed1..34e5619 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@ pre-release-commit-message = "{{crate_name}} {{version}}"
 
 [package]
 name = "minedmap"
-version = "2.4.0"
+version = "2.5.0"
 description = "Generate browsable maps from Minecraft save data"
 edition.workspace = true
 license.workspace = true

From 23b2f274be781fe20b24d778adb36595923be725 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 2 Apr 2025 19:04:15 +0200
Subject: [PATCH 445/460] ci, docker: update to Rust 1.85.1

---
 .github/workflows/MinedMap.yml | 10 +++++-----
 Dockerfile                     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/MinedMap.yml b/.github/workflows/MinedMap.yml
index 40ea96a..ece4e50 100644
--- a/.github/workflows/MinedMap.yml
+++ b/.github/workflows/MinedMap.yml
@@ -48,7 +48,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: '1.85'
+          toolchain: '1.85.1'
           components: rustfmt
       - run: cargo fmt --all -- --check
 
@@ -58,7 +58,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: '1.85'
+          toolchain: '1.85.1'
           components: clippy
       - uses: swatinem/rust-cache@v2
       - uses: actions-rs/clippy-check@v1
@@ -72,7 +72,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: '1.85'
+          toolchain: '1.85.1'
           components: rust-docs
       - uses: swatinem/rust-cache@v2
       - run: cargo doc --workspace --no-deps --document-private-items
@@ -87,7 +87,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: '1.85'
+          toolchain: '1.85.1'
       - uses: swatinem/rust-cache@v2
       - run: cargo test --workspace
       - run: cargo test --workspace --no-default-features
@@ -127,7 +127,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: '1.85'
+          toolchain: '1.85.1'
           targets: '${{ matrix.target }}'
 
       - uses: swatinem/rust-cache@v2
diff --git a/Dockerfile b/Dockerfile
index 41d4c6c..ad36c79 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/rust:1.85-alpine AS builder
+FROM docker.io/library/rust:1.85.1-alpine AS builder
 
 WORKDIR /build
 RUN apk add --no-cache build-base tini-static

From 442009eb0804891fdca520edbbbb61dabb12ef2e Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 2 Apr 2025 19:05:52 +0200
Subject: [PATCH 446/460] Update dependencies

---
 Cargo.lock | 105 ++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 71 insertions(+), 34 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6b6d6ff..d9f14f8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -161,9 +161,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
 [[package]]
 name = "cc"
-version = "1.2.16"
+version = "1.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
+checksum = "1fcb57c740ae1daf453ae85f16e37396f672b039e00d9d866e07ddb24e328e3a"
 dependencies = [
  "jobserver",
  "libc",
@@ -184,9 +184,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.5.32"
+version = "4.5.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83"
+checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -194,9 +194,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.32"
+version = "4.5.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8"
+checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9"
 dependencies = [
  "anstream",
  "anstyle",
@@ -360,9 +360,9 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc"
+checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
 dependencies = [
  "crc32fast",
  "libz-rs-sys",
@@ -371,9 +371,9 @@ dependencies = [
 
 [[package]]
 name = "foldhash"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 
 [[package]]
 name = "fsevent-sys"
@@ -421,6 +421,18 @@ dependencies = [
  "slab",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasi 0.14.2+wasi-0.2.4",
+]
+
 [[package]]
 name = "gimli"
 version = "0.31.1"
@@ -449,9 +461,9 @@ dependencies = [
 
 [[package]]
 name = "glam"
-version = "0.30.0"
+version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17fcdf9683c406c2fc4d124afd29c0d595e22210d633cbdb8695ba9935ab1dc6"
+checksum = "bf3aa70d918d2b234126ff4f850f628f172542bf0603ded26b8ee36e5e22d5f9"
 
 [[package]]
 name = "hashbrown"
@@ -484,9 +496,9 @@ checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f"
 
 [[package]]
 name = "image"
-version = "0.25.5"
+version = "0.25.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd6f44aed642f18953a158afeb30206f4d50da59fbc66ecb53c66488de73563b"
+checksum = "db35664ce6b9810857a38a906215e75a9c879f0696556a39f59c62829710251a"
 dependencies = [
  "bytemuck",
  "byteorder-lite",
@@ -558,10 +570,11 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "jobserver"
-version = "0.1.32"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
+checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
 dependencies = [
+ "getrandom",
  "libc",
 ]
 
@@ -610,18 +623,18 @@ dependencies = [
 
 [[package]]
 name = "libz-rs-sys"
-version = "0.4.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "902bc563b5d65ad9bba616b490842ef0651066a1a1dc3ce1087113ffcb873c8d"
+checksum = "6489ca9bd760fe9642d7644e827b0c9add07df89857b0416ee15c1cc1a3b8c5a"
 dependencies = [
  "zlib-rs",
 ]
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9c683daf087dc577b7506e9695b3d556a9f3849903fa28186283afd6809e9"
+checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413"
 
 [[package]]
 name = "lock_api"
@@ -635,9 +648,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.26"
+version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
 [[package]]
 name = "lru"
@@ -744,7 +757,7 @@ checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
  "libc",
  "log",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "windows-sys 0.52.0",
 ]
 
@@ -822,9 +835,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.21.1"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "overload"
@@ -952,6 +965,12 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "r-efi"
+version = "5.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -1039,9 +1058,9 @@ checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustix"
-version = "1.0.2"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7178faa4b75a30e269c71e61c353ce2748cf3d76f0c44c393f4e60abf49b825"
+checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf"
 dependencies = [
  "bitflags 2.9.0",
  "errno",
@@ -1325,6 +1344,15 @@ version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
+[[package]]
+name = "wasi"
+version = "0.14.2+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -1439,10 +1467,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
-name = "zlib-rs"
-version = "0.4.2"
+name = "wit-bindgen-rt"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b20717f0917c908dc63de2e44e97f1e6b126ca58d0e391cee86d504eb8fbd05"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+dependencies = [
+ "bitflags 2.9.0",
+]
+
+[[package]]
+name = "zlib-rs"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "868b928d7949e09af2f6086dfc1e01936064cc7a819253bce650d4e2a2d63ba8"
 
 [[package]]
 name = "zstd"
@@ -1455,18 +1492,18 @@ dependencies = [
 
 [[package]]
 name = "zstd-safe"
-version = "7.2.3"
+version = "7.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3051792fbdc2e1e143244dc28c60f73d8470e93f3f9cbd0ead44da5ed802722"
+checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d"
 dependencies = [
  "zstd-sys",
 ]
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.14+zstd.1.5.7"
+version = "2.0.15+zstd.1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fb060d4926e4ac3a3ad15d864e99ceb5f343c6b34f5bd6d81ae6ed417311be5"
+checksum = "eb81183ddd97d0c74cedf1d50d85c8d08c1b8b68ee863bdee9e706eedba1a237"
 dependencies = [
  "cc",
  "pkg-config",

From ba6e4bae7f072c697e1d204955f72ed2a6bbb148 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 2 Apr 2025 22:39:26 +0200
Subject: [PATCH 447/460] world: rename JSONText to TextValue

New Minecraft version do not store text as JSON anymore.
---
 src/world/de.rs                           | 12 ++++++------
 src/world/mod.rs                          |  2 +-
 src/world/sign.rs                         |  4 ++--
 src/world/{json_text.rs => text_value.rs} | 22 +++++++++++-----------
 4 files changed, 20 insertions(+), 20 deletions(-)
 rename src/world/{json_text.rs => text_value.rs} (93%)

diff --git a/src/world/de.rs b/src/world/de.rs
index 7ab8ba7..0a4b4b6 100644
--- a/src/world/de.rs
+++ b/src/world/de.rs
@@ -2,7 +2,7 @@
 
 use serde::Deserialize;
 
-use super::json_text::JSONText;
+use super::text_value::TextValue;
 
 /// Element of the `palette` list of 1.18+ [block states](BlockStatesV1_18)
 #[derive(Debug, Deserialize)]
@@ -110,7 +110,7 @@ pub enum BiomesV0 {
 #[derive(Debug, Deserialize)]
 pub struct BlockEntitySignV1_20Text {
 	/// Lines of sign text
-	pub messages: Vec<JSONText>,
+	pub messages: Vec<TextValue>,
 	/// Default text color
 	pub color: Option<String>,
 }
@@ -125,13 +125,13 @@ pub enum BlockEntitySign {
 	#[serde(rename_all = "PascalCase")]
 	V0 {
 		/// Line 1 of the sign text
-		text1: JSONText,
+		text1: TextValue,
 		/// Line 2 of the sign text
-		text2: JSONText,
+		text2: TextValue,
 		/// Line 3 of the sign text
-		text3: JSONText,
+		text3: TextValue,
 		/// Line 4 of the sign text
-		text4: JSONText,
+		text4: TextValue,
 		/// Default text color
 		color: Option<String>,
 	},
diff --git a/src/world/mod.rs b/src/world/mod.rs
index 6426c92..8a2e9be 100644
--- a/src/world/mod.rs
+++ b/src/world/mod.rs
@@ -3,7 +3,7 @@
 pub mod block_entity;
 pub mod chunk;
 pub mod de;
-pub mod json_text;
 pub mod layer;
 pub mod section;
 pub mod sign;
+pub mod text_value;
diff --git a/src/world/sign.rs b/src/world/sign.rs
index 579f5b3..c913b6f 100644
--- a/src/world/sign.rs
+++ b/src/world/sign.rs
@@ -8,7 +8,7 @@ use serde::Serialize;
 
 use super::{
 	de,
-	json_text::{FormattedText, FormattedTextList, JSONText},
+	text_value::{FormattedText, FormattedTextList, TextValue},
 };
 
 /// Version-independent reference to (front or back) sign text
@@ -18,7 +18,7 @@ pub struct RawSignText<'a> {
 	///
 	/// A regular sign always has 4 lines of text. The back of pre-1.20
 	/// signs is represented as a [SignText] without any `messages`.
-	pub messages: Vec<&'a JSONText>,
+	pub messages: Vec<&'a TextValue>,
 	/// Sign color
 	///
 	/// Defaults to "black".
diff --git a/src/world/json_text.rs b/src/world/text_value.rs
similarity index 93%
rename from src/world/json_text.rs
rename to src/world/text_value.rs
index 7d3ff3a..336b1b1 100644
--- a/src/world/json_text.rs
+++ b/src/world/text_value.rs
@@ -1,4 +1,4 @@
-//! Newtype and helper methods for handling Minecraft Raw JSON Text
+//! Newtype and helper methods for handling Minecraft text values
 
 use std::{collections::VecDeque, fmt::Display};
 
@@ -8,7 +8,7 @@ use serde::{Deserialize, Serialize};
 
 /// A span of formatted text
 ///
-/// A [JSONText] consists of a tree of [FormattedText] nodes (canonically
+/// A [TextValue] consists of a tree of [FormattedText] nodes (canonically
 /// represented as a [FormattedTextTree], but other kinds are possible with
 /// is handled by [DeserializedText].
 ///
@@ -21,7 +21,7 @@ pub struct FormattedText {
 	/// Text content
 	pub text: String,
 	/// Text color
-	#[serde(skip_serializing_if = "Option::is_none", with = "json_color")]
+	#[serde(skip_serializing_if = "Option::is_none", with = "text_color")]
 	pub color: Option<Color>,
 	/// Bold formatting
 	#[serde(skip_serializing_if = "Option::is_none")]
@@ -107,9 +107,9 @@ impl Display for FormattedTextList {
 	}
 }
 
-/// Raw deserialized [JSONText]
+/// Raw deserialized [TextValue]
 ///
-/// A [JSONText] can contain various different JSON types.
+/// A [TextValue] can contain various different types serialized as JSON or NBT.
 #[derive(Debug, Deserialize)]
 #[serde(untagged)]
 pub enum DeserializedText {
@@ -169,18 +169,18 @@ impl Default for DeserializedText {
 	}
 }
 
-/// Minecraft Raw JSON Text
+/// Minecraft raw text value
 #[derive(Debug, Deserialize)]
-pub struct JSONText(pub String);
+pub struct TextValue(pub String);
 
-impl JSONText {
-	/// Deserializes a [JSONText] into a [DeserializedText]
+impl TextValue {
+	/// Deserializes a [TextValue] into a [DeserializedText]
 	pub fn deserialize(&self) -> DeserializedText {
 		serde_json::from_str(&self.0).unwrap_or_default()
 	}
 }
 
-mod json_color {
+mod text_color {
 	//! Helpers for serializing and deserializing [FormattedText](super::FormattedText) colors
 
 	use minedmap_resource::Color;
@@ -190,7 +190,7 @@ mod json_color {
 		ser::Error as _,
 	};
 
-	/// Named JSON text colors
+	/// Named text colors
 	static COLORS: phf::Map<&'static str, Color> = phf::phf_map! {
 		"black" => Color([0x00, 0x00, 0x00]),
 		"dark_blue" => Color([0x00, 0x00, 0xAA]),

From 5f84ec8ed2c4701c24032bac0ee45175f2904ddc Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 2 Apr 2025 22:43:02 +0200
Subject: [PATCH 448/460] world/text_value: add support for new NBT text
 serialization

Starting with DataVersion 4290, text is stored as NBT instead of JSON.
The structure remains the same.
---
 src/world/block_entity.rs | 19 ++++++++++++++-----
 src/world/chunk.rs        |  9 ++++++++-
 src/world/sign.rs         |  4 ++--
 src/world/text_value.rs   | 14 +++++++++++---
 4 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/world/block_entity.rs b/src/world/block_entity.rs
index 6ad58a1..589a53c 100644
--- a/src/world/block_entity.rs
+++ b/src/world/block_entity.rs
@@ -41,10 +41,15 @@ pub struct Sign {
 
 impl Sign {
 	/// Processes a [de::BlockEntitySign] into a [Sign]
-	fn new(sign: &de::BlockEntitySign, kind: SignKind, material: Option<String>) -> Sign {
+	fn new(
+		sign: &de::BlockEntitySign,
+		kind: SignKind,
+		material: Option<String>,
+		data_version: u32,
+	) -> Sign {
 		let (front_text, back_text) = sign.text();
-		let front_text = front_text.decode();
-		let back_text = back_text.decode();
+		let front_text = front_text.decode(data_version);
+		let back_text = back_text.decode(data_version);
 		Sign {
 			kind,
 			material,
@@ -78,7 +83,11 @@ pub struct BlockEntity {
 
 impl BlockEntity {
 	/// Processes a [de::BlockEntity] into a [BlockEntity]
-	pub fn new(entity: &de::BlockEntity, block_type: Option<&BlockType>) -> Option<Self> {
+	pub fn new(
+		entity: &de::BlockEntity,
+		block_type: Option<&BlockType>,
+		data_version: u32,
+	) -> Option<Self> {
 		let wall_sign = block_type
 			.map(|block_type| block_type.block_color.is(BlockFlag::WallSign))
 			.unwrap_or_default();
@@ -92,7 +101,7 @@ impl BlockEntity {
 		let material = block_type
 			.as_ref()
 			.and_then(|block_type| block_type.sign_material.as_ref());
-		let data = BlockEntityData::Sign(Sign::new(sign, kind, material.cloned()));
+		let data = BlockEntityData::Sign(Sign::new(sign, kind, material.cloned(), data_version));
 
 		Some(BlockEntity {
 			x: entity.x,
diff --git a/src/world/chunk.rs b/src/world/chunk.rs
index c4744d0..311fca8 100644
--- a/src/world/chunk.rs
+++ b/src/world/chunk.rs
@@ -58,6 +58,8 @@ pub struct Chunk<'a> {
 	inner: ChunkInner<'a>,
 	/// Unprocessed block entities
 	block_entities: &'a Vec<de::BlockEntity>,
+	/// Chunk data version
+	data_version: u32,
 }
 
 impl<'a> Chunk<'a> {
@@ -87,6 +89,7 @@ impl<'a> Chunk<'a> {
 			Chunk {
 				inner,
 				block_entities,
+				data_version,
 			},
 			has_unknown,
 		))
@@ -292,7 +295,11 @@ impl<'a> Chunk<'a> {
 			.iter()
 			.map(|block_entity| {
 				let block_type = self.block_type_at_block_entity(block_entity)?;
-				Ok(BlockEntity::new(block_entity, block_type))
+				Ok(BlockEntity::new(
+					block_entity,
+					block_type,
+					self.data_version,
+				))
 			})
 			.collect::<Result<_>>()?;
 		Ok(entities.into_iter().flatten().collect())
diff --git a/src/world/sign.rs b/src/world/sign.rs
index c913b6f..8e4e670 100644
--- a/src/world/sign.rs
+++ b/src/world/sign.rs
@@ -49,7 +49,7 @@ static DYE_COLORS: phf::Map<&'static str, Color> = phf::phf_map! {
 
 impl RawSignText<'_> {
 	/// Decodes the [RawSignText] into a [SignText]
-	pub fn decode(&self) -> SignText {
+	pub fn decode(&self, data_version: u32) -> SignText {
 		let color = self
 			.color
 			.map(|c| DYE_COLORS.get(c).copied().unwrap_or(DEFAULT_COLOR));
@@ -60,7 +60,7 @@ impl RawSignText<'_> {
 		SignText(
 			self.messages
 				.iter()
-				.map(|message| message.deserialize().linearize(&parent))
+				.map(|message| message.deserialize(data_version).linearize(&parent))
 				.collect(),
 		)
 	}
diff --git a/src/world/text_value.rs b/src/world/text_value.rs
index 336b1b1..75defc4 100644
--- a/src/world/text_value.rs
+++ b/src/world/text_value.rs
@@ -171,12 +171,20 @@ impl Default for DeserializedText {
 
 /// Minecraft raw text value
 #[derive(Debug, Deserialize)]
-pub struct TextValue(pub String);
+pub struct TextValue(pub fastnbt::Value);
 
 impl TextValue {
 	/// Deserializes a [TextValue] into a [DeserializedText]
-	pub fn deserialize(&self) -> DeserializedText {
-		serde_json::from_str(&self.0).unwrap_or_default()
+	pub fn deserialize(&self, data_version: u32) -> DeserializedText {
+		if data_version < 4290 {
+			if let fastnbt::Value::String(json) = &self.0 {
+				if let Ok(content) = serde_json::from_str(json) {
+					return content;
+				}
+			}
+		}
+
+		fastnbt::from_value(&self.0).unwrap_or_default()
 	}
 }
 

From 42b302f493a0824efa912fb8c56cf16c19adc266 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 2 Apr 2025 19:05:09 +0200
Subject: [PATCH 449/460] resource: add new Minecraft 1.21.5 block types

---
 CHANGELOG.md                       |  6 ++
 crates/resource/src/block_types.rs | 90 ++++++++++++++++++++++++++++++
 resource/blocks.json               | 11 ++++
 src/core/common.rs                 |  4 +-
 4 files changed, 109 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 482d462..f96ddca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## [Unreleased] - ReleaseDate
 
+### Added
+
+- Added support for Minecraft 1.21.5
+
+  Added new block types and handling for changed sign text storage format.
+
 ## [2.5.0] - 2025-03-16
 
 ### Added
diff --git a/crates/resource/src/block_types.rs b/crates/resource/src/block_types.rs
index da556b8..044a153 100644
--- a/crates/resource/src/block_types.rs
+++ b/crates/resource/src/block_types.rs
@@ -1488,6 +1488,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"bush",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque|Grass}),
+				color: Color([119, 120, 119]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"cactus",
 		ConstBlockType {
@@ -1498,6 +1508,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"cactus_flower",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([209, 120, 135]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"cake",
 		ConstBlockType {
@@ -3808,6 +3828,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"firefly_bush",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([87, 83, 43]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"fletching_table",
 		ConstBlockType {
@@ -4878,6 +4908,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"leaf_litter",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"lectern",
 		ConstBlockType {
@@ -8698,6 +8738,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"short_dry_grass",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([187, 158, 108]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"short_grass",
 		ConstBlockType {
@@ -9638,6 +9688,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"tall_dry_grass",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([196, 171, 122]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"tall_grass",
 		ConstBlockType {
@@ -9678,6 +9738,26 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"test_block",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
+			sign_material: None,
+		},
+	),
+	(
+		"test_instance_block",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"tinted_glass",
 		ConstBlockType {
@@ -10828,6 +10908,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"wildflowers",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{}),
+				color: Color([0, 0, 0]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"wither_rose",
 		ConstBlockType {
diff --git a/resource/blocks.json b/resource/blocks.json
index a409abb..caf6f8a 100644
--- a/resource/blocks.json
+++ b/resource/blocks.json
@@ -316,9 +316,13 @@
 	"bubble_coral_fan": null,
 	"bubble_coral_wall_fan": null,
 	"budding_amethyst": {},
+	"bush": {
+		"grass": true
+	},
 	"cactus": {
 		"texture": "cactus_top"
 	},
+	"cactus_flower": {},
 	"cake": {
 		"texture": "cake_top"
 	},
@@ -778,6 +782,7 @@
 	"fire_coral_block": {},
 	"fire_coral_fan": null,
 	"fire_coral_wall_fan": null,
+	"firefly_bush": {},
 	"fletching_table": {
 		"texture": "fletching_table_top"
 	},
@@ -987,6 +992,7 @@
 	"lava_cauldron": {
 		"texture": "cauldron_top"
 	},
+	"leaf_litter": null,
 	"lectern": {
 		"texture": "lectern_top"
 	},
@@ -1782,6 +1788,7 @@
 	"sea_lantern": {},
 	"sea_pickle": {},
 	"seagrass": {},
+	"short_dry_grass": {},
 	"short_grass": null,
 	"shroomlight": {},
 	"shulker_box": {},
@@ -2013,6 +2020,7 @@
 	"sweet_berry_bush": {
 		"texture": "sweet_berry_bush_stage3"
 	},
+	"tall_dry_grass": {},
 	"tall_grass": {
 		"grass": true,
 		"texture": "tall_grass_top"
@@ -2024,6 +2032,8 @@
 		"texture": "target_top"
 	},
 	"terracotta": {},
+	"test_block": null,
+	"test_instance_block": null,
 	"tinted_glass": {},
 	"tnt": {
 		"texture": "tnt_top"
@@ -2288,6 +2298,7 @@
 	"white_tulip": null,
 	"white_wall_banner": null,
 	"white_wool": {},
+	"wildflowers": null,
 	"wither_rose": null,
 	"wither_skeleton_skull": null,
 	"wither_skeleton_wall_skull": null,
diff --git a/src/core/common.rs b/src/core/common.rs
index 06a3277..d285f4c 100644
--- a/src/core/common.rs
+++ b/src/core/common.rs
@@ -26,7 +26,7 @@ use crate::{
 ///
 /// Increase when the generation of processed regions from region data changes
 /// (usually because of updated resource data)
-pub const REGION_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(6);
+pub const REGION_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(7);
 
 /// MinedMap map tile data version number
 ///
@@ -38,7 +38,7 @@ pub const MAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
 ///
 /// Increase when the generation of lightmap tiles from region data changes
 /// (usually because of updated resource data)
-pub const LIGHTMAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(4);
+pub const LIGHTMAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(5);
 
 /// MinedMap mipmap data version number
 ///

From 69b62576ea805c2674144f5f600ad00fecdbb111 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 3 Apr 2025 18:37:36 +0200
Subject: [PATCH 450/460] world/chunk: fix new Rust 1.86 clippy warning

---
 src/world/chunk.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/world/chunk.rs b/src/world/chunk.rs
index 311fca8..aadf882 100644
--- a/src/world/chunk.rs
+++ b/src/world/chunk.rs
@@ -419,7 +419,7 @@ impl<'a> Iterator for SectionIter<'a> {
 	}
 
 	fn last(mut self) -> Option<Self::Item> {
-		self.with_iter(|iter| iter.last())
+		self.next_back()
 	}
 }
 

From dd56e842b526774aa0d1bba035b7da6d7cdd57e9 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 3 Apr 2025 18:31:41 +0200
Subject: [PATCH 451/460] ci: update to Rust 1.86

There is no official 1.86 Docker image yet.
---
 .github/workflows/MinedMap.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/MinedMap.yml b/.github/workflows/MinedMap.yml
index ece4e50..4dbb5d2 100644
--- a/.github/workflows/MinedMap.yml
+++ b/.github/workflows/MinedMap.yml
@@ -48,7 +48,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: '1.85.1'
+          toolchain: '1.86'
           components: rustfmt
       - run: cargo fmt --all -- --check
 
@@ -58,7 +58,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: '1.85.1'
+          toolchain: '1.86'
           components: clippy
       - uses: swatinem/rust-cache@v2
       - uses: actions-rs/clippy-check@v1
@@ -72,7 +72,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: '1.85.1'
+          toolchain: '1.86'
           components: rust-docs
       - uses: swatinem/rust-cache@v2
       - run: cargo doc --workspace --no-deps --document-private-items
@@ -87,7 +87,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: '1.85.1'
+          toolchain: '1.86'
       - uses: swatinem/rust-cache@v2
       - run: cargo test --workspace
       - run: cargo test --workspace --no-default-features
@@ -127,7 +127,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: '1.85.1'
+          toolchain: '1.86'
           targets: '${{ matrix.target }}'
 
       - uses: swatinem/rust-cache@v2

From ca880ab3b457a12f775e83a43b3ede5804f7bc63 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 3 Apr 2025 18:26:49 +0200
Subject: [PATCH 452/460] world/text_value: do not fall back to NBT
 deserialization after DataVersion 4290

An invalid JSON string should not be emitted verbatim; ignore the
content instead.

Also increment entity meta version, which had been forgotten in the
previous commit.
---
 src/core/common.rs      |  2 +-
 src/world/text_value.rs | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/core/common.rs b/src/core/common.rs
index d285f4c..45b541c 100644
--- a/src/core/common.rs
+++ b/src/core/common.rs
@@ -48,7 +48,7 @@ pub const MIPMAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
 /// MinedMap processed entity data version number
 ///
 /// Increase when entity collection changes bacause of code changes.
-pub const ENTITIES_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(2);
+pub const ENTITIES_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(3);
 
 /// Coordinate pair of a generated tile
 ///
diff --git a/src/world/text_value.rs b/src/world/text_value.rs
index 75defc4..3de6593 100644
--- a/src/world/text_value.rs
+++ b/src/world/text_value.rs
@@ -176,15 +176,20 @@ pub struct TextValue(pub fastnbt::Value);
 impl TextValue {
 	/// Deserializes a [TextValue] into a [DeserializedText]
 	pub fn deserialize(&self, data_version: u32) -> DeserializedText {
+		// TODO: Improve error handling
+		//
+		// Unfortunately, there are a number of weird ways an empty sign coould
+		// be encoded (for example a compound with an "" key), so for now we
+		// simply interpret undecodable data as empty.
 		if data_version < 4290 {
-			if let fastnbt::Value::String(json) = &self.0 {
-				if let Ok(content) = serde_json::from_str(json) {
-					return content;
-				}
-			}
-		}
+			let fastnbt::Value::String(json) = &self.0 else {
+				return DeserializedText::default();
+			};
 
-		fastnbt::from_value(&self.0).unwrap_or_default()
+			serde_json::from_str(json).unwrap_or_default()
+		} else {
+			fastnbt::from_value(&self.0).unwrap_or_default()
+		}
 	}
 }
 

From ec4fd7986497f9d1e03626c4044ebf07cd561271 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 29 Jun 2025 17:04:15 +0200
Subject: [PATCH 453/460] Update dependencies

---
 Cargo.lock | 394 ++++++++++++++++++++++++++++++-----------------------
 Cargo.toml |   4 +-
 2 files changed, 228 insertions(+), 170 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d9f14f8..8187256 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -13,9 +13,9 @@ dependencies = [
 
 [[package]]
 name = "adler2"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
 name = "aho-corasick"
@@ -34,9 +34,9 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "anstream"
-version = "0.6.18"
+version = "0.6.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -49,56 +49,56 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9"
 dependencies = [
  "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.7"
+version = "3.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
+checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882"
 dependencies = [
  "anstyle",
- "once_cell",
+ "once_cell_polyfill",
  "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.97"
+version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
+checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
 
 [[package]]
 name = "autocfg"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "backtrace"
-version = "0.3.74"
+version = "0.3.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
+checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
 dependencies = [
  "addr2line",
  "cfg-if",
@@ -106,7 +106,7 @@ dependencies = [
  "miniz_oxide",
  "object",
  "rustc-demangle",
- "windows-targets",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -137,15 +137,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.9.0"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
 
 [[package]]
 name = "bytemuck"
-version = "1.22.0"
+version = "1.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6b1fc10dbac614ebc03540c9dbd60e83887fda27794998c6528f1782047d540"
+checksum = "5c76a5792e44e4abe34d3abf15636779261d45a7450612059293d1d2cfc63422"
 
 [[package]]
 name = "byteorder"
@@ -161,9 +161,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
 [[package]]
 name = "cc"
-version = "1.2.17"
+version = "1.2.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fcb57c740ae1daf453ae85f16e37396f672b039e00d9d866e07ddb24e328e3a"
+checksum = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc"
 dependencies = [
  "jobserver",
  "libc",
@@ -178,15 +178,15 @@ checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
 
 [[package]]
 name = "clap"
-version = "4.5.35"
+version = "4.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944"
+checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -194,9 +194,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.35"
+version = "4.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9"
+checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e"
 dependencies = [
  "anstream",
  "anstyle",
@@ -207,9 +207,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.32"
+version = "4.5.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
+checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -219,15 +219,15 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 
 [[package]]
 name = "crc32fast"
@@ -291,18 +291,18 @@ dependencies = [
 
 [[package]]
 name = "enumflags2"
-version = "0.7.11"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba2f4b465f5318854c6f8dd686ede6c0a9dc67d4b1ac241cf0eb51521a309147"
+checksum = "1027f7680c853e056ebcec683615fb6fbbc07dbaa13b4d5d9442b146ded4ecef"
 dependencies = [
  "enumflags2_derive",
 ]
 
 [[package]]
 name = "enumflags2_derive"
-version = "0.7.11"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc4caf64a58d7a6d65ab00639b046ff54399a39f5f2554728895ace4b297cd79"
+checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -317,12 +317,12 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
 [[package]]
 name = "errno"
-version = "0.3.10"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
+checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -337,6 +337,12 @@ dependencies = [
  "serde_bytes",
 ]
 
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+
 [[package]]
 name = "fdeflate"
 version = "0.3.7"
@@ -360,9 +366,9 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
+checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
 dependencies = [
  "crc32fast",
  "libz-rs-sys",
@@ -423,9 +429,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
 dependencies = [
  "cfg-if",
  "libc",
@@ -461,15 +467,15 @@ dependencies = [
 
 [[package]]
 name = "glam"
-version = "0.30.1"
+version = "0.30.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf3aa70d918d2b234126ff4f850f628f172542bf0603ded26b8ee36e5e22d5f9"
+checksum = "50a99dbe56b72736564cfa4b85bf9a33079f16ae8b74983ab06af3b1a3696b11"
 
 [[package]]
 name = "hashbrown"
-version = "0.15.2"
+version = "0.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
 dependencies = [
  "allocator-api2",
  "equivalent",
@@ -484,9 +490,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hermit-abi"
-version = "0.3.9"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
 
 [[package]]
 name = "humantime"
@@ -509,9 +515,9 @@ dependencies = [
 
 [[package]]
 name = "image-webp"
-version = "0.2.1"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b77d01e822461baa8409e156015a1d91735549f0f2c17691bd2d996bef238f7f"
+checksum = "f6970fe7a5300b4b42e62c52efa0187540a5bef546c60edaf554ef595d2e6f0b"
 dependencies = [
  "byteorder-lite",
  "quick-error",
@@ -519,9 +525,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.8.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058"
+checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -533,7 +539,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "inotify-sys",
  "libc",
 ]
@@ -580,9 +586,9 @@ dependencies = [
 
 [[package]]
 name = "kqueue"
-version = "1.0.8"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
+checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a"
 dependencies = [
  "kqueue-sys",
  "libc",
@@ -606,41 +612,41 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.171"
+version = "0.2.174"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
+checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
 
 [[package]]
 name = "libredox"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+checksum = "1580801010e535496706ba011c15f8532df6b42297d2e471fec38ceadd8c0638"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "libc",
  "redox_syscall",
 ]
 
 [[package]]
 name = "libz-rs-sys"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6489ca9bd760fe9642d7644e827b0c9add07df89857b0416ee15c1cc1a3b8c5a"
+checksum = "172a788537a2221661b480fee8dc5f96c580eb34fa88764d3205dc356c7e4221"
 dependencies = [
  "zlib-rs",
 ]
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413"
+checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
 
 [[package]]
 name = "lock_api"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -654,18 +660,18 @@ checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 
 [[package]]
 name = "lru"
-version = "0.13.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "227748d55f2f0ab4735d87fd623798cb6b664512fe979705f829c9f81c934465"
+checksum = "0281c2e25e62316a5c9d98f2d2e9e95a37841afdaf4383c177dbb5c1dfab0568"
 dependencies = [
  "hashbrown",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.7.4"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
 
 [[package]]
 name = "minedmap"
@@ -741,9 +747,9 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.8.5"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
  "adler2",
  "simd-adler32",
@@ -751,14 +757,14 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
 dependencies = [
  "libc",
  "log",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.52.0",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -767,7 +773,7 @@ version = "8.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "filetime",
  "fsevent-sys",
  "inotify",
@@ -816,9 +822,9 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b"
 dependencies = [
  "hermit-abi",
  "libc",
@@ -839,6 +845,12 @@ version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
+
 [[package]]
 name = "overload"
 version = "0.1.1"
@@ -847,9 +859,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -857,42 +869,43 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.10"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "phf"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
+checksum = "913273894cec178f401a31ec4b656318d95473527be05c0752cc41cdc32be8b7"
 dependencies = [
  "phf_macros",
  "phf_shared",
+ "serde",
 ]
 
 [[package]]
 name = "phf_generator"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
+checksum = "2cbb1126afed61dd6368748dae63b1ee7dc480191c6262a3b4ff1e29d86a6c5b"
 dependencies = [
+ "fastrand",
  "phf_shared",
- "rand",
 ]
 
 [[package]]
 name = "phf_macros"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
+checksum = "d713258393a82f091ead52047ca779d37e5766226d009de21696c4e667044368"
 dependencies = [
  "phf_generator",
  "phf_shared",
@@ -903,9 +916,9 @@ dependencies = [
 
 [[package]]
 name = "phf_shared"
-version = "0.11.3"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
+checksum = "06005508882fb681fd97892ecff4b7fd0fee13ef1aa569f8695dae7ab9099981"
 dependencies = [
  "siphasher",
 ]
@@ -943,9 +956,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.94"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
  "unicode-ident",
 ]
@@ -967,24 +980,9 @@ dependencies = [
 
 [[package]]
 name = "r-efi"
-version = "5.2.0"
+version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
 [[package]]
 name = "rayon"
@@ -1008,11 +1006,11 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.10"
+version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1"
+checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
 ]
 
 [[package]]
@@ -1046,9 +1044,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.24"
+version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
 
 [[package]]
 name = "rustc-hash"
@@ -1058,11 +1056,11 @@ checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustix"
-version = "1.0.5"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf"
+checksum = "c71e83d6afe7ff64890ec6b71d6a69bb8a610ab78ce364b3352876bb4c801266"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -1160,18 +1158,15 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
 [[package]]
 name = "slab"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
+checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d"
 
 [[package]]
 name = "smallvec"
-version = "1.14.0"
+version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "strsim"
@@ -1181,9 +1176,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "syn"
-version = "2.0.100"
+version = "2.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
+checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1202,12 +1197,11 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "1.1.8"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
+checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
 dependencies = [
  "cfg-if",
- "once_cell",
 ]
 
 [[package]]
@@ -1232,9 +1226,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.44.1"
+version = "1.45.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a"
+checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779"
 dependencies = [
  "backtrace",
  "parking_lot",
@@ -1254,9 +1248,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.28"
+version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
+checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1265,9 +1259,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.33"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
 dependencies = [
  "once_cell",
  "valuable",
@@ -1340,9 +1334,9 @@ dependencies = [
 
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasi"
@@ -1384,22 +1378,22 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.2",
 ]
 
 [[package]]
@@ -1408,14 +1402,30 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_gnullvm",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm 0.52.6",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.53.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
+dependencies = [
+ "windows_aarch64_gnullvm 0.53.0",
+ "windows_aarch64_msvc 0.53.0",
+ "windows_i686_gnu 0.53.0",
+ "windows_i686_gnullvm 0.53.0",
+ "windows_i686_msvc 0.53.0",
+ "windows_x86_64_gnu 0.53.0",
+ "windows_x86_64_gnullvm 0.53.0",
+ "windows_x86_64_msvc 0.53.0",
 ]
 
 [[package]]
@@ -1424,62 +1434,110 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
 [[package]]
 name = "wit-bindgen-rt"
 version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
 dependencies = [
- "bitflags 2.9.0",
+ "bitflags 2.9.1",
 ]
 
 [[package]]
 name = "zlib-rs"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "868b928d7949e09af2f6086dfc1e01936064cc7a819253bce650d4e2a2d63ba8"
+checksum = "626bd9fa9734751fc50d6060752170984d7053f5a39061f524cda68023d4db8a"
 
 [[package]]
 name = "zstd"
diff --git a/Cargo.toml b/Cargo.toml
index 34e5619..2f7a483 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -48,7 +48,7 @@ git-version = "0.3.5"
 humantime = "2.1.0"
 image = { version = "0.25.1", default-features = false, features = ["png", "webp"] }
 indexmap = "2.0.0"
-lru = "0.13.0"
+lru = "0.15.0"
 minedmap-default-alloc = { version = "0.1.0", path = "crates/default-alloc", optional = true }
 minedmap-nbt = { version = "0.2.0", path = "crates/nbt", default-features = false }
 minedmap-resource = { version = "0.7.0", path = "crates/resource" }
@@ -56,7 +56,7 @@ minedmap-types = { version = "0.2.0", path = "crates/types" }
 notify = "8.0.0"
 num-integer = "0.1.45"
 num_cpus = "1.16.0"
-phf = { version = "0.11.2", features = ["macros"] }
+phf = { version = "0.12.1", features = ["macros"] }
 rayon = "1.7.0"
 regex = "1.10.2"
 rustc-hash = "2.0.0"

From 64e7375f2fe171d5d9226f5ab6b938c5316aa198 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 29 Jun 2025 17:05:59 +0200
Subject: [PATCH 454/460] Fix 1.88.0 clippy warnings

---
 crates/nbt/examples/nbtdump.rs    |  2 +-
 crates/nbt/examples/regiondump.rs |  2 +-
 crates/nbt/src/region.rs          |  6 +++---
 src/core/common.rs                |  4 ++--
 src/core/region_processor.rs      | 11 ++++-------
 src/core/tile_renderer.rs         |  6 +++---
 6 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/crates/nbt/examples/nbtdump.rs b/crates/nbt/examples/nbtdump.rs
index 66aaa2a..8b61693 100644
--- a/crates/nbt/examples/nbtdump.rs
+++ b/crates/nbt/examples/nbtdump.rs
@@ -20,7 +20,7 @@ fn main() -> Result<()> {
 	let args = Args::parse();
 
 	let value: fastnbt::Value = minedmap_nbt::data::from_file(args.file.as_path())?;
-	println!("{:#x?}", value);
+	println!("{value:#x?}");
 
 	Ok(())
 }
diff --git a/crates/nbt/examples/regiondump.rs b/crates/nbt/examples/regiondump.rs
index 9315022..7cece8c 100644
--- a/crates/nbt/examples/regiondump.rs
+++ b/crates/nbt/examples/regiondump.rs
@@ -21,7 +21,7 @@ fn main() -> Result<()> {
 
 	minedmap_nbt::region::from_file(args.file.as_path())?.foreach_chunk(
 		|coords, value: fastnbt::Value| {
-			println!("Chunk {:?}: {:#x?}", coords, value);
+			println!("Chunk {coords:?}: {value:#x?}");
 			Ok(())
 		},
 	)
diff --git a/crates/nbt/src/region.rs b/crates/nbt/src/region.rs
index 1325919..6a79a39 100644
--- a/crates/nbt/src/region.rs
+++ b/crates/nbt/src/region.rs
@@ -124,7 +124,7 @@ impl<R: Read + Seek> Region<R> {
 			let mut len_buf = [0u8; 4];
 			reader
 				.read_exact(&mut len_buf)
-				.with_context(|| format!("Failed to read length for chunk {:?}", coords))?;
+				.with_context(|| format!("Failed to read length for chunk {coords:?}"))?;
 			let byte_len = u32::from_be_bytes(len_buf) as usize;
 			if byte_len < 1 || byte_len > (len as usize) * BLOCKSIZE - 4 {
 				bail!("Invalid length for chunk {:?}", coords);
@@ -133,9 +133,9 @@ impl<R: Read + Seek> Region<R> {
 			let mut buffer = vec![0; byte_len];
 			reader
 				.read_exact(&mut buffer)
-				.with_context(|| format!("Failed to read data for chunk {:?}", coords))?;
+				.with_context(|| format!("Failed to read data for chunk {coords:?}"))?;
 			let chunk = decode_chunk(&buffer)
-				.with_context(|| format!("Failed to decode data for chunk {:?}", coords))?;
+				.with_context(|| format!("Failed to decode data for chunk {coords:?}"))?;
 
 			f(coords, chunk)?;
 		}
diff --git a/src/core/common.rs b/src/core/common.rs
index 45b541c..3f3e69d 100644
--- a/src/core/common.rs
+++ b/src/core/common.rs
@@ -237,7 +237,7 @@ impl Config {
 	fn sign_transform(splitter: &Regex, transform: &str) -> Result<(Regex, String)> {
 		let captures = splitter
 			.captures(transform)
-			.with_context(|| format!("Invalid transform pattern '{}'", transform))?;
+			.with_context(|| format!("Invalid transform pattern '{transform}'"))?;
 		let regexp = Regex::new(&captures[1])?;
 		let replacement = captures[2].to_string();
 		Ok((regexp, replacement))
@@ -275,7 +275,7 @@ impl Config {
 			TileKind::Map => "map",
 			TileKind::Lightmap => "light",
 		};
-		let dir = format!("{}/{}", prefix, level);
+		let dir = format!("{prefix}/{level}");
 		[&self.output_dir, Path::new(&dir)].iter().collect()
 	}
 
diff --git a/src/core/region_processor.rs b/src/core/region_processor.rs
index e638342..74939bd 100644
--- a/src/core/region_processor.rs
+++ b/src/core/region_processor.rs
@@ -228,7 +228,7 @@ impl<'a> SingleRegionProcessor<'a> {
 	) -> Result<()> {
 		let (chunk, has_unknown) =
 			world::chunk::Chunk::new(&chunk_data, self.block_types, self.biome_types)
-				.with_context(|| format!("Failed to decode chunk {:?}", chunk_coords))?;
+				.with_context(|| format!("Failed to decode chunk {chunk_coords:?}"))?;
 		data.has_unknown |= has_unknown;
 
 		if self.output_needed || self.lightmap_needed {
@@ -238,7 +238,7 @@ impl<'a> SingleRegionProcessor<'a> {
 				block_light,
 				depths,
 			}) = world::layer::top_layer(&mut data.biome_list, &chunk)
-				.with_context(|| format!("Failed to process chunk {:?}", chunk_coords))?
+				.with_context(|| format!("Failed to process chunk {chunk_coords:?}"))?
 			{
 				if self.output_needed {
 					data.chunks[chunk_coords] = Some(Box::new(ProcessedChunk {
@@ -257,10 +257,7 @@ impl<'a> SingleRegionProcessor<'a> {
 
 		if self.entities_needed {
 			let mut block_entities = chunk.block_entities().with_context(|| {
-				format!(
-					"Failed to process block entities for chunk {:?}",
-					chunk_coords,
-				)
+				format!("Failed to process block entities for chunk {chunk_coords:?}")
 			})?;
 			data.entities.block_entities.append(&mut block_entities);
 		}
@@ -407,7 +404,7 @@ impl<'a> RegionProcessor<'a> {
 		self.collect_regions()?.par_iter().try_for_each(|&coords| {
 			let ret = self
 				.process_region(coords)
-				.with_context(|| format!("Failed to process region {:?}", coords))?;
+				.with_context(|| format!("Failed to process region {coords:?}"))?;
 
 			if ret != Status::ErrorMissing {
 				region_send.send(coords).unwrap();
diff --git a/src/core/tile_renderer.rs b/src/core/tile_renderer.rs
index 9d7e188..0b534b8 100644
--- a/src/core/tile_renderer.rs
+++ b/src/core/tile_renderer.rs
@@ -249,7 +249,7 @@ impl<'a> TileRenderer<'a> {
 			.filter(|entry| self.region_set.contains(entry))
 		})
 		.try_map(|entry| self.processed_source(entry))
-		.with_context(|| format!("Region {:?} from previous step must exist", coords))?;
+		.with_context(|| format!("Region {coords:?} from previous step must exist"))?;
 
 		let max_timestamp = *sources
 			.iter()
@@ -293,7 +293,7 @@ impl<'a> TileRenderer<'a> {
 		let region_group = self
 			.rt
 			.block_on(self.load_region_group(processed_paths))
-			.with_context(|| format!("Region {:?} from previous step must be loadable", coords))?;
+			.with_context(|| format!("Region {coords:?} from previous step must be loadable"))?;
 		let mut image = image::RgbaImage::new(N, N);
 		Self::render_region(&mut image, &region_group);
 
@@ -325,7 +325,7 @@ impl<'a> TileRenderer<'a> {
 			.map(|&coords| {
 				anyhow::Ok(usize::from(
 					self.render_tile(coords)
-						.with_context(|| format!("Failed to render tile {:?}", coords))?,
+						.with_context(|| format!("Failed to render tile {coords:?}"))?,
 				))
 			})
 			.try_reduce(|| 0, |a, b| Ok(a + b))?;

From 6a2f5356d90959a2d2664383975cee88fcdb930a Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 29 Jun 2025 17:26:59 +0200
Subject: [PATCH 455/460] ci, docker: update to Rust 1.88.0

---
 .github/workflows/MinedMap.yml | 10 +++++-----
 Dockerfile                     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/MinedMap.yml b/.github/workflows/MinedMap.yml
index 4dbb5d2..a0e58cf 100644
--- a/.github/workflows/MinedMap.yml
+++ b/.github/workflows/MinedMap.yml
@@ -48,7 +48,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: '1.86'
+          toolchain: '1.88'
           components: rustfmt
       - run: cargo fmt --all -- --check
 
@@ -58,7 +58,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: '1.86'
+          toolchain: '1.88'
           components: clippy
       - uses: swatinem/rust-cache@v2
       - uses: actions-rs/clippy-check@v1
@@ -72,7 +72,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: '1.86'
+          toolchain: '1.88'
           components: rust-docs
       - uses: swatinem/rust-cache@v2
       - run: cargo doc --workspace --no-deps --document-private-items
@@ -87,7 +87,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: '1.86'
+          toolchain: '1.88'
       - uses: swatinem/rust-cache@v2
       - run: cargo test --workspace
       - run: cargo test --workspace --no-default-features
@@ -127,7 +127,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: '1.86'
+          toolchain: '1.88'
           targets: '${{ matrix.target }}'
 
       - uses: swatinem/rust-cache@v2
diff --git a/Dockerfile b/Dockerfile
index ad36c79..4b9de31 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/rust:1.85.1-alpine AS builder
+FROM docker.io/library/rust:1.88.0-alpine AS builder
 
 WORKDIR /build
 RUN apk add --no-cache build-base tini-static

From 19355d8f64732de0be43e736556f5814cfaa4159 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 29 Jun 2025 23:29:02 +0200
Subject: [PATCH 456/460] README.md: add link to minecraft_map_marker project

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index 952163f..6402d21 100644
--- a/README.md
+++ b/README.md
@@ -120,3 +120,8 @@ cargo install --git 'https://github.com/neocturne/MinedMap.git'
 If you are looking for the older C++ implementation of the MinedMap tile renderer,
 see the [v1.19.1](https://github.com/neocturne/MinedMap/tree/v1.19.1) tag.
 
+## See also
+
+Other projects using MinedMap:
+
+- [minecraft\_map\_marker](https://github.com/christopher-besch/minecraft_map_marker)

From 04aeacbfd41a2b49c84d8cd5710406bf8e0d762a Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 29 Jun 2025 23:53:56 +0200
Subject: [PATCH 457/460] resource: add Minecraft 1.21.6 Dried Ghast block type

As Minecraft 1.21.7 is a hotfix release with no new block types or
biomes, it is supported as well.
---
 CHANGELOG.md                       |  2 +-
 README.md                          |  2 +-
 crates/resource/src/block_types.rs | 10 ++++++++++
 resource/blocks.json               |  3 +++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f96ddca..94dbb8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 ### Added
 
-- Added support for Minecraft 1.21.5
+- Added support for Minecraft 1.21.5 to 1.21.7
 
   Added new block types and handling for changed sign text storage format.
 
diff --git a/README.md b/README.md
index 6402d21..cd30c8b 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 * Render beautiful maps of your [Minecraft](https://minecraft.net/) worlds!
 * Put them on a webserver and view them in your browser!
-* Compatible with unmodified Minecraft Java Edition 1.8 up to 1.21.4 (no mod installation required!)
+* Compatible with unmodified Minecraft Java Edition 1.8 up to 1.21.7 (no mod installation required!)
 * Illumination layer: the world at night
 * Fast: create a full map for a huge 3GB savegame in less than 5 minutes in single-threaded operation
 * Multi-threading support: pass `-j N` to the renderer to use `N` parallel threads for generation
diff --git a/crates/resource/src/block_types.rs b/crates/resource/src/block_types.rs
index 044a153..9419690 100644
--- a/crates/resource/src/block_types.rs
+++ b/crates/resource/src/block_types.rs
@@ -3508,6 +3508,16 @@ pub const BLOCK_TYPES: &[(&str, ConstBlockType)] = &[
 			sign_material: None,
 		},
 	),
+	(
+		"dried_ghast",
+		ConstBlockType {
+			block_color: BlockColor {
+				flags: make_bitflags!(BlockFlag::{Opaque}),
+				color: Color([179, 168, 168]),
+			},
+			sign_material: None,
+		},
+	),
 	(
 		"dried_kelp_block",
 		ConstBlockType {
diff --git a/resource/blocks.json b/resource/blocks.json
index caf6f8a..15dae2b 100644
--- a/resource/blocks.json
+++ b/resource/blocks.json
@@ -720,6 +720,9 @@
 	"dragon_egg": {},
 	"dragon_head": null,
 	"dragon_wall_head": null,
+	"dried_ghast": {
+		"texture": "dried_ghast_hydration_1_top"
+	},
 	"dried_kelp_block": {
 		"texture": "dried_kelp_top"
 	},

From 8278185c9c6dff03838423482321d39425eee4a5 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 30 Jun 2025 22:00:59 +0200
Subject: [PATCH 458/460] core: update region and lightmap version

The versions need to be updated for the new block type.
---
 src/core/common.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/common.rs b/src/core/common.rs
index 3f3e69d..094d567 100644
--- a/src/core/common.rs
+++ b/src/core/common.rs
@@ -26,7 +26,7 @@ use crate::{
 ///
 /// Increase when the generation of processed regions from region data changes
 /// (usually because of updated resource data)
-pub const REGION_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(7);
+pub const REGION_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(8);
 
 /// MinedMap map tile data version number
 ///
@@ -38,7 +38,7 @@ pub const MAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(0);
 ///
 /// Increase when the generation of lightmap tiles from region data changes
 /// (usually because of updated resource data)
-pub const LIGHTMAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(5);
+pub const LIGHTMAP_FILE_META_VERSION: FileMetaVersion = FileMetaVersion(6);
 
 /// MinedMap mipmap data version number
 ///

From 190b92b68d474db18a406146c0c2819439b274c4 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 30 Jun 2025 22:07:55 +0200
Subject: [PATCH 459/460] minedmap-resource 0.8.0

---
 Cargo.lock                 | 2 +-
 Cargo.toml                 | 2 +-
 crates/resource/Cargo.toml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8187256..953a4a3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -730,7 +730,7 @@ dependencies = [
 
 [[package]]
 name = "minedmap-resource"
-version = "0.7.0"
+version = "0.8.0"
 dependencies = [
  "bincode",
  "enumflags2",
diff --git a/Cargo.toml b/Cargo.toml
index 2f7a483..39664f7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -51,7 +51,7 @@ indexmap = "2.0.0"
 lru = "0.15.0"
 minedmap-default-alloc = { version = "0.1.0", path = "crates/default-alloc", optional = true }
 minedmap-nbt = { version = "0.2.0", path = "crates/nbt", default-features = false }
-minedmap-resource = { version = "0.7.0", path = "crates/resource" }
+minedmap-resource = { version = "0.8.0", path = "crates/resource" }
 minedmap-types = { version = "0.2.0", path = "crates/types" }
 notify = "8.0.0"
 num-integer = "0.1.45"
diff --git a/crates/resource/Cargo.toml b/crates/resource/Cargo.toml
index 1257a90..b59492c 100644
--- a/crates/resource/Cargo.toml
+++ b/crates/resource/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "minedmap-resource"
-version = "0.7.0"
+version = "0.8.0"
 description = "Data describing Minecraft biomes and block types"
 edition.workspace = true
 license.workspace = true

From f0ef6d318983580e99082822b965a68d585d4e16 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Mon, 30 Jun 2025 22:08:16 +0200
Subject: [PATCH 460/460] minedmap 2.6.0

---
 CHANGELOG.md | 5 ++++-
 Cargo.lock   | 2 +-
 Cargo.toml   | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94dbb8b..f1f0234 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## [Unreleased] - ReleaseDate
 
+## [2.6.0] - 2025-06-30
+
 ### Added
 
 - Added support for Minecraft 1.21.5 to 1.21.7
@@ -194,7 +196,8 @@ intermediate data.
   Full support for custom biomes datapacks might be added in a future release.
 
 <!-- next-url -->
-[Unreleased]: https://github.com/neocturne/MinedMap/compare/v2.5.0...HEAD
+[Unreleased]: https://github.com/neocturne/MinedMap/compare/v2.6.0...HEAD
+[2.6.0]: https://github.com/neocturne/MinedMap/compare/v2.5.0...v2.6.0
 [2.5.0]: https://github.com/neocturne/MinedMap/compare/v2.4.0...v2.5.0
 [2.4.0]: https://github.com/neocturne/MinedMap/compare/v2.3.1...v2.4.0
 [2.3.1]: https://github.com/neocturne/MinedMap/compare/v2.3.0...v2.3.1
diff --git a/Cargo.lock b/Cargo.lock
index 953a4a3..a000b9d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -675,7 +675,7 @@ checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
 
 [[package]]
 name = "minedmap"
-version = "2.5.0"
+version = "2.6.0"
 dependencies = [
  "anyhow",
  "bincode",
diff --git a/Cargo.toml b/Cargo.toml
index 39664f7..f0c2bc0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@ pre-release-commit-message = "{{crate_name}} {{version}}"
 
 [package]
 name = "minedmap"
-version = "2.5.0"
+version = "2.6.0"
 description = "Generate browsable maps from Minecraft save data"
 edition.workspace = true
 license.workspace = true