vistaslayer/LegacyRenouveau
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: neoapps dysfunctional build script

Browse Source
This commit is contained in:
Fireblade
2026-05-05 23:20:16 -04:00
parent 8ccb2b6741
commit f8e4f6376e
287 changed files with 4143 additions and 4710 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/BookshelfTile_SPU.h
+1 -1
View File
@@ -11,7 +11,7 @@ public:
virtual Icon_SPU *getTexture(int face, int data)
{
if (face == Facing::UP || face == Facing::DOWN)
return TileRef_SPU(wood_Id)->getTexture(face);
return TileRef_SPU(planks_Id)->getTexture(face);
return Tile_SPU::getTexture(face, data);
}
};
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ButtonTile_SPU.h
+2 -2
View File
@@ -10,8 +10,8 @@ public:
Icon_SPU *getTexture(int face, int data)
{
if(id == Tile_SPU::button_wood_Id)
return TileRef_SPU(wood_Id)->getTexture(Facing::UP);
if(id == Tile_SPU::wooden_button_Id)
return TileRef_SPU(planks_Id)->getTexture(Facing::UP);
else
return TileRef_SPU(rock_Id)->getTexture(Facing::UP);
}
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ChunkRebuildData.cpp
+22 -22
View File
@@ -89,30 +89,30 @@ void ChunkRebuildData::disableUnseenTiles()
// Establish whether this tile and its neighbours are all made of rock, dirt, unbreakable tiles, or have already
// been determined to meet this criteria themselves and have a tile of 255 set.
if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::bedrock_Id ) || ( flags & e_flag_NoRender) ) ) continue;
tileID = getTile(iX-1, iY, iZ);
flags = getFlags(iX-1, iY, iZ);
if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::bedrock_Id ) || ( flags & e_flag_NoRender) ) ) continue;
tileID = getTile(iX+1, iY, iZ);
flags = getFlags(iX+1, iY, iZ);
if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::bedrock_Id ) || ( flags & e_flag_NoRender) ) ) continue;
tileID = getTile(iX, iY, iZ-1);
flags = getFlags(iX, iY, iZ-1);
if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::bedrock_Id ) || ( flags & e_flag_NoRender) ) ) continue;
tileID = getTile(iX, iY, iZ+1);
flags = getFlags(iX, iY, iZ+1);
if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::bedrock_Id ) || ( flags & e_flag_NoRender) ) ) continue;
// Treat the bottom of the world differently - we shouldn't ever be able to look up at this, so consider tiles as invisible
// if they are surrounded on sides other than the bottom
if( iY > 0 )
{
tileID = getTile(iX, iY-1, iZ);
flags = getFlags(iX, iY-1, iZ);
if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::bedrock_Id ) || ( flags & e_flag_NoRender) ) ) continue;
}
tileID = getTile(iX, iY+1, iZ);
flags = getFlags(iX, iY+1, iZ);
if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::unbreakable_Id ) || ( flags & e_flag_NoRender) ) ) continue;
if( !( ( tileID == Tile_SPU::rock_Id ) || ( tileID == Tile_SPU::dirt_Id ) || ( tileID == Tile_SPU::bedrock_Id ) || ( flags & e_flag_NoRender) ) ) continue;
// This tile is surrounded. Flag it as not requiring to be rendered by setting its id to 255.
setFlag(iX, iY, iZ, e_flag_NoRender);
@@ -148,11 +148,11 @@ void ChunkRebuildData::buildMaterials()
buildMaterial(Material_SPU::air_Id, Material::air);
buildMaterial(Material_SPU::grass_Id, Material::grass);
buildMaterial(Material_SPU::dirt_Id, Material::dirt);
buildMaterial(Material_SPU::wood_Id, Material::wood);
buildMaterial(Material_SPU::planks_Id, Material::wood);
buildMaterial(Material_SPU::stone_Id, Material::stone);
buildMaterial(Material_SPU::metal_Id, Material::metal);
buildMaterial(Material_SPU::water_Id, Material::water);
buildMaterial(Material_SPU::lava_Id, Material::lava);
buildMaterial(Material_SPU::flowing_water_Id, Material::water);
buildMaterial(Material_SPU::flowing_lava_Id, Material::lava);
buildMaterial(Material_SPU::leaves_Id, Material::leaves);
buildMaterial(Material_SPU::plant_Id, Material::plant);
buildMaterial(Material_SPU::replaceable_plant_Id, Material::replaceable_plant);
@@ -166,7 +166,7 @@ void ChunkRebuildData::buildMaterials()
buildMaterial(Material_SPU::explosive_Id, Material::explosive);
buildMaterial(Material_SPU::coral_Id, Material::coral);
buildMaterial(Material_SPU::ice_Id, Material::ice);
buildMaterial(Material_SPU::topSnow_Id, Material::topSnow);
buildMaterial(Material_SPU::snow_layer_Id, Material::topSnow);
buildMaterial(Material_SPU::snow_Id, Material::snow);
buildMaterial(Material_SPU::cactus_Id, Material::cactus);
buildMaterial(Material_SPU::clay_Id, Material::clay);
@@ -186,11 +186,11 @@ int ChunkRebuildData::getMaterialID(Tile* pTile)
if(m == Material::air) return Material_SPU::air_Id;
if(m == Material::grass) return Material_SPU::grass_Id;
if(m == Material::dirt) return Material_SPU::dirt_Id;
if(m == Material::wood) return Material_SPU::wood_Id;
if(m == Material::wood) return Material_SPU::planks_Id;
if(m == Material::stone) return Material_SPU::stone_Id;
if(m == Material::metal) return Material_SPU::metal_Id;
if(m == Material::water) return Material_SPU::water_Id;
if(m == Material::lava) return Material_SPU::lava_Id;
if(m == Material::water) return Material_SPU::flowing_water_Id;
if(m == Material::lava) return Material_SPU::flowing_lava_Id;
if(m == Material::leaves) return Material_SPU::leaves_Id;
if(m == Material::plant) return Material_SPU::plant_Id;
if(m == Material::replaceable_plant)return Material_SPU::replaceable_plant_Id;
@@ -204,7 +204,7 @@ int ChunkRebuildData::getMaterialID(Tile* pTile)
if(m == Material::explosive) return Material_SPU::explosive_Id;
if(m == Material::coral) return Material_SPU::coral_Id;
if(m == Material::ice) return Material_SPU::ice_Id;
if(m == Material::topSnow) return Material_SPU::topSnow_Id;
if(m == Material::topSnow) return Material_SPU::snow_layer_Id;
if(m == Material::snow) return Material_SPU::snow_Id;
if(m == Material::cactus) return Material_SPU::cactus_Id;
if(m == Material::clay) return Material_SPU::clay_Id;
@@ -269,8 +269,8 @@ void ChunkRebuildData::createTileData()
setIconSPUFromIcon(&m_tileData.grass_iconSideOverlay, Tile::grass->iconSideOverlay);
// ThinFence
setIconSPUFromIcon(&m_tileData.ironFence_EdgeTexture, static_cast<ThinFenceTile *>(Tile::ironFence)->getEdgeTexture());
setIconSPUFromIcon(&m_tileData.thinGlass_EdgeTexture, static_cast<ThinFenceTile *>(Tile::thinGlass)->getEdgeTexture());
setIconSPUFromIcon(&m_tileData.iron_bars_EdgeTexture, static_cast<ThinFenceTile *>(Tile::iron_bars)->getEdgeTexture());
setIconSPUFromIcon(&m_tileData.glass_pane_EdgeTexture, static_cast<ThinFenceTile *>(Tile::glass_pane)->getEdgeTexture());
//FarmTile
setIconSPUFromIcon(&m_tileData.farmTile_Dry, static_cast<FarmTile *>(Tile::farmland)->iconDry);
@@ -279,7 +279,7 @@ void ChunkRebuildData::createTileData()
// DoorTile
for(int i=0;i<8; i++)
{
setIconSPUFromIcon(&m_tileData.doorTile_Icons[i], static_cast<DoorTile *>(Tile::door_wood)->icons[i]);
setIconSPUFromIcon(&m_tileData.doorTile_Icons[i], static_cast<DoorTile *>(Tile::wooden_door)->icons[i]);
// we're not supporting flipped icons, so manually flip here
if(i>=4)
m_tileData.doorTile_Icons[i].flipHorizontal();
@@ -830,11 +830,11 @@ int ChunkRebuildData::getRawBrightness(int x, int y, int z, bool propagate)
int id = getTile(x, y, z);
switch(id)
{
case Tile_SPU::stoneSlabHalf_Id:
case Tile_SPU::woodSlabHalf_Id:
case Tile_SPU::stone_slab_Id:
case Tile_SPU::wooden_slab_Id:
case Tile_SPU::farmland_Id:
case Tile_SPU::stairs_stone_Id:
case Tile_SPU::stairs_wood_Id:
case Tile_SPU::stone_stairs_Id:
case Tile_SPU::oak_stairs_Id:
{
int br = getRawBrightness(x, y + 1, z, false);
int br1 = getRawBrightness(x + 1, y, z, false);
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/DiodeTile_SPU.h
+2 -2
View File
@@ -19,7 +19,7 @@ public:
// down is used by the torch tesselator
if (face == Facing::DOWN)
{
if (id==diode_on_Id)
if (id==powered_repeater_Id)
{
return TileRef_SPU(notGate_on_Id)->getTexture(face);
}
@@ -30,7 +30,7 @@ public:
return icon();
}
// edge of stone half-step
return TileRef_SPU(stoneSlab_Id)->getTexture(Facing::UP);
return TileRef_SPU(double_stone_slab_Id)->getTexture(Facing::UP);
}
virtual bool shouldRenderFace(LevelSource *level, int x, int y, int z, int face)
{
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FenceGateTile_SPU.h
+1 -1
View File
@@ -9,7 +9,7 @@ private:
public:
FenceGateTile_SPU(int id) : Tile_SPU(id) {}
Icon_SPU *getTexture(int face, int data) { return TileRef_SPU(wood_Id)->getTexture(face); }
Icon_SPU *getTexture(int face, int data) { return TileRef_SPU(planks_Id)->getTexture(face); }
static int getDirection(int data) { return (data & DIRECTION_MASK); }
virtual void updateShape(ChunkRebuildData *level, int x, int y, int z, int forceData = -1, TileEntity* forceEntity = nullptr) // 4J added forceData, forceEntity param // Brought forward from 1.2.3
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FenceTile_SPU.cpp
+1 -1
View File
@@ -54,7 +54,7 @@ int FenceTile_SPU::getRenderShape()
bool FenceTile_SPU::connectsTo(ChunkRebuildData *level, int x, int y, int z)
{
int tile = level->getTile(x, y, z);
if (tile == id || tile == Tile_SPU::fenceGate_Id)
if (tile == id || tile == Tile_SPU::fence_gate_Id)
{
return true;
}
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FireTile_SPU.h
+8 -8
View File
@@ -20,15 +20,15 @@ public:
int id = level->getTile(x, y, z);
switch (id)
{
case Tile_SPU::wood_Id:
case Tile_SPU::woodSlab_Id:
case Tile_SPU::woodSlabHalf_Id:
case Tile_SPU::planks_Id:
case Tile_SPU::double_wooden_slab_Id:
case Tile_SPU::wooden_slab_Id:
case Tile_SPU::fence_Id:
case Tile_SPU::stairs_wood_Id:
case Tile_SPU::stairs_birchwood_Id:
case Tile_SPU::stairs_sprucewood_Id:
case Tile_SPU::stairs_junglewood_Id:
case Tile_SPU::treeTrunk_Id:
case Tile_SPU::oak_stairs_Id:
case Tile_SPU::birch_stairs_Id:
case Tile_SPU::spruce_stairs_Id:
case Tile_SPU::jungle_stairs_Id:
case Tile_SPU::log_Id:
case Tile_SPU::leaves_Id:
case Tile_SPU::bookshelf_Id:
case Tile_SPU::tnt_Id:
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FurnaceTile_SPU.h
+1 -1
View File
@@ -14,7 +14,7 @@ public:
if (face != data) return icon();
if(id == furnace_Id)
return &ms_pTileData->furnaceTile_iconFront;
else //furnace_lit_Id
else //lit_furnace_Id
return &ms_pTileData->furnaceTile_iconFront_lit;
}
};
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/GrassTile_SPU.cpp
+1 -1
View File
@@ -21,7 +21,7 @@ Icon_SPU *GrassTile_SPU::getTexture(ChunkRebuildData *level, int x, int y, int z
if (face == Facing::UP) return &ms_pTileData->grass_iconTop;
if (face == Facing::DOWN) return TileRef_SPU(dirt_Id)->getTexture(face);
Material_SPU *above = level->getMaterial(x, y + 1, z);
if (above->getID() == Material_SPU::topSnow_Id || above->getID() == Material_SPU::snow_Id)
if (above->getID() == Material_SPU::snow_layer_Id || above->getID() == Material_SPU::snow_Id)
return &ms_pTileData->grass_iconSnowSide;
else
return icon();
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/HalfSlabTile_SPU.cpp
+1 -1
View File
@@ -71,7 +71,7 @@ bool HalfSlabTile_SPU::shouldRenderFace(ChunkRebuildData *level, int x, int y, i
bool HalfSlabTile_SPU::isHalfSlab(int tileId)
{
return tileId == Tile_SPU::stoneSlabHalf_Id || tileId == Tile_SPU::woodSlabHalf_Id;
return tileId == Tile_SPU::stone_slab_Id || tileId == Tile_SPU::wooden_slab_Id;
}
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/LiquidTile_SPU.cpp
+10 -10
View File
@@ -24,7 +24,7 @@ int LiquidTile_SPU::getColor(ChunkRebuildData *level, int x, int y, int z)
int LiquidTile_SPU::getColor(ChunkRebuildData *level, int x, int y, int z, int d)
{
// MGH - TODO
if (getMaterial()->getID() == Material_SPU::water_Id)
if (getMaterial()->getID() == Material_SPU::flowing_water_Id)
{
// Biome b = level.getBiomeSource().getBiome(x, z);
// return b.waterColor;
@@ -62,16 +62,16 @@ Icon_SPU *LiquidTile_SPU::getTexture(int face, int data)
{
if (face == Facing::DOWN || face == Facing::UP)
{
if(id == water_Id || id == calmWater_Id)
if(id == flowing_water_Id || id == water_Id)
return &ms_pTileData->liquidTile_iconWaterStill;
else //(id == lava_Id || id == calmLava_Id)
else //(id == flowing_lava_Id || id == lava_Id)
return &ms_pTileData->liquidTile_iconLavaStill;
}
else
{
if(id == water_Id || id == calmWater_Id)
if(id == flowing_water_Id || id == water_Id)
return &ms_pTileData->liquidTile_iconWaterFlow;
else //(id == lava_Id || id == calmLava_Id)
else //(id == flowing_lava_Id || id == lava_Id)
return &ms_pTileData->liquidTile_iconLavaFlow;
}
}
@@ -201,21 +201,21 @@ float LiquidTile_SPU::getBrightness(ChunkRebuildData *level, int x, int y, int z
int LiquidTile_SPU::getRenderLayer()
{
return getMaterial()->getID() == Material_SPU::water_Id ? 1 : 0;
return getMaterial()->getID() == Material_SPU::flowing_water_Id ? 1 : 0;
}
double LiquidTile_SPU::getSlopeAngle(ChunkRebuildData *level, int x, int y, int z, Material_SPU *m)
{
Vec3_SPU flow = Vec3_SPU(0,0,0);
if (m->getID() == Material_SPU::water_Id)
if (m->getID() == Material_SPU::flowing_water_Id)
{
TileRef_SPU tRef(Tile_SPU::water_Id);
TileRef_SPU tRef(Tile_SPU::flowing_water_Id);
flow = static_cast<LiquidTile_SPU *>(tRef.getPtr())->getFlow(level, x, y, z);
}
if (m->getID() == Material_SPU::lava_Id)
if (m->getID() == Material_SPU::flowing_lava_Id)
{
TileRef_SPU tRef(Tile_SPU::lava_Id);
TileRef_SPU tRef(Tile_SPU::flowing_lava_Id);
flow = static_cast<LiquidTile_SPU *>(tRef.getPtr())->getFlow(level, x, y, z);
}
if (flow.x == 0 && flow.z == 0) return -1000;
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Material_SPU.h
+4 -4
View File
@@ -10,11 +10,11 @@ public:
static const int air_Id = 0;
static const int grass_Id = 1;
static const int dirt_Id = 2;
static const int wood_Id = 3;
static const int planks_Id = 3;
static const int stone_Id = 4;
static const int metal_Id = 5;
static const int water_Id = 6;
static const int lava_Id = 7;
static const int flowing_water_Id = 6;
static const int flowing_lava_Id = 7;
static const int leaves_Id = 8;
static const int plant_Id = 9;
static const int replaceable_plant_Id = 10;
@@ -27,7 +27,7 @@ public:
static const int explosive_Id = 17;
static const int coral_Id = 18;
static const int ice_Id = 19;
static const int topSnow_Id = 20;
static const int snow_layer_Id = 20;
static const int snow_Id = 21;
static const int cactus_Id = 22;
static const int clay_Id = 23;
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/MycelTile_SPU.h
+1 -1
View File
@@ -17,7 +17,7 @@ public:
if (face == Facing::UP) return &ms_pTileData->mycelTile_iconTop;
if (face == Facing::DOWN) return TileRef_SPU(dirt_Id)->getTexture(face);
Material_SPU *above = level->getMaterial(x, y + 1, z);
if (above->getID() == Material_SPU::topSnow_Id || above->getID() == Material_SPU::snow_Id)
if (above->getID() == Material_SPU::snow_layer_Id || above->getID() == Material_SPU::snow_Id)
return &ms_pTileData->mycelTile_iconSnowSide;
else return icon();
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/PumpkinTile_SPU.h
+1 -1
View File
@@ -17,7 +17,7 @@ public:
if (face == Facing::DOWN) return &ms_pTileData->pumpkinTile_iconTop;
Icon_SPU* iconFace = &ms_pTileData->pumpkinTile_iconFace;
if(id == litPumpkin_Id)
if(id == lit_pumpkin_Id)
iconFace = &ms_pTileData->pumpkinTile_iconFaceLit;
if (data == DIR_NORTH && face == Facing::NORTH) return iconFace;
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/RailTile_SPU.h
+3 -3
View File
@@ -25,7 +25,7 @@ public:
{
bool usesDataBit = false;
Icon_SPU* iconTurn = &ms_pTileData->railTile_iconTurn;
if(id == goldenRail_Id)
if(id == golden_rail_Id)
{
usesDataBit = true;
iconTurn = &ms_pTileData->railTile_iconTurnGolden;
@@ -33,7 +33,7 @@ public:
if (usesDataBit)
{
// if (id == Tile::goldenRail_Id)
// if (id == Tile::golden_rail_Id)
// {
if ((data & RAIL_DATA_BIT) == 0)
{
@@ -51,7 +51,7 @@ public:
virtual int getRenderShape() { return Tile_SPU::SHAPE_RAIL; }
bool isUsesDataBit()
{
if(id == goldenRail_Id || id == detectorRail_Id)
if(id == golden_rail_Id || id == detector_rail_Id)
return true;
return false;
}
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/RedStoneDustTile_SPU.h
+2 -2
View File
@@ -32,9 +32,9 @@ public:
static bool shouldConnectTo(ChunkRebuildData *level, int x, int y, int z, int direction)
{
int t = level->getTile(x, y, z);
if (t == Tile_SPU::redStoneDust_Id) return true;
if (t == Tile_SPU::redstone_wire_Id) return true;
if (t == 0) return false;
if (t == Tile_SPU::diode_off_Id || t == Tile_SPU::diode_on_Id)
if (t == Tile_SPU::unpowered_repeater_Id || t == Tile_SPU::powered_repeater_Id)
{
int data = level->getData(x, y, z);
return direction == (data & DiodeTile_SPU::DIRECTION_MASK) || direction == Direction::DIRECTION_OPPOSITE[data & DiodeTile_SPU::DIRECTION_MASK];
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/SignTile_SPU.h
+3 -3
View File
@@ -9,13 +9,13 @@ public:
SignTile_SPU(int id) : EntityTile_SPU(id) {}
bool onGround()
{
if(id == wallSign_Id)
if(id == wall_standing_sign_Id)
return false;
// sign_Id
// standing_sign_Id
return true;
}
Icon_SPU *getTexture(int face, int data){ return TileRef_SPU(wood_Id)->getTexture(face); }
Icon_SPU *getTexture(int face, int data){ return TileRef_SPU(planks_Id)->getTexture(face); }
void updateShape(ChunkRebuildData *level, int x, int y, int z, int forceData = -1, TileEntity* forceEntity = nullptr) // 4J added forceData, forceEntity param
{
if (onGround()) return;
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StairTile_SPU.cpp
+8 -8
View File
@@ -36,14 +36,14 @@ bool StairTile_SPU::isStairs(int id)
{
switch(id)
{
case Tile_SPU::stairs_wood_Id:
case Tile_SPU::stairs_stone_Id:
case Tile_SPU::stairs_bricks_Id:
case Tile_SPU::stairs_stoneBrickSmooth_Id:
case Tile_SPU::stairs_netherBricks_Id:
case Tile_SPU::stairs_sandstone_Id:
case Tile_SPU::stairs_sprucewood_Id:
case Tile_SPU::stairs_birchwood_Id:
case Tile_SPU::oak_stairs_Id:
case Tile_SPU::stone_stairs_Id:
case Tile_SPU::brick_stairs_Id:
case Tile_SPU::stone_brick_stairsSmooth_Id:
case Tile_SPU::nether_brick_stairs_Id:
case Tile_SPU::sandstone_stairs_Id:
case Tile_SPU::spruce_stairs_Id:
case Tile_SPU::birch_stairs_Id:
return true;
default:
return false;
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StemTile_SPU.h
+2 -2
View File
@@ -45,8 +45,8 @@ public:
int getConnectDir(ChunkRebuildData *level, int x, int y, int z)
{
int fruitID = pumpkin_Id;
if(id == melonStem_Id)
fruitID = melon_Id;
if(id == melon_stem_Id)
fruitID = melon_block_Id;
int d = level->getData(x, y, z);
if (d < 7) return -1;
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StoneMonsterTile_SPU.h
+1 -1
View File
@@ -21,7 +21,7 @@ public:
{
if (data == HOST_COBBLE)
{
return TileRef_SPU(stoneBrick_Id)->getTexture(face);
return TileRef_SPU(stonebrick_Id)->getTexture(face);
}
if (data == HOST_STONEBRICK)
{
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/StoneSlabTile_SPU.h
+6 -6
View File
@@ -37,19 +37,19 @@ public:
return &ms_pTileData->stoneSlab_iconSide;
break;
case SAND_SLAB:
return TileRef_SPU(sandStone_Id)->getTexture(face); //Tile::sandStone->getTexture(face);
return TileRef_SPU(sandstone_Id)->getTexture(face); //Tile::sandStone->getTexture(face);
case WOOD_SLAB:
return TileRef_SPU(wood_Id)->getTexture(face); //Tile::wood->getTexture(face);
return TileRef_SPU(planks_Id)->getTexture(face); //Tile::wood->getTexture(face);
case COBBLESTONE_SLAB:
return TileRef_SPU(stoneBrick_Id)->getTexture(face); //Tile::stoneBrick->getTexture(face);
return TileRef_SPU(stonebrick_Id)->getTexture(face); //Tile::stoneBrick->getTexture(face);
case BRICK_SLAB:
return TileRef_SPU(redBrick_Id)->getTexture(face); //Tile::redBrick->getTexture(face);
return TileRef_SPU(brick_block_Id)->getTexture(face); //Tile::redBrick->getTexture(face);
case SMOOTHBRICK_SLAB:
return TileRef_SPU(stoneBrickSmooth_Id)->getTexture(face); //Tile::stoneBrickSmooth->getTexture(face, SmoothStoneBrickTile::TYPE_DEFAULT);
case NETHERBRICK_SLAB:
return TileRef_SPU(netherBrick_Id)->getTexture(Facing::UP); //Tile::netherBrick->getTexture(Facing::UP);
return TileRef_SPU(nether_brick_Id)->getTexture(Facing::UP); //Tile::netherBrick->getTexture(Facing::UP);
case QUARTZ_SLAB:
return TileRef_SPU(quartzBlock_Id)->getTexture(face); //Tile::quartzBlock->getTexture(face);
return TileRef_SPU(quartz_block_Id)->getTexture(face); //Tile::quartzBlock->getTexture(face);
}
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ThinFenceTile_SPU.cpp
+4 -4
View File
@@ -67,10 +67,10 @@ void ThinFenceTile_SPU::updateShape(ChunkRebuildData *level, int x, int y, int z
Icon_SPU *ThinFenceTile_SPU::getEdgeTexture()
{
if(id == Tile_SPU::ironFence_Id)
return &ms_pTileData->ironFence_EdgeTexture;
if(id == Tile_SPU::thinGlass_Id)
return &ms_pTileData->thinGlass_EdgeTexture;
if(id == Tile_SPU::iron_bars_Id)
return &ms_pTileData->iron_bars_EdgeTexture;
if(id == Tile_SPU::glass_pane_Id)
return &ms_pTileData->glass_pane_EdgeTexture;
#ifndef SN_TARGET_PS3_SPU
assert(0);
#endif