From 8247a595b18f0e007f6b831fffcf05466dde917e Mon Sep 17 00:00:00 2001
From: VorTechnix <45538536+VorTechnix@users.noreply.github.com>
Date: Thu, 12 Sep 2024 08:04:21 -0700
Subject: [PATCH] re-aliasing

---
 .gitignore                                    |  1 +
 .../commands/selectors/init.lua               | 83 +++++++++++--------
 2 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/.gitignore b/.gitignore
index 546dc51..76541c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -242,6 +242,7 @@ temp/
 
 # VorTechnix stuff
 .vdev/
+*.old.lua
 # Created by https://www.toptal.com/developers/gitignore/api/archives
 # Edit at https://www.toptal.com/developers/gitignore?templates=archives
 
diff --git a/worldeditadditions_commands/commands/selectors/init.lua b/worldeditadditions_commands/commands/selectors/init.lua
index 00d5685..52056ed 100644
--- a/worldeditadditions_commands/commands/selectors/init.lua
+++ b/worldeditadditions_commands/commands/selectors/init.lua
@@ -1,34 +1,49 @@
--- ███████ ███████ ██      ███████  ██████ ████████  ██████  ██████  ███████
--- ██      ██      ██      ██      ██         ██    ██    ██ ██   ██ ██
--- ███████ █████   ██      █████   ██         ██    ██    ██ ██████  ███████
---      ██ ██      ██      ██      ██         ██    ██    ██ ██   ██      ██
--- ███████ ███████ ███████ ███████  ██████    ██     ██████  ██   ██ ███████
-
--- Chat commands that operate on selections.
-
-local wea_cmdpath = worldeditadditions_commands.modpath .. "/commands/selectors/"
-local weac = worldeditadditions_core
-
-dofile(wea_cmdpath.."srel.lua")
-dofile(wea_cmdpath.."scentre.lua")
-dofile(wea_cmdpath.."scloud.lua")
-dofile(wea_cmdpath.."scol.lua")
-dofile(wea_cmdpath.."scube.lua")
-dofile(wea_cmdpath.."sfactor.lua")
-dofile(wea_cmdpath.."smake.lua")
-dofile(wea_cmdpath.."spop.lua")
-dofile(wea_cmdpath.."spush.lua")
-dofile(wea_cmdpath.."srect.lua")
-dofile(wea_cmdpath.."sshift.lua")
-dofile(wea_cmdpath.."sstack.lua")
-
-dofile(wea_cmdpath.."unmark.lua")
-dofile(wea_cmdpath.."mark.lua")
-dofile(wea_cmdpath.."pos1-2.lua")
-dofile(wea_cmdpath.."reset.lua")
-
--- Aliases
-weac.register_alias("sfac", "sfactor")
-
-weac.register_alias("1", "pos1", true) -- true = override target
-weac.register_alias("2", "pos2", true) -- true = override target
+-- ███████ ███████ ██      ███████  ██████ ████████  ██████  ██████  ███████
+-- ██      ██      ██      ██      ██         ██    ██    ██ ██   ██ ██
+-- ███████ █████   ██      █████   ██         ██    ██    ██ ██████  ███████
+--      ██ ██      ██      ██      ██         ██    ██    ██ ██   ██      ██
+-- ███████ ███████ ███████ ███████  ██████    ██     ██████  ██   ██ ███████
+
+-- Chat commands that operate on selections.
+
+local wea_cmdpath = worldeditadditions_commands.modpath .. "/commands/selectors/"
+local weac = worldeditadditions_core
+
+dofile(wea_cmdpath.."srel.lua")
+dofile(wea_cmdpath.."scentre.lua")
+dofile(wea_cmdpath.."scloud.lua")
+dofile(wea_cmdpath.."smake.lua")
+dofile(wea_cmdpath.."spop.lua")
+dofile(wea_cmdpath.."spush.lua")
+dofile(wea_cmdpath.."sshift.lua")
+dofile(wea_cmdpath.."sstack.lua")
+
+--- DEPRECATED ---
+dofile(wea_cmdpath.."scol.lua")
+dofile(wea_cmdpath.."scube.lua")
+dofile(wea_cmdpath.."srect.lua")
+-- TODO: Deprecate this.
+dofile(wea_cmdpath.."sfactor.lua")
+--- END DEPRECATED ---
+
+dofile(wea_cmdpath.."unmark.lua")
+dofile(wea_cmdpath.."mark.lua")
+dofile(wea_cmdpath.."pos1-2.lua")
+dofile(wea_cmdpath.."reset.lua")
+
+-- Aliases
+weac.register_alias("sfac", "sfactor")
+
+-- Pre-subcommand aliases
+weac.register_alias("s rel", "srel")
+weac.register_alias("s centre", "scentre")
+weac.register_alias("s cloud", "scloud")
+weac.register_alias("s factor", "sfactor")
+weac.register_alias("s make", "smake")
+weac.register_alias("s pop", "spop")
+weac.register_alias("s push", "spush")
+weac.register_alias("s shift", "sshift")
+weac.register_alias("s stack", "sstack")
+
+weac.register_alias("1", "pos1", true) -- true = override target
+weac.register_alias("2", "pos2", true) -- true = override target