fix: neoapps dysfunctional build script
This commit is contained in:
@@ -123,7 +123,7 @@ Icon *PistonBaseTile::getTexture(const wstring &name)
|
||||
{
|
||||
if (name.compare(EDGE_TEX) == 0) return Tile::pistonBase->icon;
|
||||
if (name.compare(PLATFORM_TEX) == 0) return Tile::pistonBase->iconPlatform;
|
||||
if (name.compare(PLATFORM_STICKY_TEX) == 0) return Tile::pistonStickyBase->iconPlatform;
|
||||
if (name.compare(PLATFORM_STICKY_TEX) == 0) return Tile::sticky_piston->iconPlatform;
|
||||
if (name.compare(INSIDE_TEX) == 0) return Tile::pistonBase->iconInside;
|
||||
|
||||
return nullptr;
|
||||
@@ -326,7 +326,7 @@ bool PistonBaseTile::triggerEvent(Level *level, int x, int y, int z, int param1,
|
||||
}
|
||||
|
||||
stopSharingIfServer(level, x, y, z); // 4J added
|
||||
level->setTileAndData(x, y, z, Tile::pistonMovingPiece_Id, facing, Tile::UPDATE_ALL);
|
||||
level->setTileAndData(x, y, z, Tile::piston_extension_Id, facing, Tile::UPDATE_ALL);
|
||||
level->setTileEntity(x, y, z, PistonMovingPiece::newMovingPieceEntity(id, facing, facing, false, true));
|
||||
|
||||
PIXEndNamedEvent();
|
||||
@@ -344,7 +344,7 @@ bool PistonBaseTile::triggerEvent(Level *level, int x, int y, int z, int param1,
|
||||
|
||||
PIXEndNamedEvent();
|
||||
|
||||
if (block == Tile::pistonMovingPiece_Id)
|
||||
if (block == Tile::piston_extension_Id)
|
||||
{
|
||||
PIXBeginNamedEvent(0,"Contract sticky phase B\n");
|
||||
// the block two steps away is a moving piston block piece, so replace it with the real data,
|
||||
@@ -368,7 +368,7 @@ bool PistonBaseTile::triggerEvent(Level *level, int x, int y, int z, int param1,
|
||||
|
||||
PIXBeginNamedEvent(0,"Contract sticky phase C\n");
|
||||
if (!pistonPiece && block > 0 && (isPushable(block, level, twoX, twoY, twoZ, false))
|
||||
&& (Tile::tiles[block]->getPistonPushReaction() == Material::PUSH_NORMAL || block == Tile::pistonBase_Id || block == Tile::pistonStickyBase_Id))
|
||||
&& (Tile::tiles[block]->getPistonPushReaction() == Material::PUSH_NORMAL || block == Tile::piston_Id || block == Tile::sticky_piston_Id))
|
||||
{
|
||||
stopSharingIfServer(level, twoX, twoY, twoZ); // 4J added
|
||||
|
||||
@@ -376,7 +376,7 @@ bool PistonBaseTile::triggerEvent(Level *level, int x, int y, int z, int param1,
|
||||
y += Facing::STEP_Y[facing];
|
||||
z += Facing::STEP_Z[facing];
|
||||
|
||||
level->setTileAndData(x, y, z, Tile::pistonMovingPiece_Id, blockData, Tile::UPDATE_ALL);
|
||||
level->setTileAndData(x, y, z, Tile::piston_extension_Id, blockData, Tile::UPDATE_ALL);
|
||||
level->setTileEntity(x, y, z, PistonMovingPiece::newMovingPieceEntity(block, blockData, facing, false, false));
|
||||
|
||||
ignoreUpdate(false);
|
||||
@@ -511,7 +511,7 @@ bool PistonBaseTile::isPushable(int block, Level *level, int cx, int cy, int cz,
|
||||
return false;
|
||||
}
|
||||
|
||||
if (block == Tile::pistonBase_Id || block == Tile::pistonStickyBase_Id)
|
||||
if (block == Tile::piston_Id || block == Tile::sticky_piston_Id)
|
||||
{
|
||||
// special case for piston bases
|
||||
if (isExtended(level->getData(cx, cy, cz)))
|
||||
@@ -691,12 +691,12 @@ bool PistonBaseTile::createPush(Level *level, int sx, int sy, int sz, int facing
|
||||
|
||||
if (block == id && nx == sx && ny == sy && nz == sz)
|
||||
{
|
||||
level->setTileAndData(cx, cy, cz, Tile::pistonMovingPiece_Id, facing | (isSticky ? PistonExtensionTile::STICKY_BIT : 0), Tile::UPDATE_NONE);
|
||||
level->setTileEntity(cx, cy, cz, PistonMovingPiece::newMovingPieceEntity(Tile::pistonExtensionPiece_Id, facing | (isSticky ? PistonExtensionTile::STICKY_BIT : 0), facing, true, false));
|
||||
level->setTileAndData(cx, cy, cz, Tile::piston_extension_Id, facing | (isSticky ? PistonExtensionTile::STICKY_BIT : 0), Tile::UPDATE_NONE);
|
||||
level->setTileEntity(cx, cy, cz, PistonMovingPiece::newMovingPieceEntity(Tile::piston_head_Id, facing | (isSticky ? PistonExtensionTile::STICKY_BIT : 0), facing, true, false));
|
||||
}
|
||||
else
|
||||
{
|
||||
level->setTileAndData(cx, cy, cz, Tile::pistonMovingPiece_Id, data, Tile::UPDATE_NONE);
|
||||
level->setTileAndData(cx, cy, cz, Tile::piston_extension_Id, data, Tile::UPDATE_NONE);
|
||||
level->setTileEntity(cx, cy, cz, PistonMovingPiece::newMovingPieceEntity(block, data, facing, true, false));
|
||||
}
|
||||
tiles[count++] = block;
|
||||
|
||||
Reference in New Issue
Block a user