LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-27 05:44:39 +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

190
Minecraft.World/Containers/CraftingMenu.cpp
View File

@@ -17,122 +17,106 @@ const int CraftingMenu::INV_SLOT_END = CraftingMenu::INV_SLOT_START + 9 * 3;
const int CraftingMenu::USE_ROW_SLOT_START = CraftingMenu::INV_SLOT_END;
const int CraftingMenu::USE_ROW_SLOT_END = CraftingMenu::USE_ROW_SLOT_START + 9;
CraftingMenu::CraftingMenu(std::shared_ptr<Inventory> inventory, Level *level, int xt, int yt, int zt) : AbstractContainerMenu()
{
craftSlots = std::shared_ptr<CraftingContainer>( new CraftingContainer(this, 3, 3) );
resultSlots = std::shared_ptr<ResultContainer>( new ResultContainer() );
CraftingMenu::CraftingMenu(std::shared_ptr<Inventory> inventory, Level* level,
int xt, int yt, int zt)
: AbstractContainerMenu() {
craftSlots =
std::shared_ptr<CraftingContainer>(new CraftingContainer(this, 3, 3));
resultSlots = std::shared_ptr<ResultContainer>(new ResultContainer());
this->level = level;
this->x = xt;
this->y = yt;
this->z = zt;
addSlot(new ResultSlot( inventory->player, craftSlots, resultSlots, 0, 120 + 4, 31 + 4));
this->level = level;
this->x = xt;
this->y = yt;
this->z = zt;
addSlot(new ResultSlot(inventory->player, craftSlots, resultSlots, 0,
120 + 4, 31 + 4));
for (int y = 0; y < 3; y++)
{
for (int x = 0; x < 3; x++)
{
addSlot(new Slot(craftSlots, x + y * 3, 30 + x * 18, 17 + y * 18));
}
}
for (int y = 0; y < 3; y++) {
for (int x = 0; x < 3; x++) {
addSlot(new Slot(craftSlots, x + y * 3, 30 + x * 18, 17 + 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, 84 + y * 18));
}
}
for (int x = 0; x < 9; x++)
{
addSlot(new Slot(inventory, x, 8 + x * 18, 142));
}
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, 84 + y * 18));
}
}
for (int x = 0; x < 9; x++) {
addSlot(new Slot(inventory, x, 8 + x * 18, 142));
}
slotsChanged(); // 4J - removed craftSlots parameter, see comment below
slotsChanged(); // 4J - removed craftSlots parameter, see comment below
}
void CraftingMenu::slotsChanged() // 4J used to take a std::shared_ptr<Container> but wasn't using it, so removed to simplify things
void CraftingMenu::slotsChanged() // 4J used to take a
// std::shared_ptr<Container> but wasn't
// using it, so removed to simplify things
{
resultSlots->setItem(0, Recipes::getInstance()->getItemFor(craftSlots, level));
resultSlots->setItem(0,
Recipes::getInstance()->getItemFor(craftSlots, level));
}
void CraftingMenu::removed(std::shared_ptr<Player> player)
{
AbstractContainerMenu::removed(player);
if (level->isClientSide) return;
void CraftingMenu::removed(std::shared_ptr<Player> player) {
AbstractContainerMenu::removed(player);
if (level->isClientSide) return;
for (int i = 0; i < 9; i++)
{
std::shared_ptr<ItemInstance> item = craftSlots->removeItemNoUpdate(i);
if (item != NULL)
{
player->drop(item);
}
}
for (int i = 0; i < 9; i++) {
std::shared_ptr<ItemInstance> item = craftSlots->removeItemNoUpdate(i);
if (item != NULL) {
player->drop(item);
}
}
}
bool CraftingMenu::stillValid(std::shared_ptr<Player> player)
{
if (level->getTile(x, y, z) != Tile::workBench_Id) return false;
if (player->distanceToSqr(x + 0.5, y + 0.5, z + 0.5) > 8 * 8) return false;
return true;
bool CraftingMenu::stillValid(std::shared_ptr<Player> player) {
if (level->getTile(x, y, z) != Tile::workBench_Id) return false;
if (player->distanceToSqr(x + 0.5, y + 0.5, z + 0.5) > 8 * 8) return false;
return true;
}
std::shared_ptr<ItemInstance> CraftingMenu::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> CraftingMenu::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 == RESULT_SLOT)
{
if(!moveItemStackTo(stack, INV_SLOT_START, USE_ROW_SLOT_END, true))
{
return nullptr;
}
slot->onQuickCraft(stack, clicked);
}
else if (slotIndex >= INV_SLOT_START && slotIndex < INV_SLOT_END)
{
if(!moveItemStackTo(stack, USE_ROW_SLOT_START, USE_ROW_SLOT_END, false))
{
return nullptr;
}
}
else if (slotIndex >= USE_ROW_SLOT_START && slotIndex < USE_ROW_SLOT_END)
{
if(!moveItemStackTo(stack, INV_SLOT_START, INV_SLOT_END, false))
{
return nullptr;
}
}
else
{
if(!moveItemStackTo(stack, INV_SLOT_START, USE_ROW_SLOT_END, false))
{
return nullptr;
}
}
if (stack->count == 0)
{
slot->set(nullptr);
}
else
{
slot->setChanged();
}
if (stack->count == clicked->count)
{
// nothing moved
return nullptr;
}
else
{
slot->onTake(player, stack);
}
}
return clicked;
if (slotIndex == RESULT_SLOT) {
if (!moveItemStackTo(stack, INV_SLOT_START, USE_ROW_SLOT_END,
true)) {
return nullptr;
}
slot->onQuickCraft(stack, clicked);
} else if (slotIndex >= INV_SLOT_START && slotIndex < INV_SLOT_END) {
if (!moveItemStackTo(stack, USE_ROW_SLOT_START, USE_ROW_SLOT_END,
false)) {
return nullptr;
}
} else if (slotIndex >= USE_ROW_SLOT_START &&
slotIndex < USE_ROW_SLOT_END) {
if (!moveItemStackTo(stack, INV_SLOT_START, INV_SLOT_END, false)) {
return nullptr;
}
} else {
if (!moveItemStackTo(stack, INV_SLOT_START, USE_ROW_SLOT_END,
false)) {
return nullptr;
}
}
if (stack->count == 0) {
slot->set(nullptr);
} else {
slot->setChanged();
}
if (stack->count == clicked->count) {
// nothing moved
return nullptr;
} else {
slot->onTake(player, stack);
}
}
return clicked;
}