a9be52c41a
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides
131 lines
3.3 KiB
C++
131 lines
3.3 KiB
C++
#include "stdafx.h"
|
|
#include "net.minecraft.world.entity.ai.control.h"
|
|
#include "net.minecraft.world.entity.ai.navigation.h"
|
|
#include "net.minecraft.world.entity.ai.goal.h"
|
|
#include "net.minecraft.world.entity.animal.h"
|
|
#include "net.minecraft.world.level.h"
|
|
#include "net.minecraft.world.level.tile.h"
|
|
#include "net.minecraft.world.level.tile.entity.h"
|
|
#include "BasicTypeContainers.h"
|
|
#include "Arrays.h"
|
|
#include "OcelotSitOnTileGoal.h"
|
|
|
|
const int OcelotSitOnTileGoal::GIVE_UP_TICKS = 3 * SharedConstants::TICKS_PER_SECOND;
|
|
const int OcelotSitOnTileGoal::SIT_TICKS = 60 * SharedConstants::TICKS_PER_SECOND;
|
|
const int OcelotSitOnTileGoal::SEARCH_RANGE = 8;
|
|
const double OcelotSitOnTileGoal::SIT_CHANCE = 0.0065f;
|
|
|
|
OcelotSitOnTileGoal::OcelotSitOnTileGoal(Ocelot *ocelot, double speedModifier)
|
|
{
|
|
_tick = 0;
|
|
tryTicks = 0;
|
|
maxTicks = 0;
|
|
tileX = 0;
|
|
tileY = 0;
|
|
tileZ = 0;
|
|
|
|
this->ocelot = ocelot;
|
|
this->speedModifier = speedModifier;
|
|
setRequiredControlFlags(Control::MoveControlFlag | Control::JumpControlFlag);
|
|
}
|
|
|
|
bool OcelotSitOnTileGoal::canUse()
|
|
{
|
|
return ocelot->isTame() && !ocelot->isSitting() && ocelot->getRandom()->nextDouble() <= SIT_CHANCE && findNearestTile();
|
|
}
|
|
|
|
bool OcelotSitOnTileGoal::canContinueToUse()
|
|
{
|
|
return _tick <= maxTicks && tryTicks <= GIVE_UP_TICKS && isValidTarget(ocelot->level, tileX, tileY, tileZ);
|
|
}
|
|
|
|
void OcelotSitOnTileGoal::start()
|
|
{
|
|
ocelot->getNavigation()->moveTo(static_cast<float>(tileX) + 0.5, tileY + 1, static_cast<float>(tileZ) + 0.5, speedModifier);
|
|
_tick = 0;
|
|
tryTicks = 0;
|
|
maxTicks = ocelot->getRandom()->nextInt(ocelot->getRandom()->nextInt(SIT_TICKS) + SIT_TICKS) + SIT_TICKS;
|
|
ocelot->getSitGoal()->wantToSit(false);
|
|
|
|
ocelot->setSittingOnTile(true); // 4J-Added.
|
|
}
|
|
|
|
void OcelotSitOnTileGoal::stop()
|
|
{
|
|
ocelot->setSitting(false);
|
|
|
|
ocelot->setSittingOnTile(false); // 4J-Added.
|
|
}
|
|
|
|
void OcelotSitOnTileGoal::tick()
|
|
{
|
|
_tick++;
|
|
ocelot->getSitGoal()->wantToSit(false);
|
|
if (ocelot->distanceToSqr(tileX, tileY + 1, tileZ) > 1)
|
|
{
|
|
ocelot->setSitting(false);
|
|
ocelot->getNavigation()->moveTo(static_cast<float>(tileX) + 0.5, tileY + 1, static_cast<float>(tileZ) + 0.5, speedModifier);
|
|
tryTicks++;
|
|
}
|
|
else if (!ocelot->isSitting())
|
|
{
|
|
ocelot->setSitting(true);
|
|
}
|
|
else
|
|
{
|
|
tryTicks--;
|
|
}
|
|
}
|
|
|
|
bool OcelotSitOnTileGoal::findNearestTile()
|
|
{
|
|
int y = static_cast<int>(ocelot->y);
|
|
double distSqr = Integer::MAX_VALUE;
|
|
|
|
for (int x = static_cast<int>(ocelot->x) - SEARCH_RANGE; x < ocelot->x + SEARCH_RANGE; x++)
|
|
{
|
|
for (int z = static_cast<int>(ocelot->z) - SEARCH_RANGE; z < ocelot->z + SEARCH_RANGE; z++)
|
|
{
|
|
if (isValidTarget(ocelot->level, x, y, z) && ocelot->level->isEmptyTile(x, y + 1, z))
|
|
{
|
|
double dist = ocelot->distanceToSqr(x, y, z);
|
|
|
|
if (dist < distSqr)
|
|
{
|
|
tileX = x;
|
|
tileY = y;
|
|
tileZ = z;
|
|
distSqr = dist;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return distSqr < Integer::MAX_VALUE;
|
|
}
|
|
|
|
bool OcelotSitOnTileGoal::isValidTarget(Level *level, int x, int y, int z)
|
|
{
|
|
int tile = level->getTile(x, y, z);
|
|
int data = level->getData(x, y, z);
|
|
|
|
if (tile == Tile::chest_Id)
|
|
{
|
|
shared_ptr<ChestTileEntity> chest = dynamic_pointer_cast<ChestTileEntity>(level->getTileEntity(x, y, z));
|
|
|
|
if (chest->openCount < 1)
|
|
{
|
|
return true;
|
|
}
|
|
}
|
|
else if (tile == Tile::furnace_lit_Id)
|
|
{
|
|
return true;
|
|
}
|
|
else if (tile == Tile::bed_Id && !BedTile::isHeadPiece(data))
|
|
{
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
} |