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
108 lines
2.3 KiB
C++
108 lines
2.3 KiB
C++
#include "stdafx.h"
|
|
#include "net.minecraft.world.level.h"
|
|
#include "net.minecraft.world.level.tile.h"
|
|
#include "MinecartSpawner.h"
|
|
|
|
MinecartSpawner::MinecartMobSpawner::MinecartMobSpawner(MinecartSpawner *parent)
|
|
{
|
|
m_parent = parent;
|
|
}
|
|
|
|
void MinecartSpawner::MinecartMobSpawner::broadcastEvent(int id)
|
|
{
|
|
m_parent->level->broadcastEntityEvent(m_parent->shared_from_this(), static_cast<byte>(id));
|
|
}
|
|
|
|
Level *MinecartSpawner::MinecartMobSpawner::getLevel()
|
|
{
|
|
return m_parent->level;
|
|
}
|
|
|
|
int MinecartSpawner::MinecartMobSpawner::getX()
|
|
{
|
|
return Mth::floor(m_parent->x);
|
|
}
|
|
|
|
int MinecartSpawner::MinecartMobSpawner::getY()
|
|
{
|
|
return Mth::floor(m_parent->y);
|
|
}
|
|
|
|
int MinecartSpawner::MinecartMobSpawner::getZ()
|
|
{
|
|
return Mth::floor(m_parent->z);
|
|
}
|
|
|
|
MinecartSpawner::MinecartSpawner(Level *level) : Minecart(level)
|
|
{
|
|
// 4J Stu - This function call had to be moved here from the Entity ctor to ensure that
|
|
// the derived version of the function is called
|
|
this->defineSynchedData();
|
|
|
|
spawner = new MinecartMobSpawner(this);
|
|
}
|
|
|
|
MinecartSpawner::MinecartSpawner(Level *level, double x, double y, double z) : Minecart(level, x, y, z)
|
|
{
|
|
// 4J Stu - This function call had to be moved here from the Entity ctor to ensure that
|
|
// the derived version of the function is called
|
|
this->defineSynchedData();
|
|
|
|
spawner = new MinecartMobSpawner(this);
|
|
}
|
|
|
|
MinecartSpawner::~MinecartSpawner()
|
|
{
|
|
delete spawner;
|
|
}
|
|
|
|
int MinecartSpawner::getType()
|
|
{
|
|
return TYPE_SPAWNER;
|
|
}
|
|
|
|
Tile *MinecartSpawner::getDefaultDisplayTile()
|
|
{
|
|
return Tile::mobSpawner;
|
|
}
|
|
|
|
void MinecartSpawner::readAdditionalSaveData(CompoundTag *tag)
|
|
{
|
|
Minecart::readAdditionalSaveData(tag);
|
|
spawner->load(tag);
|
|
}
|
|
|
|
void MinecartSpawner::addAdditonalSaveData(CompoundTag *tag)
|
|
{
|
|
Minecart::addAdditonalSaveData(tag);
|
|
spawner->save(tag);
|
|
}
|
|
|
|
void MinecartSpawner::handleEntityEvent(byte eventId)
|
|
{
|
|
spawner->onEventTriggered(eventId);
|
|
}
|
|
|
|
void MinecartSpawner::tick()
|
|
{
|
|
Minecart::tick();
|
|
spawner->tick();
|
|
}
|
|
|
|
BaseMobSpawner *MinecartSpawner::getSpawner()
|
|
{
|
|
return spawner;
|
|
}
|
|
|
|
int MinecartSpawner::getAttackTooltipId(std::shared_ptr<Player> player)
|
|
{
|
|
return IDS_TOOLTIPS_MINE;
|
|
}
|
|
|
|
int MinecartSpawner::getInteractTooltipId(Level *level,
|
|
std::shared_ptr<Player> player,
|
|
std::shared_ptr<ItemInstance> heldItem)
|
|
{
|
|
return 0;
|
|
}
|