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
114 lines
3.4 KiB
C++
114 lines
3.4 KiB
C++
#include "stdafx.h"
|
|
#include "net.minecraft.world.entity.player.h"
|
|
#include "net.minecraft.world.entity.projectile.h"
|
|
#include "net.minecraft.world.item.h"
|
|
#include "net.minecraft.world.level.h"
|
|
#include "FireworksItem.h"
|
|
|
|
const wstring FireworksItem::TAG_FIREWORKS = L"Fireworks";
|
|
const wstring FireworksItem::TAG_EXPLOSION = L"Explosion";
|
|
const wstring FireworksItem::TAG_EXPLOSIONS = L"Explosions";
|
|
const wstring FireworksItem::TAG_FLIGHT = L"Flight";
|
|
const wstring FireworksItem::TAG_E_TYPE = L"Type";
|
|
const wstring FireworksItem::TAG_E_TRAIL = L"Trail";
|
|
const wstring FireworksItem::TAG_E_FLICKER = L"Flicker";
|
|
const wstring FireworksItem::TAG_E_COLORS = L"Colors";
|
|
const wstring FireworksItem::TAG_E_FADECOLORS = L"FadeColors";
|
|
|
|
FireworksItem::FireworksItem(int id) : Item(id)
|
|
{
|
|
}
|
|
|
|
shared_ptr<ItemInstance> FireworksItem::use(shared_ptr<ItemInstance> instance, Level *level, shared_ptr<Player> player)
|
|
{
|
|
if (player->isElytraFlying() && player->m_elytraRocketCooldown == 0)
|
|
{
|
|
player->m_elytraRocketCooldown = 20;
|
|
player->startFireworkBoost(instance);
|
|
player->playSound(eSoundType_FIREWORKS_LAUNCH, 3.0f, 1.0f);
|
|
if (!level->isClientSide)
|
|
{
|
|
shared_ptr<FireworksRocketEntity> rocket(new FireworksRocketEntity(level, player->x, player->y, player->z, instance));
|
|
level->addEntity(rocket);
|
|
if (!player->abilities.instabuild)
|
|
instance->count--;
|
|
}
|
|
return instance;
|
|
}
|
|
return instance;
|
|
}
|
|
|
|
bool FireworksItem::useOn(shared_ptr<ItemInstance> instance, shared_ptr<Player> player, Level *level, int x, int y, int z, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly)
|
|
{
|
|
// 4J-JEV: Fix for xb1 #173493 - CU7: Content: UI: Missing tooltip for Firework Rocket.
|
|
if (bTestUseOnOnly) return true;
|
|
|
|
if (!level->isClientSide)
|
|
{
|
|
shared_ptr<FireworksRocketEntity> f(new FireworksRocketEntity(level, x + clickX, y + clickY, z + clickZ, instance));
|
|
level->addEntity(f);
|
|
|
|
if (!player->abilities.instabuild)
|
|
{
|
|
instance->count--;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
void FireworksItem::appendHoverText(shared_ptr<ItemInstance> itemInstance, shared_ptr<Player> player, vector<HtmlString> *lines, bool advanced)
|
|
{
|
|
if (!itemInstance->hasTag())
|
|
{
|
|
return;
|
|
}
|
|
CompoundTag *fireTag = itemInstance->getTag()->getCompound(TAG_FIREWORKS);
|
|
if (fireTag == nullptr)
|
|
{
|
|
return;
|
|
}
|
|
if (fireTag->contains(TAG_FLIGHT))
|
|
{
|
|
lines->push_back(wstring(app.GetString(IDS_ITEM_FIREWORKS_FLIGHT)) + L" " + std::to_wstring((fireTag->getByte(TAG_FLIGHT))));
|
|
}
|
|
|
|
ListTag<CompoundTag> *explosions = (ListTag<CompoundTag> *) fireTag->getList(TAG_EXPLOSIONS);
|
|
if (explosions != nullptr && explosions->size() > 0)
|
|
{
|
|
|
|
for (int i = 0; i < explosions->size(); i++)
|
|
{
|
|
CompoundTag *expTag = explosions->get(i);
|
|
|
|
vector<HtmlString> eLines;
|
|
FireworksChargeItem::appendHoverText(expTag, &eLines);
|
|
|
|
if (eLines.size() > 0)
|
|
{
|
|
// Indent lines after first line
|
|
for (size_t i = 1; i < eLines.size(); i++)
|
|
{
|
|
eLines[i].indent = true;
|
|
}
|
|
|
|
lines->insert(lines->end(), eLines.begin(), eLines.end());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
int FireworksItem::getUseTooltipId(std::shared_ptr<ItemInstance> itemInstance,
|
|
std::shared_ptr<Player> player,
|
|
Level* level,
|
|
int x, int y, int z,
|
|
bool bUseItem) const
|
|
{
|
|
if (bUseItem)
|
|
{
|
|
return IDS_TOOLTIPS_FIREWORK_LAUNCH;
|
|
}
|
|
|
|
return 0;
|
|
} |