str1k3r/TU0
0
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: remove iron bars

Browse Source
This commit is contained in:
str1k3r committed 2026-10-08 20:35:52 -04:00
1 parent 7c6ed9dbcb
commit 6315c27226
12 files changed
+2 -87
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.gitea/PROGRESS.md
+1 -1
View File
@@ -113,7 +113,7 @@
- [ ] Glass Bottle
- [ ] Ghast Tear
- [ ] Magma Cream
- [ ] Iron Bars
- [x] Iron Bars
- [ ] Ender Pearl
- [ ] Eye of Ender
- [ ] Music Discs (excluding 13 and Cat)
Minecraft.Client/Common/Tutorial/Tutorial.cpp
-3
View File
@@ -628,9 +628,6 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad( iPad )
int hugeMushroomItems[] = {Tile::hugeMushroom1_Id,Tile::hugeMushroom2_Id};
if(!isHintCompleted(e_Tutorial_Hint_Huge_Mushroom)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Huge_Mushroom, this, hugeMushroomItems, 2 ) );
int ironFenceItems[] = {Tile::ironFence_Id};
if(!isHintCompleted(e_Tutorial_Hint_Iron_Fence)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Iron_Fence, this, ironFenceItems, 1 ) );
int thisGlassItems[] = {Tile::thinGlass_Id};
if(!isHintCompleted(e_Tutorial_Hint_Thin_Glass)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Thin_Glass, this, thisGlassItems, 1 ) );
Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
-1
View File
@@ -226,7 +226,6 @@ void IUIScene_CreativeMenu::staticCtor()
ITEM(Tile::anvil_Id);
ITEM(Tile::fence_Id)
ITEM(Tile::netherFence_Id)
ITEM(Tile::ironFence_Id)
ITEM_AUX(Tile::cobbleWall_Id, WallTile::TYPE_NORMAL)
ITEM_AUX(Tile::cobbleWall_Id, WallTile::TYPE_MOSSY)
ITEM(Item::bed_Id)
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/ThinFenceTile_SPU.cpp
-2
View File
@@ -67,8 +67,6 @@ 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;
#ifndef SN_TARGET_PS3_SPU
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp
-1
View File
@@ -682,7 +682,6 @@ void Tile_SPU::initTilePointers()
CREATE_TILE_TYPE(chest_Id, ChestTile_SPU);
CREATE_TILE_TYPE(ironFence_Id, ThinFenceTile_SPU);
CREATE_TILE_TYPE(thinGlass_Id, ThinFenceTile_SPU);
CREATE_TILE_TYPE(fence_Id, FenceTile_SPU);
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.h
-1
View File
@@ -399,7 +399,6 @@ public:
static const int stoneBrickSmooth_Id = 98;
static const int hugeMushroom1_Id = 99;
static const int hugeMushroom2_Id = 100;
static const int ironFence_Id = 101;
static const int thinGlass_Id = 102;
static const int melon_Id = 103;
static const int pumpkinStem_Id = 104;
Minecraft.World/SpikeFeature.cpp
-49
View File
@@ -119,55 +119,6 @@ bool SpikeFeature::placeWithIndex(Level *level, Random *random, int x, int y, in
}
}
// cap the last spikes with a fence to stop lucky arrows hitting the crystal
if(iIndex>5)
{
for (int yy = y; yy < y + hh; yy++)
{
if (yy < Level::genDepth)
{
for (int xx = x - 2; xx <= x + 2; xx++)
{
for (int zz = z - 2; zz <= z + 2; zz++)
{
int xd = xx - x;
int zd = zz - z;
int iVal = xd * xd + zd * zd;
if ( iVal >= 2 * 2)
{
if(yy==(y + hh - 1))
{
placeBlock(level, xx, y + hh, zz, Tile::ironFence_Id, 0);
placeBlock(level, xx, y + hh +1, zz, Tile::ironFence_Id, 0);
placeBlock(level, xx, y + hh +2, zz, Tile::ironFence_Id, 0);
}
}
}
}
}
else
{
app.DebugPrintf("Breaking out of spike feature\n");
break;
}
}
// and cap off the top
int yy = y + hh + 3;
if (yy < Level::genDepth)
{
for (int xx = x - 2; xx <= x + 2; xx++)
{
for (int zz = z - 2; zz <= z + 2; zz++)
{
placeBlock(level, xx, yy, zz, Tile::ironFence_Id, 0);
}
}
}
}
shared_ptr<EnderCrystal> enderCrystal = shared_ptr<EnderCrystal>(new EnderCrystal(level));
enderCrystal->moveTo(x + 0.5f, y + hh, z + 0.5f, random->nextFloat() * 360, 0);
level->addEntity(enderCrystal);
Minecraft.World/StrongholdPieces.cpp
-24
View File
@@ -262,13 +262,6 @@ void StrongholdPieces::StrongholdPiece::generateSmallDoor(Level *level, Random *
case GRATES:
placeBlock(level, 0, 0, footX + 1, footY, footZ, chunkBB);
placeBlock(level, 0, 0, footX + 1, footY + 1, footZ, chunkBB);
placeBlock(level, Tile::ironFence_Id, 0, footX, footY, footZ, chunkBB);
placeBlock(level, Tile::ironFence_Id, 0, footX, footY + 1, footZ, chunkBB);
placeBlock(level, Tile::ironFence_Id, 0, footX, footY + 2, footZ, chunkBB);
placeBlock(level, Tile::ironFence_Id, 0, footX + 1, footY + 2, footZ, chunkBB);
placeBlock(level, Tile::ironFence_Id, 0, footX + 2, footY + 2, footZ, chunkBB);
placeBlock(level, Tile::ironFence_Id, 0, footX + 2, footY + 1, footZ, chunkBB);
placeBlock(level, Tile::ironFence_Id, 0, footX + 2, footY, footZ, chunkBB);
break;
case IRON_DOOR:
placeBlock(level, Tile::stoneBrickSmooth_Id, 0, footX, footY, footZ, chunkBB);
@@ -1062,13 +1055,7 @@ bool StrongholdPieces::PrisonHall::postProcess(Level *level, Random *random, Bou
generateBox(level, chunkBB, 4, 1, 7, 4, 3, 7, false, random, (BlockSelector *)smoothStoneSelector);
generateBox(level, chunkBB, 4, 1, 9, 4, 3, 9, false, random, (BlockSelector *)smoothStoneSelector);
// grates
generateBox(level, chunkBB, 4, 1, 4, 4, 3, 6, Tile::ironFence_Id, Tile::ironFence_Id, false);
generateBox(level, chunkBB, 5, 1, 5, 7, 3, 5, Tile::ironFence_Id, Tile::ironFence_Id, false);
// doors
placeBlock(level, Tile::ironFence_Id, 0, 4, 3, 2, chunkBB);
placeBlock(level, Tile::ironFence_Id, 0, 4, 3, 8, chunkBB);
placeBlock(level, Tile::door_iron_Id, getOrientationData(Tile::door_iron_Id, 3), 4, 1, 2, chunkBB);
placeBlock(level, Tile::door_iron_Id, getOrientationData(Tile::door_iron_Id, 3) + DoorTile::UPPER_BIT, 4, 2, 2, chunkBB);
placeBlock(level, Tile::door_iron_Id, getOrientationData(Tile::door_iron_Id, 3), 4, 1, 8, chunkBB);
@@ -1394,17 +1381,6 @@ bool StrongholdPieces::PortalRoom::postProcess(Level *level, Random *random, Bou
generateBox(level, chunkBB, 3, 1, 8, 7, 1, 12, false, random, (BlockSelector *)smoothStoneSelector);
generateBox(level, chunkBB, 4, 1, 9, 6, 1, 11, Tile::lava_Id, Tile::lava_Id, false);
// wall decorations
for (int z = 3; z < depth - 2; z += 2)
{
generateBox(level, chunkBB, 0, 3, z, 0, 4, z, Tile::ironFence_Id, Tile::ironFence_Id, false);
generateBox(level, chunkBB, width - 1, 3, z, width - 1, 4, z, Tile::ironFence_Id, Tile::ironFence_Id, false);
}
for (int x = 2; x < width - 2; x += 2)
{
generateBox(level, chunkBB, x, 3, depth - 1, x, 4, depth - 1, Tile::ironFence_Id, Tile::ironFence_Id, false);
}
// stair
int orientationData = getOrientationData(Tile::stairs_stoneBrickSmooth_Id, 3);
generateBox(level, chunkBB, 4, 1, 5, 6, 1, 7, false, random, (BlockSelector *)smoothStoneSelector);
Minecraft.World/Tile.cpp
-1
View File
@@ -1568,7 +1568,6 @@ const int Tile::monsterStoneEgg_Id;
const int Tile::stoneBrickSmooth_Id;
const int Tile::hugeMushroom1_Id;
const int Tile::hugeMushroom2_Id;
const int Tile::ironFence_Id;
const int Tile::thinGlass_Id;
const int Tile::melon_Id;
const int Tile::pumpkinStem_Id;
Minecraft.World/Tile.h
-1
View File
@@ -261,7 +261,6 @@ public:
static const int stoneBrickSmooth_Id = 98;
static const int hugeMushroom1_Id = 99;
static const int hugeMushroom2_Id = 100;
static const int ironFence_Id = 101;
static const int thinGlass_Id = 102;
static const int melon_Id = 103;
static const int pumpkinStem_Id = 104;
Minecraft.World/VillagePieces.cpp
-2
View File
@@ -1556,8 +1556,6 @@ bool VillagePieces::Smithy::postProcess(Level *level, Random *random, BoundingBo
generateBox(level, chunkBB, 6, 1, 4, 9, 4, 6, Tile::stoneBrick_Id, Tile::stoneBrick_Id, false);
placeBlock(level, Tile::lava_Id, 0, 7, 1, 5, chunkBB);
placeBlock(level, Tile::lava_Id, 0, 8, 1, 5, chunkBB);
placeBlock(level, Tile::ironFence_Id, 0, 9, 2, 5, chunkBB);
placeBlock(level, Tile::ironFence_Id, 0, 9, 2, 4, chunkBB);
generateBox(level, chunkBB, 7, 2, 4, 8, 2, 5, 0, 0, false);
placeBlock(level, Tile::stoneBrick_Id, 0, 6, 1, 3, chunkBB);
placeBlock(level, Tile::furnace_Id, 0, 6, 2, 3, chunkBB);
Minecraft.World/Zombie.cpp
+1 -1
View File
@@ -347,7 +347,7 @@ int Zombie::getConversionProgress()
{
int tile = level->getTile(xx, yy, zz);
if (tile == Tile::ironFence_Id || tile == Tile::bed_Id)
if (tile == Tile::bed_Id)
{
if (random->nextFloat() < 0.3f) amount++;
specialBlocksCount++;