Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 0 additions & 53 deletions apply_diff.lua

This file was deleted.

160 changes: 0 additions & 160 deletions create_diff.lua

This file was deleted.

55 changes: 0 additions & 55 deletions diff.spec.lua

This file was deleted.

9 changes: 1 addition & 8 deletions init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,10 @@ dofile(MP.."/deserialize_mapblock.lua")
dofile(MP.."/localize_nodeids.lua")
dofile(MP.."/functions.lua")

-- diff / patch
dofile(MP.."/create_diff.lua")
dofile(MP.."/apply_diff.lua")
loadfile(MP.."/patch.lua")(global_env)

-- save/load
dofile(MP.."/auto_save.lua")
dofile(MP.."/auto_update.lua")
loadfile(MP.."/save.lua")(global_env)
dofile(MP.."/save.lua")
loadfile(MP.."/data.lua")(global_env)
dofile(MP.."/load.lua")
dofile(MP.."/mapgen.lua")
Expand Down Expand Up @@ -77,8 +72,6 @@ if minetest.get_modpath("mtt") and mtt.enabled then
dofile(MP.."/init.spec.lua")
dofile(MP.."/functions.spec.lua")
dofile(MP.."/data.spec.lua")
dofile(MP.."/diff.spec.lua")
dofile(MP.."/patch.spec.lua")
dofile(MP.."/api.spec.lua")
dofile(MP.."/serialize_chunk.spec.lua")
end
31 changes: 0 additions & 31 deletions load.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,5 @@ function mapsync.load(chunk_pos, vmanip)
return true, "No backend available"
end

-- load baseline chunk (might be non-existent)
mapsync.deserialize_chunk(chunk_pos, mapsync.get_chunk_zip_path(backend_def.path, chunk_pos), vmanip)

if backend_def.patch_path then
-- load diff
local f = io.open(mapsync.get_chunk_json_path(backend_def.patch_path, chunk_pos), "r")
if not f then
-- no diff
return true
end

local changed_nodes = {}
for line in f:lines() do
local changed_node = minetest.parse_json(line)
if changed_node then
table.insert(changed_nodes, changed_node)
end
end
f:close()

-- apply diff
local success, msg = mapsync.apply_diff(chunk_pos, changed_nodes)
if not success then
return false, msg
end

-- fix lighting
local mb_pos1, mb_pos2 = mapsync.get_mapblock_bounds_from_chunk(chunk_pos)
local pos1 = mapsync.get_node_bounds_from_mapblock(mb_pos1)
local _, pos2 = mapsync.get_node_bounds_from_mapblock(mb_pos2)
minetest.fix_light(pos1, pos2)
end
end
Loading