backups/MinecraftConsoles
2
0
Fork 1
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-08-20 09:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added Chat Listening For Chat Commands, Added /kill,gamemode,teleport,give,enchant,setblock,fill,time,weather,summon for Chat Commands, Added Summon in Console Commands And Edited Help For New parameters

Browse source
This commit is contained in:
KKNecmi 2026-03-08 13:31:26 +03:00
parent 23bf01fc27
commit 38edfa87d6
11 changed files with 805 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

131
Minecraft.Client/MinecraftServer.cpp
View file

@ -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;
}
@ -538,6 +538,135 @@ static bool ExecuteConsoleCommand(MinecraftServer *server, const wstring &rawCom
return true;
}
if (action == L"summon")
{
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;
}

399
Minecraft.Client/PlayerConnection.cpp
View file

@ -9,9 +9,11 @@
#include "..\Minecraft.World\net.minecraft.network.h"
#include "..\Minecraft.World\net.minecraft.world.entity.item.h"
#include "..\Minecraft.World\net.minecraft.world.level.h"
#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
#include "..\Minecraft.World\net.minecraft.world.level.dimension.h"
#include "..\Minecraft.World\net.minecraft.world.item.h"
#include "..\Minecraft.World\net.minecraft.world.item.trading.h"
#include "..\Minecraft.World\net.minecraft.world.item.enchantment.h"
#include "..\Minecraft.World\net.minecraft.world.inventory.h"
#include "..\Minecraft.World\net.minecraft.world.level.tile.entity.h"
#include "..\Minecraft.World\net.minecraft.world.level.saveddata.h"
@ -646,7 +648,27 @@ void PlayerConnection::handleCommand(const wstring& message)
if (commandStr == L"/kill")
{
server->getCommandDispatcher()->performCommand(player, eGameCommand_Kill, byteArray());
if (args.size() == 0)
{
// Kill self
server->getCommandDispatcher()->performCommand(player, eGameCommand_Kill, byteArray());
}
else
{
// Kill target player
shared_ptr<ServerPlayer> targetPlayer = server->getPlayers()->getPlayer(args[0]);
if (!targetPlayer)
{
player->sendMessage(L"Player '" + args[0] + L"' not found!");
return;
}
ByteArrayOutputStream baos;
DataOutputStream dos(&baos);
dos.writePlayerUID(targetPlayer->getXuid());
server->getCommandDispatcher()->performCommand(player, eGameCommand_Kill, baos.toByteArray());
}
}
else if (commandStr == L"/gamemode")
{
@ -655,7 +677,7 @@ void PlayerConnection::handleCommand(const wstring& message)
if (args.size() == 0)
{
player->sendMessage(L"Incorrect command usage!");
player->sendMessage(L"Incorrect command usage! Use: /gamemode <mode> [player]");
return;
}
@ -665,7 +687,6 @@ void PlayerConnection::handleCommand(const wstring& message)
{
// Player was specified in the command arguments
shared_ptr<ServerPlayer> serverPlayer = server->getPlayers()->getPlayer(args[1]);
string playerName = wstringtochararray(args[1]);
if (!serverPlayer)
{
// Player not found
@ -688,16 +709,380 @@ void PlayerConnection::handleCommand(const wstring& message)
{
if (args.size() == 0)
{
player->sendMessage(L"Incorrect command usage!");
player->sendMessage(L"Incorrect command usage! Use: /tp <target> <sendplayer> or /tp <target> <x> <y> <z>");
return;
}
if (args.size() >= 4)
// tp <targetplayer> <toplayer>
if (args.size() == 2)
{
app.DebugPrintf("size much");
shared_ptr<ServerPlayer> targetPlayer = server->getPlayers()->getPlayer(args[0]);
shared_ptr<ServerPlayer> toPlayer = server->getPlayers()->getPlayer(args[1]);
if (!targetPlayer)
{
player->sendMessage(L"Target player '" + args[0] + L"' not found!");
return;
}
if (!toPlayer)
{
player->sendMessage(L"Send to player '" + args[1] + L"' not found!");
return;
}
ByteArrayOutputStream baos;
DataOutputStream dos(&baos);
dos.writePlayerUID(targetPlayer->getXuid());
dos.writePlayerUID(toPlayer->getXuid());
server->getCommandDispatcher()->performCommand(player, eGameCommand_Teleport, baos.toByteArray());
}
// tp <targetplayer> <x> <y> <z>
else if (args.size() == 4)
{
shared_ptr<ServerPlayer> targetPlayer = server->getPlayers()->getPlayer(args[0]);
if (!targetPlayer)
{
player->sendMessage(L"Target player '" + args[0] + L"' not found!");
return;
}
int x = _wtoi(args[1].c_str());
int y = _wtoi(args[2].c_str());
int z = _wtoi(args[3].c_str());
targetPlayer->connection->teleport(x + 0.5f, y, z + 0.5f, targetPlayer->yRot, targetPlayer->xRot);
player->sendMessage(L"Teleported " + targetPlayer->getName() + L" to " + args[1] + L" " + args[2] + L" " + args[3]);
}
// tp <targetplayer>
else if (args.size() == 1)
{
shared_ptr<ServerPlayer> toPlayer = server->getPlayers()->getPlayer(args[0]);
if (!toPlayer)
{
player->sendMessage(L"Target player '" + args[0] + L"' not found!");
return;
}
ByteArrayOutputStream baos;
DataOutputStream dos(&baos);
dos.writePlayerUID(player->getXuid());
dos.writePlayerUID(toPlayer->getXuid());
server->getCommandDispatcher()->performCommand(player, eGameCommand_Teleport, baos.toByteArray());
}
app.DebugPrintf("Teleported");
else
{
player->sendMessage(L"Incorrect command usage! Use: /tp <target> <sendplayer> or /tp <target> <x> <y> <z>");
}
}
else if (commandStr == L"/give" || commandStr == L"/giveitem")
{
if (args.size() < 2)
{
player->sendMessage(L"Incorrect command usage! Use: /give <player> <item> [amount] [aux]");
return;
}
shared_ptr<ServerPlayer> targetPlayer = server->getPlayers()->getPlayer(args[0]);
if (!targetPlayer)
{
player->sendMessage(L"Player '" + args[0] + L"' not found!");
return;
}
int itemId = _wtoi(args[1].c_str());
if (itemId <= 0 || itemId >= Item::items.length || Item::items[itemId] == NULL)
{
player->sendMessage(L"Invalid item ID: " + args[1]);
return;
}
int amount = 1;
if (args.size() >= 3)
{
amount = _wtoi(args[2].c_str());
if (amount < 1 || amount > 64)
{
player->sendMessage(L"Amount must be between 1 and 64");
return;
}
}
int aux = 0;
if (args.size() >= 4)
{
aux = _wtoi(args[3].c_str());
}
ByteArrayOutputStream baos;
DataOutputStream dos(&baos);
dos.writePlayerUID(targetPlayer->getXuid());
dos.writeInt(itemId);
dos.writeInt(amount);
dos.writeInt(aux);
dos.writeUTF(L"");
server->getCommandDispatcher()->performCommand(player, eGameCommand_Give, baos.toByteArray());
}
else if (commandStr == L"/enchant" || commandStr == L"/enchantitem")
{
if (args.size() < 2)
{
player->sendMessage(L"Incorrect command usage! Use: /enchant <player> <enchantment_id> [level]");
return;
}
shared_ptr<ServerPlayer> targetPlayer = server->getPlayers()->getPlayer(args[0]);
if (!targetPlayer)
{
player->sendMessage(L"Player '" + args[0] + L"' not found!");
return;
}
if (targetPlayer->getSelectedItem() == NULL)
{
player->sendMessage(L"Player " + targetPlayer->getName() + L" is not holding an item");
return;
}
int enchantmentId = -1;
wchar_t* endptr;
long numId = wcstol(args[1].c_str(), &endptr, 10);
if (*endptr == L'\0')
{
enchantmentId = (int)numId;
}
else
{
wstring enchantName = args[1];
if (enchantName == L"protection") enchantmentId = 0;
else if (enchantName == L"fire_protection") enchantmentId = 1;
else if (enchantName == L"feather_falling") enchantmentId = 2;
else if (enchantName == L"blast_protection") enchantmentId = 3;
else if (enchantName == L"projectile_protection") enchantmentId = 4;
else if (enchantName == L"respiration") enchantmentId = 5;
else if (enchantName == L"aqua_affinity") enchantmentId = 6;
else if (enchantName == L"thorns") enchantmentId = 7;
else if (enchantName == L"sharpness") enchantmentId = 16;
else if (enchantName == L"smite") enchantmentId = 17;
else if (enchantName == L"bane_of_arthropods") enchantmentId = 18;
else if (enchantName == L"knockback") enchantmentId = 19;
else if (enchantName == L"fire_aspect") enchantmentId = 20;
else if (enchantName == L"looting") enchantmentId = 21;
else if (enchantName == L"efficiency") enchantmentId = 32;
else if (enchantName == L"silk_touch") enchantmentId = 33;
else if (enchantName == L"unbreaking") enchantmentId = 34;
else if (enchantName == L"fortune") enchantmentId = 35;
else if (enchantName == L"power") enchantmentId = 48;
else if (enchantName == L"punch") enchantmentId = 49;
else if (enchantName == L"flame") enchantmentId = 50;
else if (enchantName == L"infinity") enchantmentId = 51;
else
{
player->sendMessage(L"Unknown enchantment name: " + enchantName);
return;
}
}
if (enchantmentId < 0 || enchantmentId >= Enchantment::enchantments.length || Enchantment::enchantments[enchantmentId] == NULL)
{
player->sendMessage(L"Invalid enchantment ID: " + args[1]);
return;
}
int level = 1;
if (args.size() >= 3)
{
level = _wtoi(args[2].c_str());
Enchantment* e = Enchantment::enchantments[enchantmentId];
if (level < e->getMinLevel() || level > e->getMaxLevel())
{
player->sendMessage(L"Enchantment level must be between " +
to_wstring(e->getMinLevel()) + L" and " +
to_wstring(e->getMaxLevel()));
return;
}
}
ByteArrayOutputStream baos;
DataOutputStream dos(&baos);
dos.writePlayerUID(targetPlayer->getXuid());
dos.writeInt(enchantmentId);
dos.writeInt(level);
server->getCommandDispatcher()->performCommand(player, eGameCommand_EnchantItem, baos.toByteArray());
}
else if (commandStr == L"/setblock")
{
if (args.size() == 0)
{
player->sendMessage(L"Incorrect command usage! Use: /setblock <x> <y> <z> <block_id>");
return;
}
// setblock <x> <y> <z> <block_id>
else if (args.size() == 4)
{
int x = _wtoi(args[0].c_str());
int y = _wtoi(args[1].c_str());
int z = _wtoi(args[2].c_str());
int blockId = _wtoi(args[3].c_str());
if (blockId < 0 || blockId >= Tile::TILE_NUM_COUNT || Tile::tiles[blockId] == NULL)
{
player->sendMessage(L"Invalid block ID: " + args[3]);
return;
}
ServerLevel* level = server->getLevel(player->dimension);
if (level == NULL)
{
player->sendMessage(L"Null Dimension");
return;
}
level->setTileAndData(x, y, z, blockId, 0, Tile::UPDATE_ALL);
level->sendTileUpdated(x, y, z);
player->sendMessage(L"Changed the block at "+ args[0] + L", " + args[1] + L", " + args[2] + L",");
}
else
{
player->sendMessage(L"Incorrect command usage! Use: /setblock <x> <y> <z> <block_id>");
}
}
else if (commandStr == L"/fill")
{
if (args.size() < 7)
{
player->sendMessage(L"Incorrect command usage! Use: /fill <x1> <y1> <z1> <x2> <y2> <z2> <block_id>");
return;
}
int x1 = _wtoi(args[0].c_str());
int y1 = _wtoi(args[1].c_str());
int z1 = _wtoi(args[2].c_str());
int x2 = _wtoi(args[3].c_str());
int y2 = _wtoi(args[4].c_str());
int z2 = _wtoi(args[5].c_str());
int blockId = _wtoi(args[6].c_str());
if (x1 > x2) swap(x1, x2);
if (y1 > y2) swap(y1, y2);
if (z1 > z2) swap(z1, z2);
if (blockId < 0 || blockId >= Tile::TILE_NUM_COUNT || Tile::tiles[blockId] == NULL)
{
player->sendMessage(L"Invalid block ID: " + args[6]);
return;
}
int volume = (x2 - x1 + 1) * (y2 - y1 + 1) * (z2 - z1 + 1);
if (volume > 32768)
{
player->sendMessage(L"Changed Block Count is Too Big Maximum is 32768 blocks");
return;
}
ServerLevel* level = server->getLevel(player->dimension);
if (level == NULL)
{
player->sendMessage(L"Null Dimension");
return;
}
int blocksChanged = 0;
for (int x = x1; x <= x2; x++)
{
for (int y = y1; y <= y2; y++)
{
for (int z = z1; z <= z2; z++)
{
level->setTileAndData(x, y, z, blockId, 0, Tile::UPDATE_ALL);
blocksChanged++;
}
}
}
level->sendTileUpdated(x1, y1, z1);
level->sendTileUpdated(x2, y2, z2);
player->sendMessage(L"Successfully filled " + to_wstring(blocksChanged) + L" blocks with " + args[6]);
}
else if (commandStr == L"/time")
{
if (args.size() < 2)
{
player->sendMessage(L"Incorrect command usage! Use: /time set <value> or /time add <value>");
return;
}
wstring operation = args[0];
int value = _wtoi(args[1].c_str());
ByteArrayOutputStream baos;
DataOutputStream dos(&baos);
dos.writeUTF(operation);
dos.writeInt(value);
server->getCommandDispatcher()->performCommand(player, eGameCommand_Time, baos.toByteArray());
}
else if (commandStr == L"/weather")
{
if (args.size() == 0)
{
player->sendMessage(L"Incorrect command usage! Use: /weather <clear/rain/thunder> [duration]");
return;
}
wstring weatherType = args[0];
int duration = -1;
if (args.size() >= 2)
{
duration = _wtoi(args[1].c_str());
}
ByteArrayOutputStream baos;
DataOutputStream dos(&baos);
dos.writeUTF(weatherType);
dos.writeInt(duration);
server->getCommandDispatcher()->performCommand(player, eGameCommand_Weather, baos.toByteArray());
}
else if (commandStr == L"/summon")
{
if (args.size() < 1)
{
player->sendMessage(L"Incorrect command usage! Use: /summon <entity> [x] [y] [z]");
return;
}
wstring entityType = args[0];
int x = INT_MIN, y = INT_MIN, z = INT_MIN;
if (args.size() >= 4)
{
x = _wtoi(args[1].c_str());
y = _wtoi(args[2].c_str());
z = _wtoi(args[3].c_str());
}
ByteArrayOutputStream baos;
DataOutputStream dos(&baos);
dos.writeUTF(entityType);
dos.writeInt(x);
dos.writeInt(y);
dos.writeInt(z);
server->getCommandDispatcher()->performCommand(player, eGameCommand_Summon, baos.toByteArray());
}
else
{

3
Minecraft.Client/ServerCommandDispatcher.cpp
View file

@ -5,6 +5,7 @@
#include "..\Minecraft.World\net.minecraft.commands.h"
#include "..\Minecraft.World\net.minecraft.commands.common.h"
#include "TeleportCommand.h"
#include "ServerCommandDispatcher.h"
ServerCommandDispatcher::ServerCommandDispatcher()
@ -18,6 +19,8 @@ ServerCommandDispatcher::ServerCommandDispatcher()
addCommand(new TeleportCommand());
addCommand(new GiveItemCommand());
addCommand(new EnchantItemCommand());
addCommand(new WeatherCommand());
addCommand(new SummonCommand());
//addCommand(new EmoteCommand());
//addCommand(new ShowSeedCommand());
//addCommand(new HelpCommand());

2
Minecraft.World/CommandsEnum.h
View file

@ -12,5 +12,7 @@ enum EGameCommand
eGameCommand_Time,
eGameCommand_ToggleDownfall,
eGameCommand_Teleport,
eGameCommand_Weather,
eGameCommand_Summon,
eGameCommand_COUNT
};

3
Minecraft.World/Minecraft.World.vcxproj
View file

@ -2808,6 +2808,7 @@
<ClInclude Include="StoneButtonTile.h" />
<ClInclude Include="StructureFeatureIO.h" />
<ClInclude Include="StructureFeatureSavedData.h" />
<ClInclude Include="SummonCommand.h" />
<ClInclude Include="SwampRiversLayer.h" />
<ClInclude Include="SwellGoal.h" />
<ClInclude Include="TakeFlowerGoal.h" />
@ -3635,7 +3636,9 @@
<ClCompile Include="StoneButtonTile.cpp" />
<ClCompile Include="StructureFeatureIO.cpp" />
<ClCompile Include="StructureFeatureSavedData.cpp" />
<ClCompile Include="SummonCommand.cpp" />
<ClCompile Include="Team.cpp" />
<ClCompile Include="WeatherCommand.cpp" />
<ClCompile Include="WeightedPressurePlateTile.cpp" />
<ClCompile Include="WoodButtonTile.cpp" />
<ClCompile Include="WoolTileItem.cpp" />

9
Minecraft.World/Minecraft.World.vcxproj.filters
View file

@ -3197,6 +3197,9 @@
<ClInclude Include="FireworksMenu.h">
<Filter>net\minecraft\world\inventory</Filter>
</ClInclude>
<ClInclude Include="SummonCommand.h">
<Filter>net\minecraft\commands\common</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="stdafx.cpp">
@ -5626,5 +5629,11 @@
<ClCompile Include="EmptyMapItem.cpp">
<Filter>net\minecraft\world\item</Filter>
</ClCompile>
<ClCompile Include="WeatherCommand.cpp">
<Filter>net\minecraft\commands\common</Filter>
</ClCompile>
<ClCompile Include="SummonCommand.cpp">
<Filter>net\minecraft\commands\common</Filter>
</ClCompile>
</ItemGroup>
</Project>

156
Minecraft.World/SummonCommand.cpp Normal file
View file

@ -0,0 +1,156 @@
#include "stdafx.h"
#include "..\Minecraft.Client\MinecraftServer.h"
#include "..\Minecraft.Client\ServerPlayer.h"
#include "..\Minecraft.Client\ServerLevel.h"
#include "..\Minecraft.World\net.minecraft.commands.h"
#include "..\Minecraft.World\net.minecraft.world.level.h"
#include "GameCommandPacket.h"
#include "EntityIO.h"
#include "SummonCommand.h"
EGameCommand SummonCommand::getId()
{
return eGameCommand_Summon;
}
int SummonCommand::getPermissionLevel()
{
return LEVEL_GAMEMASTERS;
}
void SummonCommand::execute(shared_ptr<CommandSender> source, byteArray commandData)
{
ByteArrayInputStream bais(commandData);
DataInputStream dis(&bais);
wstring entityType = dis.readUTF();
int x = dis.readInt();
int y = dis.readInt();
int z = dis.readInt();
bais.reset();
MinecraftServer* server = MinecraftServer::getInstance();
ServerLevel* level = NULL;
shared_ptr<ServerPlayer> player = dynamic_pointer_cast<ServerPlayer>(source);
if (player != NULL)
{
level = server->getLevel(player->dimension);
if (x == INT_MIN || y == INT_MIN || z == INT_MIN)
{
x = (int)player->x;
y = (int)player->y;
z = (int)player->z;
}
}
else
{
level = server->getLevel(0);
if (x == INT_MIN || y == INT_MIN || z == INT_MIN)
{
source->sendMessage(L"Player Not Founded Coords Are Required: /summon <entity> <x> <y> <z>");
return;
}
}
if (level == NULL) return;
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
{
source->sendMessage(L"Unknown entity type: " + entityType);
return;
}
}
shared_ptr<Entity> entity = EntityIO::newById(entityId, level);
if (entity == NULL)
{
source->sendMessage(L"Failed to summon entity: " + entityType);
return;
}
entity->setPos(x + 0.5, y, z + 0.5);
level->addEntity(entity);
wstring successMsg = L"Summoned " + entityType + L" at (" +
to_wstring(x) + L", " + to_wstring(y) + L", " + to_wstring(z) + L")";
source->sendMessage(successMsg);
}
shared_ptr<GameCommandPacket> SummonCommand::preparePacket(const wstring& entityType, int x, int y, int z)
{
ByteArrayOutputStream baos;
DataOutputStream dos(&baos);
dos.writeUTF(entityType);
dos.writeInt(x);
dos.writeInt(y);
dos.writeInt(z);
return shared_ptr<GameCommandPacket>(new GameCommandPacket(eGameCommand_Summon, baos.toByteArray()));
}

16
Minecraft.World/SummonCommand.h Normal file
View file

@ -0,0 +1,16 @@
#pragma once
#include "Command.h"
#include "level.h"
class GameCommandPacket;
class SummonCommand : public Command
{
public:
virtual EGameCommand getId();
virtual int getPermissionLevel();
virtual void execute(shared_ptr<CommandSender> source, byteArray commandData);
static shared_ptr<GameCommandPacket> preparePacket(const wstring& entityType, int x, int y, int z);
};

80
Minecraft.World/WeatherCommand.cpp Normal file
View file

@ -0,0 +1,80 @@
#include "stdafx.h"
#include "..\Minecraft.Client\MinecraftServer.h"
#include "..\Minecraft.Client\ServerLevel.h"
#include "..\Minecraft.World\net.minecraft.commands.h"
#include "..\Minecraft.World\net.minecraft.world.level.h"
#include "..\Minecraft.World\net.minecraft.world.level.storage.h"
#include "..\Minecraft.World\SharedConstants.h"
#include "GameCommandPacket.h"
#include "WeatherCommand.h"
EGameCommand WeatherCommand::getId()
{
return eGameCommand_Weather;
}
int WeatherCommand::getPermissionLevel()
{
return LEVEL_GAMEMASTERS;
}
void WeatherCommand::execute(shared_ptr<CommandSender> source, byteArray commandData)
{
ByteArrayInputStream bais(commandData);
DataInputStream dis(&bais);
wstring weatherType = dis.readUTF();
int duration = dis.readInt();
bais.reset();
MinecraftServer* server = MinecraftServer::getInstance();
ServerLevel* level = server->getLevel(0);
if (level == NULL) return;
LevelData* levelData = level->getLevelData();
if (duration <= 0)
{
Random random;
duration = (300 + random.nextInt(600)) * SharedConstants::TICKS_PER_SECOND;
}
else
{
duration = duration * SharedConstants::TICKS_PER_SECOND;
}
levelData->setRainTime(duration);
levelData->setThunderTime(duration);
if (weatherType == L"clear")
{
levelData->setRaining(false);
levelData->setThundering(false);
logAdminAction(source, ChatPacket::e_ChatCustom, L"commands.weather.clear");
}
else if (weatherType == L"rain")
{
levelData->setRaining(true);
levelData->setThundering(false);
logAdminAction(source, ChatPacket::e_ChatCustom, L"commands.weather.rain");
}
else if (weatherType == L"thunder")
{
levelData->setRaining(true);
levelData->setThundering(true);
logAdminAction(source, ChatPacket::e_ChatCustom, L"commands.weather.thunder");
}
}
shared_ptr<GameCommandPacket> WeatherCommand::preparePacket(const wstring& weatherType, int duration)
{
ByteArrayOutputStream baos;
DataOutputStream dos(&baos);
dos.writeUTF(weatherType);
dos.writeInt(duration);
return shared_ptr<GameCommandPacket>(new GameCommandPacket(eGameCommand_Weather, baos.toByteArray()));
}

81
Minecraft.World/WeatherCommand.h
View file

@ -1,73 +1,14 @@
/*
package net.minecraft.commands.common;
#pragma once
#include "Command.h"
import java.util.*;
class GameCommandPacket;
import net.minecraft.SharedConstants;
import net.minecraft.commands.*;
import net.minecraft.commands.exceptions.UsageException;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.storage.LevelData;
class WeatherCommand : public Command
{
public:
virtual EGameCommand getId();
virtual int getPermissionLevel();
virtual void execute(shared_ptr<CommandSender> source, byteArray commandData);
public class WeatherCommand extends BaseCommand {
@Override
public String getName() {
return "weather";
}
@Override
public int getPermissionLevel() {
return LEVEL_GAMEMASTERS;
}
@Override
public String getUsage(CommandSender source) {
return "commands.weather.usage";
}
@Override
public void execute(CommandSender source, String[] args) {
if (args.length < 1 || args.length > 2) {
throw new UsageException("commands.weather.usage");
}
int duration = (300 + new Random().nextInt(600)) * SharedConstants.TICKS_PER_SECOND;
if (args.length >= 2) {
duration = convertArgToInt(source, args[1], 1, 1000000) * SharedConstants.TICKS_PER_SECOND;
}
Level level = MinecraftServer.getInstance().levels[0];
LevelData levelData = level.getLevelData();
levelData.setRainTime(duration);
levelData.setThunderTime(duration);
if ("clear".equalsIgnoreCase(args[0])) {
levelData.setRaining(false);
levelData.setThundering(false);
logAdminAction(source, "commands.weather.clear");
} else if ("rain".equalsIgnoreCase(args[0])) {
levelData.setRaining(true);
levelData.setThundering(false);
logAdminAction(source, "commands.weather.rain");
} else if ("thunder".equalsIgnoreCase(args[0])) {
levelData.setRaining(true);
levelData.setThundering(true);
logAdminAction(source, "commands.weather.thunder");
} else {
throw new UsageException("commands.weather.usage");
}
}
@Override
public List<String> matchArguments(CommandSender source, String[] args) {
if (args.length == 1) {
return matchArguments(args, "clear", "rain", "thunder");
}
return null;
}
}
*/
static shared_ptr<GameCommandPacket> preparePacket(const wstring& weatherType, int duration = -1);
};

4
Minecraft.World/net.minecraft.commands.common.h
View file

@ -8,4 +8,6 @@
#include "GiveItemCommand.h"
#include "KillCommand.h"
#include "TimeCommand.h"
#include "ToggleDownfallCommand.h"
#include "ToggleDownfallCommand.h"
#include "WeatherCommand.h"
#include "SummonCommand.h"