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
74 lines
2.2 KiB
C++
74 lines
2.2 KiB
C++
#include "stdafx.h"
|
|
#include "net.minecraft.world.entity.player.h"
|
|
#include "net.minecraft.world.level.h"
|
|
#include "net.minecraft.world.level.tile.h"
|
|
#include "ItemInstance.h"
|
|
#include "HoeItem.h"
|
|
|
|
HoeItem::HoeItem(int id, const Tier *tier) : Item(id)
|
|
{
|
|
this->tier = tier;
|
|
maxStackSize = 1;
|
|
setMaxDamage(tier->getUses());
|
|
}
|
|
|
|
bool HoeItem::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)
|
|
{
|
|
if (!player->mayUseItemAt(x, y, z, face, instance)) return false;
|
|
|
|
// 4J-PB - Adding a test only version to allow tooltips to be displayed
|
|
|
|
int targetType = level->getTile(x, y, z);
|
|
int above = level->getTile(x, y + 1, z);
|
|
|
|
if (face != 0 && above == 0 && (targetType == Tile::grass_Id || targetType == Tile::dirt_Id || targetType == Tile::mycelium_Id))
|
|
{
|
|
if(!bTestUseOnOnly)
|
|
{
|
|
Tile *tile = Tile::farmland;
|
|
level->playSound(x + 0.5f, y + 0.5f, z + 0.5f, tile->soundType->getStepSound(), (tile->soundType->getVolume() + 1) / 2, tile->soundType->getPitch() * 0.8f);
|
|
|
|
if (level->isClientSide) return true;
|
|
level->setTileAndUpdate(x, y, z, tile->id);
|
|
instance->hurtAndBreak(1, player);
|
|
}
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
float HoeItem::getDestroySpeed(shared_ptr<ItemInstance> itemInstance, Tile *tile)
|
|
{
|
|
if (tile != nullptr && (tile->id == Tile::nether_wart_block_Id || tile->id == Tile::hayBlock->id))
|
|
return tier->getSpeed();
|
|
return Item::getDestroySpeed(itemInstance, tile);
|
|
}
|
|
|
|
bool HoeItem::isHandEquipped()
|
|
{
|
|
return true;
|
|
}
|
|
|
|
const Item::Tier *HoeItem::getTier()
|
|
{
|
|
return tier;
|
|
}
|
|
|
|
int HoeItem::getUseTooltipId(std::shared_ptr<ItemInstance> itemInstance, std::shared_ptr<Player> player, Level* level, int x, int y, int z, bool bUseItem) const
|
|
{
|
|
if (bUseItem && level != nullptr)
|
|
{
|
|
int targetType = level->getTile(x, y, z);
|
|
int above = level->getTile(x, y + 1, z);
|
|
|
|
// Not4J Anaël: We need to check if the target block is grass, dirt or mycelium and if the top is exposed to air
|
|
if (above == 0 && (targetType == Tile::grass_Id || targetType == Tile::dirt_Id || targetType == Tile::mycelium_Id))
|
|
{
|
|
return IDS_TOOLTIPS_TILL;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|