Anaël
d8d65bcd49
Moved the whole logic to a new file (TooltipManager.cpp), and rewrote most of the logic to profit from object oriented programming. The side-effect is that the changes are scattered across entities, tiles and items because moving everything to OOP requires to add the tooltip to every .cpp file for every tile/item/entities (or their class, on plants for example which all use the tooltip IDS_TOOLTIPS_PLANT)
The issue with the default tooltips loop written by 4J is that:
Its running in the main Minecraft::tick loop and is more than a thousand lines long, polluting the function.
Not using C++'s full potential with object oriented programming, 4J decided to use a big switch case (probably because it could run better on hardware without branch prediction like the WiiU or Xbox 360 ?)
And seems to be better off in its own file than in the main Minecraft.cpp file
101 lines
2.4 KiB
C++
101 lines
2.4 KiB
C++
#pragma once
|
|
|
|
#include "TamableAnimal.h"
|
|
#include "AvoidPlayerGoal.h"
|
|
|
|
class TemptGoal;
|
|
|
|
class Ocelot : public TamableAnimal
|
|
{
|
|
friend class OcelotSitOnTileGoal;
|
|
|
|
public:
|
|
eINSTANCEOF GetType() { return eTYPE_OCELOT; }
|
|
static Entity *create(Level *level) { return new Ocelot(level); }
|
|
|
|
public:
|
|
static const double SNEAK_SPEED_MOD;
|
|
static const double WALK_SPEED_MOD;
|
|
static const double FOLLOW_SPEED_MOD;
|
|
static const double SPRINT_SPEED_MOD;
|
|
|
|
private:
|
|
static const int DATA_TYPE_ID;
|
|
|
|
public:
|
|
enum
|
|
{
|
|
TYPE_OCELOT,
|
|
TYPE_BLACK,
|
|
TYPE_RED,
|
|
TYPE_SIAMESE,
|
|
};
|
|
|
|
private:
|
|
TemptGoal *temptGoal;
|
|
AvoidPlayerGoal *avoidPlayerGoal;
|
|
|
|
public:
|
|
Ocelot(Level *level);
|
|
|
|
protected:
|
|
virtual void defineSynchedData();
|
|
|
|
public:
|
|
virtual void serverAiMobStep();
|
|
virtual void reassessTameGoals();
|
|
virtual void setTame(bool tame);
|
|
|
|
protected:
|
|
virtual bool removeWhenFarAway();
|
|
|
|
public:
|
|
virtual bool useNewAi();
|
|
|
|
protected:
|
|
virtual void registerAttributes();
|
|
virtual void causeFallDamage(float distance);
|
|
|
|
public:
|
|
virtual void addAdditonalSaveData(CompoundTag *tag);
|
|
virtual void readAdditionalSaveData(CompoundTag *tag);
|
|
|
|
protected:
|
|
virtual int getAmbientSound();
|
|
virtual int getHurtSound();
|
|
virtual int getDeathSound();
|
|
virtual float getSoundVolume();
|
|
virtual int getDeathLoot();
|
|
|
|
public:
|
|
virtual bool doHurtTarget(shared_ptr<Entity> target);
|
|
virtual bool hurt(DamageSource *source, float dmg);
|
|
|
|
// protected:
|
|
// virtual void dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel);
|
|
|
|
public:
|
|
virtual bool mobInteract(shared_ptr<Player> player);
|
|
virtual shared_ptr<AgableMob> getBreedOffspring(shared_ptr<AgableMob> target);
|
|
virtual bool isFood(shared_ptr<ItemInstance> itemInstance);
|
|
virtual bool canMate(shared_ptr<Animal> animal);
|
|
virtual int getCatType();
|
|
virtual void setCatType(int type);
|
|
virtual bool canSpawn();
|
|
//virtual bool checkSpawnObstruction(); TODO when blockstates will be merged.
|
|
virtual wstring getAName();
|
|
virtual MobGroupData *finalizeMobSpawn(MobGroupData *groupData, int extraData = 0); // 4J Added extraData param
|
|
|
|
|
|
// 4J-JEV: Added for tooltips, is cat annoying player by sitting on chest or furnace.
|
|
private:
|
|
void setSittingOnTile(bool val);
|
|
public:
|
|
bool isSittingOnTile();
|
|
|
|
virtual int getAttackTooltipId(std::shared_ptr<Player> player);
|
|
virtual int getInteractTooltipId(Level *level,
|
|
std::shared_ptr<Player> player,
|
|
std::shared_ptr<ItemInstance> heldItem);
|
|
};
|