Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: TU19 (Dec 2014) Features & Content (#155)

Browse Source 
* try to resolve merge conflict

* feat: TU19 (Dec 2014) Features & Content (#32)

* December 2014 files

* Working release build

* Fix compilation issues

* Add sound to Windows64Media

* Add DLC content and force Tutorial DLC

* Revert "Add DLC content and force Tutorial DLC"

This reverts commit 97a4399472.

* Disable broken light packing

* Disable breakpoint during DLC texture map load

Allows DLC loading but the DLC textures are still broken

* Fix post build not working

* ...

* fix vs2022 build

* fix cmake build

---------

Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
daoge
2026-03-03 03:04:10 +08:00
committed by GitHub
parent 84c31a2331
commit b3feddfef3
2069 changed files with 264842 additions and 139522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Minecraft.World/RecordingItem.cpp
View File

@@ -2,14 +2,18 @@
#include "net.minecraft.world.entity.player.h"
#include "net.minecraft.world.level.h"
#include "net.minecraft.world.level.tile.h"
#include "net.minecraft.world.item.h"
#include "net.minecraft.world.h"
#include "ItemInstance.h"
#include "RecordingItem.h"
#include "GenericStats.h"
unordered_map<wstring, RecordingItem *> RecordingItem::BY_NAME;
RecordingItem::RecordingItem(int id, const wstring& recording) : Item(id), recording( recording )
{
this->maxStackSize = 1;
BY_NAME[recording] = this;
}
Icon *RecordingItem::getIcon(int auxValue)
@@ -20,13 +24,13 @@ Icon *RecordingItem::getIcon(int auxValue)
bool RecordingItem::useOn(shared_ptr<ItemInstance> itemInstance, shared_ptr<Player> player, Level *level, int x, int y, int z, int face, float clickX, float clickY, float clickZ, bool bTestUseOnOnly)
{
// 4J-PB - Adding a test only version to allow tooltips to be displayed
if (level->getTile(x, y, z) == Tile::recordPlayer_Id && level->getData(x, y, z) == 0)
if (level->getTile(x, y, z) == Tile::jukebox_Id && level->getData(x, y, z) == 0)
{
if(!bTestUseOnOnly)
{
if (level->isClientSide) return true;
((RecordPlayerTile *) Tile::recordPlayer)->setRecord(level, x, y, z, id);
((JukeboxTile *) Tile::jukebox)->setRecord(level, x, y, z, itemInstance);
level->levelEvent(nullptr, LevelEvent::SOUND_PLAY_RECORDING, x, y, z, id);
itemInstance->count--;
@@ -40,17 +44,14 @@ bool RecordingItem::useOn(shared_ptr<ItemInstance> itemInstance, shared_ptr<Play
return false;
}
void RecordingItem::appendHoverText(shared_ptr<ItemInstance> itemInstance, shared_ptr<Player> player, vector<wstring> *lines, bool advanced, vector<wstring> &unformattedStrings)
void RecordingItem::appendHoverText(shared_ptr<ItemInstance> itemInstance, shared_ptr<Player> player, vector<HtmlString> *lines, bool advanced)
{
eMinecraftColour rarityColour = getRarity(shared_ptr<ItemInstance>())->color;
int colour = app.GetHTMLColour(rarityColour);
wchar_t formatted[256];
eMinecraftColour color = getRarity(shared_ptr<ItemInstance>())->color;
swprintf(formatted, 256, L"<font color=\"#%08x\">%ls</font>",colour,L"C418 - ", recording.c_str());
wchar_t text[256];
swprintf(text, 256, L"%ls %ls", L"C418 -", recording.c_str());
lines->push_back(formatted);
unformattedStrings.push_back(recording);
lines->push_back(HtmlString(text, color));
}
const Rarity *RecordingItem::getRarity(shared_ptr<ItemInstance> itemInstance)
@@ -62,3 +63,16 @@ void RecordingItem::registerIcons(IconRegister *iconRegister)
{
icon = iconRegister->registerIcon(L"record_" + recording);
}
RecordingItem *RecordingItem::getByName(const wstring &name)
{
AUTO_VAR(it,BY_NAME.find(name));
if(it != BY_NAME.end())
{
return it->second;
}
else
{
return NULL;
}
}