diff --git a/init.lua b/init.lua index b362e78..a0407e3 100644 --- a/init.lua +++ b/init.lua @@ -1,181 +1,181 @@ -- Biomes -cartographer.register_biome("Marsh", { +cartographer.biomes.add("Marsh", { "ctg_pix_simple_land", "ctg_pix_colored_land", }); -cartographer.register_biome("Swamp", { +cartographer.biomes.add("Swamp", { "ctg_pix_simple_land", "ctg_pix_colored_land", "ctg_pix_colored_land", "ctg_pix_swamp", }); -cartographer.register_biome("Deep Forest", { +cartographer.biomes.add("Deep Forest", { "ctg_pix_simple_forest", "ctg_pix_colored_forest", "ctg_pix_deep_forest", }); -cartographer.register_biome("Forest", { +cartographer.biomes.add("Forest", { "ctg_pix_simple_forest", "ctg_pix_colored_forest", "ctg_pix_dense_forest", }); -cartographer.register_biome("Grove", { +cartographer.biomes.add("Grove", { "ctg_pix_simple_forest", "ctg_pix_colored_forest", "ctg_pix_grove", }); -cartographer.register_biome("Wilderness", { +cartographer.biomes.add("Wilderness", { "ctg_pix_simple_forest", "ctg_pix_colored_forest", }); -cartographer.register_biome("Grassland", { +cartographer.biomes.add("Grassland", { "ctg_pix_simple_land", "ctg_pix_colored_land", }); -cartographer.register_biome("Orchard", { +cartographer.biomes.add("Orchard", { "ctg_pix_simple_forest", "ctg_pix_colored_forest", }); -cartographer.register_biome("Chaparral", { +cartographer.biomes.add("Chaparral", { "ctg_pix_simple_land", "ctg_pix_colored_land", "ctg_pix_colored_land", "ctg_pix_chaparral", }); -cartographer.register_biome("Savanna", { +cartographer.biomes.add("Savanna", { "ctg_pix_simple_land", "ctg_pix_colored_land", "ctg_pix_colored_land", "ctg_pix_savanna", }); -cartographer.register_biome("Desert", { +cartographer.biomes.add("Desert", { "ctg_pix_simple_land", "ctg_pix_colored_sand", "ctg_pix_colored_sand", }); -cartographer.register_biome("Wasteland", { +cartographer.biomes.add("Wasteland", { "ctg_pix_simple_land", "ctg_pix_colored_sand", "ctg_pix_colored_sand", "ctg_pix_wasteland", }, 1); -cartographer.register_biome("Wasteland", { +cartographer.biomes.add("Wasteland", { "ctg_pix_simple_water", "ctg_pix_colored_water", }, nil, 0); -cartographer.register_biome("Grassland Ocean", { +cartographer.biomes.add("Grassland Ocean", { "ctg_pix_simple_water", "ctg_pix_colored_water", }, nil, 0); -cartographer.register_biome("Grassland Ocean", { +cartographer.biomes.add("Grassland Ocean", { "ctg_pix_simple_land", "ctg_pix_colored_sand", }, 1); -cartographer.register_biome("Gravel Beach", { +cartographer.biomes.add("Gravel Beach", { "ctg_pix_simple_water", "ctg_pix_colored_water", }, nil, 0); -cartographer.register_biome("Gravel Beach", { +cartographer.biomes.add("Gravel Beach", { "ctg_pix_simple_land", "ctg_pix_colored_sand", "ctg_pix_gravel", }, 1); -cartographer.register_biome("Savanna Ocean", { +cartographer.biomes.add("Savanna Ocean", { "ctg_pix_simple_water", "ctg_pix_colored_water", }, nil, 0); -cartographer.register_biome("Savanna Ocean", { +cartographer.biomes.add("Savanna Ocean", { "ctg_pix_simple_land", "ctg_pix_colored_sand", }, 1); -- Markers -- General markers -cartographer.register_marker("ctg_pix:house", "House", { +cartographer.markers.add("ctg_pix:house", "House", { "ctg_pix_marker_house", "ctg_pix_marker_house_2", }); -cartographer.register_marker("ctg_pix:skull", "Skull", { +cartographer.markers.add("ctg_pix:skull", "Skull", { "ctg_pix_marker_skull", }); -cartographer.register_marker("ctg_pix:jewel", "Jewel", { +cartographer.markers.add("ctg_pix:jewel", "Jewel", { "ctg_pix_marker_jewel", "ctg_pix_marker_jewel_2", }); -cartographer.register_marker("ctg_pix:x", "X", { +cartographer.markers.add("ctg_pix:x", "X", { "ctg_pix_marker_x", "ctg_pix_marker_x_2", }); -cartographer.register_marker("ctg_pix:flag", "Flag", { +cartographer.markers.add("ctg_pix:flag", "Flag", { "ctg_pix_marker_flag", "ctg_pix_marker_flag_2", }); -- Line drawing markers -cartographer.register_marker("ctg_pix:line_h", "Line (Horizontal)", { +cartographer.markers.add("ctg_pix:line_h", "Line (Horizontal)", { "ctg_pix_marker_line_h", }); -cartographer.register_marker("ctg_pix:line_v", "Line (Vertical)", { +cartographer.markers.add("ctg_pix:line_v", "Line (Vertical)", { "ctg_pix_marker_line_v", }); -cartographer.register_marker("ctg_pix:line_c_ne", "Line (North-East Corner)", { +cartographer.markers.add("ctg_pix:line_c_ne", "Line (North-East Corner)", { "ctg_pix_marker_line_c_ne", }); -cartographer.register_marker("ctg_pix:line_c_se", "Line (South-East Corner)", { +cartographer.markers.add("ctg_pix:line_c_se", "Line (South-East Corner)", { "ctg_pix_marker_line_c_se", }); -cartographer.register_marker("ctg_pix:line_c_nw", "Line (North-West Corner)", { +cartographer.markers.add("ctg_pix:line_c_nw", "Line (North-West Corner)", { "ctg_pix_marker_line_c_nw", }); -cartographer.register_marker("ctg_pix:line_c_sw", "Line (South-West Corner)", { +cartographer.markers.add("ctg_pix:line_c_sw", "Line (South-West Corner)", { "ctg_pix_marker_line_c_sw", }); -cartographer.register_marker("ctg_pix:line_t_n", "Line (North T-Intersection)", { +cartographer.markers.add("ctg_pix:line_t_n", "Line (North T-Intersection)", { "ctg_pix_marker_line_t_n", }); -cartographer.register_marker("ctg_pix:line_t_s", "Line (South T-Intersection)", { +cartographer.markers.add("ctg_pix:line_t_s", "Line (South T-Intersection)", { "ctg_pix_marker_line_t_s", }); -cartographer.register_marker("ctg_pix:line_t_e", "Line (East T-Intersection)", { +cartographer.markers.add("ctg_pix:line_t_e", "Line (East T-Intersection)", { "ctg_pix_marker_line_t_e", }); -cartographer.register_marker("ctg_pix:line_t_w", "Line (West T-Intersection)", { +cartographer.markers.add("ctg_pix:line_t_w", "Line (West T-Intersection)", { "ctg_pix_marker_line_t_w", }); -cartographer.register_marker("ctg_pix:line_cross", "Line (Crossing)", { +cartographer.markers.add("ctg_pix:line_cross", "Line (Crossing)", { "ctg_pix_marker_line_cross", }); -- Arrow markers -cartographer.register_marker("ctg_pix:arrow_n", "Arrow (North)", { +cartographer.markers.add("ctg_pix:arrow_n", "Arrow (North)", { "ctg_pix_marker_arrow_n", }); -cartographer.register_marker("ctg_pix:arrow_s", "Arrow (South)", { +cartographer.markers.add("ctg_pix:arrow_s", "Arrow (South)", { "ctg_pix_marker_arrow_s", }); -cartographer.register_marker("ctg_pix:arrow_e", "Arrow (East)", { +cartographer.markers.add("ctg_pix:arrow_e", "Arrow (East)", { "ctg_pix_marker_arrow_e", }); -cartographer.register_marker("ctg_pix:arrow_w", "Arrow (West)", { +cartographer.markers.add("ctg_pix:arrow_w", "Arrow (West)", { "ctg_pix_marker_arrow_w", }); -cartographer.register_marker("ctg_pix:arrow_ne", "Arrow (North-East)", { +cartographer.markers.add("ctg_pix:arrow_ne", "Arrow (North-East)", { "ctg_pix_marker_arrow_ne", }); -cartographer.register_marker("ctg_pix:arrow_se", "Arrow (South-East)", { +cartographer.markers.add("ctg_pix:arrow_se", "Arrow (South-East)", { "ctg_pix_marker_arrow_se", }); -cartographer.register_marker("ctg_pix:arrow_nw", "Arrow (North-West)", { +cartographer.markers.add("ctg_pix:arrow_nw", "Arrow (North-West)", { "ctg_pix_marker_arrow_nw", }); -cartographer.register_marker("ctg_pix:arrow_sw", "Arrow (South-West)", { +cartographer.markers.add("ctg_pix:arrow_sw", "Arrow (South-West)", { "ctg_pix_marker_arrow_sw", }); -- Materials -cartographer.register_map_material_name("default:paper", "paper", 1); -cartographer.register_map_material_name("default:lump_coal", "pigment"); -cartographer.register_map_material_name("default:block_coal", "pigment", 9); +cartographer.materials.register_by_name("default:paper", "paper"); +cartographer.materials.register_by_name("default:lump_coal", "pigment"); +cartographer.materials.register_by_name("default:block_coal", "pigment", 9); -- Crafting Recipes crafting.register_craft({ @@ -193,3 +193,10 @@ crafting.register_craft({ "default:ingot_steel 6", }, }); +crafting.register_craft({ + output = "cartographer:advanced_table", + items = { + "cartographer:advanced_table", + "default:ingot_carbon_steel 6", + }, +}); diff --git a/textures/ctg_pix_chaparral.1.png b/textures/ctg_pix_chaparral.1.png index d6ffa2b..d663626 100644 Binary files a/textures/ctg_pix_chaparral.1.png and b/textures/ctg_pix_chaparral.1.png differ diff --git a/textures/ctg_pix_chaparral.2.png b/textures/ctg_pix_chaparral.2.png index 8e4d975..4161688 100644 Binary files a/textures/ctg_pix_chaparral.2.png and b/textures/ctg_pix_chaparral.2.png differ diff --git a/textures/ctg_pix_chaparral.3.png b/textures/ctg_pix_chaparral.3.png index 28add66..8c9e955 100644 Binary files a/textures/ctg_pix_chaparral.3.png and b/textures/ctg_pix_chaparral.3.png differ diff --git a/textures/ctg_pix_chaparral.4.png b/textures/ctg_pix_chaparral.4.png index cd2bfc4..a208419 100644 Binary files a/textures/ctg_pix_chaparral.4.png and b/textures/ctg_pix_chaparral.4.png differ diff --git a/textures/ctg_pix_deep_forest.1.png b/textures/ctg_pix_deep_forest.1.png index 439ef83..0545ee8 100644 Binary files a/textures/ctg_pix_deep_forest.1.png and b/textures/ctg_pix_deep_forest.1.png differ diff --git a/textures/ctg_pix_deep_forest.2.png b/textures/ctg_pix_deep_forest.2.png index 5479bf4..d88d2b9 100644 Binary files a/textures/ctg_pix_deep_forest.2.png and b/textures/ctg_pix_deep_forest.2.png differ diff --git a/textures/ctg_pix_deep_forest.3.png b/textures/ctg_pix_deep_forest.3.png index 40c2310..8fb914f 100644 Binary files a/textures/ctg_pix_deep_forest.3.png and b/textures/ctg_pix_deep_forest.3.png differ diff --git a/textures/ctg_pix_deep_forest.4.png b/textures/ctg_pix_deep_forest.4.png index 4a86574..bd2e516 100644 Binary files a/textures/ctg_pix_deep_forest.4.png and b/textures/ctg_pix_deep_forest.4.png differ diff --git a/textures/ctg_pix_dense_forest.1.png b/textures/ctg_pix_dense_forest.1.png index ecfff27..1e256fd 100644 Binary files a/textures/ctg_pix_dense_forest.1.png and b/textures/ctg_pix_dense_forest.1.png differ diff --git a/textures/ctg_pix_dense_forest.3.png b/textures/ctg_pix_dense_forest.3.png index 202f74c..cb4c1ad 100644 Binary files a/textures/ctg_pix_dense_forest.3.png and b/textures/ctg_pix_dense_forest.3.png differ diff --git a/textures/ctg_pix_dense_forest.4.png b/textures/ctg_pix_dense_forest.4.png index 94beda5..bc8ca2f 100644 Binary files a/textures/ctg_pix_dense_forest.4.png and b/textures/ctg_pix_dense_forest.4.png differ diff --git a/textures/ctg_pix_marker_jewel.png b/textures/ctg_pix_marker_jewel.png index 688f155..d93a330 100644 Binary files a/textures/ctg_pix_marker_jewel.png and b/textures/ctg_pix_marker_jewel.png differ diff --git a/textures/ctg_pix_marker_jewel_2.png b/textures/ctg_pix_marker_jewel_2.png index 91223c5..0cea17e 100644 Binary files a/textures/ctg_pix_marker_jewel_2.png and b/textures/ctg_pix_marker_jewel_2.png differ diff --git a/textures/ctg_pix_savanna.1.png b/textures/ctg_pix_savanna.1.png index eecf993..0abed5f 100644 Binary files a/textures/ctg_pix_savanna.1.png and b/textures/ctg_pix_savanna.1.png differ diff --git a/textures/ctg_pix_savanna.2.png b/textures/ctg_pix_savanna.2.png index ca6ea25..5216849 100644 Binary files a/textures/ctg_pix_savanna.2.png and b/textures/ctg_pix_savanna.2.png differ diff --git a/textures/ctg_pix_savanna.3.png b/textures/ctg_pix_savanna.3.png index a7deab2..addae46 100644 Binary files a/textures/ctg_pix_savanna.3.png and b/textures/ctg_pix_savanna.3.png differ diff --git a/textures/ctg_pix_savanna.4.png b/textures/ctg_pix_savanna.4.png index 63b6b2a..c4f164d 100644 Binary files a/textures/ctg_pix_savanna.4.png and b/textures/ctg_pix_savanna.4.png differ diff --git a/textures/ctg_pix_swamp.1.png b/textures/ctg_pix_swamp.1.png index dd4ac25..b06f3bb 100644 Binary files a/textures/ctg_pix_swamp.1.png and b/textures/ctg_pix_swamp.1.png differ diff --git a/textures/ctg_pix_swamp.2.png b/textures/ctg_pix_swamp.2.png index 6282bad..01f19b6 100644 Binary files a/textures/ctg_pix_swamp.2.png and b/textures/ctg_pix_swamp.2.png differ diff --git a/textures/ctg_pix_swamp.3.png b/textures/ctg_pix_swamp.3.png index e625b20..38d5fd5 100644 Binary files a/textures/ctg_pix_swamp.3.png and b/textures/ctg_pix_swamp.3.png differ diff --git a/textures/ctg_pix_swamp.4.png b/textures/ctg_pix_swamp.4.png index bad5aaa..04a1533 100644 Binary files a/textures/ctg_pix_swamp.4.png and b/textures/ctg_pix_swamp.4.png differ