mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-07-13 21:39:29 +00:00
chore: format Minecraft.World
This commit is contained in:
Tropical
@@ -6,61 +6,40 @@
|
||||
#include "../../Headers/net.minecraft.world.item.h"
|
||||
#include "../../Headers/net.minecraft.world.item.alchemy.h"
|
||||
|
||||
|
||||
|
||||
BrewingStandTileEntity::BrewingStandTileEntity()
|
||||
{
|
||||
brewTime = 0;
|
||||
items = ItemInstanceArray(4);
|
||||
BrewingStandTileEntity::BrewingStandTileEntity() {
|
||||
brewTime = 0;
|
||||
items = ItemInstanceArray(4);
|
||||
}
|
||||
|
||||
BrewingStandTileEntity::~BrewingStandTileEntity()
|
||||
{
|
||||
delete [] items.data;
|
||||
}
|
||||
BrewingStandTileEntity::~BrewingStandTileEntity() { delete[] items.data; }
|
||||
|
||||
int BrewingStandTileEntity::getName()
|
||||
{
|
||||
return IDS_TILE_BREWINGSTAND;
|
||||
}
|
||||
int BrewingStandTileEntity::getName() { return IDS_TILE_BREWINGSTAND; }
|
||||
|
||||
unsigned int BrewingStandTileEntity::getContainerSize()
|
||||
{
|
||||
return items.length;
|
||||
}
|
||||
unsigned int BrewingStandTileEntity::getContainerSize() { return items.length; }
|
||||
|
||||
void BrewingStandTileEntity::tick()
|
||||
{
|
||||
if (brewTime > 0)
|
||||
{
|
||||
void BrewingStandTileEntity::tick() {
|
||||
if (brewTime > 0) {
|
||||
brewTime--;
|
||||
|
||||
if (brewTime == 0)
|
||||
{
|
||||
if (brewTime == 0) {
|
||||
// apply ingredients to all potions
|
||||
doBrew();
|
||||
setChanged();
|
||||
}
|
||||
else if (!isBrewable())
|
||||
{
|
||||
} else if (!isBrewable()) {
|
||||
brewTime = 0;
|
||||
setChanged();
|
||||
} else if (ingredientId != items[INGREDIENT_SLOT]->id) {
|
||||
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;
|
||||
} else if (isBrewable()) {
|
||||
brewTime = SharedConstants::TICKS_PER_SECOND *
|
||||
PotionBrewing::BREWING_TIME_SECONDS;
|
||||
ingredientId = items[INGREDIENT_SLOT]->id;
|
||||
}
|
||||
|
||||
int newCount = getPotionBits();
|
||||
if (newCount != lastPotionCount)
|
||||
{
|
||||
if (newCount != lastPotionCount) {
|
||||
lastPotionCount = newCount;
|
||||
level->setData(x, y, z, newCount);
|
||||
}
|
||||
@@ -68,63 +47,55 @@ void BrewingStandTileEntity::tick()
|
||||
TileEntity::tick();
|
||||
}
|
||||
|
||||
int BrewingStandTileEntity::getBrewTime()
|
||||
{
|
||||
return brewTime;
|
||||
}
|
||||
int BrewingStandTileEntity::getBrewTime() { return brewTime; }
|
||||
|
||||
bool BrewingStandTileEntity::isBrewable()
|
||||
{
|
||||
if (items[INGREDIENT_SLOT] == NULL || items[INGREDIENT_SLOT]->count <= 0)
|
||||
{
|
||||
bool BrewingStandTileEntity::isBrewable() {
|
||||
if (items[INGREDIENT_SLOT] == NULL || items[INGREDIENT_SLOT]->count <= 0) {
|
||||
return false;
|
||||
}
|
||||
std::shared_ptr<ItemInstance> ingredient = items[INGREDIENT_SLOT];
|
||||
if (PotionBrewing::SIMPLIFIED_BREWING)
|
||||
{
|
||||
if (!Item::items[ingredient->id]->hasPotionBrewingFormula())
|
||||
{
|
||||
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)
|
||||
{
|
||||
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) );
|
||||
int newBrew = NORMALISE_POTION_AUXVAL(
|
||||
applyIngredient(currentBrew, ingredient));
|
||||
|
||||
if (!PotionItem::isThrowable(currentBrew) && PotionItem::isThrowable(newBrew))
|
||||
{
|
||||
if (!PotionItem::isThrowable(currentBrew) &&
|
||||
PotionItem::isThrowable(newBrew)) {
|
||||
oneResult = true;
|
||||
break;
|
||||
}
|
||||
|
||||
std::vector<MobEffectInstance *> *currentEffects = Item::potion->getMobEffects(currentBrew);
|
||||
std::vector<MobEffectInstance *> *newEffects = Item::potion->getMobEffects(newBrew);
|
||||
std::vector<MobEffectInstance*>* currentEffects =
|
||||
Item::potion->getMobEffects(currentBrew);
|
||||
std::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;
|
||||
}
|
||||
}
|
||||
}
|
||||
// 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)
|
||||
{
|
||||
(currentEffects != NULL &&
|
||||
(equals || newEffects == NULL))) {
|
||||
} else if (currentBrew != newBrew) {
|
||||
oneResult = true;
|
||||
break;
|
||||
}
|
||||
@@ -132,31 +103,27 @@ bool BrewingStandTileEntity::isBrewable()
|
||||
}
|
||||
return oneResult;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!Item::items[ingredient->id]->hasPotionBrewingFormula() && ingredient->id != Item::bucket_water_Id && ingredient->id != Item::netherStalkSeeds_Id)
|
||||
{
|
||||
} else {
|
||||
if (!Item::items[ingredient->id]->hasPotionBrewingFormula() &&
|
||||
ingredient->id != Item::bucket_water_Id &&
|
||||
ingredient->id != Item::netherStalkSeeds_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)
|
||||
{
|
||||
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)
|
||||
{
|
||||
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)
|
||||
{
|
||||
} else if (isWater && items[dest] != NULL &&
|
||||
items[dest]->id == Item::glassBottle_Id) {
|
||||
oneResult = true;
|
||||
break;
|
||||
}
|
||||
@@ -165,151 +132,134 @@ bool BrewingStandTileEntity::isBrewable()
|
||||
}
|
||||
}
|
||||
|
||||
void BrewingStandTileEntity::doBrew()
|
||||
{
|
||||
if (!isBrewable())
|
||||
{
|
||||
void BrewingStandTileEntity::doBrew() {
|
||||
if (!isBrewable()) {
|
||||
return;
|
||||
}
|
||||
|
||||
std::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)
|
||||
{
|
||||
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) );
|
||||
int newBrew = NORMALISE_POTION_AUXVAL(
|
||||
applyIngredient(currentBrew, ingredient));
|
||||
|
||||
std::vector<MobEffectInstance *> *currentEffects = Item::potion->getMobEffects(currentBrew);
|
||||
std::vector<MobEffectInstance *> *newEffects = Item::potion->getMobEffects(newBrew);
|
||||
std::vector<MobEffectInstance*>* currentEffects =
|
||||
Item::potion->getMobEffects(currentBrew);
|
||||
std::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;
|
||||
}
|
||||
}
|
||||
}
|
||||
// 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))
|
||||
{
|
||||
(currentEffects != NULL &&
|
||||
(equals || newEffects == NULL))) {
|
||||
if (!PotionItem::isThrowable(currentBrew) &&
|
||||
PotionItem::isThrowable(newBrew)) {
|
||||
items[dest]->setAuxValue(newBrew);
|
||||
}
|
||||
|
||||
}
|
||||
else if (currentBrew != newBrew)
|
||||
{
|
||||
} else if (currentBrew != newBrew) {
|
||||
items[dest]->setAuxValue(newBrew);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
} 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)
|
||||
{
|
||||
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) );
|
||||
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] = std::shared_ptr<ItemInstance>(new ItemInstance(Item::potion));
|
||||
} else if (isWater && items[dest] != NULL &&
|
||||
items[dest]->id == Item::glassBottle_Id) {
|
||||
items[dest] = std::shared_ptr<ItemInstance>(
|
||||
new ItemInstance(Item::potion));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (Item::items[ingredient->id]->hasCraftingRemainingItem())
|
||||
{
|
||||
items[INGREDIENT_SLOT] = std::shared_ptr<ItemInstance>(new ItemInstance(Item::items[ingredient->id]->getCraftingRemainingItem()));
|
||||
}
|
||||
else
|
||||
{
|
||||
if (Item::items[ingredient->id]->hasCraftingRemainingItem()) {
|
||||
items[INGREDIENT_SLOT] = std::shared_ptr<ItemInstance>(new ItemInstance(
|
||||
Item::items[ingredient->id]->getCraftingRemainingItem()));
|
||||
} else {
|
||||
items[INGREDIENT_SLOT]->count--;
|
||||
if (items[INGREDIENT_SLOT]->count <= 0)
|
||||
{
|
||||
if (items[INGREDIENT_SLOT]->count <= 0) {
|
||||
items[INGREDIENT_SLOT] = nullptr;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int BrewingStandTileEntity::applyIngredient(int currentBrew, std::shared_ptr<ItemInstance> ingredient)
|
||||
{
|
||||
if (ingredient == NULL)
|
||||
{
|
||||
return currentBrew;
|
||||
}
|
||||
if (!PotionBrewing::SIMPLIFIED_BREWING)
|
||||
{
|
||||
int BrewingStandTileEntity::applyIngredient(
|
||||
int currentBrew, std::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::netherStalkSeeds_Id)
|
||||
{
|
||||
return PotionBrewing::stirr(currentBrew);
|
||||
}
|
||||
// 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::netherStalkSeeds_Id) {
|
||||
return PotionBrewing::stirr(currentBrew);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
if (Item::items[ingredient->id]->hasPotionBrewingFormula())
|
||||
{
|
||||
return PotionBrewing::applyBrew(currentBrew, Item::items[ingredient->id]->getPotionBrewingFormula());
|
||||
}
|
||||
return currentBrew;
|
||||
}
|
||||
if (Item::items[ingredient->id]->hasPotionBrewingFormula()) {
|
||||
return PotionBrewing::applyBrew(
|
||||
currentBrew,
|
||||
Item::items[ingredient->id]->getPotionBrewingFormula());
|
||||
}
|
||||
return currentBrew;
|
||||
}
|
||||
|
||||
void BrewingStandTileEntity::load(CompoundTag *base)
|
||||
{
|
||||
|
||||
void BrewingStandTileEntity::load(CompoundTag* base) {
|
||||
TileEntity::load(base);
|
||||
|
||||
ListTag<Tag> *inventoryList = base->getList(L"Items");
|
||||
ListTag<Tag>* inventoryList = base->getList(L"Items");
|
||||
|
||||
delete [] items.data;
|
||||
delete[] items.data;
|
||||
items = ItemInstanceArray(getContainerSize());
|
||||
for (int i = 0; i < inventoryList->size(); i++)
|
||||
{
|
||||
CompoundTag *tag = (CompoundTag*) inventoryList->get(i);
|
||||
for (int i = 0; i < inventoryList->size(); i++) {
|
||||
CompoundTag* tag = (CompoundTag*)inventoryList->get(i);
|
||||
int slot = tag->getByte(L"Slot");
|
||||
if (slot >= 0 && slot < items.length) items[slot] = ItemInstance::fromTag(tag);
|
||||
if (slot >= 0 && slot < items.length)
|
||||
items[slot] = ItemInstance::fromTag(tag);
|
||||
}
|
||||
|
||||
brewTime = base->getShort(L"BrewTime");
|
||||
}
|
||||
|
||||
void BrewingStandTileEntity::save(CompoundTag *base)
|
||||
{
|
||||
void BrewingStandTileEntity::save(CompoundTag* base) {
|
||||
TileEntity::save(base);
|
||||
|
||||
base->putShort(L"BrewTime", (short) (brewTime));
|
||||
ListTag<CompoundTag> *listTag = new ListTag<CompoundTag>();
|
||||
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", (uint8_t) i);
|
||||
for (int i = 0; i < items.length; i++) {
|
||||
if (items[i] != NULL) {
|
||||
CompoundTag* tag = new CompoundTag();
|
||||
tag->putByte(L"Slot", (uint8_t)i);
|
||||
items[i]->save(tag);
|
||||
listTag->add(tag);
|
||||
}
|
||||
@@ -317,96 +267,76 @@ void BrewingStandTileEntity::save(CompoundTag *base)
|
||||
base->put(L"Items", listTag);
|
||||
}
|
||||
|
||||
std::shared_ptr<ItemInstance> BrewingStandTileEntity::getItem(unsigned int slot)
|
||||
{
|
||||
if (slot >= 0 && slot < items.length)
|
||||
{
|
||||
return items[slot];
|
||||
}
|
||||
return nullptr;
|
||||
std::shared_ptr<ItemInstance> BrewingStandTileEntity::getItem(
|
||||
unsigned int slot) {
|
||||
if (slot >= 0 && slot < items.length) {
|
||||
return items[slot];
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
std::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.
|
||||
std::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)
|
||||
{
|
||||
std::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
|
||||
{
|
||||
std::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;
|
||||
}
|
||||
|
||||
std::shared_ptr<ItemInstance> BrewingStandTileEntity::removeItemNoUpdate(int slot)
|
||||
{
|
||||
if (slot >= 0 && slot < items.length)
|
||||
{
|
||||
std::shared_ptr<ItemInstance> item = items[slot];
|
||||
items[slot] = nullptr;
|
||||
return item;
|
||||
}
|
||||
return nullptr;
|
||||
if (slot >= 0 && slot < items.length && items[slot] != NULL) {
|
||||
if (items[slot]->count <= count) {
|
||||
std::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 {
|
||||
std::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;
|
||||
}
|
||||
|
||||
void BrewingStandTileEntity::setItem(unsigned int slot, std::shared_ptr<ItemInstance> item)
|
||||
{
|
||||
if (slot >= 0 && slot < items.length)
|
||||
{
|
||||
std::shared_ptr<ItemInstance> BrewingStandTileEntity::removeItemNoUpdate(
|
||||
int slot) {
|
||||
if (slot >= 0 && slot < items.length) {
|
||||
std::shared_ptr<ItemInstance> item = items[slot];
|
||||
items[slot] = nullptr;
|
||||
return item;
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
void BrewingStandTileEntity::setItem(unsigned int slot,
|
||||
std::shared_ptr<ItemInstance> item) {
|
||||
if (slot >= 0 && slot < items.length) {
|
||||
items[slot] = item;
|
||||
}
|
||||
}
|
||||
|
||||
int BrewingStandTileEntity::getMaxStackSize()
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
int BrewingStandTileEntity::getMaxStackSize() { return 1; }
|
||||
|
||||
bool BrewingStandTileEntity::stillValid(std::shared_ptr<Player> player)
|
||||
{
|
||||
bool BrewingStandTileEntity::stillValid(std::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::startOpen() {}
|
||||
|
||||
void BrewingStandTileEntity::stopOpen()
|
||||
{
|
||||
}
|
||||
void BrewingStandTileEntity::stopOpen() {}
|
||||
|
||||
void BrewingStandTileEntity::setBrewTime(int value)
|
||||
{
|
||||
this->brewTime = value;
|
||||
}
|
||||
void BrewingStandTileEntity::setBrewTime(int value) { this->brewTime = value; }
|
||||
|
||||
int BrewingStandTileEntity::getPotionBits()
|
||||
{
|
||||
int BrewingStandTileEntity::getPotionBits() {
|
||||
int newCount = 0;
|
||||
for (int potion = 0; potion < 3; potion++)
|
||||
{
|
||||
if (items[potion] != NULL)
|
||||
{
|
||||
for (int potion = 0; potion < 3; potion++) {
|
||||
if (items[potion] != NULL) {
|
||||
newCount |= (1 << potion);
|
||||
}
|
||||
}
|
||||
@@ -414,21 +344,19 @@ int BrewingStandTileEntity::getPotionBits()
|
||||
}
|
||||
|
||||
// 4J Added
|
||||
std::shared_ptr<TileEntity> BrewingStandTileEntity::clone()
|
||||
{
|
||||
std::shared_ptr<BrewingStandTileEntity> result = std::shared_ptr<BrewingStandTileEntity>( new BrewingStandTileEntity() );
|
||||
TileEntity::clone(result);
|
||||
std::shared_ptr<TileEntity> BrewingStandTileEntity::clone() {
|
||||
std::shared_ptr<BrewingStandTileEntity> result =
|
||||
std::shared_ptr<BrewingStandTileEntity>(new BrewingStandTileEntity());
|
||||
TileEntity::clone(result);
|
||||
|
||||
result->brewTime = brewTime;
|
||||
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;
|
||||
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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user