From 5df0703e2c5fb4cd52d15d39639cf21fcc0d7e1f Mon Sep 17 00:00:00 2001 From: Jeffrey Phillips Freeman <the@jeffreyfreeman.me> Date: Mon, 4 May 2020 14:00:23 -0400 Subject: [PATCH] Moved commands directory to its own input_handlers directory. --- lib/aethyr/core/connection/server.rb | 4 ++++ .../core/{actions/commands => input_handlers}/admin/acarea.rb | 0 .../core/{actions/commands => input_handlers}/admin/acdoor.rb | 0 .../core/{actions/commands => input_handlers}/admin/acexit.rb | 0 .../core/{actions/commands => input_handlers}/admin/acomm.rb | 0 .../{actions/commands => input_handlers}/admin/acomment.rb | 0 .../{actions/commands => input_handlers}/admin/aconfig.rb | 0 .../{actions/commands => input_handlers}/admin/acportal.rb | 0 .../core/{actions/commands => input_handlers}/admin/acprop.rb | 0 .../{actions/commands => input_handlers}/admin/acreate.rb | 0 .../core/{actions/commands => input_handlers}/admin/acroom.rb | 0 .../{actions/commands => input_handlers}/admin/adelete.rb | 0 .../core/{actions/commands => input_handlers}/admin/adesc.rb | 0 .../commands => input_handlers}/admin/admin_handler.rb | 0 .../core/{actions/commands => input_handlers}/admin/aforce.rb | 0 .../core/{actions/commands => input_handlers}/admin/ahelp.rb | 0 .../core/{actions/commands => input_handlers}/admin/ahide.rb | 0 .../core/{actions/commands => input_handlers}/admin/ainfo.rb | 0 .../core/{actions/commands => input_handlers}/admin/alearn.rb | 0 .../core/{actions/commands => input_handlers}/admin/alist.rb | 0 .../core/{actions/commands => input_handlers}/admin/alog.rb | 0 .../core/{actions/commands => input_handlers}/admin/alook.rb | 0 .../core/{actions/commands => input_handlers}/admin/aput.rb | 0 .../core/{actions/commands => input_handlers}/admin/areact.rb | 0 .../core/{actions/commands => input_handlers}/admin/areas.rb | 0 .../{actions/commands => input_handlers}/admin/areload.rb | 0 .../core/{actions/commands => input_handlers}/admin/asave.rb | 0 .../core/{actions/commands => input_handlers}/admin/aset.rb | 0 .../core/{actions/commands => input_handlers}/admin/ashow.rb | 0 .../{actions/commands => input_handlers}/admin/astatus.rb | 0 .../core/{actions/commands => input_handlers}/admin/ateach.rb | 0 .../core/{actions/commands => input_handlers}/admin/awatch.rb | 0 .../core/{actions/commands => input_handlers}/admin/awho.rb | 0 .../commands => input_handlers}/admin/deleteplayer.rb | 0 .../{actions/commands => input_handlers}/admin/restart.rb | 0 .../{actions/commands => input_handlers}/admin/terrain.rb | 0 lib/aethyr/core/{actions/commands => input_handlers}/block.rb | 0 lib/aethyr/core/{actions/commands => input_handlers}/close.rb | 0 .../{actions/commands => input_handlers}/command_handler.rb | 0 lib/aethyr/core/{actions/commands => input_handlers}/dodge.rb | 0 lib/aethyr/core/{actions/commands => input_handlers}/drop.rb | 0 .../core/{actions/commands => input_handlers}/emotes/agree.rb | 0 .../core/{actions/commands => input_handlers}/emotes/back.rb | 0 .../core/{actions/commands => input_handlers}/emotes/blush.rb | 0 .../core/{actions/commands => input_handlers}/emotes/bow.rb | 0 .../core/{actions/commands => input_handlers}/emotes/brb.rb | 0 .../core/{actions/commands => input_handlers}/emotes/bye.rb | 0 .../core/{actions/commands => input_handlers}/emotes/cheer.rb | 0 .../core/{actions/commands => input_handlers}/emotes/cry.rb | 0 .../{actions/commands => input_handlers}/emotes/curtsey.rb | 0 .../core/{actions/commands => input_handlers}/emotes/eh.rb | 0 .../core/{actions/commands => input_handlers}/emotes/emote.rb | 0 .../commands => input_handlers}/emotes/emote_handler.rb | 0 .../core/{actions/commands => input_handlers}/emotes/er.rb | 0 .../core/{actions/commands => input_handlers}/emotes/ew.rb | 0 .../core/{actions/commands => input_handlers}/emotes/frown.rb | 0 .../core/{actions/commands => input_handlers}/emotes/grin.rb | 0 .../core/{actions/commands => input_handlers}/emotes/hi.rb | 0 .../core/{actions/commands => input_handlers}/emotes/hm.rb | 0 .../core/{actions/commands => input_handlers}/emotes/hug.rb | 0 .../core/{actions/commands => input_handlers}/emotes/huh.rb | 0 .../core/{actions/commands => input_handlers}/emotes/laugh.rb | 0 .../core/{actions/commands => input_handlers}/emotes/no.rb | 0 .../core/{actions/commands => input_handlers}/emotes/nod.rb | 0 .../core/{actions/commands => input_handlers}/emotes/pet.rb | 0 .../core/{actions/commands => input_handlers}/emotes/poke.rb | 0 .../{actions/commands => input_handlers}/emotes/ponder.rb | 0 .../core/{actions/commands => input_handlers}/emotes/shrug.rb | 0 .../core/{actions/commands => input_handlers}/emotes/sigh.rb | 0 .../core/{actions/commands => input_handlers}/emotes/skip.rb | 0 .../core/{actions/commands => input_handlers}/emotes/smile.rb | 0 .../{actions/commands => input_handlers}/emotes/snicker.rb | 0 .../core/{actions/commands => input_handlers}/emotes/uh.rb | 0 .../core/{actions/commands => input_handlers}/emotes/wave.rb | 0 .../core/{actions/commands => input_handlers}/emotes/yawn.rb | 0 .../core/{actions/commands => input_handlers}/emotes/yes.rb | 0 lib/aethyr/core/{actions/commands => input_handlers}/gait.rb | 0 .../core/{actions/commands => input_handlers}/generic.rb | 0 lib/aethyr/core/{actions/commands => input_handlers}/get.rb | 0 lib/aethyr/core/{actions/commands => input_handlers}/give.rb | 0 lib/aethyr/core/{actions/commands => input_handlers}/help.rb | 0 .../core/{actions/commands => input_handlers}/help_handler.rb | 0 .../core/{actions/commands => input_handlers}/inventory.rb | 0 lib/aethyr/core/{actions/commands => input_handlers}/issue.rb | 0 lib/aethyr/core/{actions/commands => input_handlers}/kick.rb | 0 .../core/{actions/commands => input_handlers}/locking.rb | 0 lib/aethyr/core/{actions/commands => input_handlers}/look.rb | 0 lib/aethyr/core/{actions/commands => input_handlers}/map.rb | 0 lib/aethyr/core/{actions/commands => input_handlers}/more.rb | 0 lib/aethyr/core/{actions/commands => input_handlers}/move.rb | 0 lib/aethyr/core/{actions/commands => input_handlers}/news.rb | 0 lib/aethyr/core/{actions/commands => input_handlers}/open.rb | 0 .../core/{actions/commands => input_handlers}/portal.rb | 0 lib/aethyr/core/{actions/commands => input_handlers}/pose.rb | 0 lib/aethyr/core/{actions/commands => input_handlers}/punch.rb | 0 lib/aethyr/core/{actions/commands => input_handlers}/put.rb | 0 lib/aethyr/core/{actions/commands => input_handlers}/quit.rb | 0 .../core/{actions/commands => input_handlers}/remove.rb | 0 lib/aethyr/core/{actions/commands => input_handlers}/say.rb | 0 lib/aethyr/core/{actions/commands => input_handlers}/set.rb | 0 lib/aethyr/core/{actions/commands => input_handlers}/sit.rb | 0 .../core/{actions/commands => input_handlers}/skills.rb | 0 lib/aethyr/core/{actions/commands => input_handlers}/slash.rb | 0 lib/aethyr/core/{actions/commands => input_handlers}/stand.rb | 0 lib/aethyr/core/{actions/commands => input_handlers}/tell.rb | 0 .../core/{actions/commands => input_handlers}/unwield.rb | 0 lib/aethyr/core/{actions/commands => input_handlers}/wear.rb | 0 .../core/{actions/commands => input_handlers}/whereis.rb | 0 .../core/{actions/commands => input_handlers}/whisper.rb | 0 lib/aethyr/core/{actions/commands => input_handlers}/wield.rb | 0 lib/aethyr/core/render/display.rb | 4 ++-- lib/aethyr/core/util/all-commands.rb | 4 ++-- 112 files changed, 8 insertions(+), 4 deletions(-) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/acarea.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/acdoor.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/acexit.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/acomm.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/acomment.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/aconfig.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/acportal.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/acprop.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/acreate.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/acroom.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/adelete.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/adesc.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/admin_handler.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/aforce.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/ahelp.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/ahide.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/ainfo.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/alearn.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/alist.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/alog.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/alook.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/aput.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/areact.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/areas.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/areload.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/asave.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/aset.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/ashow.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/astatus.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/ateach.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/awatch.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/awho.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/deleteplayer.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/restart.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/admin/terrain.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/block.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/close.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/command_handler.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/dodge.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/drop.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/agree.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/back.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/blush.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/bow.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/brb.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/bye.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/cheer.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/cry.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/curtsey.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/eh.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/emote.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/emote_handler.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/er.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/ew.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/frown.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/grin.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/hi.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/hm.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/hug.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/huh.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/laugh.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/no.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/nod.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/pet.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/poke.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/ponder.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/shrug.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/sigh.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/skip.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/smile.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/snicker.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/uh.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/wave.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/yawn.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/emotes/yes.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/gait.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/generic.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/get.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/give.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/help.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/help_handler.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/inventory.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/issue.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/kick.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/locking.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/look.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/map.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/more.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/move.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/news.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/open.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/portal.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/pose.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/punch.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/put.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/quit.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/remove.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/say.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/set.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/sit.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/skills.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/slash.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/stand.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/tell.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/unwield.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/wear.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/whereis.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/whisper.rb (100%) rename lib/aethyr/core/{actions/commands => input_handlers}/wield.rb (100%) diff --git a/lib/aethyr/core/connection/server.rb b/lib/aethyr/core/connection/server.rb index bb6db53..7c330bc 100644 --- a/lib/aethyr/core/connection/server.rb +++ b/lib/aethyr/core/connection/server.rb @@ -84,6 +84,10 @@ module Aethyr players.each do |player| player.display.layout end + #$manager.find_all("class", Player).each do |player| + # puts "updating display of #{player}" + # player.update_display + #end end end diff --git a/lib/aethyr/core/actions/commands/admin/acarea.rb b/lib/aethyr/core/input_handlers/admin/acarea.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/acarea.rb rename to lib/aethyr/core/input_handlers/admin/acarea.rb diff --git a/lib/aethyr/core/actions/commands/admin/acdoor.rb b/lib/aethyr/core/input_handlers/admin/acdoor.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/acdoor.rb rename to lib/aethyr/core/input_handlers/admin/acdoor.rb diff --git a/lib/aethyr/core/actions/commands/admin/acexit.rb b/lib/aethyr/core/input_handlers/admin/acexit.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/acexit.rb rename to lib/aethyr/core/input_handlers/admin/acexit.rb diff --git a/lib/aethyr/core/actions/commands/admin/acomm.rb b/lib/aethyr/core/input_handlers/admin/acomm.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/acomm.rb rename to lib/aethyr/core/input_handlers/admin/acomm.rb diff --git a/lib/aethyr/core/actions/commands/admin/acomment.rb b/lib/aethyr/core/input_handlers/admin/acomment.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/acomment.rb rename to lib/aethyr/core/input_handlers/admin/acomment.rb diff --git a/lib/aethyr/core/actions/commands/admin/aconfig.rb b/lib/aethyr/core/input_handlers/admin/aconfig.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/aconfig.rb rename to lib/aethyr/core/input_handlers/admin/aconfig.rb diff --git a/lib/aethyr/core/actions/commands/admin/acportal.rb b/lib/aethyr/core/input_handlers/admin/acportal.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/acportal.rb rename to lib/aethyr/core/input_handlers/admin/acportal.rb diff --git a/lib/aethyr/core/actions/commands/admin/acprop.rb b/lib/aethyr/core/input_handlers/admin/acprop.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/acprop.rb rename to lib/aethyr/core/input_handlers/admin/acprop.rb diff --git a/lib/aethyr/core/actions/commands/admin/acreate.rb b/lib/aethyr/core/input_handlers/admin/acreate.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/acreate.rb rename to lib/aethyr/core/input_handlers/admin/acreate.rb diff --git a/lib/aethyr/core/actions/commands/admin/acroom.rb b/lib/aethyr/core/input_handlers/admin/acroom.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/acroom.rb rename to lib/aethyr/core/input_handlers/admin/acroom.rb diff --git a/lib/aethyr/core/actions/commands/admin/adelete.rb b/lib/aethyr/core/input_handlers/admin/adelete.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/adelete.rb rename to lib/aethyr/core/input_handlers/admin/adelete.rb diff --git a/lib/aethyr/core/actions/commands/admin/adesc.rb b/lib/aethyr/core/input_handlers/admin/adesc.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/adesc.rb rename to lib/aethyr/core/input_handlers/admin/adesc.rb diff --git a/lib/aethyr/core/actions/commands/admin/admin_handler.rb b/lib/aethyr/core/input_handlers/admin/admin_handler.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/admin_handler.rb rename to lib/aethyr/core/input_handlers/admin/admin_handler.rb diff --git a/lib/aethyr/core/actions/commands/admin/aforce.rb b/lib/aethyr/core/input_handlers/admin/aforce.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/aforce.rb rename to lib/aethyr/core/input_handlers/admin/aforce.rb diff --git a/lib/aethyr/core/actions/commands/admin/ahelp.rb b/lib/aethyr/core/input_handlers/admin/ahelp.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/ahelp.rb rename to lib/aethyr/core/input_handlers/admin/ahelp.rb diff --git a/lib/aethyr/core/actions/commands/admin/ahide.rb b/lib/aethyr/core/input_handlers/admin/ahide.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/ahide.rb rename to lib/aethyr/core/input_handlers/admin/ahide.rb diff --git a/lib/aethyr/core/actions/commands/admin/ainfo.rb b/lib/aethyr/core/input_handlers/admin/ainfo.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/ainfo.rb rename to lib/aethyr/core/input_handlers/admin/ainfo.rb diff --git a/lib/aethyr/core/actions/commands/admin/alearn.rb b/lib/aethyr/core/input_handlers/admin/alearn.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/alearn.rb rename to lib/aethyr/core/input_handlers/admin/alearn.rb diff --git a/lib/aethyr/core/actions/commands/admin/alist.rb b/lib/aethyr/core/input_handlers/admin/alist.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/alist.rb rename to lib/aethyr/core/input_handlers/admin/alist.rb diff --git a/lib/aethyr/core/actions/commands/admin/alog.rb b/lib/aethyr/core/input_handlers/admin/alog.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/alog.rb rename to lib/aethyr/core/input_handlers/admin/alog.rb diff --git a/lib/aethyr/core/actions/commands/admin/alook.rb b/lib/aethyr/core/input_handlers/admin/alook.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/alook.rb rename to lib/aethyr/core/input_handlers/admin/alook.rb diff --git a/lib/aethyr/core/actions/commands/admin/aput.rb b/lib/aethyr/core/input_handlers/admin/aput.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/aput.rb rename to lib/aethyr/core/input_handlers/admin/aput.rb diff --git a/lib/aethyr/core/actions/commands/admin/areact.rb b/lib/aethyr/core/input_handlers/admin/areact.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/areact.rb rename to lib/aethyr/core/input_handlers/admin/areact.rb diff --git a/lib/aethyr/core/actions/commands/admin/areas.rb b/lib/aethyr/core/input_handlers/admin/areas.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/areas.rb rename to lib/aethyr/core/input_handlers/admin/areas.rb diff --git a/lib/aethyr/core/actions/commands/admin/areload.rb b/lib/aethyr/core/input_handlers/admin/areload.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/areload.rb rename to lib/aethyr/core/input_handlers/admin/areload.rb diff --git a/lib/aethyr/core/actions/commands/admin/asave.rb b/lib/aethyr/core/input_handlers/admin/asave.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/asave.rb rename to lib/aethyr/core/input_handlers/admin/asave.rb diff --git a/lib/aethyr/core/actions/commands/admin/aset.rb b/lib/aethyr/core/input_handlers/admin/aset.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/aset.rb rename to lib/aethyr/core/input_handlers/admin/aset.rb diff --git a/lib/aethyr/core/actions/commands/admin/ashow.rb b/lib/aethyr/core/input_handlers/admin/ashow.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/ashow.rb rename to lib/aethyr/core/input_handlers/admin/ashow.rb diff --git a/lib/aethyr/core/actions/commands/admin/astatus.rb b/lib/aethyr/core/input_handlers/admin/astatus.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/astatus.rb rename to lib/aethyr/core/input_handlers/admin/astatus.rb diff --git a/lib/aethyr/core/actions/commands/admin/ateach.rb b/lib/aethyr/core/input_handlers/admin/ateach.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/ateach.rb rename to lib/aethyr/core/input_handlers/admin/ateach.rb diff --git a/lib/aethyr/core/actions/commands/admin/awatch.rb b/lib/aethyr/core/input_handlers/admin/awatch.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/awatch.rb rename to lib/aethyr/core/input_handlers/admin/awatch.rb diff --git a/lib/aethyr/core/actions/commands/admin/awho.rb b/lib/aethyr/core/input_handlers/admin/awho.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/awho.rb rename to lib/aethyr/core/input_handlers/admin/awho.rb diff --git a/lib/aethyr/core/actions/commands/admin/deleteplayer.rb b/lib/aethyr/core/input_handlers/admin/deleteplayer.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/deleteplayer.rb rename to lib/aethyr/core/input_handlers/admin/deleteplayer.rb diff --git a/lib/aethyr/core/actions/commands/admin/restart.rb b/lib/aethyr/core/input_handlers/admin/restart.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/restart.rb rename to lib/aethyr/core/input_handlers/admin/restart.rb diff --git a/lib/aethyr/core/actions/commands/admin/terrain.rb b/lib/aethyr/core/input_handlers/admin/terrain.rb similarity index 100% rename from lib/aethyr/core/actions/commands/admin/terrain.rb rename to lib/aethyr/core/input_handlers/admin/terrain.rb diff --git a/lib/aethyr/core/actions/commands/block.rb b/lib/aethyr/core/input_handlers/block.rb similarity index 100% rename from lib/aethyr/core/actions/commands/block.rb rename to lib/aethyr/core/input_handlers/block.rb diff --git a/lib/aethyr/core/actions/commands/close.rb b/lib/aethyr/core/input_handlers/close.rb similarity index 100% rename from lib/aethyr/core/actions/commands/close.rb rename to lib/aethyr/core/input_handlers/close.rb diff --git a/lib/aethyr/core/actions/commands/command_handler.rb b/lib/aethyr/core/input_handlers/command_handler.rb similarity index 100% rename from lib/aethyr/core/actions/commands/command_handler.rb rename to lib/aethyr/core/input_handlers/command_handler.rb diff --git a/lib/aethyr/core/actions/commands/dodge.rb b/lib/aethyr/core/input_handlers/dodge.rb similarity index 100% rename from lib/aethyr/core/actions/commands/dodge.rb rename to lib/aethyr/core/input_handlers/dodge.rb diff --git a/lib/aethyr/core/actions/commands/drop.rb b/lib/aethyr/core/input_handlers/drop.rb similarity index 100% rename from lib/aethyr/core/actions/commands/drop.rb rename to lib/aethyr/core/input_handlers/drop.rb diff --git a/lib/aethyr/core/actions/commands/emotes/agree.rb b/lib/aethyr/core/input_handlers/emotes/agree.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/agree.rb rename to lib/aethyr/core/input_handlers/emotes/agree.rb diff --git a/lib/aethyr/core/actions/commands/emotes/back.rb b/lib/aethyr/core/input_handlers/emotes/back.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/back.rb rename to lib/aethyr/core/input_handlers/emotes/back.rb diff --git a/lib/aethyr/core/actions/commands/emotes/blush.rb b/lib/aethyr/core/input_handlers/emotes/blush.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/blush.rb rename to lib/aethyr/core/input_handlers/emotes/blush.rb diff --git a/lib/aethyr/core/actions/commands/emotes/bow.rb b/lib/aethyr/core/input_handlers/emotes/bow.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/bow.rb rename to lib/aethyr/core/input_handlers/emotes/bow.rb diff --git a/lib/aethyr/core/actions/commands/emotes/brb.rb b/lib/aethyr/core/input_handlers/emotes/brb.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/brb.rb rename to lib/aethyr/core/input_handlers/emotes/brb.rb diff --git a/lib/aethyr/core/actions/commands/emotes/bye.rb b/lib/aethyr/core/input_handlers/emotes/bye.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/bye.rb rename to lib/aethyr/core/input_handlers/emotes/bye.rb diff --git a/lib/aethyr/core/actions/commands/emotes/cheer.rb b/lib/aethyr/core/input_handlers/emotes/cheer.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/cheer.rb rename to lib/aethyr/core/input_handlers/emotes/cheer.rb diff --git a/lib/aethyr/core/actions/commands/emotes/cry.rb b/lib/aethyr/core/input_handlers/emotes/cry.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/cry.rb rename to lib/aethyr/core/input_handlers/emotes/cry.rb diff --git a/lib/aethyr/core/actions/commands/emotes/curtsey.rb b/lib/aethyr/core/input_handlers/emotes/curtsey.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/curtsey.rb rename to lib/aethyr/core/input_handlers/emotes/curtsey.rb diff --git a/lib/aethyr/core/actions/commands/emotes/eh.rb b/lib/aethyr/core/input_handlers/emotes/eh.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/eh.rb rename to lib/aethyr/core/input_handlers/emotes/eh.rb diff --git a/lib/aethyr/core/actions/commands/emotes/emote.rb b/lib/aethyr/core/input_handlers/emotes/emote.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/emote.rb rename to lib/aethyr/core/input_handlers/emotes/emote.rb diff --git a/lib/aethyr/core/actions/commands/emotes/emote_handler.rb b/lib/aethyr/core/input_handlers/emotes/emote_handler.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/emote_handler.rb rename to lib/aethyr/core/input_handlers/emotes/emote_handler.rb diff --git a/lib/aethyr/core/actions/commands/emotes/er.rb b/lib/aethyr/core/input_handlers/emotes/er.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/er.rb rename to lib/aethyr/core/input_handlers/emotes/er.rb diff --git a/lib/aethyr/core/actions/commands/emotes/ew.rb b/lib/aethyr/core/input_handlers/emotes/ew.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/ew.rb rename to lib/aethyr/core/input_handlers/emotes/ew.rb diff --git a/lib/aethyr/core/actions/commands/emotes/frown.rb b/lib/aethyr/core/input_handlers/emotes/frown.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/frown.rb rename to lib/aethyr/core/input_handlers/emotes/frown.rb diff --git a/lib/aethyr/core/actions/commands/emotes/grin.rb b/lib/aethyr/core/input_handlers/emotes/grin.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/grin.rb rename to lib/aethyr/core/input_handlers/emotes/grin.rb diff --git a/lib/aethyr/core/actions/commands/emotes/hi.rb b/lib/aethyr/core/input_handlers/emotes/hi.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/hi.rb rename to lib/aethyr/core/input_handlers/emotes/hi.rb diff --git a/lib/aethyr/core/actions/commands/emotes/hm.rb b/lib/aethyr/core/input_handlers/emotes/hm.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/hm.rb rename to lib/aethyr/core/input_handlers/emotes/hm.rb diff --git a/lib/aethyr/core/actions/commands/emotes/hug.rb b/lib/aethyr/core/input_handlers/emotes/hug.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/hug.rb rename to lib/aethyr/core/input_handlers/emotes/hug.rb diff --git a/lib/aethyr/core/actions/commands/emotes/huh.rb b/lib/aethyr/core/input_handlers/emotes/huh.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/huh.rb rename to lib/aethyr/core/input_handlers/emotes/huh.rb diff --git a/lib/aethyr/core/actions/commands/emotes/laugh.rb b/lib/aethyr/core/input_handlers/emotes/laugh.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/laugh.rb rename to lib/aethyr/core/input_handlers/emotes/laugh.rb diff --git a/lib/aethyr/core/actions/commands/emotes/no.rb b/lib/aethyr/core/input_handlers/emotes/no.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/no.rb rename to lib/aethyr/core/input_handlers/emotes/no.rb diff --git a/lib/aethyr/core/actions/commands/emotes/nod.rb b/lib/aethyr/core/input_handlers/emotes/nod.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/nod.rb rename to lib/aethyr/core/input_handlers/emotes/nod.rb diff --git a/lib/aethyr/core/actions/commands/emotes/pet.rb b/lib/aethyr/core/input_handlers/emotes/pet.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/pet.rb rename to lib/aethyr/core/input_handlers/emotes/pet.rb diff --git a/lib/aethyr/core/actions/commands/emotes/poke.rb b/lib/aethyr/core/input_handlers/emotes/poke.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/poke.rb rename to lib/aethyr/core/input_handlers/emotes/poke.rb diff --git a/lib/aethyr/core/actions/commands/emotes/ponder.rb b/lib/aethyr/core/input_handlers/emotes/ponder.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/ponder.rb rename to lib/aethyr/core/input_handlers/emotes/ponder.rb diff --git a/lib/aethyr/core/actions/commands/emotes/shrug.rb b/lib/aethyr/core/input_handlers/emotes/shrug.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/shrug.rb rename to lib/aethyr/core/input_handlers/emotes/shrug.rb diff --git a/lib/aethyr/core/actions/commands/emotes/sigh.rb b/lib/aethyr/core/input_handlers/emotes/sigh.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/sigh.rb rename to lib/aethyr/core/input_handlers/emotes/sigh.rb diff --git a/lib/aethyr/core/actions/commands/emotes/skip.rb b/lib/aethyr/core/input_handlers/emotes/skip.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/skip.rb rename to lib/aethyr/core/input_handlers/emotes/skip.rb diff --git a/lib/aethyr/core/actions/commands/emotes/smile.rb b/lib/aethyr/core/input_handlers/emotes/smile.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/smile.rb rename to lib/aethyr/core/input_handlers/emotes/smile.rb diff --git a/lib/aethyr/core/actions/commands/emotes/snicker.rb b/lib/aethyr/core/input_handlers/emotes/snicker.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/snicker.rb rename to lib/aethyr/core/input_handlers/emotes/snicker.rb diff --git a/lib/aethyr/core/actions/commands/emotes/uh.rb b/lib/aethyr/core/input_handlers/emotes/uh.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/uh.rb rename to lib/aethyr/core/input_handlers/emotes/uh.rb diff --git a/lib/aethyr/core/actions/commands/emotes/wave.rb b/lib/aethyr/core/input_handlers/emotes/wave.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/wave.rb rename to lib/aethyr/core/input_handlers/emotes/wave.rb diff --git a/lib/aethyr/core/actions/commands/emotes/yawn.rb b/lib/aethyr/core/input_handlers/emotes/yawn.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/yawn.rb rename to lib/aethyr/core/input_handlers/emotes/yawn.rb diff --git a/lib/aethyr/core/actions/commands/emotes/yes.rb b/lib/aethyr/core/input_handlers/emotes/yes.rb similarity index 100% rename from lib/aethyr/core/actions/commands/emotes/yes.rb rename to lib/aethyr/core/input_handlers/emotes/yes.rb diff --git a/lib/aethyr/core/actions/commands/gait.rb b/lib/aethyr/core/input_handlers/gait.rb similarity index 100% rename from lib/aethyr/core/actions/commands/gait.rb rename to lib/aethyr/core/input_handlers/gait.rb diff --git a/lib/aethyr/core/actions/commands/generic.rb b/lib/aethyr/core/input_handlers/generic.rb similarity index 100% rename from lib/aethyr/core/actions/commands/generic.rb rename to lib/aethyr/core/input_handlers/generic.rb diff --git a/lib/aethyr/core/actions/commands/get.rb b/lib/aethyr/core/input_handlers/get.rb similarity index 100% rename from lib/aethyr/core/actions/commands/get.rb rename to lib/aethyr/core/input_handlers/get.rb diff --git a/lib/aethyr/core/actions/commands/give.rb b/lib/aethyr/core/input_handlers/give.rb similarity index 100% rename from lib/aethyr/core/actions/commands/give.rb rename to lib/aethyr/core/input_handlers/give.rb diff --git a/lib/aethyr/core/actions/commands/help.rb b/lib/aethyr/core/input_handlers/help.rb similarity index 100% rename from lib/aethyr/core/actions/commands/help.rb rename to lib/aethyr/core/input_handlers/help.rb diff --git a/lib/aethyr/core/actions/commands/help_handler.rb b/lib/aethyr/core/input_handlers/help_handler.rb similarity index 100% rename from lib/aethyr/core/actions/commands/help_handler.rb rename to lib/aethyr/core/input_handlers/help_handler.rb diff --git a/lib/aethyr/core/actions/commands/inventory.rb b/lib/aethyr/core/input_handlers/inventory.rb similarity index 100% rename from lib/aethyr/core/actions/commands/inventory.rb rename to lib/aethyr/core/input_handlers/inventory.rb diff --git a/lib/aethyr/core/actions/commands/issue.rb b/lib/aethyr/core/input_handlers/issue.rb similarity index 100% rename from lib/aethyr/core/actions/commands/issue.rb rename to lib/aethyr/core/input_handlers/issue.rb diff --git a/lib/aethyr/core/actions/commands/kick.rb b/lib/aethyr/core/input_handlers/kick.rb similarity index 100% rename from lib/aethyr/core/actions/commands/kick.rb rename to lib/aethyr/core/input_handlers/kick.rb diff --git a/lib/aethyr/core/actions/commands/locking.rb b/lib/aethyr/core/input_handlers/locking.rb similarity index 100% rename from lib/aethyr/core/actions/commands/locking.rb rename to lib/aethyr/core/input_handlers/locking.rb diff --git a/lib/aethyr/core/actions/commands/look.rb b/lib/aethyr/core/input_handlers/look.rb similarity index 100% rename from lib/aethyr/core/actions/commands/look.rb rename to lib/aethyr/core/input_handlers/look.rb diff --git a/lib/aethyr/core/actions/commands/map.rb b/lib/aethyr/core/input_handlers/map.rb similarity index 100% rename from lib/aethyr/core/actions/commands/map.rb rename to lib/aethyr/core/input_handlers/map.rb diff --git a/lib/aethyr/core/actions/commands/more.rb b/lib/aethyr/core/input_handlers/more.rb similarity index 100% rename from lib/aethyr/core/actions/commands/more.rb rename to lib/aethyr/core/input_handlers/more.rb diff --git a/lib/aethyr/core/actions/commands/move.rb b/lib/aethyr/core/input_handlers/move.rb similarity index 100% rename from lib/aethyr/core/actions/commands/move.rb rename to lib/aethyr/core/input_handlers/move.rb diff --git a/lib/aethyr/core/actions/commands/news.rb b/lib/aethyr/core/input_handlers/news.rb similarity index 100% rename from lib/aethyr/core/actions/commands/news.rb rename to lib/aethyr/core/input_handlers/news.rb diff --git a/lib/aethyr/core/actions/commands/open.rb b/lib/aethyr/core/input_handlers/open.rb similarity index 100% rename from lib/aethyr/core/actions/commands/open.rb rename to lib/aethyr/core/input_handlers/open.rb diff --git a/lib/aethyr/core/actions/commands/portal.rb b/lib/aethyr/core/input_handlers/portal.rb similarity index 100% rename from lib/aethyr/core/actions/commands/portal.rb rename to lib/aethyr/core/input_handlers/portal.rb diff --git a/lib/aethyr/core/actions/commands/pose.rb b/lib/aethyr/core/input_handlers/pose.rb similarity index 100% rename from lib/aethyr/core/actions/commands/pose.rb rename to lib/aethyr/core/input_handlers/pose.rb diff --git a/lib/aethyr/core/actions/commands/punch.rb b/lib/aethyr/core/input_handlers/punch.rb similarity index 100% rename from lib/aethyr/core/actions/commands/punch.rb rename to lib/aethyr/core/input_handlers/punch.rb diff --git a/lib/aethyr/core/actions/commands/put.rb b/lib/aethyr/core/input_handlers/put.rb similarity index 100% rename from lib/aethyr/core/actions/commands/put.rb rename to lib/aethyr/core/input_handlers/put.rb diff --git a/lib/aethyr/core/actions/commands/quit.rb b/lib/aethyr/core/input_handlers/quit.rb similarity index 100% rename from lib/aethyr/core/actions/commands/quit.rb rename to lib/aethyr/core/input_handlers/quit.rb diff --git a/lib/aethyr/core/actions/commands/remove.rb b/lib/aethyr/core/input_handlers/remove.rb similarity index 100% rename from lib/aethyr/core/actions/commands/remove.rb rename to lib/aethyr/core/input_handlers/remove.rb diff --git a/lib/aethyr/core/actions/commands/say.rb b/lib/aethyr/core/input_handlers/say.rb similarity index 100% rename from lib/aethyr/core/actions/commands/say.rb rename to lib/aethyr/core/input_handlers/say.rb diff --git a/lib/aethyr/core/actions/commands/set.rb b/lib/aethyr/core/input_handlers/set.rb similarity index 100% rename from lib/aethyr/core/actions/commands/set.rb rename to lib/aethyr/core/input_handlers/set.rb diff --git a/lib/aethyr/core/actions/commands/sit.rb b/lib/aethyr/core/input_handlers/sit.rb similarity index 100% rename from lib/aethyr/core/actions/commands/sit.rb rename to lib/aethyr/core/input_handlers/sit.rb diff --git a/lib/aethyr/core/actions/commands/skills.rb b/lib/aethyr/core/input_handlers/skills.rb similarity index 100% rename from lib/aethyr/core/actions/commands/skills.rb rename to lib/aethyr/core/input_handlers/skills.rb diff --git a/lib/aethyr/core/actions/commands/slash.rb b/lib/aethyr/core/input_handlers/slash.rb similarity index 100% rename from lib/aethyr/core/actions/commands/slash.rb rename to lib/aethyr/core/input_handlers/slash.rb diff --git a/lib/aethyr/core/actions/commands/stand.rb b/lib/aethyr/core/input_handlers/stand.rb similarity index 100% rename from lib/aethyr/core/actions/commands/stand.rb rename to lib/aethyr/core/input_handlers/stand.rb diff --git a/lib/aethyr/core/actions/commands/tell.rb b/lib/aethyr/core/input_handlers/tell.rb similarity index 100% rename from lib/aethyr/core/actions/commands/tell.rb rename to lib/aethyr/core/input_handlers/tell.rb diff --git a/lib/aethyr/core/actions/commands/unwield.rb b/lib/aethyr/core/input_handlers/unwield.rb similarity index 100% rename from lib/aethyr/core/actions/commands/unwield.rb rename to lib/aethyr/core/input_handlers/unwield.rb diff --git a/lib/aethyr/core/actions/commands/wear.rb b/lib/aethyr/core/input_handlers/wear.rb similarity index 100% rename from lib/aethyr/core/actions/commands/wear.rb rename to lib/aethyr/core/input_handlers/wear.rb diff --git a/lib/aethyr/core/actions/commands/whereis.rb b/lib/aethyr/core/input_handlers/whereis.rb similarity index 100% rename from lib/aethyr/core/actions/commands/whereis.rb rename to lib/aethyr/core/input_handlers/whereis.rb diff --git a/lib/aethyr/core/actions/commands/whisper.rb b/lib/aethyr/core/input_handlers/whisper.rb similarity index 100% rename from lib/aethyr/core/actions/commands/whisper.rb rename to lib/aethyr/core/input_handlers/whisper.rb diff --git a/lib/aethyr/core/actions/commands/wield.rb b/lib/aethyr/core/input_handlers/wield.rb similarity index 100% rename from lib/aethyr/core/actions/commands/wield.rb rename to lib/aethyr/core/input_handlers/wield.rb diff --git a/lib/aethyr/core/render/display.rb b/lib/aethyr/core/render/display.rb index fdf1508..9a62e88 100644 --- a/lib/aethyr/core/render/display.rb +++ b/lib/aethyr/core/render/display.rb @@ -289,9 +289,9 @@ class Display if @windows[:map].exists? room = $manager.get_object(player.container) if !room.nil? - send(room.area.render_map(player, room.area.position(room)), message_type: :map, internal_clear: true) + player.output(room.area.render_map(player, room.area.position(room)), message_type: :map, internal_clear: true) else - send('No map of current area.', message_type: :map, internal_clear: true) + player.output('No map of current area.', message_type: :map, internal_clear: true) end end diff --git a/lib/aethyr/core/util/all-commands.rb b/lib/aethyr/core/util/all-commands.rb index c4cc5a1..a343cb0 100644 --- a/lib/aethyr/core/util/all-commands.rb +++ b/lib/aethyr/core/util/all-commands.rb @@ -22,5 +22,5 @@ #require 'aethyr/core/actions/commands/weapon_combat' require 'require_all' -require_all 'lib/aethyr/core/actions/commands/' -require_all 'lib/aethyr/extensions/actions/commands/' +require_all 'lib/aethyr/core/actions/input_handlers/' +require_all 'lib/aethyr/extensions/actions/input_handlers/' -- GitLab