LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-06-02 07:26:08 +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

237
Minecraft.World/Containers/Slot.cpp
View File

@@ -5,159 +5,128 @@
#include "../Headers/net.minecraft.world.item.crafting.h"
#include "Slot.h"
Slot::Slot(std::shared_ptr<Container> container, int slot, int x, int y) : container( container ), slot( slot )
{
this->x = x;
this->y = y;
Slot::Slot(std::shared_ptr<Container> container, int slot, int x, int y)
: container(container), slot(slot) {
this->x = x;
this->y = y;
this->index = 0;
this->index = 0;
}
void Slot::onQuickCraft(std::shared_ptr<ItemInstance> picked, std::shared_ptr<ItemInstance> original)
{
if (picked == NULL || original == NULL)
{
return;
}
if (picked->id != original->id)
{
return;
}
int count = original->count - picked->count;
if (count > 0)
{
onQuickCraft(picked, count);
}
void Slot::onQuickCraft(std::shared_ptr<ItemInstance> picked,
std::shared_ptr<ItemInstance> original) {
if (picked == NULL || original == NULL) {
return;
}
if (picked->id != original->id) {
return;
}
int count = original->count - picked->count;
if (count > 0) {
onQuickCraft(picked, count);
}
}
void Slot::onQuickCraft(std::shared_ptr<ItemInstance> picked, int count) {}
void Slot::onQuickCraft(std::shared_ptr<ItemInstance> picked, int count)
{
void Slot::checkTakeAchievements(std::shared_ptr<ItemInstance> picked) {}
void Slot::swap(Slot* other) {
std::shared_ptr<ItemInstance> item1 = container->getItem(slot);
std::shared_ptr<ItemInstance> item2 =
other->container->getItem(other->slot);
if (item1 != NULL && item1->count > other->getMaxStackSize()) {
if (item2 != NULL) return;
item2 = item1->remove(item1->count - other->getMaxStackSize());
}
if (item2 != NULL && item2->count > getMaxStackSize()) {
if (item1 != NULL) return;
item1 = item2->remove(item2->count - getMaxStackSize());
}
other->container->setItem(other->slot, item1);
container->setItem(slot, item2);
setChanged();
}
void Slot::checkTakeAchievements(std::shared_ptr<ItemInstance> picked)
{
void Slot::onTake(std::shared_ptr<Player> player,
std::shared_ptr<ItemInstance> carried) {
setChanged();
}
void Slot::swap(Slot *other)
{
std::shared_ptr<ItemInstance> item1 = container->getItem(slot);
std::shared_ptr<ItemInstance> item2 = other->container->getItem(other->slot);
bool Slot::mayPlace(std::shared_ptr<ItemInstance> item) { return true; }
if (item1 != NULL && item1->count > other->getMaxStackSize())
{
if (item2 != NULL) return;
item2 = item1->remove(item1->count - other->getMaxStackSize());
}
if (item2 != NULL && item2->count > getMaxStackSize())
{
if (item1 != NULL) return;
item1 = item2->remove(item2->count - getMaxStackSize());
}
other->container->setItem(other->slot, item1);
container->setItem(slot, item2);
setChanged();
std::shared_ptr<ItemInstance> Slot::getItem() {
return container->getItem(slot);
}
void Slot::onTake(std::shared_ptr<Player> player, std::shared_ptr<ItemInstance> carried)
{
setChanged();
bool Slot::hasItem() { return getItem() != NULL; }
void Slot::set(std::shared_ptr<ItemInstance> item) {
container->setItem(slot, item);
setChanged();
}
bool Slot::mayPlace(std::shared_ptr<ItemInstance> item)
{
return true;
void Slot::setChanged() { container->setChanged(); }
int Slot::getMaxStackSize() { return container->getMaxStackSize(); }
Icon* Slot::getNoItemIcon() { return NULL; }
std::shared_ptr<ItemInstance> Slot::remove(int c) {
return container->removeItem(slot, c);
}
std::shared_ptr<ItemInstance> Slot::getItem()
{
return container->getItem(slot);
bool Slot::isAt(std::shared_ptr<Container> c, int s) {
return c == container && s == slot;
}
bool Slot::hasItem()
{
return getItem() != NULL;
bool Slot::mayPickup(std::shared_ptr<Player> player) { return true; }
bool Slot::mayCombine(std::shared_ptr<ItemInstance> second) {
std::shared_ptr<ItemInstance> first = getItem();
if (first == NULL || second == NULL) return false;
ArmorItem* thisItem = dynamic_cast<ArmorItem*>(first->getItem());
if (thisItem) {
bool thisIsDyableArmor =
thisItem->getMaterial() == ArmorItem::ArmorMaterial::CLOTH;
bool itemIsDye = second->id == Item::dye_powder_Id;
return thisIsDyableArmor && itemIsDye;
}
// 4J Stu - This condition taken from Recipes::getItemFor to repair items,
// but added the damaged check to skip when the result is pointless
else if (first != NULL && second != NULL && first->id == second->id &&
first->count == 1 && second->count == 1 &&
Item::items[first->id]->canBeDepleted() &&
(first->isDamaged() || second->isDamaged())) {
// 4J Stu - Don't allow combinining enchanted items, the enchantment
// will be lost. They can use the anvil for this
return !first->isEnchanted() && !second->isEnchanted();
}
return false;
}
void Slot::set(std::shared_ptr<ItemInstance> item)
{
container->setItem(slot, item);
setChanged();
}
void Slot::setChanged()
{
container->setChanged();
}
int Slot::getMaxStackSize()
{
return container->getMaxStackSize();
}
Icon *Slot::getNoItemIcon()
{
return NULL;
}
std::shared_ptr<ItemInstance> Slot::remove(int c)
{
return container->removeItem(slot, c);
}
bool Slot::isAt(std::shared_ptr<Container> c, int s)
{
return c == container && s == slot;
}
bool Slot::mayPickup(std::shared_ptr<Player> player)
{
return true;
}
bool Slot::mayCombine(std::shared_ptr<ItemInstance> second)
{
std::shared_ptr<ItemInstance> first = getItem();
if(first == NULL || second == NULL) return false;
ArmorItem *thisItem = dynamic_cast<ArmorItem *>(first->getItem());
if(thisItem)
{
bool thisIsDyableArmor = thisItem->getMaterial() == ArmorItem::ArmorMaterial::CLOTH;
bool itemIsDye = second->id == Item::dye_powder_Id;
return thisIsDyableArmor && itemIsDye;
}
// 4J Stu - This condition taken from Recipes::getItemFor to repair items, but added the damaged check to skip when the result is pointless
else if (first != NULL && second != NULL && first->id == second->id && first->count == 1 && second->count == 1 && Item::items[first->id]->canBeDepleted() && (first->isDamaged() || second->isDamaged()) )
{
// 4J Stu - Don't allow combinining enchanted items, the enchantment will be lost. They can use the anvil for this
return !first->isEnchanted() && !second->isEnchanted();
}
return false;
}
std::shared_ptr<ItemInstance> Slot::combine(std::shared_ptr<ItemInstance> item)
{
std::shared_ptr<ItemInstance> result = nullptr;
std::shared_ptr<ItemInstance> first = getItem();
std::shared_ptr<CraftingContainer> craftSlots = std::shared_ptr<CraftingContainer>( new CraftingContainer(NULL, 2, 2) );
craftSlots->setItem(0, item);
craftSlots->setItem(1, first);
ArmorItem *thisItem = dynamic_cast<ArmorItem *>(first->getItem());
if(thisItem)
{
result = ArmorDyeRecipe::assembleDyedArmor(craftSlots);
}
else
{
result = Recipes::getInstance()->getItemFor(craftSlots, NULL);
}
craftSlots->setItem(0, nullptr);
craftSlots->setItem(1, nullptr);
return result;
std::shared_ptr<ItemInstance> Slot::combine(
std::shared_ptr<ItemInstance> item) {
std::shared_ptr<ItemInstance> result = nullptr;
std::shared_ptr<ItemInstance> first = getItem();
std::shared_ptr<CraftingContainer> craftSlots =
std::shared_ptr<CraftingContainer>(new CraftingContainer(NULL, 2, 2));
craftSlots->setItem(0, item);
craftSlots->setItem(1, first);
ArmorItem* thisItem = dynamic_cast<ArmorItem*>(first->getItem());
if (thisItem) {
result = ArmorDyeRecipe::assembleDyedArmor(craftSlots);
} else {
result = Recipes::getInstance()->getItemFor(craftSlots, NULL);
}
craftSlots->setItem(0, nullptr);
craftSlots->setItem(1, nullptr);
return result;
}