backups/neoLegacy
2
0
Fork 0
mirror of https://github.com/neoStudiosLCE/neoLegacy.git synced 2026-08-20 09:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into exp/worldgen

Browse source
This commit is contained in:
github-actions 2026-05-22 19:23:03 +00:00
parent d1df3e2dd7 8446d10fa9
commit 3c3b7ea48a
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Minecraft.World/LeafTile2.cpp
View file

@ -15,13 +15,13 @@ const unsigned int LeafTile2::LEAF2_NAMES[LEAF2_NAMES_SIZE] = {
}; };
const wstring LeafTile2::TEXTURES[2][2] = { const wstring LeafTile2::TEXTURES[2][2] = {
{ L"leaves_acacia", L"leaves_dark_oak" }, // Indice 0: Fancy { L"leaves_acacia", L"leaves_dark_oak" }, // index 0: Fancy
{ L"leaves_acacia_opaque", L"leaves_dark_oak_opaque" } // Indice 1: Veloce/Opaca { L"leaves_acacia_opaque", L"leaves_dark_oak_opaque" } // index 1: Fast
}; };
LeafTile2::LeafTile2(int id) : LeafTile(id) LeafTile2::LeafTile2(int id) : LeafTile(id)
{ {
// Non serve fare checkBuffer qui, ci pensa già la classe padre LeafTile! // do nothing here
} }
Icon *LeafTile2::getTexture(int face, int data) Icon *LeafTile2::getTexture(int face, int data)
@ -29,8 +29,8 @@ Icon *LeafTile2::getTexture(int face, int data)
int type = data & 3; int type = data & 3;
if (type >= LEAF2_NAMES_SIZE) type = 0; if (type >= LEAF2_NAMES_SIZE) type = 0;
// isSolidRender() in LeafTile restituisce 'true' se la grafica è su Veloce/Opaca. // isSolidRender() in LeafTile returns 'true' if graphics is Fast
// Quindi se è true usiamo l'indice 1, se è false (Trasparente) usiamo l'indice 0. // if true -> index is 1, else 0.
int textureSet = isSolidRender(false) ? 1 : 0; int textureSet = isSolidRender(false) ? 1 : 0;
return icons[textureSet][type]; return icons[textureSet][type];
@ -56,13 +56,14 @@ void LeafTile2::registerIcons(IconRegister *iconRegister)
int LeafTile2::getColor(int data) int LeafTile2::getColor(int data)
{ {
// In inventario o in mano, l'Acacia e la Dark Oak usano il verde base // in the inventory use the default colour for leaves
return FoliageColor::getDefaultColor(); return FoliageColor::getDefaultColor();
} }
int LeafTile2::getColor(LevelSource *level, int x, int y, int z, int data) int LeafTile2::getColor(LevelSource *level, int x, int y, int z, int data)
{ {
// Codice di blending per il colore del bioma (copiato dal tuo LeafTile.cpp) // Codice di blending per il colore del bioma (copiato dal tuo LeafTile.cpp))
// blending biome colors copied from LeafTile.cpp
int totalRed = 0; int totalRed = 0;
int totalGreen = 0; int totalGreen = 0;
int totalBlue = 0; int totalBlue = 0;
@ -71,7 +72,7 @@ int LeafTile2::getColor(LevelSource *level, int x, int y, int z, int data)
{ {
for (int ox = -1; ox <= 1; ox++) for (int ox = -1; ox <= 1; ox++)
{ {
int foliageColor = level->getBiome(x + ox, z + oz)->getFolageColor(); // Attento, nel tuo engine si chiama getFolageColor() senza la 'i' int foliageColor = level->getBiome(x + ox, z + oz)->getFolageColor(); // they mispelled the word. getFolageColor without "i"
totalRed += (foliageColor & 0xff0000) >> 16; totalRed += (foliageColor & 0xff0000) >> 16;
totalGreen += (foliageColor & 0xff00) >> 8; totalGreen += (foliageColor & 0xff00) >> 8;
totalBlue += (foliageColor & 0xff); totalBlue += (foliageColor & 0xff);
@ -83,7 +84,7 @@ int LeafTile2::getColor(LevelSource *level, int x, int y, int z, int data)
void LeafTile2::playerDestroy(Level *level, shared_ptr<Player> player, int x, int y, int z, int data) void LeafTile2::playerDestroy(Level *level, shared_ptr<Player> player, int x, int y, int z, int data)
{ {
// Se il giocatore usa le cesoie, vogliamo droppare "leaves2" (ID 161) e non "leaves" (ID 18) // if player is using shears, drop "leaves2" (ID 161) , instead of "leaves" (ID 18)
if (!level->isClientSide && player->getSelectedItem() != nullptr && player->getSelectedItem()->id == Item::shears->id) if (!level->isClientSide && player->getSelectedItem() != nullptr && player->getSelectedItem()->id == Item::shears->id)
{ {
player->awardStat( player->awardStat(
@ -95,7 +96,7 @@ void LeafTile2::playerDestroy(Level *level, shared_ptr<Player> player, int x, in
} }
else else
{ {
// Altrimenti usa la distruzione standard di TransparentTile // or default destroy
TransparentTile::playerDestroy(level, player, x, y, z, data); TransparentTile::playerDestroy(level, player, x, y, z, data);
} }
} }