Skip to content

Add ChatCommands & New ConsoleCommands #939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
KKNecmi wants to merge 23 commits into from
Closed

Add ChatCommands & New ConsoleCommands #939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
a3b9f0f
Fix mouse getting grabbed outside window of the game
KKNecmi Mar 5, 2026
b5873a3
Merge branch 'smartcmd:main' into main
KKNecmi Mar 6, 2026
06b774e
Merge branch 'smartcmd:main' into main
KKNecmi Mar 6, 2026
cb6106b
Merge branch 'main' of https://github.com/smartcmd/MinecraftConsoles
KKNecmi Mar 6, 2026
0436a6e
Merge branch 'main' of https://github.com/KKNecmi/MinecraftConsoles
KKNecmi Mar 6, 2026
c7e8db1
Merge branch 'smartcmd:main' into main
KKNecmi Mar 6, 2026
79dbd39
Merge branch 'main' of https://github.com/KKNecmi/MinecraftConsoles
KKNecmi Mar 6, 2026
76b501a
revert sln
KKNecmi Mar 6, 2026
86102e7
merge
KKNecmi Mar 6, 2026
0b76293
Merge branch 'main' of https://github.com/smartcmd/MinecraftConsoles
KKNecmi Mar 6, 2026
1884085
Merge branch 'smartcmd:main' into main
KKNecmi Mar 6, 2026
860876c
Merge branch 'smartcmd:main' into main
KKNecmi Mar 6, 2026
0cfe187
Merge branch 'smartcmd:main' into main
KKNecmi Mar 7, 2026
7d891f1
Merge branch 'main' of https://github.com/KKNecmi/MinecraftConsoles
KKNecmi Mar 7, 2026
19db7e7
Merge branch 'main' of https://github.com/smartcmd/MinecraftConsoles
KKNecmi Mar 7, 2026
5e3f188
Merge branch 'main' of https://github.com/smartcmd/MinecraftConsoles
KKNecmi Mar 7, 2026
23bf01f
ChatCommands Testing
KKNecmi Mar 7, 2026
38edfa8
Added Chat Listening For Chat Commands, Added /kill,gamemode,teleport…
KKNecmi Mar 8, 2026
5755be1
Merge branch 'smartcmd:main' into chatcommands
KKNecmi Mar 8, 2026
44f17c7
trying to resolve conflict
KKNecmi Mar 9, 2026
1a0953e
Merge branch 'main' into chatcommands
KKNecmi Mar 9, 2026
441e5f0
start adding /effect
KKNecmi Mar 9, 2026
6d458d7
Merge branch 'chatcommands' of https://github.com/KKNecmi/MinecraftCo…
KKNecmi Mar 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
131 changes: 130 additions & 1 deletion Minecraft.Client/MinecraftServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCom

if (action == L"help" || action == L"?")
{
server->info(L"Commands: help, stop, list, say <message>, save-all, time <set day|night|ticks|add ticks>, weather <clear|rain|thunder> [seconds], tp <player> <target>, give <player> <itemId> [amount] [aux], enchant <player> <enchantId> [level], kill <player>");
server->info(L"Commands: help, stop, list, say <message>, save-all, time <set day|night|ticks|add ticks>, weather <clear|rain|thunder> [seconds], tp <player> <target>, give <player> <itemId> [amount] [aux], enchant <player> <enchantId> [level], kill <player>, summon <entity> <x> <y> <z> [dimension]");
return true;
}

Expand Down Expand Up @@ -538,6 +538,135 @@ static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCom
return true;
}

if (action == L"summon")
Copy link
Collaborator

@codeHusky codeHusky Mar 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general, this particular non-modular implementation of commands in addition to the various independent command .cpp/.h files is confusing and not very good architecturally. Ideally these should be unified and all of our commands should be implemented in their own files. Having this duplicate implementation is messy and just not good for maintainability long term.

Copy link
Contributor Author

@KKNecmi KKNecmi Mar 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Im not sure if you made a error in "should be implemented in their own files." because thats like that right now , because 4J had "independent command .cpp/.h files" i taken from there if i dont get you wrong you saying its better if gamemodecommand.cpp,teleportcommand.cpp etc comes in to single file just could be in playerconnection.cpp while checking logadminaction everything inside playerconnection or merging everycommand.cpp with already used commandispatcher.cpp

Copy link
Collaborator

@codeHusky codeHusky Mar 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I’m not sure what you mean

Copy link
Contributor Author

@KKNecmi KKNecmi Mar 10, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"What is your opinion on how to fix the issue of 'various independent command .cpp/.h files is confusing' in this case?

Add everything to playerconnection.cpp and check everything there within the message (like console commands).

or

Merge every xxxcommand.cpp into commanddispatcher.cpp, and still use playerconnection to get args and send them directly to commanddispatcher rather than having enums and separate xxxcommand.cpp files."

Copy link
Collaborator

@codeHusky codeHusky Mar 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, just define all commands in their own separate .cpp files. Again, there is no reason to have hard coded commands in any particular irrelevant file, the commands should be defined in their own files, registered somewhere centrally so they work in singleplayer and dedicated servers, and then all the weird hardcoded ones should be removed. That’s a far more maintainable pattern than what you’re proposing.

Copy link
Contributor Author

@KKNecmi KKNecmi Mar 10, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

did you read the code? by this answer i dont think you did it the commands are in the their own command files and with servercommandispatcher they get registered can you show me which hardcoded ones you talking about

Copy link
Collaborator

@codeHusky codeHusky Mar 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/smartcmd/MinecraftConsoles/pull/939/files/6d458d7ef8205d6173bb967df0d25e29b09adf6c#diff-6c71d6fb6dc90b8265c816b3bdc2c79bbeb3676c23ce0874871b1148c350b2b3

Copy link
Contributor Author

@KKNecmi KKNecmi Mar 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh you mean the console commands i continued adding them same as direct usage i guess i could rewrite to use xxxcommand.cpp and bytearrayoutputstream same as playerconnection thanks for pointing this i will make it so use same methods as playerconnection also add some more needed commands and one day maybe open a pr again

{
if (tokens.size() < 4)
{
server->warn(L"Usage: summon <entity> <x> <y> <z> [dimension]");
server->warn(L"Dimensions: 0=Overworld, -1=Nether, 1=End");
return false;
}

wstring entityType = tokens[1];
int x = 0, y = 0, z = 0;
int dimension = 0;

if (!TryParseIntValue(tokens[2], x) || !TryParseIntValue(tokens[3], y) || !TryParseIntValue(tokens[4], z))
{
server->warn(L"Invalid coordinates. Usage: summon <entity> <x> <y> <z>");
return false;
}

if (tokens.size() >= 5)
{
if (!TryParseIntValue(tokens[5], dimension))
{
server->warn(L"Invalid dimension. Use: 0=Overworld, -1=Nether, 1=End");
return false;
}

if (dimension != 0 && dimension != -1 && dimension != 1)
{
server->warn(L"Invalid dimension. Use: 0=Overworld, -1=Nether, 1=End");
return false;
}
}
ServerLevel* level = server->getLevel(dimension);
if (level == NULL)
{
server->warn(L"Could not access level");
return false;
}

int entityId = -1;
wchar_t* endptr;
long numId = wcstol(entityType.c_str(), &endptr, 10);
if (*endptr == L'\0')
{
entityId = (int)numId;
}
else
{
if (entityType == L"creeper") entityId = 50;
else if (entityType == L"skeleton") entityId = 51;
else if (entityType == L"spider") entityId = 52;
else if (entityType == L"giant") entityId = 53;
else if (entityType == L"zombie") entityId = 54;
else if (entityType == L"slime") entityId = 55;
else if (entityType == L"ghast") entityId = 56;
else if (entityType == L"pigzombie") entityId = 57;
else if (entityType == L"enderman") entityId = 58;
else if (entityType == L"cavespider") entityId = 59;
else if (entityType == L"silverfish") entityId = 60;
else if (entityType == L"blaze") entityId = 61;
else if (entityType == L"lavaslime") entityId = 62;
else if (entityType == L"enderdragon") entityId = 63;
else if (entityType == L"wither") entityId = 64;
else if (entityType == L"bat") entityId = 65;
else if (entityType == L"witch") entityId = 66;
else if (entityType == L"pig") entityId = 90;
else if (entityType == L"sheep") entityId = 91;
else if (entityType == L"cow") entityId = 92;
else if (entityType == L"chicken") entityId = 93;
else if (entityType == L"squid") entityId = 94;
else if (entityType == L"wolf") entityId = 95;
else if (entityType == L"mushroomcow") entityId = 96;
else if (entityType == L"snowman") entityId = 97;
else if (entityType == L"ocelot") entityId = 98;
else if (entityType == L"villagergolem") entityId = 99;
else if (entityType == L"horse") entityId = 100;
else if (entityType == L"villager") entityId = 120;
else if (entityType == L"item") entityId = 1;
else if (entityType == L"xporb") entityId = 2;
else if (entityType == L"painting") entityId = 9;
else if (entityType == L"arrow") entityId = 10;
else if (entityType == L"snowball") entityId = 11;
else if (entityType == L"fireball") entityId = 12;
else if (entityType == L"smallfireball") entityId = 13;
else if (entityType == L"enderpearl") entityId = 14;
else if (entityType == L"potion") entityId = 16;
else if (entityType == L"experiencebottle") entityId = 17;
else if (entityType == L"itemframe") entityId = 18;
else if (entityType == L"witherskull") entityId = 19;
else if (entityType == L"tnt") entityId = 20;
else if (entityType == L"fallingsand") entityId = 21;
else if (entityType == L"fireworks") entityId = 22;
else if (entityType == L"boat") entityId = 41;
else if (entityType == L"minecart") entityId = 42;
else if (entityType == L"chestminecart") entityId = 43;
else if (entityType == L"furnaceminecart") entityId = 44;
else if (entityType == L"tntminecart") entityId = 45;
else if (entityType == L"hopperminecart") entityId = 46;
else if (entityType == L"spawnerminecart") entityId = 47;
else
{
server->warn(L"Unknown entity type: " + entityType);
return false;
}
}

shared_ptr<Entity> entity = EntityIO::newById(entityId, level);

if (entity == NULL)
{
server->warn(L"Failed to summon entity: " + entityType);
return false;
}

entity->setPos(x + 0.5, y, z + 0.5);

level->addEntity(entity);

wstring dimensionName;
if (dimension == 0) dimensionName = L"Overworld";
else if (dimension == -1) dimensionName = L"Nether";
else if (dimension == 1) dimensionName = L"End";

server->info(L"Summoned " + entityType + L" at (" +
std::to_wstring(x) + L", " + std::to_wstring(y) + L", " + std::to_wstring(z) + L") in " + dimensionName);
return true;
}

server->warn(L"Unknown command: " + command);
return false;
}
Expand Down
Loading