LegacyConsole/4jcraft
2
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-24 07:45:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: format Minecraft.World

Browse Source
This commit is contained in:
Tropical
2026-03-13 17:06:56 -05:00
parent bd6284025d
commit 33d0737d1d
1511 changed files with 108661 additions and 115521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

173
Minecraft.World/Containers/ContainerMenu.cpp
View File

@@ -8,113 +8,108 @@
#include "../../Minecraft.Client/Player/LocalPlayer.h"
#include "ContainerMenu.h"
ContainerMenu::ContainerMenu(std::shared_ptr<Container> inventory, std::shared_ptr<Container> container) : AbstractContainerMenu()
{
this->container = container;
this->containerRows = container->getContainerSize() / 9;
container->startOpen();
ContainerMenu::ContainerMenu(std::shared_ptr<Container> inventory,
std::shared_ptr<Container> container)
: AbstractContainerMenu() {
this->container = container;
this->containerRows = container->getContainerSize() / 9;
container->startOpen();
int yo = (containerRows - 4) * 18;
int yo = (containerRows - 4) * 18;
for (int y = 0; y < containerRows; y++)
{
for (int x = 0; x < 9; x++)
{
addSlot(new Slot(container, x + y * 9, 8 + x * 18, 18 + y * 18));
}
}
for (int y = 0; y < containerRows; y++) {
for (int x = 0; x < 9; x++) {
addSlot(new Slot(container, x + y * 9, 8 + x * 18, 18 + y * 18));
}
}
for (int y = 0; y < 3; y++)
{
for (int x = 0; x < 9; x++)
{
addSlot(new Slot(inventory, x + y * 9 + 9, 8 + x * 18, 103 + y * 18 + yo));
}
}
for (int x = 0; x < 9; x++)
{
addSlot(new Slot(inventory, x, 8 + x * 18, 161 + yo));
}
for (int y = 0; y < 3; y++) {
for (int x = 0; x < 9; x++) {
addSlot(new Slot(inventory, x + y * 9 + 9, 8 + x * 18,
103 + y * 18 + yo));
}
}
for (int x = 0; x < 9; x++) {
addSlot(new Slot(inventory, x, 8 + x * 18, 161 + yo));
}
}
bool ContainerMenu::stillValid(std::shared_ptr<Player> player)
{
return container->stillValid(player);
bool ContainerMenu::stillValid(std::shared_ptr<Player> player) {
return container->stillValid(player);
}
std::shared_ptr<ItemInstance> ContainerMenu::quickMoveStack(std::shared_ptr<Player> player, int slotIndex)
{
std::shared_ptr<ItemInstance> clicked = nullptr;
Slot *slot = slots->at(slotIndex);
if (slot != NULL && slot->hasItem())
{
std::shared_ptr<ItemInstance> stack = slot->getItem();
clicked = stack->copy();
std::shared_ptr<ItemInstance> ContainerMenu::quickMoveStack(
std::shared_ptr<Player> player, int slotIndex) {
std::shared_ptr<ItemInstance> clicked = nullptr;
Slot* slot = slots->at(slotIndex);
if (slot != NULL && slot->hasItem()) {
std::shared_ptr<ItemInstance> stack = slot->getItem();
clicked = stack->copy();
if (slotIndex < containerRows * 9)
{
if(!moveItemStackTo(stack, containerRows * 9, (int)slots->size(), true))
{
// 4J Stu - Brought forward from 1.2
return nullptr;
}
}
else
{
if(!moveItemStackTo(stack, 0, containerRows * 9, false))
{
// 4J Stu - Brought forward from 1.2
return nullptr;
}
}
if (stack->count == 0)
{
slot->set(nullptr);
}
else
{
slot->setChanged();
}
}
return clicked;
if (slotIndex < containerRows * 9) {
if (!moveItemStackTo(stack, containerRows * 9, (int)slots->size(),
true)) {
// 4J Stu - Brought forward from 1.2
return nullptr;
}
} else {
if (!moveItemStackTo(stack, 0, containerRows * 9, false)) {
// 4J Stu - Brought forward from 1.2
return nullptr;
}
}
if (stack->count == 0) {
slot->set(nullptr);
} else {
slot->setChanged();
}
}
return clicked;
}
void ContainerMenu::removed(std::shared_ptr<Player> player)
{
AbstractContainerMenu::removed(player);
container->stopOpen();
void ContainerMenu::removed(std::shared_ptr<Player> player) {
AbstractContainerMenu::removed(player);
container->stopOpen();
}
std::shared_ptr<ItemInstance> ContainerMenu::clicked(int slotIndex, int buttonNum, int clickType, std::shared_ptr<Player> player)
{
std::shared_ptr<ItemInstance> out = AbstractContainerMenu::clicked(slotIndex, buttonNum, clickType, player);
std::shared_ptr<ItemInstance> ContainerMenu::clicked(
int slotIndex, int buttonNum, int clickType,
std::shared_ptr<Player> player) {
std::shared_ptr<ItemInstance> out =
AbstractContainerMenu::clicked(slotIndex, buttonNum, clickType, player);
#ifdef _EXTENDED_ACHIEVEMENTS
std::shared_ptr<LocalPlayer> localPlayer = std::dynamic_pointer_cast<LocalPlayer>(player);
std::shared_ptr<LocalPlayer> localPlayer =
std::dynamic_pointer_cast<LocalPlayer>(player);
if (localPlayer != NULL) // 4J-JEV: For "Chestful o'Cobblestone" achievement.
{
int cobblecount = 0;
for (int i = 0; i < container->getContainerSize(); i++)
{
std::shared_ptr<ItemInstance> item = container->getItem(i);
if ( (item != nullptr) && (item->id == Tile::stoneBrick_Id) )
{
cobblecount += item->GetCount();
}
}
if (localPlayer !=
NULL) // 4J-JEV: For "Chestful o'Cobblestone" achievement.
{
int cobblecount = 0;
for (int i = 0; i < container->getContainerSize(); i++) {
std::shared_ptr<ItemInstance> item = container->getItem(i);
if ((item != nullptr) && (item->id == Tile::stoneBrick_Id)) {
cobblecount += item->GetCount();
}
}
// 4J-JEV: This check performed on XboxOne servers, for other platforms check here.
// 4J-JEV: This check performed on XboxOne servers, for other platforms
// check here.
#ifndef _DURANGO
StatsCounter *sc = Minecraft::GetInstance()->stats[localPlayer->GetXboxPad()];
int minedCount = sc->getTotalValue(GenericStats::blocksMined(Tile::rock_Id)) + sc->getTotalValue(GenericStats::blocksMined(Tile::stoneBrick_Id));
if (cobblecount >= 1728 && minedCount >= 1728 )
StatsCounter* sc =
Minecraft::GetInstance()->stats[localPlayer->GetXboxPad()];
int minedCount =
sc->getTotalValue(GenericStats::blocksMined(Tile::rock_Id)) +
sc->getTotalValue(GenericStats::blocksMined(Tile::stoneBrick_Id));
if (cobblecount >= 1728 && minedCount >= 1728)
#endif
{
localPlayer->awardStat(GenericStats::chestfulOfCobblestone(),GenericStats::param_chestfulOfCobblestone(cobblecount));
}
}
{
localPlayer->awardStat(
GenericStats::chestfulOfCobblestone(),
GenericStats::param_chestfulOfCobblestone(cobblecount));
}
}
#endif
return out;
return out;
}