Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2025-03-11 06:07:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Get legacy maps to zoom correctly

Browse source
This commit is contained in:
teknomunk 2025-03-01 12:56:42 -06:00 committed by the-real-herowl
parent 4a8784668e
commit 0642345a7d
2 changed files with 45 additions and 5 deletions
mods/ITEMS
mcl_cartography_table
init.lua
mcl_maps
init.lua

17
mods/ITEMS/mcl_cartography_table/init.lua
View file

@ -51,16 +51,27 @@ local function update_cartography_table(player)
local addon = inv:get_stack("cartography_table_input", 2)
inv:set_stack("cartography_table_output", 1, nil)
local meta
local old_zoom
if not map:is_empty() then
meta = map:get_meta()
old_zoom = meta:get_int("mcl_maps:zoom")
if old_zoom < 1 then
mcl_maps.convert_legacy_map(map, meta)
old_zoom = 1
end
end
if not map:is_empty() and addon:get_name() == "mcl_core:paper"
and map:get_meta():get_int("mcl_maps:zoom") < mcl_maps.max_zoom
and map:get_meta():get_int("mcl_maps:locked") ~= 1 then
and old_zoom < mcl_maps.max_zoom
and meta :get_int("mcl_maps:locked") ~= 1 then
---- Zoom a map
formspec = formspec .. "image[5.125,0.5;4,4;mcl_maps_map_background.png]"
-- TODO: show half size in appropriate position?
if texture then formspec = formspec .. "image[6.25,1.625;1.75,1.75;" .. texture .. "]" end
-- zoom will be really applied when taking from the stack
-- to not cause unnecessary map generation. But the tooltip should be right already:
map:get_meta():set_int("mcl_maps:zoom", map:get_meta():get_int("mcl_maps:zoom") + 1)
map:get_meta():set_int("mcl_maps:zoom", old_zoom + 1)
tt.reload_itemstack_description(map)
inv:set_stack("cartography_table_output", 1, map)

33
mods/ITEMS/mcl_maps/init.lua
View file

@ -140,17 +140,47 @@ local function emerge_generate_map(id, minp, maxp, callback)
end)
end
function mcl_maps.convert_legacy_map(itemstack, meta)
meta = meta or itemstack:get_meta()
tt.reload_itemstack_description(itemstack)
local minp = string_to_pos(meta:get_string("mcl_maps:minp"))
local maxp = string_to_pos(meta:get_string("mcl_maps:maxp"))
cx = minp.x + 64
cz = minp.z + 64
meta:set_int("mcl_maps:cx", cx)
meta:set_int("mcl_maps:cz", cz)
meta:set_int("mcl_maps:zoom", 1)
meta:set_string("mcl_maps:dim", "overworld")
tt.reload_itemstack_description(itemstack)
end
local function configure_map(itemstack, cx, dim, cz, zoom, callback)
zoom = max(zoom or 1, 1)
-- Texture size is 128
local size = 64 * (2^zoom)
local halfsize = size / 2
local meta = itemstack:get_meta()
-- Legacy conversion
if dim == "" then
local fields = meta:to_table().fields
local minp = string_to_pos(meta:get_string("mcl_maps:minp"))
local maxp = string_to_pos(meta:get_string("mcl_maps:maxp"))
dim = "overworld"
cx = minp.x + halfsize
cz = minp.z + halfsize
end
-- If enabled, round to halfsize grid, otherwise to size grid.
if mcl_maps.map_allow_overlap then
cx, cz = (floor(cx / halfsize) + 0.5) * halfsize, (floor(cz / halfsize) + 0.5) * halfsize
else
cx, cz = (floor(cx / size) + 0.5) * size, (floor(cz / size) + 0.5) * size
end
-- Y range to use for mapping. In nether, if we begin above bedrock, maps will be bedrock only, similar to MC
-- Prefer smaller ranges for performance!
local miny, maxy
@ -162,7 +192,7 @@ local function configure_map(itemstack, cx, dim, cz, zoom, callback)
else
miny, maxy = mcl_vars.mg_nether_max, mcl_vars.mg_nether_max -- map the nether roof...
end
elseif dim == "overworld" or dim == "" then
elseif dim == "overworld" then
miny, maxy = -32, 63
else
miny = tonumber(dim) - 32
@ -176,7 +206,6 @@ local function configure_map(itemstack, cx, dim, cz, zoom, callback)
local minp = vector.new(cx - halfsize, miny, cz - halfsize)
local maxp = vector.new(cx + halfsize - 1, maxy, cz + halfsize - 1)
local meta = itemstack:get_meta()
meta:set_string("mcl_maps:id", id)
meta:set_int("mcl_maps:cx", cx)
meta:set_string("mcl_maps:dim", dim)