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

55
Minecraft.World/TheEndPortal.cpp
View File

@@ -21,9 +21,9 @@ void TheEndPortal::allowAnywhere(bool set)
TlsSetValue(tlsIdx,(LPVOID)(set?1:0));
}
TheEndPortal::TheEndPortal(int id, Material *material) : EntityTile(id, material, isSolidRender())
TheEndPortal::TheEndPortal(int id, Material *material) : BaseEntityTile(id, material, isSolidRender())
{
this->setLightEmission(1.0f);
this->setLightEmission(1.0f);
}
shared_ptr<TileEntity> TheEndPortal::newTileEntity(Level *level)
@@ -33,14 +33,14 @@ shared_ptr<TileEntity> TheEndPortal::newTileEntity(Level *level)
void TheEndPortal::updateShape(LevelSource *level, int x, int y, int z, int forceData, shared_ptr<TileEntity> forceEntity) // 4J added forceData, forceEntity param
{
float r = 1 / 16.0f;
this->setShape(0, 0, 0, 1, r, 1);
float r = 1 / 16.0f;
setShape(0, 0, 0, 1, r, 1);
}
bool TheEndPortal::shouldRenderFace(LevelSource *level, int x, int y, int z, int face)
{
if (face != 0) return false;
return EntityTile::shouldRenderFace(level, x, y, z, face);
if (face != 0) return false;
return BaseEntityTile::shouldRenderFace(level, x, y, z, face);
}
void TheEndPortal::addAABBs(Level *level, int x, int y, int z, AABB *box, AABBList *boxes, shared_ptr<Entity> source)
@@ -64,11 +64,13 @@ int TheEndPortal::getResourceCount(Random *random)
void TheEndPortal::entityInside(Level *level, int x, int y, int z, shared_ptr<Entity> entity)
{
if (entity->riding == NULL && entity->rider.lock() == NULL)
if (entity->GetType() == eTYPE_EXPERIENCEORB ) return; // 4J added
if (entity->riding == NULL && entity->rider.lock() == NULL)
{
if (dynamic_pointer_cast<Player>(entity) != NULL)
if (!level->isClientSide)
{
if (!level->isClientSide)
if ( entity->instanceof(eTYPE_PLAYER) )
{
// 4J Stu - Update the level data position so that the stronghold portal can be shown on the maps
int x,z;
@@ -79,39 +81,38 @@ void TheEndPortal::entityInside(Level *level, int x, int y, int z, shared_ptr<En
level->getLevelData()->setZStrongholdEndPortal(z);
level->getLevelData()->setHasStrongholdEndPortal();
}
(dynamic_pointer_cast<Player>(entity))->changeDimension(1);
}
}
}
}
entity->changeDimension(1);
}
}
}
void TheEndPortal::animateTick(Level *level, int xt, int yt, int zt, Random *random)
{
double x = xt + random->nextFloat();
double y = yt + 0.8f;
double z = zt + random->nextFloat();
double xa = 0;
double ya = 0;
double za = 0;
double x = xt + random->nextFloat();
double y = yt + 0.8f;
double z = zt + random->nextFloat();
double xa = 0;
double ya = 0;
double za = 0;
level->addParticle(eParticleType_endportal, x, y, z, xa, ya, za);
level->addParticle(eParticleType_endportal, x, y, z, xa, ya, za);
}
int TheEndPortal::getRenderShape()
{
return SHAPE_INVISIBLE;
return SHAPE_INVISIBLE;
}
void TheEndPortal::onPlace(Level *level, int x, int y, int z)
{
if (allowAnywhere()) return;
if (allowAnywhere()) return;
if (level->dimension->id != 0)
if (level->dimension->id != 0)
{
level->setTile(x, y, z, 0);
return;
}
level->removeTile(x, y, z);
return;
}
}
int TheEndPortal::cloneTileId(Level *level, int x, int y, int z)