From 26dc63af6b51a7c7552b0b7469ebae179c14c167 Mon Sep 17 00:00:00 2001 From: kuwacom Date: Fri, 13 Mar 2026 00:14:20 +0900 Subject: [PATCH] refactor: refactor command path structure As the number of commands has increased and become harder to navigate, each command has been organized into separate folders. --- CMakeLists.txt | 22 ++++----- Minecraft.Server/Console/ServerCliEngine.cpp | 22 ++++----- .../commands/{ => ban-ip}/CliCommandBanIp.cpp | 25 ++++++----- .../commands/{ => ban-ip}/CliCommandBanIp.h | 4 +- .../{ => ban-list}/CliCommandBanList.cpp | 9 ++-- .../{ => ban-list}/CliCommandBanList.h | 3 +- .../commands/{ => ban}/CliCommandBan.cpp | 15 ++++--- .../commands/{ => ban}/CliCommandBan.h | 4 +- .../{ => gamemode}/CliCommandGamemode.cpp | 15 ++++--- .../{ => gamemode}/CliCommandGamemode.h | 3 +- .../commands/{ => help}/CliCommandHelp.cpp | 5 ++- .../commands/{ => help}/CliCommandHelp.h | 3 +- .../commands/{ => list}/CliCommandList.cpp | 9 ++-- .../commands/{ => list}/CliCommandList.h | 3 +- .../{ => pardon-ip}/CliCommandPardonIp.cpp | 11 ++--- .../{ => pardon-ip}/CliCommandPardonIp.h | 4 +- .../{ => pardon}/CliCommandPardon.cpp | 11 ++--- .../commands/{ => pardon}/CliCommandPardon.h | 4 +- .../commands/{ => stop}/CliCommandStop.cpp | 3 +- .../commands/{ => stop}/CliCommandStop.h | 3 +- .../commands/{ => tp}/CliCommandTp.cpp | 13 +++--- .../Console/commands/{ => tp}/CliCommandTp.h | 3 +- .../{ => whitelist}/CliCommandWhitelist.cpp | 11 ++--- .../{ => whitelist}/CliCommandWhitelist.h | 3 +- Minecraft.Server/Minecraft.Server.vcxproj | 45 ++++++++++--------- .../Minecraft.Server.vcxproj.filters | 45 ++++++++++--------- 26 files changed, 159 insertions(+), 139 deletions(-) rename Minecraft.Server/Console/commands/{ => ban-ip}/CliCommandBanIp.cpp (89%) rename Minecraft.Server/Console/commands/{ => ban-ip}/CliCommandBanIp.h (93%) rename Minecraft.Server/Console/commands/{ => ban-list}/CliCommandBanList.cpp (95%) rename Minecraft.Server/Console/commands/{ => ban-list}/CliCommandBanList.h (94%) rename Minecraft.Server/Console/commands/{ => ban}/CliCommandBan.cpp (91%) rename Minecraft.Server/Console/commands/{ => ban}/CliCommandBan.h (94%) rename Minecraft.Server/Console/commands/{ => gamemode}/CliCommandGamemode.cpp (86%) rename Minecraft.Server/Console/commands/{ => gamemode}/CliCommandGamemode.h (93%) rename Minecraft.Server/Console/commands/{ => help}/CliCommandHelp.cpp (92%) rename Minecraft.Server/Console/commands/{ => help}/CliCommandHelp.h (91%) rename Minecraft.Server/Console/commands/{ => list}/CliCommandList.cpp (82%) rename Minecraft.Server/Console/commands/{ => list}/CliCommandList.h (89%) rename Minecraft.Server/Console/commands/{ => pardon-ip}/CliCommandPardonIp.cpp (92%) rename Minecraft.Server/Console/commands/{ => pardon-ip}/CliCommandPardonIp.h (93%) rename Minecraft.Server/Console/commands/{ => pardon}/CliCommandPardon.cpp (95%) rename Minecraft.Server/Console/commands/{ => pardon}/CliCommandPardon.h (93%) rename Minecraft.Server/Console/commands/{ => stop}/CliCommandStop.cpp (93%) rename Minecraft.Server/Console/commands/{ => stop}/CliCommandStop.h (89%) rename Minecraft.Server/Console/commands/{ => tp}/CliCommandTp.cpp (85%) rename Minecraft.Server/Console/commands/{ => tp}/CliCommandTp.h (93%) rename Minecraft.Server/Console/commands/{ => whitelist}/CliCommandWhitelist.cpp (97%) rename Minecraft.Server/Console/commands/{ => whitelist}/CliCommandWhitelist.h (92%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 969113244..1ecd100a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,17 +103,17 @@ list(APPEND MINECRAFT_SERVER_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/ServerCliParser.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/ServerCliEngine.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/ServerCliRegistry.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/CliCommandBan.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/CliCommandBanIp.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/CliCommandBanList.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/CliCommandHelp.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/CliCommandPardon.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/CliCommandPardonIp.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/CliCommandStop.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/CliCommandList.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/CliCommandTp.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/CliCommandWhitelist.cpp" - "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/CliCommandGamemode.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/ban/CliCommandBan.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/ban-ip/CliCommandBanIp.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/ban-list/CliCommandBanList.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/help/CliCommandHelp.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/pardon/CliCommandPardon.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/pardon-ip/CliCommandPardonIp.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/stop/CliCommandStop.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/list/CliCommandList.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/tp/CliCommandTp.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/whitelist/CliCommandWhitelist.cpp" + "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Console/commands/gamemode/CliCommandGamemode.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Common/FileUtils.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/Common/StringUtils.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/Minecraft.Server/ServerLogger.cpp" diff --git a/Minecraft.Server/Console/ServerCliEngine.cpp b/Minecraft.Server/Console/ServerCliEngine.cpp index c629b765f..1162f4d85 100644 --- a/Minecraft.Server/Console/ServerCliEngine.cpp +++ b/Minecraft.Server/Console/ServerCliEngine.cpp @@ -5,17 +5,17 @@ #include "ServerCliParser.h" #include "ServerCliRegistry.h" #include "commands\IServerCliCommand.h" -#include "commands\CliCommandBan.h" -#include "commands\CliCommandBanIp.h" -#include "commands\CliCommandBanList.h" -#include "commands\CliCommandGamemode.h" -#include "commands\CliCommandHelp.h" -#include "commands\CliCommandList.h" -#include "commands\CliCommandPardon.h" -#include "commands\CliCommandPardonIp.h" -#include "commands\CliCommandStop.h" -#include "commands\CliCommandTp.h" -#include "commands\CliCommandWhitelist.h" +#include "commands\ban\CliCommandBan.h" +#include "commands\ban-ip\CliCommandBanIp.h" +#include "commands\ban-list\CliCommandBanList.h" +#include "commands\gamemode\CliCommandGamemode.h" +#include "commands\help\CliCommandHelp.h" +#include "commands\list\CliCommandList.h" +#include "commands\pardon\CliCommandPardon.h" +#include "commands\pardon-ip\CliCommandPardonIp.h" +#include "commands\stop\CliCommandStop.h" +#include "commands\tp\CliCommandTp.h" +#include "commands\whitelist\CliCommandWhitelist.h" #include "..\Common\StringUtils.h" #include "..\ServerShutdown.h" #include "..\ServerLogger.h" diff --git a/Minecraft.Server/Console/commands/CliCommandBanIp.cpp b/Minecraft.Server/Console/commands/ban-ip/CliCommandBanIp.cpp similarity index 89% rename from Minecraft.Server/Console/commands/CliCommandBanIp.cpp rename to Minecraft.Server/Console/commands/ban-ip/CliCommandBanIp.cpp index c093698e7..99c1455e0 100644 --- a/Minecraft.Server/Console/commands/CliCommandBanIp.cpp +++ b/Minecraft.Server/Console/commands/ban-ip/CliCommandBanIp.cpp @@ -2,18 +2,18 @@ #include "CliCommandBanIp.h" -#include "..\ServerCliEngine.h" -#include "..\ServerCliParser.h" -#include "..\..\Access\Access.h" -#include "..\..\Common\NetworkUtils.h" -#include "..\..\Common\StringUtils.h" -#include "..\..\ServerLogManager.h" -#include "..\..\..\Minecraft.Client\MinecraftServer.h" -#include "..\..\..\Minecraft.Client\PlayerConnection.h" -#include "..\..\..\Minecraft.Client\PlayerList.h" -#include "..\..\..\Minecraft.Client\ServerPlayer.h" -#include "..\..\..\Minecraft.World\Connection.h" -#include "..\..\..\Minecraft.World\DisconnectPacket.h" +#include "..\..\ServerCliEngine.h" +#include "..\..\ServerCliParser.h" +#include "..\..\..\Access\Access.h" +#include "..\..\..\Common\NetworkUtils.h" +#include "..\..\..\Common\StringUtils.h" +#include "..\..\..\ServerLogManager.h" +#include "..\..\..\..\Minecraft.Client\MinecraftServer.h" +#include "..\..\..\..\Minecraft.Client\PlayerConnection.h" +#include "..\..\..\..\Minecraft.Client\PlayerList.h" +#include "..\..\..\..\Minecraft.Client\ServerPlayer.h" +#include "..\..\..\..\Minecraft.World\Connection.h" +#include "..\..\..\..\Minecraft.World\DisconnectPacket.h" namespace ServerRuntime { @@ -168,3 +168,4 @@ namespace ServerRuntime } } } + diff --git a/Minecraft.Server/Console/commands/CliCommandBanIp.h b/Minecraft.Server/Console/commands/ban-ip/CliCommandBanIp.h similarity index 93% rename from Minecraft.Server/Console/commands/CliCommandBanIp.h rename to Minecraft.Server/Console/commands/ban-ip/CliCommandBanIp.h index a717405f7..1c116fa68 100644 --- a/Minecraft.Server/Console/commands/CliCommandBanIp.h +++ b/Minecraft.Server/Console/commands/ban-ip/CliCommandBanIp.h @@ -1,6 +1,6 @@ #pragma once -#include "IServerCliCommand.h" +#include "..\IServerCliCommand.h" namespace ServerRuntime { @@ -16,4 +16,4 @@ namespace ServerRuntime virtual bool Execute(const ServerCliParsedLine &line, ServerCliEngine *engine); virtual void Complete(const ServerCliCompletionContext &context, const ServerCliEngine *engine, std::vector *out) const; }; -} \ No newline at end of file +} diff --git a/Minecraft.Server/Console/commands/CliCommandBanList.cpp b/Minecraft.Server/Console/commands/ban-list/CliCommandBanList.cpp similarity index 95% rename from Minecraft.Server/Console/commands/CliCommandBanList.cpp rename to Minecraft.Server/Console/commands/ban-list/CliCommandBanList.cpp index 86f10ae1b..146416172 100644 --- a/Minecraft.Server/Console/commands/CliCommandBanList.cpp +++ b/Minecraft.Server/Console/commands/ban-list/CliCommandBanList.cpp @@ -2,10 +2,10 @@ #include "CliCommandBanList.h" -#include "..\ServerCliEngine.h" -#include "..\ServerCliParser.h" -#include "..\..\Access\Access.h" -#include "..\..\Common\StringUtils.h" +#include "..\..\ServerCliEngine.h" +#include "..\..\ServerCliParser.h" +#include "..\..\..\Access\Access.h" +#include "..\..\..\Common\StringUtils.h" #include @@ -133,3 +133,4 @@ namespace ServerRuntime (void)out; } } + diff --git a/Minecraft.Server/Console/commands/CliCommandBanList.h b/Minecraft.Server/Console/commands/ban-list/CliCommandBanList.h similarity index 94% rename from Minecraft.Server/Console/commands/CliCommandBanList.h rename to Minecraft.Server/Console/commands/ban-list/CliCommandBanList.h index f948fc9f4..1db32bc1d 100644 --- a/Minecraft.Server/Console/commands/CliCommandBanList.h +++ b/Minecraft.Server/Console/commands/ban-list/CliCommandBanList.h @@ -1,6 +1,6 @@ #pragma once -#include "IServerCliCommand.h" +#include "..\IServerCliCommand.h" namespace ServerRuntime { @@ -20,3 +20,4 @@ namespace ServerRuntime virtual void Complete(const ServerCliCompletionContext &context, const ServerCliEngine *engine, std::vector *out) const; }; } + diff --git a/Minecraft.Server/Console/commands/CliCommandBan.cpp b/Minecraft.Server/Console/commands/ban/CliCommandBan.cpp similarity index 91% rename from Minecraft.Server/Console/commands/CliCommandBan.cpp rename to Minecraft.Server/Console/commands/ban/CliCommandBan.cpp index 6cfc66c06..f9855c0cb 100644 --- a/Minecraft.Server/Console/commands/CliCommandBan.cpp +++ b/Minecraft.Server/Console/commands/ban/CliCommandBan.cpp @@ -2,13 +2,13 @@ #include "CliCommandBan.h" -#include "..\ServerCliEngine.h" -#include "..\ServerCliParser.h" -#include "..\..\Access\Access.h" -#include "..\..\Common\StringUtils.h" -#include "..\..\..\Minecraft.Client\PlayerConnection.h" -#include "..\..\..\Minecraft.Client\ServerPlayer.h" -#include "..\..\..\Minecraft.World\DisconnectPacket.h" +#include "..\..\ServerCliEngine.h" +#include "..\..\ServerCliParser.h" +#include "..\..\..\Access\Access.h" +#include "..\..\..\Common\StringUtils.h" +#include "..\..\..\..\Minecraft.Client\PlayerConnection.h" +#include "..\..\..\..\Minecraft.Client\ServerPlayer.h" +#include "..\..\..\..\Minecraft.World\DisconnectPacket.h" #include @@ -142,3 +142,4 @@ namespace ServerRuntime } } } + diff --git a/Minecraft.Server/Console/commands/CliCommandBan.h b/Minecraft.Server/Console/commands/ban/CliCommandBan.h similarity index 94% rename from Minecraft.Server/Console/commands/CliCommandBan.h rename to Minecraft.Server/Console/commands/ban/CliCommandBan.h index 0135d9c00..8605474c6 100644 --- a/Minecraft.Server/Console/commands/CliCommandBan.h +++ b/Minecraft.Server/Console/commands/ban/CliCommandBan.h @@ -1,6 +1,6 @@ #pragma once -#include "IServerCliCommand.h" +#include "..\IServerCliCommand.h" namespace ServerRuntime { @@ -17,4 +17,4 @@ namespace ServerRuntime virtual bool Execute(const ServerCliParsedLine &line, ServerCliEngine *engine); virtual void Complete(const ServerCliCompletionContext &context, const ServerCliEngine *engine, std::vector *out) const; }; -} \ No newline at end of file +} diff --git a/Minecraft.Server/Console/commands/CliCommandGamemode.cpp b/Minecraft.Server/Console/commands/gamemode/CliCommandGamemode.cpp similarity index 86% rename from Minecraft.Server/Console/commands/CliCommandGamemode.cpp rename to Minecraft.Server/Console/commands/gamemode/CliCommandGamemode.cpp index f54392370..2d97b3461 100644 --- a/Minecraft.Server/Console/commands/CliCommandGamemode.cpp +++ b/Minecraft.Server/Console/commands/gamemode/CliCommandGamemode.cpp @@ -2,13 +2,13 @@ #include "CliCommandGamemode.h" -#include "..\ServerCliEngine.h" -#include "..\ServerCliParser.h" -#include "..\..\Common\StringUtils.h" -#include "..\..\..\Minecraft.Client\MinecraftServer.h" -#include "..\..\..\Minecraft.Client\PlayerList.h" -#include "..\..\..\Minecraft.Client\ServerPlayer.h" -#include "..\..\..\Minecraft.World\LevelSettings.h" +#include "..\..\ServerCliEngine.h" +#include "..\..\ServerCliParser.h" +#include "..\..\..\Common\StringUtils.h" +#include "..\..\..\..\Minecraft.Client\MinecraftServer.h" +#include "..\..\..\..\Minecraft.Client\PlayerList.h" +#include "..\..\..\..\Minecraft.Client\ServerPlayer.h" +#include "..\..\..\..\Minecraft.World\LevelSettings.h" namespace ServerRuntime { @@ -96,3 +96,4 @@ namespace ServerRuntime } } + diff --git a/Minecraft.Server/Console/commands/CliCommandGamemode.h b/Minecraft.Server/Console/commands/gamemode/CliCommandGamemode.h similarity index 93% rename from Minecraft.Server/Console/commands/CliCommandGamemode.h rename to Minecraft.Server/Console/commands/gamemode/CliCommandGamemode.h index 6e75d47c0..150a46021 100644 --- a/Minecraft.Server/Console/commands/CliCommandGamemode.h +++ b/Minecraft.Server/Console/commands/gamemode/CliCommandGamemode.h @@ -1,6 +1,6 @@ #pragma once -#include "IServerCliCommand.h" +#include "..\IServerCliCommand.h" namespace ServerRuntime { @@ -15,3 +15,4 @@ namespace ServerRuntime virtual void Complete(const ServerCliCompletionContext &context, const ServerCliEngine *engine, std::vector *out) const; }; } + diff --git a/Minecraft.Server/Console/commands/CliCommandHelp.cpp b/Minecraft.Server/Console/commands/help/CliCommandHelp.cpp similarity index 92% rename from Minecraft.Server/Console/commands/CliCommandHelp.cpp rename to Minecraft.Server/Console/commands/help/CliCommandHelp.cpp index be911e71a..d4106a9c7 100644 --- a/Minecraft.Server/Console/commands/CliCommandHelp.cpp +++ b/Minecraft.Server/Console/commands/help/CliCommandHelp.cpp @@ -2,8 +2,8 @@ #include "CliCommandHelp.h" -#include "..\ServerCliEngine.h" -#include "..\ServerCliRegistry.h" +#include "..\..\ServerCliEngine.h" +#include "..\..\ServerCliRegistry.h" namespace ServerRuntime { @@ -43,3 +43,4 @@ namespace ServerRuntime return true; } } + diff --git a/Minecraft.Server/Console/commands/CliCommandHelp.h b/Minecraft.Server/Console/commands/help/CliCommandHelp.h similarity index 91% rename from Minecraft.Server/Console/commands/CliCommandHelp.h rename to Minecraft.Server/Console/commands/help/CliCommandHelp.h index 6439eb581..3612442f4 100644 --- a/Minecraft.Server/Console/commands/CliCommandHelp.h +++ b/Minecraft.Server/Console/commands/help/CliCommandHelp.h @@ -1,6 +1,6 @@ #pragma once -#include "IServerCliCommand.h" +#include "..\IServerCliCommand.h" namespace ServerRuntime { @@ -14,3 +14,4 @@ namespace ServerRuntime virtual bool Execute(const ServerCliParsedLine &line, ServerCliEngine *engine); }; } + diff --git a/Minecraft.Server/Console/commands/CliCommandList.cpp b/Minecraft.Server/Console/commands/list/CliCommandList.cpp similarity index 82% rename from Minecraft.Server/Console/commands/CliCommandList.cpp rename to Minecraft.Server/Console/commands/list/CliCommandList.cpp index a3c1d05b3..a9c5a2127 100644 --- a/Minecraft.Server/Console/commands/CliCommandList.cpp +++ b/Minecraft.Server/Console/commands/list/CliCommandList.cpp @@ -2,10 +2,10 @@ #include "CliCommandList.h" -#include "..\ServerCliEngine.h" -#include "..\..\Common\StringUtils.h" -#include "..\..\..\Minecraft.Client\MinecraftServer.h" -#include "..\..\..\Minecraft.Client\PlayerList.h" +#include "..\..\ServerCliEngine.h" +#include "..\..\..\Common\StringUtils.h" +#include "..\..\..\..\Minecraft.Client\MinecraftServer.h" +#include "..\..\..\..\Minecraft.Client\PlayerList.h" namespace ServerRuntime { @@ -46,3 +46,4 @@ namespace ServerRuntime } } + diff --git a/Minecraft.Server/Console/commands/CliCommandList.h b/Minecraft.Server/Console/commands/list/CliCommandList.h similarity index 89% rename from Minecraft.Server/Console/commands/CliCommandList.h rename to Minecraft.Server/Console/commands/list/CliCommandList.h index 13f404e93..ad26dcbc2 100644 --- a/Minecraft.Server/Console/commands/CliCommandList.h +++ b/Minecraft.Server/Console/commands/list/CliCommandList.h @@ -1,6 +1,6 @@ #pragma once -#include "IServerCliCommand.h" +#include "..\IServerCliCommand.h" namespace ServerRuntime { @@ -13,3 +13,4 @@ namespace ServerRuntime virtual bool Execute(const ServerCliParsedLine &line, ServerCliEngine *engine); }; } + diff --git a/Minecraft.Server/Console/commands/CliCommandPardonIp.cpp b/Minecraft.Server/Console/commands/pardon-ip/CliCommandPardonIp.cpp similarity index 92% rename from Minecraft.Server/Console/commands/CliCommandPardonIp.cpp rename to Minecraft.Server/Console/commands/pardon-ip/CliCommandPardonIp.cpp index 195ee31d6..3517dbd87 100644 --- a/Minecraft.Server/Console/commands/CliCommandPardonIp.cpp +++ b/Minecraft.Server/Console/commands/pardon-ip/CliCommandPardonIp.cpp @@ -2,11 +2,11 @@ #include "CliCommandPardonIp.h" -#include "..\ServerCliEngine.h" -#include "..\ServerCliParser.h" -#include "..\..\Access\Access.h" -#include "..\..\Common\NetworkUtils.h" -#include "..\..\Common\StringUtils.h" +#include "..\..\ServerCliEngine.h" +#include "..\..\ServerCliParser.h" +#include "..\..\..\Access\Access.h" +#include "..\..\..\Common\NetworkUtils.h" +#include "..\..\..\Common\StringUtils.h" namespace ServerRuntime { @@ -95,3 +95,4 @@ namespace ServerRuntime } } } + diff --git a/Minecraft.Server/Console/commands/CliCommandPardonIp.h b/Minecraft.Server/Console/commands/pardon-ip/CliCommandPardonIp.h similarity index 93% rename from Minecraft.Server/Console/commands/CliCommandPardonIp.h rename to Minecraft.Server/Console/commands/pardon-ip/CliCommandPardonIp.h index 631a20701..96f4c7fc7 100644 --- a/Minecraft.Server/Console/commands/CliCommandPardonIp.h +++ b/Minecraft.Server/Console/commands/pardon-ip/CliCommandPardonIp.h @@ -1,6 +1,6 @@ #pragma once -#include "IServerCliCommand.h" +#include "..\IServerCliCommand.h" namespace ServerRuntime { @@ -16,4 +16,4 @@ namespace ServerRuntime virtual bool Execute(const ServerCliParsedLine &line, ServerCliEngine *engine); virtual void Complete(const ServerCliCompletionContext &context, const ServerCliEngine *engine, std::vector *out) const; }; -} \ No newline at end of file +} diff --git a/Minecraft.Server/Console/commands/CliCommandPardon.cpp b/Minecraft.Server/Console/commands/pardon/CliCommandPardon.cpp similarity index 95% rename from Minecraft.Server/Console/commands/CliCommandPardon.cpp rename to Minecraft.Server/Console/commands/pardon/CliCommandPardon.cpp index 317f1993e..d1e995e90 100644 --- a/Minecraft.Server/Console/commands/CliCommandPardon.cpp +++ b/Minecraft.Server/Console/commands/pardon/CliCommandPardon.cpp @@ -2,11 +2,11 @@ #include "CliCommandPardon.h" -#include "..\ServerCliEngine.h" -#include "..\ServerCliParser.h" -#include "..\..\Access\Access.h" -#include "..\..\Common\StringUtils.h" -#include "..\..\..\Minecraft.Client\ServerPlayer.h" +#include "..\..\ServerCliEngine.h" +#include "..\..\ServerCliParser.h" +#include "..\..\..\Access\Access.h" +#include "..\..\..\Common\StringUtils.h" +#include "..\..\..\..\Minecraft.Client\ServerPlayer.h" #include @@ -170,3 +170,4 @@ namespace ServerRuntime engine->SuggestPlayers(context.prefix, context.linePrefix, out); } } + diff --git a/Minecraft.Server/Console/commands/CliCommandPardon.h b/Minecraft.Server/Console/commands/pardon/CliCommandPardon.h similarity index 93% rename from Minecraft.Server/Console/commands/CliCommandPardon.h rename to Minecraft.Server/Console/commands/pardon/CliCommandPardon.h index d3e8bcb3c..a171d4288 100644 --- a/Minecraft.Server/Console/commands/CliCommandPardon.h +++ b/Minecraft.Server/Console/commands/pardon/CliCommandPardon.h @@ -1,6 +1,6 @@ #pragma once -#include "IServerCliCommand.h" +#include "..\IServerCliCommand.h" namespace ServerRuntime { @@ -16,4 +16,4 @@ namespace ServerRuntime virtual bool Execute(const ServerCliParsedLine &line, ServerCliEngine *engine); virtual void Complete(const ServerCliCompletionContext &context, const ServerCliEngine *engine, std::vector *out) const; }; -} \ No newline at end of file +} diff --git a/Minecraft.Server/Console/commands/CliCommandStop.cpp b/Minecraft.Server/Console/commands/stop/CliCommandStop.cpp similarity index 93% rename from Minecraft.Server/Console/commands/CliCommandStop.cpp rename to Minecraft.Server/Console/commands/stop/CliCommandStop.cpp index 4692aeab5..29e42cd9a 100644 --- a/Minecraft.Server/Console/commands/CliCommandStop.cpp +++ b/Minecraft.Server/Console/commands/stop/CliCommandStop.cpp @@ -2,7 +2,7 @@ #include "CliCommandStop.h" -#include "..\ServerCliEngine.h" +#include "..\..\ServerCliEngine.h" namespace ServerRuntime { @@ -29,3 +29,4 @@ namespace ServerRuntime return true; } } + diff --git a/Minecraft.Server/Console/commands/CliCommandStop.h b/Minecraft.Server/Console/commands/stop/CliCommandStop.h similarity index 89% rename from Minecraft.Server/Console/commands/CliCommandStop.h rename to Minecraft.Server/Console/commands/stop/CliCommandStop.h index f4910fddf..2297c6732 100644 --- a/Minecraft.Server/Console/commands/CliCommandStop.h +++ b/Minecraft.Server/Console/commands/stop/CliCommandStop.h @@ -1,6 +1,6 @@ #pragma once -#include "IServerCliCommand.h" +#include "..\IServerCliCommand.h" namespace ServerRuntime { @@ -13,3 +13,4 @@ namespace ServerRuntime virtual bool Execute(const ServerCliParsedLine &line, ServerCliEngine *engine); }; } + diff --git a/Minecraft.Server/Console/commands/CliCommandTp.cpp b/Minecraft.Server/Console/commands/tp/CliCommandTp.cpp similarity index 85% rename from Minecraft.Server/Console/commands/CliCommandTp.cpp rename to Minecraft.Server/Console/commands/tp/CliCommandTp.cpp index 560222d2e..b4306b3b2 100644 --- a/Minecraft.Server/Console/commands/CliCommandTp.cpp +++ b/Minecraft.Server/Console/commands/tp/CliCommandTp.cpp @@ -2,12 +2,12 @@ #include "CliCommandTp.h" -#include "..\ServerCliEngine.h" -#include "..\ServerCliParser.h" -#include "..\..\..\Minecraft.Client\PlayerConnection.h" -#include "..\..\..\Minecraft.Client\ServerPlayer.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.h" -#include "..\..\..\Minecraft.World\net.minecraft.world.level.dimension.h" +#include "..\..\ServerCliEngine.h" +#include "..\..\ServerCliParser.h" +#include "..\..\..\..\Minecraft.Client\PlayerConnection.h" +#include "..\..\..\..\Minecraft.Client\ServerPlayer.h" +#include "..\..\..\..\Minecraft.World\net.minecraft.world.level.h" +#include "..\..\..\..\Minecraft.World\net.minecraft.world.level.dimension.h" namespace ServerRuntime { @@ -76,3 +76,4 @@ namespace ServerRuntime } } } + diff --git a/Minecraft.Server/Console/commands/CliCommandTp.h b/Minecraft.Server/Console/commands/tp/CliCommandTp.h similarity index 93% rename from Minecraft.Server/Console/commands/CliCommandTp.h rename to Minecraft.Server/Console/commands/tp/CliCommandTp.h index 45975e959..473e2e924 100644 --- a/Minecraft.Server/Console/commands/CliCommandTp.h +++ b/Minecraft.Server/Console/commands/tp/CliCommandTp.h @@ -1,6 +1,6 @@ #pragma once -#include "IServerCliCommand.h" +#include "..\IServerCliCommand.h" namespace ServerRuntime { @@ -15,3 +15,4 @@ namespace ServerRuntime virtual void Complete(const ServerCliCompletionContext &context, const ServerCliEngine *engine, std::vector *out) const; }; } + diff --git a/Minecraft.Server/Console/commands/CliCommandWhitelist.cpp b/Minecraft.Server/Console/commands/whitelist/CliCommandWhitelist.cpp similarity index 97% rename from Minecraft.Server/Console/commands/CliCommandWhitelist.cpp rename to Minecraft.Server/Console/commands/whitelist/CliCommandWhitelist.cpp index 9ac8ec70e..037242780 100644 --- a/Minecraft.Server/Console/commands/CliCommandWhitelist.cpp +++ b/Minecraft.Server/Console/commands/whitelist/CliCommandWhitelist.cpp @@ -2,11 +2,11 @@ #include "CliCommandWhitelist.h" -#include "..\ServerCliEngine.h" -#include "..\ServerCliParser.h" -#include "..\..\Access\Access.h" -#include "..\..\Common\StringUtils.h" -#include "..\..\ServerProperties.h" +#include "..\..\ServerCliEngine.h" +#include "..\..\ServerCliParser.h" +#include "..\..\..\Access\Access.h" +#include "..\..\..\Common\StringUtils.h" +#include "..\..\..\ServerProperties.h" #include #include @@ -282,3 +282,4 @@ namespace ServerRuntime } } } + diff --git a/Minecraft.Server/Console/commands/CliCommandWhitelist.h b/Minecraft.Server/Console/commands/whitelist/CliCommandWhitelist.h similarity index 92% rename from Minecraft.Server/Console/commands/CliCommandWhitelist.h rename to Minecraft.Server/Console/commands/whitelist/CliCommandWhitelist.h index aba96247a..45e21a5e6 100644 --- a/Minecraft.Server/Console/commands/CliCommandWhitelist.h +++ b/Minecraft.Server/Console/commands/whitelist/CliCommandWhitelist.h @@ -1,6 +1,6 @@ #pragma once -#include "IServerCliCommand.h" +#include "..\IServerCliCommand.h" namespace ServerRuntime { @@ -14,3 +14,4 @@ namespace ServerRuntime void Complete(const ServerCliCompletionContext &context, const ServerCliEngine *engine, std::vector *out) const override; }; } + diff --git a/Minecraft.Server/Minecraft.Server.vcxproj b/Minecraft.Server/Minecraft.Server.vcxproj index f3d997918..cad5f04bf 100644 --- a/Minecraft.Server/Minecraft.Server.vcxproj +++ b/Minecraft.Server/Minecraft.Server.vcxproj @@ -653,17 +653,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -689,17 +689,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -731,3 +731,4 @@ + diff --git a/Minecraft.Server/Minecraft.Server.vcxproj.filters b/Minecraft.Server/Minecraft.Server.vcxproj.filters index 50db0117f..b7768ac6a 100644 --- a/Minecraft.Server/Minecraft.Server.vcxproj.filters +++ b/Minecraft.Server/Minecraft.Server.vcxproj.filters @@ -561,37 +561,37 @@ - + Server\Console\Commands - + Server\Console\Commands - + Server\Console\Commands - + Server\Console\Commands - + Server\Console\Commands - + Server\Console\Commands - + Server\Console\Commands - + Server\Console\Commands - + Server\Console\Commands - + Server\Console\Commands - + Server\Console\Commands @@ -645,37 +645,37 @@ Server - + Server\Console\Commands - + Server\Console\Commands - + Server\Console\Commands - + Server\Console\Commands - + Server\Console\Commands - + Server\Console\Commands - + Server\Console\Commands - + Server\Console\Commands - + Server\Console\Commands - + Server\Console\Commands - + Server\Console\Commands @@ -689,3 +689,4 @@ +