From d3a52ef50e5b616812f5675ab7a3624a56935665 Mon Sep 17 00:00:00 2001
From: Hugues Ross <hugues.ross@gmail.com>
Date: Wed, 10 Jun 2020 20:37:57 -0400
Subject: [PATCH] Update to match api changes

---
 init.lua | 130 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 66 insertions(+), 64 deletions(-)

diff --git a/init.lua b/init.lua
index 615837e..e3164a1 100644
--- a/init.lua
+++ b/init.lua
@@ -1,268 +1,270 @@
 -- Biomes
 -- Icesheet
-cartographer.register_biome("icesheet", {
+cartographer.biomes.add("icesheet", {
     "ctg_mtg_simple_land",
     "ctg_mtg_colored_snow",
     "ctg_mtg_colored_snow",
 });
-cartographer.register_biome("icesheet_ocean", {
+cartographer.biomes.add("icesheet_ocean", {
     "ctg_mtg_simple_water",
     "ctg_mtg_colored_water",
 });
-cartographer.register_biome("icesheet_ocean", {
+cartographer.biomes.add("icesheet_ocean", {
     "ctg_mtg_simple_land",
     "ctg_mtg_colored_snow",
     "ctg_mtg_colored_snow",
 }, 1);
 
 -- Tundra
-cartographer.register_biome("tundra", {
+cartographer.biomes.add("tundra", {
     "ctg_mtg_simple_land",
     "ctg_mtg_colored_snow",
     "ctg_mtg_colored_snow",
 });
-cartographer.register_biome("tundra_highland", {
+cartographer.biomes.add("tundra_highland", {
     "ctg_mtg_simple_land",
     "ctg_mtg_colored_snow",
     "ctg_mtg_colored_snow",
 });
-cartographer.register_biome("tundra_beach", {
+cartographer.biomes.add("tundra_beach", {
     "ctg_mtg_simple_land",
     "ctg_mtg_colored_sand",
 });
-cartographer.register_biome("tundra_ocean", {
+cartographer.biomes.add("tundra_ocean", {
     "ctg_mtg_simple_water",
     "ctg_mtg_colored_water",
 });
 
 -- Taiga
-cartographer.register_biome("taiga", {
+cartographer.biomes.add("taiga", {
     "ctg_mtg_simple_forest",
     "ctg_mtg_snowy_forest",
 });
-cartographer.register_biome("taiga_ocean", {
+cartographer.biomes.add("taiga_ocean", {
     "ctg_mtg_simple_water",
     "ctg_mtg_colored_water",
 }, nil, 0);
-cartographer.register_biome("taiga_ocean", {
+cartographer.biomes.add("taiga_ocean", {
     "ctg_mtg_simple_land",
     "ctg_mtg_colored_snow",
 }, 1);
 
 -- Snowy Grassland
-cartographer.register_biome("snowy_grassland", {
+cartographer.biomes.add("snowy_grassland", {
     "ctg_mtg_simple_land",
     "ctg_mtg_colored_snow",
 });
-cartographer.register_biome("snowy_grassland_ocean", {
+cartographer.biomes.add("snowy_grassland_ocean", {
     "ctg_mtg_simple_water",
     "ctg_mtg_colored_water",
 }, nil, 0);
-cartographer.register_biome("snowy_grassland_ocean", {
+cartographer.biomes.add("snowy_grassland_ocean", {
     "ctg_mtg_simple_land",
     "ctg_mtg_colored_snow",
 }, 1);
 
 
 -- Grassland
-cartographer.register_biome("grassland", {
+cartographer.biomes.add("grassland", {
     "ctg_mtg_simple_land",
     "ctg_mtg_colored_land",
 });
-cartographer.register_biome("grassland_dunes", {
+cartographer.biomes.add("grassland_dunes", {
     "ctg_mtg_simple_land",
     "ctg_mtg_colored_sand",
 });
-cartographer.register_biome("grassland_ocean", {
+cartographer.biomes.add("grassland_ocean", {
     "ctg_mtg_simple_water",
     "ctg_mtg_colored_water",
 }, nil, 0);
-cartographer.register_biome("grassland_ocean", {
+cartographer.biomes.add("grassland_ocean", {
     "ctg_mtg_simple_land",
     "ctg_mtg_colored_sand",
 }, 1);
 
 -- Coniferous Forest
-cartographer.register_biome("coniferous_forest", {
+cartographer.biomes.add("coniferous_forest", {
     "ctg_mtg_simple_forest",
     "ctg_mtg_colored_forest",
+    "ctg_mtg_coniferous_forest",
 });
-cartographer.register_biome("coniferous_forest_dunes", {
+cartographer.biomes.add("coniferous_forest_dunes", {
     "ctg_mtg_simple_land",
     "ctg_mtg_colored_sand",
 });
-cartographer.register_biome("coniferous_forest_ocean", {
+cartographer.biomes.add("coniferous_forest_ocean", {
     "ctg_mtg_simple_water",
     "ctg_mtg_colored_water",
 }, nil, 0);
-cartographer.register_biome("coniferous_forest_ocean", {
+cartographer.biomes.add("coniferous_forest_ocean", {
     "ctg_mtg_simple_land",
     "ctg_mtg_colored_sand",
 }, 1);
 
 -- Deciduous Forest
-cartographer.register_biome("deciduous_forest", {
+cartographer.biomes.add("deciduous_forest", {
     "ctg_mtg_simple_forest",
     "ctg_mtg_colored_forest",
+    "ctg_mtg_deciduous_forest",
 });
-cartographer.register_biome("deciduous_forest_shore", {
+cartographer.biomes.add("deciduous_forest_shore", {
     "ctg_mtg_simple_land",
     "ctg_mtg_colored_sand",
 });
-cartographer.register_biome("deciduous_forest_ocean", {
+cartographer.biomes.add("deciduous_forest_ocean", {
     "ctg_mtg_simple_water",
     "ctg_mtg_colored_water",
 }, nil, 0);
-cartographer.register_biome("deciduous_forest_ocean", {
+cartographer.biomes.add("deciduous_forest_ocean", {
     "ctg_mtg_simple_land",
     "ctg_mtg_colored_sand",
 }, 1);
 
 -- Desert
-cartographer.register_biome("desert", {
+cartographer.biomes.add("desert", {
     "ctg_mtg_simple_land",
     "ctg_mtg_colored_sand",
     "ctg_mtg_colored_sand",
 });
-cartographer.register_biome("desert_ocean", {
+cartographer.biomes.add("desert_ocean", {
     "ctg_mtg_simple_water",
     "ctg_mtg_colored_water",
 }, nil, 0);
-cartographer.register_biome("desert_ocean", {
+cartographer.biomes.add("desert_ocean", {
     "ctg_mtg_simple_land",
     "ctg_mtg_colored_sand",
 }, 1);
 
 -- Sandstone Desert
-cartographer.register_biome("sandstone_desert", {
+cartographer.biomes.add("sandstone_desert", {
     "ctg_mtg_simple_land",
     "ctg_mtg_colored_sand",
     "ctg_mtg_colored_sand",
 });
-cartographer.register_biome("sandstone_desert_ocean", {
+cartographer.biomes.add("sandstone_desert_ocean", {
     "ctg_mtg_simple_water",
     "ctg_mtg_colored_water",
 }, nil, 0);
-cartographer.register_biome("sandstone_desert_ocean", {
+cartographer.biomes.add("sandstone_desert_ocean", {
     "ctg_mtg_simple_land",
     "ctg_mtg_colored_sand",
 }, 1);
 
 -- Cold Desert
-cartographer.register_biome("cold_desert", {
+cartographer.biomes.add("cold_desert", {
     "ctg_mtg_simple_land",
     "ctg_mtg_colored_sand",
     "ctg_mtg_colored_sand",
 });
-cartographer.register_biome("cold_desert_ocean", {
+cartographer.biomes.add("cold_desert_ocean", {
     "ctg_mtg_simple_water",
     "ctg_mtg_colored_water",
 }, nil, 0);
-cartographer.register_biome("cold_desert_ocean", {
+cartographer.biomes.add("cold_desert_ocean", {
     "ctg_mtg_simple_land",
     "ctg_mtg_colored_sand",
 }, 1);
 
 -- Savanna
-cartographer.register_biome("savanna", {
+cartographer.biomes.add("savanna", {
     "ctg_mtg_simple_land",
     "ctg_mtg_colored_land",
     "ctg_mtg_colored_land",
 });
-cartographer.register_biome("savanna_shore", {
+cartographer.biomes.add("savanna_shore", {
     "ctg_mtg_simple_land",
     "ctg_mtg_colored_sand",
 });
-cartographer.register_biome("savanna_ocean", {
+cartographer.biomes.add("savanna_ocean", {
     "ctg_mtg_simple_water",
     "ctg_mtg_colored_water",
 }, nil, 0);
-cartographer.register_biome("savanna_ocean", {
+cartographer.biomes.add("savanna_ocean", {
     "ctg_mtg_simple_land",
     "ctg_mtg_colored_sand",
 }, 1);
 
 -- Rainforest
-cartographer.register_biome("rainforest", {
+cartographer.biomes.add("rainforest", {
     "ctg_mtg_simple_forest",
     "ctg_mtg_colored_forest",
 });
-cartographer.register_biome("rainforest_swamp", {
+cartographer.biomes.add("rainforest_swamp", {
     "ctg_mtg_simple_water",
     "ctg_mtg_colored_water",
 });
-cartographer.register_biome("rainforest_ocean", {
+cartographer.biomes.add("rainforest_ocean", {
     "ctg_mtg_simple_water",
     "ctg_mtg_colored_water",
 });
 
 -- Markers
 -- Line drawing markers
-cartographer.register_marker("ctg_mtg:line_h", "Line (Horizontal)", {
+cartographer.markers.add("ctg_mtg:line_h", "Line (Horizontal)", {
     "ctg_mtg_marker_line_h",
 });
-cartographer.register_marker("ctg_mtg:line_v", "Line (Vertical)", {
+cartographer.markers.add("ctg_mtg:line_v", "Line (Vertical)", {
     "ctg_mtg_marker_line_v",
 });
-cartographer.register_marker("ctg_mtg:line_c_ne", "Line (North-East Corner)", {
+cartographer.markers.add("ctg_mtg:line_c_ne", "Line (North-East Corner)", {
     "ctg_mtg_marker_line_c_ne",
 });
-cartographer.register_marker("ctg_mtg:line_c_se", "Line (South-East Corner)", {
+cartographer.markers.add("ctg_mtg:line_c_se", "Line (South-East Corner)", {
     "ctg_mtg_marker_line_c_se",
 });
-cartographer.register_marker("ctg_mtg:line_c_nw", "Line (North-West Corner)", {
+cartographer.markers.add("ctg_mtg:line_c_nw", "Line (North-West Corner)", {
     "ctg_mtg_marker_line_c_nw",
 });
-cartographer.register_marker("ctg_mtg:line_c_sw", "Line (South-West Corner)", {
+cartographer.markers.add("ctg_mtg:line_c_sw", "Line (South-West Corner)", {
     "ctg_mtg_marker_line_c_sw",
 });
-cartographer.register_marker("ctg_mtg:line_t_n", "Line (North T-Intersection)", {
+cartographer.markers.add("ctg_mtg:line_t_n", "Line (North T-Intersection)", {
     "ctg_mtg_marker_line_t_n",
 });
-cartographer.register_marker("ctg_mtg:line_t_s", "Line (South T-Intersection)", {
+cartographer.markers.add("ctg_mtg:line_t_s", "Line (South T-Intersection)", {
     "ctg_mtg_marker_line_t_s",
 });
-cartographer.register_marker("ctg_mtg:line_t_e", "Line (East T-Intersection)", {
+cartographer.markers.add("ctg_mtg:line_t_e", "Line (East T-Intersection)", {
     "ctg_mtg_marker_line_t_e",
 });
-cartographer.register_marker("ctg_mtg:line_t_w", "Line (West T-Intersection)", {
+cartographer.markers.add("ctg_mtg:line_t_w", "Line (West T-Intersection)", {
     "ctg_mtg_marker_line_t_w",
 });
-cartographer.register_marker("ctg_mtg:line_cross", "Line (Crossing)", {
+cartographer.markers.add("ctg_mtg:line_cross", "Line (Crossing)", {
     "ctg_mtg_marker_line_cross",
 });
 
 -- Arrow markers
-cartographer.register_marker("ctg_mtg:arrow_n", "Arrow (North)", {
+cartographer.markers.add("ctg_mtg:arrow_n", "Arrow (North)", {
     "ctg_mtg_marker_arrow_n",
 });
-cartographer.register_marker("ctg_mtg:arrow_s", "Arrow (South)", {
+cartographer.markers.add("ctg_mtg:arrow_s", "Arrow (South)", {
     "ctg_mtg_marker_arrow_s",
 });
-cartographer.register_marker("ctg_mtg:arrow_e", "Arrow (East)", {
+cartographer.markers.add("ctg_mtg:arrow_e", "Arrow (East)", {
     "ctg_mtg_marker_arrow_e",
 });
-cartographer.register_marker("ctg_mtg:arrow_w", "Arrow (West)", {
+cartographer.markers.add("ctg_mtg:arrow_w", "Arrow (West)", {
     "ctg_mtg_marker_arrow_w",
 });
-cartographer.register_marker("ctg_mtg:arrow_ne", "Arrow (North-East)", {
+cartographer.markers.add("ctg_mtg:arrow_ne", "Arrow (North-East)", {
     "ctg_mtg_marker_arrow_ne",
 });
-cartographer.register_marker("ctg_mtg:arrow_se", "Arrow (South-East)", {
+cartographer.markers.add("ctg_mtg:arrow_se", "Arrow (South-East)", {
     "ctg_mtg_marker_arrow_se",
 });
-cartographer.register_marker("ctg_mtg:arrow_nw", "Arrow (North-West)", {
+cartographer.markers.add("ctg_mtg:arrow_nw", "Arrow (North-West)", {
     "ctg_mtg_marker_arrow_nw",
 });
-cartographer.register_marker("ctg_mtg:arrow_sw", "Arrow (South-West)", {
+cartographer.markers.add("ctg_mtg:arrow_sw", "Arrow (South-West)", {
     "ctg_mtg_marker_arrow_sw",
 });
 
 -- Materials
-cartographer.register_map_material_name("default:paper", "paper");
-cartographer.register_map_material_name("default:coal_lump", "pigment");
-cartographer.register_map_material_name("default:coalblock", "pigment", 9);
-cartographer.register_map_material_name("dye:black", "pigment");
+cartographer.materials.register_by_name("default:paper", "paper");
+cartographer.materials.register_by_name("default:coal_lump", "pigment");
+cartographer.materials.register_by_name("default:coalblock", "pigment", 9);
+cartographer.materials.register_by_name("dye:black", "pigment");
 
 -- Crafting Recipes
 minetest.register_craft({