This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a.
494 lines
12 KiB
C++
494 lines
12 KiB
C++
#include "stdafx.h"
|
|
#include "com.mojang.nbt.h"
|
|
#include "BrewingStandTileEntity.h"
|
|
#include "SharedConstants.h"
|
|
#include "net.minecraft.h"
|
|
#include "net.minecraft.world.level.h"
|
|
#include "net.minecraft.world.item.h"
|
|
#include "net.minecraft.world.item.alchemy.h"
|
|
|
|
int slotsForUp [] = { BrewingStandTileEntity::INGREDIENT_SLOT };
|
|
int slotsForOtherFaces [] = { 0, 1, 2 };
|
|
|
|
intArray BrewingStandTileEntity::SLOTS_FOR_UP = intArray(slotsForUp, 1);
|
|
intArray BrewingStandTileEntity::SLOTS_FOR_OTHER_FACES = intArray(slotsForOtherFaces, 3);
|
|
|
|
BrewingStandTileEntity::BrewingStandTileEntity()
|
|
{
|
|
brewTime = 0;
|
|
items = ItemInstanceArray(4);
|
|
name = L"";
|
|
}
|
|
|
|
BrewingStandTileEntity::~BrewingStandTileEntity()
|
|
{
|
|
delete [] items.data;
|
|
}
|
|
|
|
wstring BrewingStandTileEntity::getName()
|
|
{
|
|
return hasCustomName() ? name : app.GetString(IDS_TILE_BREWINGSTAND);
|
|
}
|
|
|
|
wstring BrewingStandTileEntity::getCustomName()
|
|
{
|
|
return hasCustomName() ? name : L"";
|
|
}
|
|
|
|
bool BrewingStandTileEntity::hasCustomName()
|
|
{
|
|
return !name.empty();
|
|
}
|
|
|
|
void BrewingStandTileEntity::setCustomName(const wstring &name)
|
|
{
|
|
this->name = name;
|
|
}
|
|
|
|
unsigned int BrewingStandTileEntity::getContainerSize()
|
|
{
|
|
return items.length;
|
|
}
|
|
|
|
void BrewingStandTileEntity::tick()
|
|
{
|
|
if (brewTime > 0)
|
|
{
|
|
brewTime--;
|
|
|
|
if (brewTime == 0)
|
|
{
|
|
// apply ingredients to all potions
|
|
doBrew();
|
|
setChanged();
|
|
}
|
|
else if (!isBrewable())
|
|
{
|
|
brewTime = 0;
|
|
setChanged();
|
|
}
|
|
else if (ingredientId != items[INGREDIENT_SLOT]->id)
|
|
{
|
|
brewTime = 0;
|
|
setChanged();
|
|
}
|
|
}
|
|
else if (isBrewable())
|
|
{
|
|
brewTime = SharedConstants::TICKS_PER_SECOND * PotionBrewing::BREWING_TIME_SECONDS;
|
|
ingredientId = items[INGREDIENT_SLOT]->id;
|
|
}
|
|
|
|
int newCount = getPotionBits();
|
|
if (newCount != lastPotionCount)
|
|
{
|
|
lastPotionCount = newCount;
|
|
level->setData(x, y, z, newCount, Tile::UPDATE_CLIENTS);
|
|
}
|
|
|
|
TileEntity::tick();
|
|
}
|
|
|
|
int BrewingStandTileEntity::getBrewTime()
|
|
{
|
|
return brewTime;
|
|
}
|
|
|
|
bool BrewingStandTileEntity::isBrewable()
|
|
{
|
|
if (items[INGREDIENT_SLOT] == NULL || items[INGREDIENT_SLOT]->count <= 0)
|
|
{
|
|
return false;
|
|
}
|
|
shared_ptr<ItemInstance> ingredient = items[INGREDIENT_SLOT];
|
|
if (PotionBrewing::SIMPLIFIED_BREWING)
|
|
{
|
|
if (!Item::items[ingredient->id]->hasPotionBrewingFormula())
|
|
{
|
|
return false;
|
|
}
|
|
|
|
bool oneResult = false;
|
|
for (int dest = 0; dest < 3; dest++)
|
|
{
|
|
if (items[dest] != NULL && items[dest]->id == Item::potion_Id)
|
|
{
|
|
int currentBrew = items[dest]->getAuxValue();
|
|
int newBrew = NORMALISE_POTION_AUXVAL( applyIngredient(currentBrew, ingredient) );
|
|
|
|
if (!PotionItem::isThrowable(currentBrew) && PotionItem::isThrowable(newBrew))
|
|
{
|
|
oneResult = true;
|
|
break;
|
|
}
|
|
|
|
vector<MobEffectInstance *> *currentEffects = Item::potion->getMobEffects(currentBrew);
|
|
vector<MobEffectInstance *> *newEffects = Item::potion->getMobEffects(newBrew);
|
|
|
|
// 4J - this code replaces an expression "currentEffects.equals(newEffects)" in the java.
|
|
// TODO - find out whether actually checking pointers to MobEffectInstance classes for equality
|
|
// is of any use
|
|
bool equals = false;
|
|
if( ( currentEffects != NULL ) && ( newEffects != NULL ) )
|
|
{
|
|
if( currentEffects->size() == newEffects->size() )
|
|
{
|
|
if( std::equal(currentEffects->begin(), currentEffects->end(), newEffects->begin() ) )
|
|
{
|
|
equals = true;
|
|
}
|
|
}
|
|
}
|
|
|
|
if ((currentBrew > 0 && currentEffects == newEffects) ||
|
|
(currentEffects != NULL && (equals || newEffects == NULL)))
|
|
{
|
|
}
|
|
else if (currentBrew != newBrew)
|
|
{
|
|
oneResult = true;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
return oneResult;
|
|
|
|
}
|
|
else
|
|
{
|
|
if (!Item::items[ingredient->id]->hasPotionBrewingFormula() && ingredient->id != Item::bucket_water_Id && ingredient->id != Item::netherwart_seeds_Id)
|
|
{
|
|
return false;
|
|
}
|
|
bool isWater = ingredient->id == Item::bucket_water_Id;
|
|
|
|
// at least one destination potion must have a result
|
|
bool oneResult = false;
|
|
for (int dest = 0; dest < 3; dest++)
|
|
{
|
|
if (items[dest] != NULL && items[dest]->id == Item::potion_Id)
|
|
{
|
|
int currentBrew = items[dest]->getAuxValue();
|
|
int newBrew = NORMALISE_POTION_AUXVAL( applyIngredient(currentBrew, ingredient) );
|
|
if (currentBrew != newBrew)
|
|
{
|
|
oneResult = true;
|
|
break;
|
|
}
|
|
}
|
|
else if (isWater && items[dest] != NULL && items[dest]->id == Item::glassBottle_Id)
|
|
{
|
|
oneResult = true;
|
|
break;
|
|
}
|
|
}
|
|
return oneResult;
|
|
}
|
|
}
|
|
|
|
void BrewingStandTileEntity::doBrew()
|
|
{
|
|
if (!isBrewable())
|
|
{
|
|
return;
|
|
}
|
|
|
|
shared_ptr<ItemInstance> ingredient = items[INGREDIENT_SLOT];
|
|
|
|
if (PotionBrewing::SIMPLIFIED_BREWING)
|
|
{
|
|
for (int dest = 0; dest < 3; dest++)
|
|
{
|
|
if (items[dest] != NULL && items[dest]->id == Item::potion_Id)
|
|
{
|
|
int currentBrew = items[dest]->getAuxValue();
|
|
int newBrew = NORMALISE_POTION_AUXVAL( applyIngredient(currentBrew, ingredient) );
|
|
|
|
vector<MobEffectInstance *> *currentEffects = Item::potion->getMobEffects(currentBrew);
|
|
vector<MobEffectInstance *> *newEffects = Item::potion->getMobEffects(newBrew);
|
|
|
|
// 4J - this code replaces an expression "currentEffects.equals(newEffects)" in the java.
|
|
// TODO - find out whether actually checking pointers to MobEffectInstance classes for equality
|
|
// is of any use
|
|
bool equals = false;
|
|
if( ( currentEffects != NULL ) && ( newEffects != NULL ) )
|
|
{
|
|
if( currentEffects->size() == newEffects->size() )
|
|
{
|
|
if( std::equal(currentEffects->begin(), currentEffects->end(), newEffects->begin() ) )
|
|
{
|
|
equals = true;
|
|
}
|
|
}
|
|
}
|
|
|
|
if ((currentBrew > 0 && currentEffects == newEffects) ||
|
|
(currentEffects != NULL && (equals || newEffects == NULL)))
|
|
{
|
|
if (!PotionItem::isThrowable(currentBrew) && PotionItem::isThrowable(newBrew))
|
|
{
|
|
items[dest]->setAuxValue(newBrew);
|
|
}
|
|
|
|
}
|
|
else if (currentBrew != newBrew)
|
|
{
|
|
items[dest]->setAuxValue(newBrew);
|
|
}
|
|
|
|
}
|
|
}
|
|
|
|
}
|
|
else
|
|
{
|
|
bool isWater = ingredient->id == Item::bucket_water_Id;
|
|
|
|
for (int dest = 0; dest < 3; dest++)
|
|
{
|
|
if (items[dest] != NULL && items[dest]->id == Item::potion_Id)
|
|
{
|
|
int currentBrew = items[dest]->getAuxValue();
|
|
int newBrew = NORMALISE_POTION_AUXVAL( applyIngredient(currentBrew, ingredient) );
|
|
items[dest]->setAuxValue(newBrew);
|
|
}
|
|
else if (isWater && items[dest] != NULL && items[dest]->id == Item::glassBottle_Id)
|
|
{
|
|
items[dest] = shared_ptr<ItemInstance>(new ItemInstance(Item::potion));
|
|
}
|
|
}
|
|
}
|
|
|
|
if (Item::items[ingredient->id]->hasCraftingRemainingItem())
|
|
{
|
|
items[INGREDIENT_SLOT] = shared_ptr<ItemInstance>(new ItemInstance(Item::items[ingredient->id]->getCraftingRemainingItem()));
|
|
}
|
|
else
|
|
{
|
|
items[INGREDIENT_SLOT]->count--;
|
|
if (items[INGREDIENT_SLOT]->count <= 0)
|
|
{
|
|
items[INGREDIENT_SLOT] = nullptr;
|
|
}
|
|
}
|
|
}
|
|
|
|
int BrewingStandTileEntity::applyIngredient(int currentBrew, shared_ptr<ItemInstance> ingredient)
|
|
{
|
|
if (ingredient == NULL)
|
|
{
|
|
return currentBrew;
|
|
}
|
|
if (!PotionBrewing::SIMPLIFIED_BREWING)
|
|
{
|
|
#if !(_SIMPLIFIED_BREWING)
|
|
// 4J Stu - SIMPLIFIED_BREWING is on, so we never use this
|
|
if (ingredient->id == Item::bucket_water_Id)
|
|
{
|
|
return PotionBrewing::applyBrew(currentBrew, PotionBrewing::MOD_WATER);
|
|
}
|
|
if (ingredient->id == Item::netherwart_seeds_Id)
|
|
{
|
|
return PotionBrewing::stirr(currentBrew);
|
|
}
|
|
#endif
|
|
}
|
|
if (Item::items[ingredient->id]->hasPotionBrewingFormula())
|
|
{
|
|
return PotionBrewing::applyBrew(currentBrew, Item::items[ingredient->id]->getPotionBrewingFormula());
|
|
}
|
|
return currentBrew;
|
|
}
|
|
|
|
void BrewingStandTileEntity::load(CompoundTag *base)
|
|
{
|
|
TileEntity::load(base);
|
|
|
|
ListTag<CompoundTag> *inventoryList = (ListTag<CompoundTag> *) base->getList(L"Items");
|
|
delete [] items.data;
|
|
items = ItemInstanceArray(getContainerSize());
|
|
for (int i = 0; i < inventoryList->size(); i++)
|
|
{
|
|
CompoundTag *tag = inventoryList->get(i);
|
|
int slot = tag->getByte(L"Slot");
|
|
if (slot >= 0 && slot < items.length) items[slot] = ItemInstance::fromTag(tag);
|
|
}
|
|
|
|
brewTime = base->getShort(L"BrewTime");
|
|
if (base->contains(L"CustomName")) name = base->getString(L"CustomName");
|
|
}
|
|
|
|
void BrewingStandTileEntity::save(CompoundTag *base)
|
|
{
|
|
TileEntity::save(base);
|
|
|
|
base->putShort(L"BrewTime", (short) (brewTime));
|
|
ListTag<CompoundTag> *listTag = new ListTag<CompoundTag>();
|
|
|
|
for (int i = 0; i < items.length; i++)
|
|
{
|
|
if (items[i] != NULL)
|
|
{
|
|
CompoundTag *tag = new CompoundTag();
|
|
tag->putByte(L"Slot", (byte) i);
|
|
items[i]->save(tag);
|
|
listTag->add(tag);
|
|
}
|
|
}
|
|
base->put(L"Items", listTag);
|
|
if (hasCustomName()) base->putString(L"CustomName", name);
|
|
}
|
|
|
|
shared_ptr<ItemInstance> BrewingStandTileEntity::getItem(unsigned int slot)
|
|
{
|
|
if (slot >= 0 && slot < items.length)
|
|
{
|
|
return items[slot];
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
shared_ptr<ItemInstance> BrewingStandTileEntity::removeItem(unsigned int slot, int count)
|
|
{
|
|
// 4J Stu - Changed the implementation of this function to be the same as ChestTileEntity to enable the "Pickup Half"
|
|
// option on the ingredients slot
|
|
// Fix for #65373 - TU8: Content: UI: Command "Take Half" in the Brewing Stand interface doesn't work as intended.
|
|
|
|
if (slot >= 0 && slot < items.length && items[slot] != NULL)
|
|
{
|
|
if (items[slot]->count <= count)
|
|
{
|
|
shared_ptr<ItemInstance> item = items[slot];
|
|
items[slot] = nullptr;
|
|
this->setChanged();
|
|
// 4J Stu - Fix for duplication glitch
|
|
if(item->count <= 0) return nullptr;
|
|
return item;
|
|
}
|
|
else
|
|
{
|
|
shared_ptr<ItemInstance> i = items[slot]->remove(count);
|
|
if (items[slot]->count == 0) items[slot] = nullptr;
|
|
this->setChanged();
|
|
// 4J Stu - Fix for duplication glitch
|
|
if(i->count <= 0) return nullptr;
|
|
return i;
|
|
}
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
shared_ptr<ItemInstance> BrewingStandTileEntity::removeItemNoUpdate(int slot)
|
|
{
|
|
if (slot >= 0 && slot < items.length)
|
|
{
|
|
shared_ptr<ItemInstance> item = items[slot];
|
|
items[slot] = nullptr;
|
|
return item;
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
void BrewingStandTileEntity::setItem(unsigned int slot, shared_ptr<ItemInstance> item)
|
|
{
|
|
if (slot >= 0 && slot < items.length)
|
|
{
|
|
items[slot] = item;
|
|
}
|
|
}
|
|
|
|
int BrewingStandTileEntity::getMaxStackSize() const
|
|
{
|
|
// this value is not used for the potion slots
|
|
return 64;
|
|
}
|
|
|
|
bool BrewingStandTileEntity::stillValid(shared_ptr<Player> player)
|
|
{
|
|
if (level->getTileEntity(x, y, z) != shared_from_this()) return false;
|
|
if (player->distanceToSqr(x + 0.5, y + 0.5, z + 0.5) > 8 * 8) return false;
|
|
return true;
|
|
}
|
|
|
|
void BrewingStandTileEntity::startOpen()
|
|
{
|
|
}
|
|
|
|
void BrewingStandTileEntity::stopOpen()
|
|
{
|
|
}
|
|
|
|
bool BrewingStandTileEntity::canPlaceItem(int slot, shared_ptr<ItemInstance> item)
|
|
{
|
|
if (slot == INGREDIENT_SLOT)
|
|
{
|
|
if (PotionBrewing::SIMPLIFIED_BREWING)
|
|
{
|
|
return Item::items[item->id]->hasPotionBrewingFormula();
|
|
}
|
|
else
|
|
{
|
|
return Item::items[item->id]->hasPotionBrewingFormula() || item->id == Item::netherwart_seeds_Id || item->id == Item::bucket_water_Id;
|
|
}
|
|
}
|
|
|
|
return item->id == Item::potion_Id || item->id == Item::glassBottle_Id;
|
|
}
|
|
|
|
void BrewingStandTileEntity::setBrewTime(int value)
|
|
{
|
|
brewTime = value;
|
|
}
|
|
|
|
int BrewingStandTileEntity::getPotionBits()
|
|
{
|
|
int newCount = 0;
|
|
for (int potion = 0; potion < 3; potion++)
|
|
{
|
|
if (items[potion] != NULL)
|
|
{
|
|
newCount |= (1 << potion);
|
|
}
|
|
}
|
|
return newCount;
|
|
}
|
|
|
|
intArray BrewingStandTileEntity::getSlotsForFace(int face)
|
|
{
|
|
if (face == Facing::UP)
|
|
{
|
|
return SLOTS_FOR_UP;
|
|
}
|
|
|
|
return SLOTS_FOR_OTHER_FACES;
|
|
}
|
|
|
|
bool BrewingStandTileEntity::canPlaceItemThroughFace(int slot, shared_ptr<ItemInstance> item, int face)
|
|
{
|
|
return canPlaceItem(slot, item);
|
|
}
|
|
|
|
bool BrewingStandTileEntity::canTakeItemThroughFace(int slot, shared_ptr<ItemInstance> item, int face)
|
|
{
|
|
return true;
|
|
}
|
|
|
|
// 4J Added
|
|
shared_ptr<TileEntity> BrewingStandTileEntity::clone()
|
|
{
|
|
shared_ptr<BrewingStandTileEntity> result = shared_ptr<BrewingStandTileEntity>( new BrewingStandTileEntity() );
|
|
TileEntity::clone(result);
|
|
|
|
result->brewTime = brewTime;
|
|
result->lastPotionCount = lastPotionCount;
|
|
result->ingredientId = ingredientId;
|
|
|
|
for (unsigned int i = 0; i < items.length; i++)
|
|
{
|
|
if (items.data[i] != NULL)
|
|
{
|
|
result->items.data[i] = ItemInstance::clone(items.data[i]);
|
|
}
|
|
}
|
|
return result;
|
|
} |