BuckarooBanzay/building_lib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use promises

Browse Source
This commit is contained in:
BuckarooBanzay 2023-04-17 07:42:43 +02:00
parent 5d4511edb9
commit afee95e2d2
9 changed files with 82 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.luacheckrc
View File

@ -14,5 +14,5 @@ read_globals = {
"minetest",
-- mods
"mapblock_lib", "mtt"
"mapblock_lib", "mtt", "Promise"
}

31
autoplace.lua
View File

@ -44,24 +44,21 @@ function building_lib.autoplace(mapblock_pos, playername, autoplacer_name, enabl
return false, building_name
end
local err
success, err = building_lib.build(mapblock_pos, playername, building_name, rotation)
if not success then
return success, err
end
local autoplacer = building_lib.get_autoplacer(autoplacer_name)
if enable_propagation and autoplacer.propagate then
-- propagate changes
for _, dir in ipairs(autoplacer.propagation_dirs or default_propagation_dirs) do
local offset_mapblock_pos = vector.add(mapblock_pos, dir)
success = building_lib.check_condition_table(autoplacer.propagate, offset_mapblock_pos)
if success then
-- selector matches, propagate autobuild
building_lib.autoplace(offset_mapblock_pos, playername, autoplacer_name, false)
local p = building_lib.build(mapblock_pos, playername, building_name, rotation)
p:next(function()
local autoplacer = building_lib.get_autoplacer(autoplacer_name)
if enable_propagation and autoplacer.propagate then
-- propagate changes
for _, dir in ipairs(autoplacer.propagation_dirs or default_propagation_dirs) do
local offset_mapblock_pos = vector.add(mapblock_pos, dir)
success = building_lib.check_condition_table(autoplacer.propagate, offset_mapblock_pos)
if success then
-- selector matches, propagate autobuild
building_lib.autoplace(offset_mapblock_pos, playername, autoplacer_name, false)
end
end
end
end
end)
return true
return p
end

12
build.lua
View File

@ -39,13 +39,12 @@ function building_lib.can_build(mapblock_pos, _, building_name, rotation)
return true
end
function building_lib.build(mapblock_pos, playername, building_name, rotation, callback)
callback = callback or function() end
function building_lib.build(mapblock_pos, playername, building_name, rotation)
rotation = rotation or 0
local success, message = building_lib.can_build(mapblock_pos, playername, building_name, rotation)
if not success then
return false, message
return Promise.rejected(message)
end
local building_def = building_lib.get_building(building_name)
@ -84,8 +83,11 @@ function building_lib.build(mapblock_pos, playername, building_name, rotation, c
replacements = building_def.replace(mapblock_pos, building_def)
end
local promise = Promise.new()
placement.place(placement, mapblock_pos, building_def, replacements, rotation, function()
callback()
promise:resolve()
if old_building_info then
-- replacement
local old_building_def = building_lib.get_building(old_building_info.name)
@ -111,7 +113,7 @@ function building_lib.build(mapblock_pos, playername, building_name, rotation, c
})
end
end)
return true
return promise
end
-- mapgen build shortcut, only for 1x1x1 sized buildings

54
build.spec.lua
View File

@ -13,31 +13,29 @@ building_lib.register_building("building_lib:dummy_v2", {
}
})
local mapblock_pos = {x=0, y=0, z=0}
local building_name = "building_lib:dummy"
local rotation = 0
local playername = "singleplayer"
mtt.register("build", function(callback)
-- clear store
building_lib.store:clear()
local mapblock_pos = {x=0, y=0, z=0}
local building_name = "building_lib:dummy"
local rotation = 0
local playername = "singleplayer"
-- try to build
local success, err = building_lib.can_build(mapblock_pos, playername, building_name, rotation)
assert(not err)
assert(success)
-- build
local callback_called = false
success, err = building_lib.build(mapblock_pos, playername, building_name, rotation,
function() callback_called = true end
)
assert(not err)
assert(success)
assert(callback_called)
building_lib.build(mapblock_pos, playername, building_name, rotation)
:next(callback)
end)
mtt.register("try build again", function(callback)
-- try to build again
success, err = building_lib.can_build(mapblock_pos, playername, building_name, rotation)
local success, err = building_lib.can_build(mapblock_pos, playername, building_name, rotation)
assert(err)
assert(not success)
@ -56,16 +54,13 @@ mtt.register("build", function(callback)
assert(success)
-- build over
callback_called = false
success, err = building_lib.build(mapblock_pos, playername, "building_lib:dummy_v2", rotation,
function() callback_called = true end
)
assert(not err)
assert(success)
assert(callback_called)
building_lib.build(mapblock_pos, playername, "building_lib:dummy_v2", rotation)
:next(callback)
end)
mtt.register("remove and verify", function(callback)
-- try to remove
success, err = building_lib.can_remove(mapblock_pos)
local success, err = building_lib.can_remove(mapblock_pos)
assert(not err)
assert(success)
@ -75,7 +70,7 @@ mtt.register("build", function(callback)
assert(success)
-- check
info = building_lib.get_placed_building_info(mapblock_pos)
local info = building_lib.get_placed_building_info(mapblock_pos)
assert(info == nil)
callback()
@ -85,23 +80,12 @@ mtt.benchmark("build", function(callback, iterations)
-- clear store
building_lib.store:clear()
local mapblock_pos = {x=0, y=0, z=0}
local building_name = "building_lib:dummy"
local rotation = 0
local playername = "singleplayer"
for _=1,iterations do
-- build
local callback_called = false
local success, err = building_lib.build(mapblock_pos, playername, building_name, rotation,
function() callback_called = true end
)
assert(not err)
assert(success)
assert(callback_called)
building_lib.build(mapblock_pos, playername, building_name, rotation)
-- remove
success, err = building_lib.remove(mapblock_pos)
local success, err = building_lib.remove(mapblock_pos)
assert(not err)
assert(success)
end

63
build_over.spec.lua
View File

@ -15,41 +15,38 @@ building_lib.register_building("building_lib:dummy_extension", {
}
})
mtt.register("build-over", function(callback)
local mapblock_pos = {x=0, y=0, z=0}
local playername = "singleplayer"
mtt.register("build-over (success)", function(callback)
-- clear store
building_lib.store:clear()
local mapblock_pos = {x=0, y=0, z=0}
local rotation = 0
local playername = "singleplayer"
-- build
local callback_called = false
local success, err = building_lib.build(mapblock_pos, playername, "building_lib:dummy_base", rotation,
function() callback_called = true end
)
assert(not err)
assert(success)
assert(callback_called)
-- build over (wrong angle)
success, err = building_lib.build(mapblock_pos, playername, "building_lib:dummy_extension", 90)
assert(err)
assert(not success)
-- build over (wrong angle 2)
success, err = building_lib.build(mapblock_pos, playername, "building_lib:dummy_extension", 270)
assert(err)
assert(not success)
-- build over (180° rotated)
callback_called = false
success, err = building_lib.build(mapblock_pos, playername, "building_lib:dummy_extension", 180,
function() callback_called = true end
)
assert(not err)
assert(success)
assert(callback_called)
callback()
building_lib.build(mapblock_pos, playername, "building_lib:dummy_base", 0)
:next(callback)
:catch(callback)
end)
mtt.register("build-over (wrong angle)", function(callback)
-- build
building_lib.build(mapblock_pos, playername, "building_lib:dummy_extension", 90)
:catch(function()
callback()
end)
end)
mtt.register("build-over (wrong angle 2)", function(callback)
-- build
building_lib.build(mapblock_pos, playername, "building_lib:dummy_extension", 270)
:catch(function()
callback()
end)
end)
mtt.register("build-over (180°)", function(callback)
-- build
building_lib.build(mapblock_pos, playername, "building_lib:dummy_extension", 180)
:next(callback)
:catch(callback)
end)

6
build_tool.lua
View File

@ -107,10 +107,10 @@ minetest.register_tool("building_lib:place", {
local meta = itemstack:get_meta()
local buildingname = meta:get_string("buildingname")
local success, err = building_lib.build(pointed_mapblock_pos, playername, buildingname, rotation)
if not success then
building_lib.build(pointed_mapblock_pos, playername, buildingname, rotation)
:catch(function(err)
minetest.chat_send_player(playername, err)
end
end)
end,
on_step = function(itemstack, player)
local playername = player:get_player_name()

2
mod.conf
View File

@ -1,4 +1,4 @@
name = building_lib
description = Mapblock granular building placement and tools
depends = mapblock_lib
depends = mapblock_lib, promise
optional_depends = mtt

7
readme.md
View File

@ -8,7 +8,12 @@
local success, message = building_lib.can_build(mapblock_pos, playername, building_name, rotation)
-- build it there
local success, message = building_lib.build(mapblock_pos, playername, building_name, rotation, callback)
local promise = building_lib.build(mapblock_pos, playername, building_name, rotation, callback)
promise:next(function()
-- success
end):catch(function(e)
-- error
end)
-- check if it can be removed
local success, message = building_lib.can_remove(mapblock_pos)

1
test/Dockerfile
View File

@ -7,6 +7,7 @@ RUN apk add git &&\
cd /root/.minetest/worlds/world/worldmods &&\
git clone https://github.com/BuckarooBanzay/mtt &&\
git clone https://github.com/BuckarooBanzay/mtzip &&\
git clone https://github.com/BuckarooBanzay/promise &&\
git clone https://github.com/BuckarooBanzay/mapblock_lib
ENTRYPOINT minetestserver --config /minetest.conf