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

40
Minecraft.World/GrassTile.cpp
View File

@@ -16,23 +16,23 @@ GrassTile::GrassTile(int id) : Tile(id, Material::grass)
iconSnowSide = NULL;
iconSideOverlay = NULL;
setTicking(true);
setTicking(true);
}
Icon *GrassTile::getTexture(int face, int data)
{
if (face == Facing::UP) return iconTop;
if (face == Facing::DOWN) return Tile::dirt->getTexture(face);
return icon;
if (face == Facing::UP) return iconTop;
if (face == Facing::DOWN) return Tile::dirt->getTexture(face);
return icon;
}
Icon *GrassTile::getTexture(LevelSource *level, int x, int y, int z, int face)
{
if (face == Facing::UP) return iconTop;
if (face == Facing::DOWN) return Tile::dirt->getTexture(face);
Material *above = level->getMaterial(x, y + 1, z);
if (above == Material::topSnow || above == Material::snow) return iconSnowSide;
else return icon;
if (face == Facing::UP) return iconTop;
if (face == Facing::DOWN) return Tile::dirt->getTexture(face);
Material *above = level->getMaterial(x, y + 1, z);
if (above == Material::topSnow || above == Material::snow) return iconSnowSide;
else return icon;
}
void GrassTile::registerIcons(IconRegister *iconRegister)
@@ -46,10 +46,10 @@ void GrassTile::registerIcons(IconRegister *iconRegister)
int GrassTile::getColor() const
{
// 4J Replaced
//double temp = 0.5;
//double rain = 1.0;
//double temp = 0.5;
//double rain = 1.0;
//return GrassColor::get(temp, rain);
//return GrassColor::get(temp, rain);
return Minecraft::GetInstance()->getColourTable()->getColor( eMinecraftColour_Grass_Common );
}
@@ -90,15 +90,15 @@ int GrassTile::getColor(LevelSource *level, int x, int y, int z, int data)
void GrassTile::tick(Level *level, int x, int y, int z, Random *random)
{
if (level->isClientSide) return;
if (level->isClientSide) return;
if (level->getRawBrightness(x, y + 1, z) < MIN_BRIGHTNESS && Tile::lightBlock[level->getTile(x, y + 1, z)] > 2)
if (level->getRawBrightness(x, y + 1, z) < MIN_BRIGHTNESS && Tile::lightBlock[level->getTile(x, y + 1, z)] > 2)
{
level->setTile(x, y, z, Tile::dirt_Id);
}
level->setTileAndUpdate(x, y, z, Tile::dirt_Id);
}
else
{
if (level->getRawBrightness(x, y + 1, z) >= Level::MAX_BRIGHTNESS - 6)
if (level->getRawBrightness(x, y + 1, z) >= Level::MAX_BRIGHTNESS - 6)
{
for (int i = 0; i < 4; i++)
{
@@ -108,11 +108,11 @@ void GrassTile::tick(Level *level, int x, int y, int z, Random *random)
int above = level->getTile(xt, yt + 1, zt);
if (level->getTile(xt, yt, zt) == Tile::dirt_Id && level->getRawBrightness(xt, yt + 1, zt) >= MIN_BRIGHTNESS && Tile::lightBlock[above] <= 2)
{
level->setTile(xt, yt, zt, Tile::grass_Id);
level->setTileAndUpdate(xt, yt, zt, Tile::grass_Id);
}
}
}
}
}
}
}
int GrassTile::getResource(int data, Random *random, int playerBonusLevel)