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

Implement inventory swapping

Browse source
This commit is contained in:
Alezito2008 2026-03-08 15:10:49 -03:00
parent f3f6a32e23
commit 5170b968b8
2 changed files with 61 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
Minecraft.Client/Minecraft.cpp
View file

@ -1479,10 +1479,15 @@ void Minecraft::run_middle()
if(g_KBMInput.IsMouseButtonPressed(KeyboardMouseInput::MOUSE_RIGHT)) if(g_KBMInput.IsMouseButtonPressed(KeyboardMouseInput::MOUSE_RIGHT))
localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_USE; localplayers[i]->ullButtonsPressed|=1LL<<MINECRAFT_ACTION_USE;
if (g_KBMInput.IsMouseButtonPressed(KeyboardMouseInput::MOUSE_MIDDLE) && gameMode->hasInfiniteItems() && hitResult && hitResult->type == HitResult::TILE) if (g_KBMInput.IsMouseButtonPressed(KeyboardMouseInput::MOUSE_MIDDLE) && hitResult && hitResult->type == HitResult::TILE)
{ {
auto inventory = localplayers[i]->inventory;
auto inventoryMenu = localplayers[i]->inventoryMenu;
bool isInCreative = gameMode->hasInfiniteItems();
int x = hitResult->x, y = hitResult->y, z = hitResult->z; int x = hitResult->x, y = hitResult->y, z = hitResult->z;
int containerId = inventoryMenu->containerId;
int tileId = level->getTile(x, y, z); int tileId = level->getTile(x, y, z);
if (tileId > 0 && tileId < Tile::TILE_NUM_COUNT) if (tileId > 0 && tileId < Tile::TILE_NUM_COUNT)
@ -1492,13 +1497,63 @@ void Minecraft::run_middle()
int clonedTileId = tile->cloneTileId(level, x, y, z); int clonedTileId = tile->cloneTileId(level, x, y, z);
int clonedTileData = tile->cloneTileData(level, x, y, z); int clonedTileData = tile->cloneTileData(level, x, y, z);
localplayers[i]->inventory->grabTexture(clonedTileId, clonedTileData, true, true); int itemSlot = inventory->getSlot(clonedTileId, clonedTileData);
int firstEmpty = inventory->getFreeSlot();
shared_ptr<ItemInstance> selectedItem = localplayers[i]->inventory->getSelected(); if (itemSlot >= 0)
if (gameMode && selectedItem)
{ {
// Hotbar starts at slot 36 // Item is already in hotbar
gameMode->handleCreativeModeItemAdd(selectedItem, 36 + player->inventory->selected); if (itemSlot < 9)
{
inventory->selected = itemSlot;
}
// There are free slots in the hotbar
else if (firstEmpty >= 0 && firstEmpty < 9)
{
inventory->selected = firstEmpty;
// Use quick move the item
gameMode->handleInventoryMouseClick(
containerId,
itemSlot,
AbstractContainerMenu::CLICK_QUICK_MOVE,
true,
localplayers[i]
);
}
// Swap with item in inventory
else {
int currentHotbarSlot = inventory->selected;
short changeUid = inventoryMenu->backup(inventory);
// Perform client side swap and sync with server using CLICK_SWAP to avoid ghost blocks
shared_ptr<ItemInstance> clicked = inventoryMenu->clicked(
itemSlot,
currentHotbarSlot,
AbstractContainerMenu::CLICK_SWAP,
localplayers[i]
);
localplayers[i]->connection->send(make_shared<ContainerClickPacket>(
containerId,
itemSlot,
currentHotbarSlot,
AbstractContainerMenu::CLICK_SWAP,
clicked,
changeUid
));
}
}
else if (isInCreative)
{
localplayers[i]->inventory->grabTexture(clonedTileId, clonedTileData, true, true);
shared_ptr<ItemInstance> selectedItem = localplayers[i]->inventory->getSelected();
if (gameMode && selectedItem)
{
// Hotbar starts at slot 36
// Sync new item instance with the server in creative mode
gameMode->handleCreativeModeItemAdd(selectedItem, 36 + localplayers[i]->inventory->selected);
}
} }
} }
} }

2
Minecraft.World/Inventory.h
View file

@ -39,13 +39,11 @@ public:
bool IsHeldItem(); bool IsHeldItem();
static int getSelectionSize(); static int getSelectionSize();
private:
int getSlot(int tileId); int getSlot(int tileId);
int getSlot(int tileId, int data); int getSlot(int tileId, int data);
int getSlotWithRemainingSpace(shared_ptr<ItemInstance> item); int getSlotWithRemainingSpace(shared_ptr<ItemInstance> item);
public:
int getFreeSlot(); int getFreeSlot();
void grabTexture(int id, int data, bool checkData, bool mayReplace); void grabTexture(int id, int data, bool checkData, bool mayReplace);
void swapPaint(int wheel); void swapPaint(int wheel);