mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-07-13 01:23:46 +00:00
chore: format Minecraft.World
This commit is contained in:
Tropical
@@ -7,293 +7,246 @@
|
||||
#include "../Headers/net.minecraft.world.item.enchantment.h"
|
||||
#include "EnchantmentMenu.h"
|
||||
|
||||
EnchantmentMenu::EnchantmentMenu(std::shared_ptr<Inventory> inventory, Level *level, int xt, int yt, int zt)
|
||||
{
|
||||
enchantSlots = std::shared_ptr<EnchantmentContainer>( new EnchantmentContainer(this) );
|
||||
EnchantmentMenu::EnchantmentMenu(std::shared_ptr<Inventory> inventory,
|
||||
Level* level, int xt, int yt, int zt) {
|
||||
enchantSlots =
|
||||
std::shared_ptr<EnchantmentContainer>(new EnchantmentContainer(this));
|
||||
|
||||
for(int i = 0; i < 3; ++i)
|
||||
{
|
||||
costs[i] = 0;
|
||||
}
|
||||
for (int i = 0; i < 3; ++i) {
|
||||
costs[i] = 0;
|
||||
}
|
||||
|
||||
this->level = level;
|
||||
this->x = xt;
|
||||
this->y = yt;
|
||||
this->z = zt;
|
||||
addSlot(new EnchantmentSlot(enchantSlots, 0, 21 + 4, 43 + 4));
|
||||
this->level = level;
|
||||
this->x = xt;
|
||||
this->y = yt;
|
||||
this->z = zt;
|
||||
addSlot(new EnchantmentSlot(enchantSlots, 0, 21 + 4, 43 + 4));
|
||||
|
||||
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));
|
||||
}
|
||||
|
||||
m_costsChanged = false;
|
||||
m_costsChanged = false;
|
||||
}
|
||||
|
||||
void EnchantmentMenu::addSlotListener(ContainerListener *listener)
|
||||
{
|
||||
AbstractContainerMenu::addSlotListener(listener);
|
||||
void EnchantmentMenu::addSlotListener(ContainerListener* listener) {
|
||||
AbstractContainerMenu::addSlotListener(listener);
|
||||
|
||||
listener->setContainerData(this, 0, costs[0]);
|
||||
listener->setContainerData(this, 1, costs[1]);
|
||||
listener->setContainerData(this, 2, costs[2]);
|
||||
listener->setContainerData(this, 0, costs[0]);
|
||||
listener->setContainerData(this, 1, costs[1]);
|
||||
listener->setContainerData(this, 2, costs[2]);
|
||||
}
|
||||
|
||||
void EnchantmentMenu::broadcastChanges()
|
||||
{
|
||||
AbstractContainerMenu::broadcastChanges();
|
||||
void EnchantmentMenu::broadcastChanges() {
|
||||
AbstractContainerMenu::broadcastChanges();
|
||||
|
||||
// 4J Added m_costsChanged to stop continually sending update packets even when no changes have been made
|
||||
if(m_costsChanged)
|
||||
{
|
||||
for (int i = 0; i < containerListeners->size(); i++)
|
||||
{
|
||||
ContainerListener *listener = containerListeners->at(i);
|
||||
listener->setContainerData(this, 0, costs[0]);
|
||||
listener->setContainerData(this, 1, costs[1]);
|
||||
listener->setContainerData(this, 2, costs[2]);
|
||||
}
|
||||
m_costsChanged = false;
|
||||
}
|
||||
// 4J Added m_costsChanged to stop continually sending update packets even
|
||||
// when no changes have been made
|
||||
if (m_costsChanged) {
|
||||
for (int i = 0; i < containerListeners->size(); i++) {
|
||||
ContainerListener* listener = containerListeners->at(i);
|
||||
listener->setContainerData(this, 0, costs[0]);
|
||||
listener->setContainerData(this, 1, costs[1]);
|
||||
listener->setContainerData(this, 2, costs[2]);
|
||||
}
|
||||
m_costsChanged = false;
|
||||
}
|
||||
}
|
||||
|
||||
void EnchantmentMenu::setData(int id, int value)
|
||||
{
|
||||
if (id >= 0 && id <= 2)
|
||||
{
|
||||
costs[id] = value;
|
||||
m_costsChanged = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
AbstractContainerMenu::setData(id, value);
|
||||
}
|
||||
void EnchantmentMenu::setData(int id, int value) {
|
||||
if (id >= 0 && id <= 2) {
|
||||
costs[id] = value;
|
||||
m_costsChanged = true;
|
||||
} else {
|
||||
AbstractContainerMenu::setData(id, value);
|
||||
}
|
||||
}
|
||||
|
||||
void EnchantmentMenu::slotsChanged() // 4J used to take a std::shared_ptr<Container> container but wasn't using it, so removed to simplify things
|
||||
void EnchantmentMenu::
|
||||
slotsChanged() // 4J used to take a std::shared_ptr<Container> container
|
||||
// but wasn't using it, so removed to simplify things
|
||||
{
|
||||
std::shared_ptr<ItemInstance> item = enchantSlots->getItem(0);
|
||||
std::shared_ptr<ItemInstance> item = enchantSlots->getItem(0);
|
||||
|
||||
if (item == NULL || !item->isEnchantable())
|
||||
{
|
||||
for (int i = 0; i < 3; i++)
|
||||
{
|
||||
costs[i] = 0;
|
||||
}
|
||||
m_costsChanged = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
nameSeed = random.nextLong();
|
||||
if (item == NULL || !item->isEnchantable()) {
|
||||
for (int i = 0; i < 3; i++) {
|
||||
costs[i] = 0;
|
||||
}
|
||||
m_costsChanged = true;
|
||||
} else {
|
||||
nameSeed = random.nextLong();
|
||||
|
||||
if (!level->isClientSide)
|
||||
{
|
||||
// find book cases
|
||||
int bookcases = 0;
|
||||
for (int oz = -1; oz <= 1; oz++)
|
||||
{
|
||||
for (int ox = -1; ox <= 1; ox++)
|
||||
{
|
||||
if (oz == 0 && ox == 0)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
if (!level->isClientSide) {
|
||||
// find book cases
|
||||
int bookcases = 0;
|
||||
for (int oz = -1; oz <= 1; oz++) {
|
||||
for (int ox = -1; ox <= 1; ox++) {
|
||||
if (oz == 0 && ox == 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (level->isEmptyTile(x + ox, y, z + oz) && level->isEmptyTile(x + ox, y + 1, z + oz))
|
||||
{
|
||||
if (level->getTile(x + ox * 2, y, z + oz * 2) == Tile::bookshelf_Id)
|
||||
{
|
||||
bookcases++;
|
||||
}
|
||||
if (level->getTile(x + ox * 2, y + 1, z + oz * 2) == Tile::bookshelf_Id)
|
||||
{
|
||||
bookcases++;
|
||||
}
|
||||
// corners
|
||||
if (ox != 0 && oz != 0)
|
||||
{
|
||||
if (level->getTile(x + ox * 2, y, z + oz) == Tile::bookshelf_Id)
|
||||
{
|
||||
bookcases++;
|
||||
}
|
||||
if (level->getTile(x + ox * 2, y + 1, z + oz) == Tile::bookshelf_Id)
|
||||
{
|
||||
bookcases++;
|
||||
}
|
||||
if (level->getTile(x + ox, y, z + oz * 2) == Tile::bookshelf_Id)
|
||||
{
|
||||
bookcases++;
|
||||
}
|
||||
if (level->getTile(x + ox, y + 1, z + oz * 2) == Tile::bookshelf_Id)
|
||||
{
|
||||
bookcases++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (level->isEmptyTile(x + ox, y, z + oz) &&
|
||||
level->isEmptyTile(x + ox, y + 1, z + oz)) {
|
||||
if (level->getTile(x + ox * 2, y, z + oz * 2) ==
|
||||
Tile::bookshelf_Id) {
|
||||
bookcases++;
|
||||
}
|
||||
if (level->getTile(x + ox * 2, y + 1, z + oz * 2) ==
|
||||
Tile::bookshelf_Id) {
|
||||
bookcases++;
|
||||
}
|
||||
// corners
|
||||
if (ox != 0 && oz != 0) {
|
||||
if (level->getTile(x + ox * 2, y, z + oz) ==
|
||||
Tile::bookshelf_Id) {
|
||||
bookcases++;
|
||||
}
|
||||
if (level->getTile(x + ox * 2, y + 1, z + oz) ==
|
||||
Tile::bookshelf_Id) {
|
||||
bookcases++;
|
||||
}
|
||||
if (level->getTile(x + ox, y, z + oz * 2) ==
|
||||
Tile::bookshelf_Id) {
|
||||
bookcases++;
|
||||
}
|
||||
if (level->getTile(x + ox, y + 1, z + oz * 2) ==
|
||||
Tile::bookshelf_Id) {
|
||||
bookcases++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = 0; i < 3; i++)
|
||||
{
|
||||
costs[i] = EnchantmentHelper::getEnchantmentCost(&random, i, bookcases, item);
|
||||
}
|
||||
m_costsChanged = true;
|
||||
broadcastChanges();
|
||||
}
|
||||
}
|
||||
for (int i = 0; i < 3; i++) {
|
||||
costs[i] = EnchantmentHelper::getEnchantmentCost(
|
||||
&random, i, bookcases, item);
|
||||
}
|
||||
m_costsChanged = true;
|
||||
broadcastChanges();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bool EnchantmentMenu::clickMenuButton(std::shared_ptr<Player> player, int i)
|
||||
{
|
||||
std::shared_ptr<ItemInstance> item = enchantSlots->getItem(0);
|
||||
if (costs[i] > 0 && item != NULL && (player->experienceLevel >= costs[i] || player->abilities.instabuild) )
|
||||
{
|
||||
if (!level->isClientSide)
|
||||
{
|
||||
bool isBook = item->id == Item::book_Id;
|
||||
bool EnchantmentMenu::clickMenuButton(std::shared_ptr<Player> player, int i) {
|
||||
std::shared_ptr<ItemInstance> item = enchantSlots->getItem(0);
|
||||
if (costs[i] > 0 && item != NULL &&
|
||||
(player->experienceLevel >= costs[i] || player->abilities.instabuild)) {
|
||||
if (!level->isClientSide) {
|
||||
bool isBook = item->id == Item::book_Id;
|
||||
|
||||
std::vector<EnchantmentInstance *> *newEnchantment = EnchantmentHelper::selectEnchantment(&random, item, costs[i]);
|
||||
if (newEnchantment != NULL)
|
||||
{
|
||||
player->withdrawExperienceLevels(costs[i]);
|
||||
if (isBook) item->id = Item::enchantedBook_Id;
|
||||
int randomIndex = isBook ? random.nextInt(newEnchantment->size()) : -1;
|
||||
//for (EnchantmentInstance e : newEnchantment)
|
||||
for (int index = 0; index < newEnchantment->size(); index++)
|
||||
{
|
||||
EnchantmentInstance *e = newEnchantment->at(index);
|
||||
if (isBook && index != randomIndex)
|
||||
{}
|
||||
else
|
||||
{
|
||||
if (isBook)
|
||||
{
|
||||
Item::enchantedBook->addEnchantment(item, e);
|
||||
}
|
||||
else
|
||||
{
|
||||
item->enchant(e->enchantment, e->level);
|
||||
}
|
||||
}
|
||||
delete e;
|
||||
}
|
||||
delete newEnchantment;
|
||||
slotsChanged();// Removed enchantSlots parameter as the function can reference it directly
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
std::vector<EnchantmentInstance*>* newEnchantment =
|
||||
EnchantmentHelper::selectEnchantment(&random, item, costs[i]);
|
||||
if (newEnchantment != NULL) {
|
||||
player->withdrawExperienceLevels(costs[i]);
|
||||
if (isBook) item->id = Item::enchantedBook_Id;
|
||||
int randomIndex =
|
||||
isBook ? random.nextInt(newEnchantment->size()) : -1;
|
||||
// for (EnchantmentInstance e : newEnchantment)
|
||||
for (int index = 0; index < newEnchantment->size(); index++) {
|
||||
EnchantmentInstance* e = newEnchantment->at(index);
|
||||
if (isBook && index != randomIndex) {
|
||||
} else {
|
||||
if (isBook) {
|
||||
Item::enchantedBook->addEnchantment(item, e);
|
||||
} else {
|
||||
item->enchant(e->enchantment, e->level);
|
||||
}
|
||||
}
|
||||
delete e;
|
||||
}
|
||||
delete newEnchantment;
|
||||
slotsChanged(); // Removed enchantSlots parameter as the
|
||||
// function can reference it directly
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
void EnchantmentMenu::removed(std::shared_ptr<Player> player) {
|
||||
AbstractContainerMenu::removed(player);
|
||||
if (level->isClientSide) return;
|
||||
|
||||
void EnchantmentMenu::removed(std::shared_ptr<Player> player)
|
||||
{
|
||||
AbstractContainerMenu::removed(player);
|
||||
if (level->isClientSide) return;
|
||||
|
||||
std::shared_ptr<ItemInstance> item = enchantSlots->removeItemNoUpdate(0);
|
||||
if (item != NULL)
|
||||
{
|
||||
player->drop(item);
|
||||
}
|
||||
std::shared_ptr<ItemInstance> item = enchantSlots->removeItemNoUpdate(0);
|
||||
if (item != NULL) {
|
||||
player->drop(item);
|
||||
}
|
||||
}
|
||||
|
||||
bool EnchantmentMenu::stillValid(std::shared_ptr<Player> player)
|
||||
{
|
||||
if (level->getTile(x, y, z) != Tile::enchantTable_Id) return false;
|
||||
if (player->distanceToSqr(x + 0.5, y + 0.5, z + 0.5) > 8 * 8) return false;
|
||||
return true;
|
||||
bool EnchantmentMenu::stillValid(std::shared_ptr<Player> player) {
|
||||
if (level->getTile(x, y, z) != Tile::enchantTable_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> EnchantmentMenu::quickMoveStack(std::shared_ptr<Player> player, int slotIndex)
|
||||
{
|
||||
std::shared_ptr<ItemInstance> clicked = nullptr;
|
||||
Slot *slot = slots->at(slotIndex);
|
||||
Slot *IngredientSlot = slots->at(INGREDIENT_SLOT);
|
||||
std::shared_ptr<ItemInstance> EnchantmentMenu::quickMoveStack(
|
||||
std::shared_ptr<Player> player, int slotIndex) {
|
||||
std::shared_ptr<ItemInstance> clicked = nullptr;
|
||||
Slot* slot = slots->at(slotIndex);
|
||||
Slot* IngredientSlot = slots->at(INGREDIENT_SLOT);
|
||||
|
||||
if (slot != NULL && slot->hasItem())
|
||||
{
|
||||
std::shared_ptr<ItemInstance> stack = slot->getItem();
|
||||
clicked = stack->copy();
|
||||
if (slot != NULL && slot->hasItem()) {
|
||||
std::shared_ptr<ItemInstance> stack = slot->getItem();
|
||||
clicked = stack->copy();
|
||||
|
||||
if (slotIndex == INGREDIENT_SLOT)
|
||||
{
|
||||
if (!moveItemStackTo(stack, INV_SLOT_START, INV_SLOT_END, true))
|
||||
{
|
||||
if (!moveItemStackTo(stack, USE_ROW_SLOT_START, USE_ROW_SLOT_END, false))
|
||||
{
|
||||
return nullptr;
|
||||
}
|
||||
if (slotIndex == INGREDIENT_SLOT) {
|
||||
if (!moveItemStackTo(stack, INV_SLOT_START, INV_SLOT_END, true)) {
|
||||
if (!moveItemStackTo(stack, USE_ROW_SLOT_START,
|
||||
USE_ROW_SLOT_END, false)) {
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
} else if (slotIndex >= INV_SLOT_START && slotIndex < INV_SLOT_END) {
|
||||
// if the item is an enchantable tool
|
||||
|
||||
}
|
||||
}
|
||||
else if (slotIndex >= INV_SLOT_START && slotIndex < INV_SLOT_END)
|
||||
{
|
||||
// if the item is an enchantable tool
|
||||
|
||||
if(stack->isEnchantable() && (!IngredientSlot->hasItem() ) )
|
||||
{
|
||||
if(!moveItemStackTo(stack, INGREDIENT_SLOT, INGREDIENT_SLOT+1, false))
|
||||
{
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
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 the item is an enchantable tool
|
||||
if (stack->isEnchantable() && (!IngredientSlot->hasItem())) {
|
||||
if (!moveItemStackTo(stack, INGREDIENT_SLOT,
|
||||
INGREDIENT_SLOT + 1, false)) {
|
||||
return nullptr;
|
||||
}
|
||||
} else {
|
||||
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 the item is an enchantable tool
|
||||
|
||||
if(stack->isEnchantable() && (!IngredientSlot->hasItem() ) )
|
||||
{
|
||||
if(!moveItemStackTo(stack, INGREDIENT_SLOT, INGREDIENT_SLOT+1, false))
|
||||
{
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if(!moveItemStackTo(stack, INV_SLOT_START, INV_SLOT_END, false))
|
||||
{
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return nullptr;
|
||||
}
|
||||
if (stack->isEnchantable() && (!IngredientSlot->hasItem())) {
|
||||
if (!moveItemStackTo(stack, INGREDIENT_SLOT,
|
||||
INGREDIENT_SLOT + 1, false)) {
|
||||
return nullptr;
|
||||
}
|
||||
} else {
|
||||
if (!moveItemStackTo(stack, INV_SLOT_START, INV_SLOT_END,
|
||||
false)) {
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
if (stack->count == 0)
|
||||
{
|
||||
slot->set(nullptr);
|
||||
}
|
||||
else
|
||||
{
|
||||
slot->setChanged();
|
||||
}
|
||||
if (stack->count == clicked->count)
|
||||
{
|
||||
return nullptr;
|
||||
}
|
||||
else
|
||||
{
|
||||
slot->onTake(player, stack);
|
||||
}
|
||||
}
|
||||
return clicked;
|
||||
if (stack->count == 0) {
|
||||
slot->set(nullptr);
|
||||
} else {
|
||||
slot->setChanged();
|
||||
}
|
||||
if (stack->count == clicked->count) {
|
||||
return nullptr;
|
||||
} else {
|
||||
slot->onTake(player, stack);
|
||||
}
|
||||
}
|
||||
return clicked;
|
||||
}
|
||||
Reference in New Issue
Block a user