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

47
Minecraft.World/HangingEntityItem.cpp
View File

@@ -3,6 +3,7 @@
#include "net.minecraft.world.phys.h"
#include "net.minecraft.world.damagesource.h"
#include "net.minecraft.world.level.tile.h"
#include "net.minecraft.world.item.h"
#include "net.minecraft.world.level.h"
#include "HangingEntityItem.h"
#include "HangingEntity.h"
@@ -13,10 +14,7 @@
HangingEntityItem::HangingEntityItem(int id, eINSTANCEOF eClassType) : Item(id)
{
//super(id);
//this.clazz = clazz;
this->eType=eClassType;
// setItemCategory(CreativeModeTab.TAB_DECORATIONS);
}
bool HangingEntityItem::useOn(shared_ptr<ItemInstance> instance, shared_ptr<Player> player, Level *level, int xt, int yt, int zt, int face, float clickX, float clickY, float clickZ, bool bTestOnly)
@@ -26,17 +24,16 @@ bool HangingEntityItem::useOn(shared_ptr<ItemInstance> instance, shared_ptr<Play
if(bTestOnly)
{
if (!player->mayBuild(xt, yt, zt)) return false;
if (!player->mayUseItemAt(xt, yt, zt, face, instance)) return false;
return true;
}
int dir = Direction::FACING_DIRECTION[face];
shared_ptr<HangingEntity> entity = createEntity(level, xt, yt, zt, dir);
shared_ptr<HangingEntity> entity = createEntity(level, xt, yt, zt, dir, instance->getAuxValue() );
//if (!player->mayUseItemAt(xt, yt, zt, face, instance)) return false;
if (!player->mayBuild(xt, yt, zt)) return false;
if (!player->mayUseItemAt(xt, yt, zt, face, instance)) return false;
if (entity != NULL && entity->survives())
{
@@ -65,12 +62,22 @@ bool HangingEntityItem::useOn(shared_ptr<ItemInstance> instance, shared_ptr<Play
}
shared_ptr<HangingEntity> HangingEntityItem::createEntity(Level *level, int x, int y, int z, int dir)
shared_ptr<HangingEntity> HangingEntityItem::createEntity(Level *level, int x, int y, int z, int dir, int auxValue) // 4J added auxValue
{
if (eType == eTYPE_PAINTING)
{
shared_ptr<Painting> painting = shared_ptr<Painting>(new Painting(level, x, y, z, dir));
painting->PaintingPostConstructor(dir);
#ifndef _CONTENT_PACKAGE
if (app.DebugArtToolsOn() && auxValue > 0)
{
painting->PaintingPostConstructor(dir, auxValue - 1);
}
else
#endif
{
painting->PaintingPostConstructor(dir);
}
return dynamic_pointer_cast<HangingEntity> (painting);
}
@@ -86,3 +93,25 @@ shared_ptr<HangingEntity> HangingEntityItem::createEntity(Level *level, int x, i
}
}
// 4J Adding overrides for art tools
void HangingEntityItem::appendHoverText(shared_ptr<ItemInstance> itemInstance, shared_ptr<Player> player, vector<HtmlString> *lines, bool advanced)
{
#ifndef _CONTENT_PACKAGE
if (eType == eTYPE_PAINTING && app.DebugArtToolsOn() && itemInstance->getAuxValue() > 0 )
{
int motive = itemInstance->getAuxValue() - 1;
wchar_t formatted[256];
ZeroMemory(formatted, 256 * sizeof(wchar_t));
swprintf(formatted, 256, L"** %ls %dx%d",Painting::Motive::values[motive]->name.c_str(),Painting::Motive::values[motive]->w/16,Painting::Motive::values[motive]->h/16);
wstring motiveName = formatted;
lines->push_back(HtmlString(motiveName.c_str(), eHTMLColor_c));
}
else
#endif
{
return Item::appendHoverText(itemInstance, player, lines, advanced);
}
}