From c0f52ad3445649e22f46f76ef96e20200a2d9478 Mon Sep 17 00:00:00 2001 From: FossFanatic Date: Sun, 26 Feb 2023 17:26:33 +0000 Subject: [PATCH] Fix maps to display coloured foliage and water --- mods/ITEMS/mcl_maps/init.lua | 14 +++++++++++--- mods/ITEMS/mcl_maps/palettes_foliage.json | 1 + mods/ITEMS/mcl_maps/palettes_grass.json | 1 + mods/ITEMS/mcl_maps/palettes_water.json | 1 + 4 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 mods/ITEMS/mcl_maps/palettes_foliage.json create mode 100644 mods/ITEMS/mcl_maps/palettes_grass.json create mode 100644 mods/ITEMS/mcl_maps/palettes_water.json diff --git a/mods/ITEMS/mcl_maps/init.lua b/mods/ITEMS/mcl_maps/init.lua index 62e3ec7b0..7ed8ab910 100644 --- a/mods/ITEMS/mcl_maps/init.lua +++ b/mods/ITEMS/mcl_maps/init.lua @@ -30,7 +30,9 @@ local function load_json_file(name) end local texture_colors = load_json_file("colors") -local palettes = load_json_file("palettes") +local palettes_grass = load_json_file("palettes_grass") +local palettes_foliage = load_json_file("palettes_foliage") +local palettes_water = load_json_file("palettes_water") local color_cache = {} @@ -92,8 +94,14 @@ function mcl_maps.create_map(pos) if texture then texture = texture:match("([^=^%^]-([^.]+))$"):split("^")[1] end - if def.palette then - local palette = palettes[texture] + if def.palette == "mcl_core_palette_grass.png" then + local palette = palettes_grass[texture] + color = palette and { palette = palette } + elseif def.palette == "mcl_core_palette_foliage.png" then + local palette = palettes_foliage[texture] + color = palette and { palette = palette } + elseif def.palette == "mcl_core_palette_water.png" then + local palette = palettes_water[texture] color = palette and { palette = palette } else color = texture_colors[texture] diff --git a/mods/ITEMS/mcl_maps/palettes_foliage.json b/mods/ITEMS/mcl_maps/palettes_foliage.json new file mode 100644 index 000000000..d5eedf9ab --- /dev/null +++ b/mods/ITEMS/mcl_maps/palettes_foliage.json @@ -0,0 +1 @@ +{"mcl_core_palette_foliage.png": [[86, 164, 117], [109, 196, 117], [118, 177, 120], [159, 193, 114], [159, 193, 114], [74, 107, 58], [94, 190, 107], [94, 190, 107], [222, 188, 101], [90, 197, 87], [35, 175, 105], [92, 182, 119], [93, 181, 76], [93, 181, 76], [82, 153, 81], [91, 177, 85], [86, 164, 117], [94, 190, 107]]} diff --git a/mods/ITEMS/mcl_maps/palettes_grass.json b/mods/ITEMS/mcl_maps/palettes_grass.json new file mode 100644 index 000000000..2018dea18 --- /dev/null +++ b/mods/ITEMS/mcl_maps/palettes_grass.json @@ -0,0 +1 @@ +{"mcl_core_palette_grass.png": [[109, 196, 117], [159, 193, 114], [118, 177, 120], [118, 177, 120], [107, 186, 107], [118, 177, 120], [92, 182, 119], [92, 182, 119], [92, 182, 119], [92, 182, 119], [118, 177, 120], [109, 196, 117], [35, 175, 105], [94, 190, 107], [94, 190, 107], [94, 190, 107], [94, 190, 107], [159, 193, 114], [76, 176, 84], [164, 150, 110], [164, 150, 110], [164, 150, 110], [164, 150, 110], [159, 193, 114], [93, 181, 76], [93, 181, 76], [93, 181, 76], [93, 181, 76], [76, 118, 60], [94, 190, 107]]} diff --git a/mods/ITEMS/mcl_maps/palettes_water.json b/mods/ITEMS/mcl_maps/palettes_water.json new file mode 100644 index 000000000..101e293b9 --- /dev/null +++ b/mods/ITEMS/mcl_maps/palettes_water.json @@ -0,0 +1 @@ +{"mcl_core_palette_water.png": [[63, 118, 228], [82, 121, 179], [66, 149, 235], [65, 174, 233], [62, 104, 221], [60, 93, 215], [46, 100, 218], [61, 120, 181]]}