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

* 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

View File

@@ -1,14 +1,24 @@
#include "stdafx.h"
#include "Tile.h"
#include "MultiTextureTileItem.h"
#include "net.minecraft.world.item.crafting.h"
MultiTextureTileItem::MultiTextureTileItem(int id, Tile *parentTile, int *nameExtensions, int iLength) : TileItem(id)
MultiTextureTileItem::MultiTextureTileItem(int id, Tile *parentTile, int *nameExtensions, int iLength, int anyValueName) : TileItem(id)
{
this->parentTile = parentTile;
this->nameExtensions = nameExtensions;
this->m_iNameExtensionsLength=iLength;
if(anyValueName != -1)
{
m_anyValueName = anyValueName;
}
else
{
m_anyValueName = nameExtensions[0];
}
setMaxDamage(0);
setStackedByData(true);
}
@@ -29,18 +39,15 @@ unsigned int MultiTextureTileItem::getDescriptionId(int iData)
{
iData = 0;
}
//return super.getDescriptionId() + "." + nameExtensions[auxValue];
return nameExtensions[iData];
}
unsigned int MultiTextureTileItem::getDescriptionId(shared_ptr<ItemInstance> instance)
{
int auxValue = instance->getAuxValue();
if (auxValue < 0 || auxValue >= m_iNameExtensionsLength)
{
auxValue = 0;
}
//return super.getDescriptionId() + "." + nameExtensions[auxValue];
return nameExtensions[auxValue];
}
int auxValue = instance->getAuxValue();
if (auxValue == Recipes::ANY_AUX_VALUE || auxValue < 0 || auxValue >= m_iNameExtensionsLength)
{
return m_anyValueName;
}
return nameExtensions[auxValue];
}