From c60b5c5bad5a20d2573bd6a6401563344f16068a Mon Sep 17 00:00:00 2001 From: Starbeamrainbowlabs Date: Thu, 19 May 2022 01:45:36 +0100 Subject: [PATCH] core: fix bugs, enable! --- worldeditadditions_core/core/register_command.lua | 7 ++++--- worldeditadditions_core/core/run_command.lua | 8 ++++---- worldeditadditions_core/core/safe_region.lua | 4 ++-- worldeditadditions_core/init.lua | 4 ++-- worldeditadditions_core/mod.conf | 2 +- 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/worldeditadditions_core/core/register_command.lua b/worldeditadditions_core/core/register_command.lua index e29a1a2..e7525ae 100644 --- a/worldeditadditions_core/core/register_command.lua +++ b/worldeditadditions_core/core/register_command.lua @@ -5,15 +5,16 @@ -- ██ ██ ███████ ██████ ██ ███████ ██ ███████ ██ ██ -- WorldEditAdditions chat command registration -local we_c = worldeditadditions_core - -local run_command = dofile(we_c.modpath.."/core/run_command.lua") +local modpath = minetest.get_modpath("worldeditadditions_core") +local run_command = dofile(modpath.."/core/run_command.lua") local function log_error(cmdname, error_message) minetest.log("error", "register_command("..cmdname..") error: "..error_message) end local function register_command(cmdname, options) + local we_c = worldeditadditions_core + --- -- 1: Validation --- diff --git a/worldeditadditions_core/core/run_command.lua b/worldeditadditions_core/core/run_command.lua index 22428fa..71dd4bc 100644 --- a/worldeditadditions_core/core/run_command.lua +++ b/worldeditadditions_core/core/run_command.lua @@ -1,8 +1,7 @@ -local we_c = worldeditadditions_core - -- WARNING: safe_region MUST NOT be imported more than once, as it defines chat commands. If you want to import it again elsewhere, check first that multiple dofile() calls don't execute a file more than once. -local safe_region = dofile(we_c.modpath.."/core/safe_region.lua") -local human_size = dofile(we_c.modpath.."/core/lib/human_size.lua") +local modpath = minetest.get_modpath("worldeditadditions_core") +local safe_region = dofile(modpath.."/core/safe_region.lua") +local human_size = dofile(modpath.."/core/lib/human_size.lua") -- TODO: Reimplement worldedit.player_notify(player_name, msg_text) @@ -15,6 +14,7 @@ local function run_command_stage2(player_name, func, parse_result) end local function run_command(cmdname, options, player_name, paramtext) + local we_c = worldeditadditions_core if options.require_pos > 0 and not worldedit.pos1[player_name] then worldedit.player_notify(player_name, "Error: pos1 must be selected to use this command.") return false diff --git a/worldeditadditions_core/core/safe_region.lua b/worldeditadditions_core/core/safe_region.lua index 0facbf4..a311889 100644 --- a/worldeditadditions_core/core/safe_region.lua +++ b/worldeditadditions_core/core/safe_region.lua @@ -8,8 +8,8 @@ local worldedit_command_y, worldedit_command_n if minetest.global_exists("worldedit") then - worldedit_command_y = minetest.registered_commands["/y"].func - worldedit_command_n = minetest.registered_commands["/n"].func + worldedit_command_y = minetest.chatcommands["/y"].func + worldedit_command_n = minetest.chatcommands["/n"].func end --- A table that holds at most 1 pending function call per player. diff --git a/worldeditadditions_core/init.lua b/worldeditadditions_core/init.lua index 9ed82b3..19938c2 100644 --- a/worldeditadditions_core/init.lua +++ b/worldeditadditions_core/init.lua @@ -5,8 +5,8 @@ -- @license Mozilla Public License, 2.0 -- @author Starbeamrainbowlabs and VorTechnix -local temp = true -if temp then return end +-- local temp = true +-- if temp then return end -- This mod isn't finished yet, so it will not be executed for now. diff --git a/worldeditadditions_core/mod.conf b/worldeditadditions_core/mod.conf index fc9db3e..38d5e0d 100644 --- a/worldeditadditions_core/mod.conf +++ b/worldeditadditions_core/mod.conf @@ -1,3 +1,3 @@ name = worldeditadditions_core description = worldeditadditions: core components -optional_depends = worldedit +optional_depends = worldedit, worldedit_commands, worldedit_shortcommands