mirror of
https://github.com/sbrl/Minetest-WorldEditAdditions.git
synced 2024-11-22 15:33:00 +00:00
Merge branch 'main' into VorTechnix
This commit is contained in:
commit
d79c187a9d
5 changed files with 24 additions and 11 deletions
|
@ -33,6 +33,7 @@ read_globals = {
|
||||||
"describe",
|
"describe",
|
||||||
"bonemeal",
|
"bonemeal",
|
||||||
"dofile",
|
"dofile",
|
||||||
"PerlinNoise"
|
"PerlinNoise",
|
||||||
|
"Settings"
|
||||||
}
|
}
|
||||||
std = "max"
|
std = "max"
|
||||||
|
|
10
tests.sh
10
tests.sh
|
@ -31,7 +31,15 @@ check_command luarocks;
|
||||||
luarocks_root="${PWD}/.luarocks";
|
luarocks_root="${PWD}/.luarocks";
|
||||||
|
|
||||||
# Setup the lua module path
|
# Setup the lua module path
|
||||||
eval "$(luarocks --tree "${luarocks_root}" path)";
|
# eval "$(luarocks --tree "${luarocks_root}" path)";
|
||||||
|
|
||||||
|
PATH="$(luarocks --tree "${luarocks_root}" path --lr-bin):${PATH}";
|
||||||
|
echo "PATH | ${PATH}";
|
||||||
|
LUA_PATH="$(luarocks --tree "${luarocks_root}" path --lr-path);init.lua;./?.lua";
|
||||||
|
LUA_CPATH="$(luarocks --tree "${luarocks_root}" path --lr-cpath);./?.so";
|
||||||
|
|
||||||
|
|
||||||
|
export PATH LUA_PATH LUA_CPATH;
|
||||||
|
|
||||||
mode="${1}"; if [[ "$#" -gt 0 ]]; then shift; fi
|
mode="${1}"; if [[ "$#" -gt 0 ]]; then shift; fi
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
local wea_c = worldeditadditions_core
|
local wea_c = worldeditadditions_core
|
||||||
|
|
||||||
|
|
||||||
wea_c.register_alias("smoothadv", "convolve")
|
wea_c.register_alias("smoothadv", "convolve")
|
||||||
wea_c.register_alias("conv", "convolve")
|
wea_c.register_alias("conv", "convolve")
|
||||||
|
|
||||||
|
@ -14,10 +15,13 @@ wea_c.register_alias("mfacing", "mface")
|
||||||
|
|
||||||
|
|
||||||
--- Overrides to core WorldEdit commands
|
--- Overrides to core WorldEdit commands
|
||||||
-- These are commented out for now, as they could be potentially dangerous to stability
|
-- These are disabled by default for now, as they could be potentially dangerous to stability
|
||||||
-- Thorough testing is required of our replacement commands before these are uncommented
|
-- Thorough testing is required of our replacement commands before these are enabled by default
|
||||||
-- TODO: Depend on worldeditadditions_core before uncommenting this
|
local worldmt_settings = Settings(minetest.get_worldpath().."/world.mt")
|
||||||
-- BUG: //move+ seems to be leaving stuff behind for some strange reason --@sbrl 2021-12-26
|
local should_override = worldmt_settings:get_bool("worldeditadditions_override_commands", false)
|
||||||
-- worldeditadditions_core.alias_override("copy", "copy+")
|
if should_override then
|
||||||
-- worldeditadditions_core.alias_override("move", "move+") -- MAY have issues where it doesn't overwrite the old region properly, but haven't been able to reliably reproduce this
|
minetest.log("info", "[WorldEditAdditions] Enabling override aliases")
|
||||||
-- worldeditadditions_core.alias_override("replace", "replacemix")
|
worldeditadditions_core.register_alias("copy", "copy+", true)
|
||||||
|
worldeditadditions_core.register_alias("move", "move+", true)
|
||||||
|
worldeditadditions_core.register_alias("replace", "replacemix", true)
|
||||||
|
end
|
||||||
|
|
|
@ -3,7 +3,7 @@ local wea = worldeditadditions
|
||||||
local Vector3 = wea.Vector3
|
local Vector3 = wea.Vector3
|
||||||
|
|
||||||
worldeditadditions_core.register_command("spiral2", {
|
worldeditadditions_core.register_command("spiral2", {
|
||||||
params = "[<circle|square>] [<replace_node=dirt> [<interval=3> [<acceleration=0>] ] ]",
|
params = "[circle|square] [<replace_node=dirt> [<interval=3> [<acceleration=0>] ] ]",
|
||||||
description = "Generates a spiral that fills the defined region using the specified replace node. The spiral is either square (default) or circular in shape. The interval specifies the distance between the walls of the spiral, and the acceleration specifies how quickly this value should increase.",
|
description = "Generates a spiral that fills the defined region using the specified replace node. The spiral is either square (default) or circular in shape. The interval specifies the distance between the walls of the spiral, and the acceleration specifies how quickly this value should increase.",
|
||||||
privs = { worldedit = true },
|
privs = { worldedit = true },
|
||||||
require_pos = 2,
|
require_pos = 2,
|
||||||
|
|
|
@ -16,7 +16,7 @@ local function register_alias(cmdname_target, cmdname_source, override)
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
print("DEBUG ALIAS source "..cmdname_source.." target "..cmdname_target)
|
-- print("DEBUG ALIAS source "..cmdname_source.." target "..cmdname_target)
|
||||||
|
|
||||||
if minetest.chatcommands["/"..cmdname_target] then
|
if minetest.chatcommands["/"..cmdname_target] then
|
||||||
minetest.override_chatcommand(
|
minetest.override_chatcommand(
|
||||||
|
|
Loading…
Reference in a new issue