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

fix: merge conflicts

Browse source
This commit is contained in:
Fireblade 2026-05-24 23:20:13 -04:00
parent 8676650294
commit cc424e1fad
6 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
View file

@ -234,7 +234,7 @@ void IUIScene_CreativeMenu::staticCtor()
ITEM_AUX(Tile::red_flower_Id, Rose::WHITE_TULIP) ITEM_AUX(Tile::red_flower_Id, Rose::WHITE_TULIP)
ITEM_AUX(Tile::red_flower_Id, Rose::PINK_TULIP) ITEM_AUX(Tile::red_flower_Id, Rose::PINK_TULIP)
ITEM_AUX(Tile::red_flower_Id, Rose::OXEYE_DAISY) ITEM_AUX(Tile::red_flower_Id, Rose::OXEYE_DAISY)
ITEM(Tile::tallgrass2_Id) ITEM(Tile::double_plant_Id)
ITEM_AUX(Tile::double_plant_Id, TallGrass2::LILAC) ITEM_AUX(Tile::double_plant_Id, TallGrass2::LILAC)
ITEM_AUX(Tile::double_plant_Id, TallGrass2::TALL_GRASS) ITEM_AUX(Tile::double_plant_Id, TallGrass2::TALL_GRASS)
ITEM_AUX(Tile::double_plant_Id, TallGrass2::LARGE_FERN) ITEM_AUX(Tile::double_plant_Id, TallGrass2::LARGE_FERN)

2
Minecraft.Client/TileRenderer.cpp
View file

@ -4195,7 +4195,7 @@ bool TileRenderer::tesselateCrossInWorld( Tile* tt, int x, int y, int z )
zt += ((((seed >> 24) & 0xf) / 15.0f) - 0.5f) * 0.5f; zt += ((((seed >> 24) & 0xf) / 15.0f) - 0.5f) * 0.5f;
} }
if (tt == Tile::tallgrass2) if (tt == Tile::double_plant)
{ {
const int data = level->getData(x, y, z); const int data = level->getData(x, y, z);
const bool isUpper = (data & TallGrass2::UPPER_BIT) != 0; const bool isUpper = (data & TallGrass2::UPPER_BIT) != 0;

4
Minecraft.World/GrassTile.cpp
View file

@ -121,8 +121,8 @@ void GrassTile::tick(Level *level, int x, int y, int z, Random *random)
} }
} }
Material* above = level->getMaterial(x, y + 1, z); Material* above = level->getMaterial(x, y + 1, z);
if (above->isSolid() || above->isLiquid()) level->setTileAndUpdate(x, y, z, Tile::dirt_Id); if (level->isSolidBlockingTile(x, y + 1, z) || above->isLiquid()) level->setTileAndUpdate(x, y, z, Tile::dirt_Id);
} }
int GrassTile::getResource(int data, Random *random, int playerBonusLevel) int GrassTile::getResource(int data, Random *random, int playerBonusLevel)

2
Minecraft.World/OreRecipies.cpp
View file

@ -33,7 +33,7 @@ void OreRecipies::_init()
ADD_OBJECT(map[7],new ItemInstance(Item::wheat, 9)); ADD_OBJECT(map[7],new ItemInstance(Item::wheat, 9));
ADD_OBJECT(map[8],Tile::slimeBlock); ADD_OBJECT(map[8],Tile::slimeBlock);
ADD_OBJECT(map[8],new ItemInstance(Item::slimeBall, 9)); ADD_OBJECT(map[8],new ItemInstance(Item::slime_ball, 9));
} }
void OreRecipies::addRecipes(Recipes *r) void OreRecipies::addRecipes(Recipes *r)
{ {

4
Minecraft.World/PistonBaseTile.cpp
View file

@ -455,7 +455,7 @@ bool PistonBaseTile::triggerEvent(Level *level, int x, int y, int z, int param1,
int destZ = adjZ - Facing::STEP_Z[facing]; int destZ = adjZ - Facing::STEP_Z[facing];
stopSharingIfServer(level, destX, destY, destZ); stopSharingIfServer(level, destX, destY, destZ);
level->setTileAndData(destX, destY, destZ, Tile::pistonMovingPiece_Id, adjData, Tile::UPDATE_NONE); level->setTileAndData(destX, destY, destZ, Tile::piston_extension_Id, adjData, Tile::UPDATE_NONE);
level->setTileEntity(destX, destY, destZ, PistonMovingPiece::newMovingPieceEntity(adjBlock, adjData, facing, false, false)); level->setTileEntity(destX, destY, destZ, PistonMovingPiece::newMovingPieceEntity(adjBlock, adjData, facing, false, false));
ignoreUpdate(false); ignoreUpdate(false);
@ -852,7 +852,7 @@ bool PistonBaseTile::createPush(Level *level, int sx, int sy, int sz, int facing
int dz = nz + Facing::STEP_Z[facing]; int dz = nz + Facing::STEP_Z[facing];
stopSharingIfServer(level, dx, dy, dz); stopSharingIfServer(level, dx, dy, dz);
level->setTileAndData(dx, dy, dz, Tile::pistonMovingPiece_Id, data, Tile::UPDATE_NONE); level->setTileAndData(dx, dy, dz, Tile::piston_extension_Id, data, Tile::UPDATE_NONE);
level->setTileEntity(dx, dy, dz, PistonMovingPiece::newMovingPieceEntity(block, data, facing, true, false)); level->setTileEntity(dx, dy, dz, PistonMovingPiece::newMovingPieceEntity(block, data, facing, true, false));
level->removeTile(nx, ny, nz); level->removeTile(nx, ny, nz);
level->updateNeighborsAt(nx, ny, nz, block); level->updateNeighborsAt(nx, ny, nz, block);

1
Minecraft.World/Tile.cpp
View file

@ -1790,7 +1790,6 @@ const int Tile::web_Id;
const int Tile::tallgrass_Id; const int Tile::tallgrass_Id;
const int Tile::deadbush_Id; const int Tile::deadbush_Id;
const int Tile::piston_Id; const int Tile::piston_Id;
const int Tile::pistonMovingPiece_Id;
const int Tile::wool_Id; const int Tile::wool_Id;
const int Tile::piston_extension_Id; const int Tile::piston_extension_Id;
const int Tile::yellow_flower_Id; const int Tile::yellow_flower_Id;