chore: format Minecraft.World

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

View File

@@ -6,97 +6,111 @@
#include "../Headers/net.minecraft.world.level.tile.h"
#include "ResultSlot.h"
ResultSlot::ResultSlot(Player *player, std::shared_ptr<Container> craftSlots, std::shared_ptr<Container> container, int id, int x, int y) : Slot( container, id, x, y )
{
this->player = player;
this->craftSlots = craftSlots;
removeCount = 0;
ResultSlot::ResultSlot(Player* player, std::shared_ptr<Container> craftSlots,
std::shared_ptr<Container> container, int id, int x,
int y)
: Slot(container, id, x, y) {
this->player = player;
this->craftSlots = craftSlots;
removeCount = 0;
}
bool ResultSlot::mayPlace(std::shared_ptr<ItemInstance> item)
{
return false;
bool ResultSlot::mayPlace(std::shared_ptr<ItemInstance> item) { return false; }
std::shared_ptr<ItemInstance> ResultSlot::remove(int c) {
if (hasItem()) {
removeCount += std::min(c, getItem()->count);
}
return Slot::remove(c);
}
std::shared_ptr<ItemInstance> ResultSlot::remove(int c)
{
if (hasItem())
{
removeCount += std::min(c, getItem()->count);
}
return Slot::remove(c);
void ResultSlot::onQuickCraft(std::shared_ptr<ItemInstance> picked, int count) {
removeCount += count;
checkTakeAchievements(picked);
}
void ResultSlot::onQuickCraft(std::shared_ptr<ItemInstance> picked, int count)
{
removeCount += count;
checkTakeAchievements(picked);
void ResultSlot::checkTakeAchievements(std::shared_ptr<ItemInstance> carried) {
carried->onCraftedBy(
player->level,
std::dynamic_pointer_cast<Player>(player->shared_from_this()),
removeCount);
removeCount = 0;
if (carried->id == Tile::workBench_Id)
player->awardStat(GenericStats::buildWorkbench(),
GenericStats::param_buildWorkbench());
else if (carried->id == Item::pickAxe_wood_Id)
player->awardStat(GenericStats::buildPickaxe(),
GenericStats::param_buildPickaxe());
else if (carried->id == Tile::furnace_Id)
player->awardStat(GenericStats::buildFurnace(),
GenericStats::param_buildFurnace());
else if (carried->id == Item::hoe_wood_Id)
player->awardStat(GenericStats::buildHoe(),
GenericStats::param_buildHoe());
else if (carried->id == Item::bread_Id)
player->awardStat(GenericStats::makeBread(),
GenericStats::param_makeBread());
else if (carried->id == Item::cake_Id)
player->awardStat(GenericStats::bakeCake(),
GenericStats::param_bakeCake());
else if (carried->id == Item::pickAxe_stone_Id)
player->awardStat(GenericStats::buildBetterPickaxe(),
GenericStats::param_buildBetterPickaxe());
else if (carried->id == Item::sword_wood_Id)
player->awardStat(GenericStats::buildSword(),
GenericStats::param_buildSword());
// else if (carried->id == Tile::enchantTable_Id)
// player->awardStat(GenericStats::enchantments(),
// GenericStats::param_achievement(eAward_));
else if (carried->id == Tile::bookshelf_Id)
player->awardStat(GenericStats::bookcase(),
GenericStats::param_bookcase());
// 4J : WESTY : Added new acheivements.
else if (carried->id == Tile::dispenser_Id)
player->awardStat(GenericStats::dispenseWithThis(),
GenericStats::param_dispenseWithThis());
}
void ResultSlot::checkTakeAchievements(std::shared_ptr<ItemInstance> carried)
{
carried->onCraftedBy(player->level, std::dynamic_pointer_cast<Player>( player->shared_from_this() ), removeCount);
removeCount = 0;
void ResultSlot::onTake(std::shared_ptr<Player> player,
std::shared_ptr<ItemInstance> carried) {
checkTakeAchievements(carried);
if (carried->id == Tile::workBench_Id) player->awardStat(GenericStats::buildWorkbench(), GenericStats::param_buildWorkbench());
else if (carried->id == Item::pickAxe_wood_Id) player->awardStat(GenericStats::buildPickaxe(), GenericStats::param_buildPickaxe());
else if (carried->id == Tile::furnace_Id) player->awardStat(GenericStats::buildFurnace(), GenericStats::param_buildFurnace());
else if (carried->id == Item::hoe_wood_Id) player->awardStat(GenericStats::buildHoe(), GenericStats::param_buildHoe());
else if (carried->id == Item::bread_Id) player->awardStat(GenericStats::makeBread(), GenericStats::param_makeBread());
else if (carried->id == Item::cake_Id) player->awardStat(GenericStats::bakeCake(), GenericStats::param_bakeCake());
else if (carried->id == Item::pickAxe_stone_Id) player->awardStat(GenericStats::buildBetterPickaxe(), GenericStats::param_buildBetterPickaxe());
else if (carried->id == Item::sword_wood_Id) player->awardStat(GenericStats::buildSword(), GenericStats::param_buildSword());
//else if (carried->id == Tile::enchantTable_Id) player->awardStat(GenericStats::enchantments(), GenericStats::param_achievement(eAward_));
else if (carried->id == Tile::bookshelf_Id) player->awardStat(GenericStats::bookcase(), GenericStats::param_bookcase());
for (unsigned int i = 0; i < craftSlots->getContainerSize(); i++) {
std::shared_ptr<ItemInstance> item = craftSlots->getItem(i);
if (item != NULL) {
craftSlots->removeItem(i, 1);
// 4J : WESTY : Added new acheivements.
else if (carried->id == Tile::dispenser_Id) player->awardStat(GenericStats::dispenseWithThis(), GenericStats::param_dispenseWithThis());
if (item->getItem()->hasCraftingRemainingItem()) {
// (TheApathetic)
std::shared_ptr<ItemInstance> craftResult =
std::shared_ptr<ItemInstance>(new ItemInstance(
item->getItem()->getCraftingRemainingItem()));
/*
* Try to place this in the player's inventory (See we.java
* for new method)
*/
if (item->getItem()->shouldMoveCraftingResultToInventory(
item) &&
this->player->inventory->add(craftResult)) {
continue;
}
// If this slot is now empty, place it there (current
// behavior)
if (craftSlots->getItem(i) == NULL) {
craftSlots->setItem(i, craftResult);
} else {
// Finally, if nothing else, just drop the item
this->player->drop(craftResult);
}
}
}
}
}
void ResultSlot::onTake(std::shared_ptr<Player> player, std::shared_ptr<ItemInstance> carried)
{
checkTakeAchievements(carried);
for (unsigned int i = 0; i < craftSlots->getContainerSize(); i++)
{
std::shared_ptr<ItemInstance> item = craftSlots->getItem(i);
if (item != NULL)
{
craftSlots->removeItem(i, 1);
if (item->getItem()->hasCraftingRemainingItem())
{
// (TheApathetic)
std::shared_ptr<ItemInstance> craftResult = std::shared_ptr<ItemInstance>(new ItemInstance(item->getItem()->getCraftingRemainingItem()));
/*
* Try to place this in the player's inventory (See we.java
* for new method)
*/
if (item->getItem()->shouldMoveCraftingResultToInventory(item) && this->player->inventory->add(craftResult))
{
continue;
}
// If this slot is now empty, place it there (current
// behavior)
if (craftSlots->getItem(i) == NULL)
{
craftSlots->setItem(i, craftResult);
}
else
{
// Finally, if nothing else, just drop the item
this->player->drop(craftResult);
}
}
}
}
}
bool ResultSlot::mayCombine(std::shared_ptr<ItemInstance> second)
{
return false;
bool ResultSlot::mayCombine(std::shared_ptr<ItemInstance> second) {
return false;
}