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

feat: remove shears & fencegate

Browse Source
This commit is contained in:
str1k3r committed 2026-10-03 01:32:49 -04:00
1 parent 299bf5bc3d
commit 1bf91df452
18 files changed
+3 -68
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Minecraft.Client/Common/Tutorial/Tutorial.cpp
-3
View File
@@ -640,9 +640,6 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad( iPad )
int vineItems[] = {Tile::vine_Id};
if(!isHintCompleted(e_Tutorial_Hint_Vine)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Vine, this, vineItems, 1 ) );
int fenceGateItems[] = {Tile::fenceGate_Id};
if(!isHintCompleted(e_Tutorial_Hint_Fence_Gate)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Fence_Gate, this, fenceGateItems, 1 ) );
int mycelItems[] = {Tile::mycel_Id};
if(!isHintCompleted(e_Tutorial_Hint_Mycel)) addHint(e_Tutorial_State_Gameplay, new LookAtTileHint(e_Tutorial_Hint_Mycel, this, mycelItems, 1 ) );
Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp
-2
View File
@@ -80,7 +80,6 @@ void IUIScene_CreativeMenu::staticCtor()
ITEM_AUX(Tile::quartzBlock_Id,QuartzBlockTile::TYPE_CHISELED)
ITEM_AUX(Tile::quartzBlock_Id,QuartzBlockTile::TYPE_LINES_Y)
ITEM(Tile::trapdoor_Id)
ITEM(Tile::fenceGate_Id)
ITEM(Item::door_wood_Id)
ITEM(Item::door_iron_Id)
ITEM_AUX(Tile::stoneSlabHalf_Id,StoneSlabTile::STONE_SLAB)
@@ -361,7 +360,6 @@ void IUIScene_CreativeMenu::staticCtor()
ITEM(Item::fireball_Id)
ITEM(Item::clock_Id)
ITEM(Item::shears_Id)
ITEM(Item::fishingRod_Id)
ITEM(Item::carrotOnAStick_Id)
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FenceTile_SPU.cpp
-4
View File
@@ -54,10 +54,6 @@ 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)
{
return true;
}
TileRef_SPU tileInstance(tile);
if (tileInstance.getPtr() != NULL)
{
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp
-2
View File
@@ -819,8 +819,6 @@ void Tile_SPU::initTilePointers()
CREATE_TILE_TYPE(redStoneDust_Id, RedStoneDustTile_SPU);
CREATE_TILE_TYPE(fenceGate_Id, FenceGateTile_SPU);
CREATE_TILE_TYPE(bed_Id, BedTile_SPU);
CREATE_TILE_TYPE(pistonBase_Id, PistonBaseTile_SPU);
Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.h
-1
View File
@@ -405,7 +405,6 @@ public:
static const int pumpkinStem_Id = 104;
static const int melonStem_Id = 105;
static const int vine_Id = 106;
static const int fenceGate_Id = 107;
static const int stairs_bricks_Id = 108;
static const int stairs_stoneBrickSmooth_Id = 109;
Minecraft.World/DeadBushTile.cpp
+1 -14
View File
@@ -29,18 +29,5 @@ int DeadBushTile::getResource(int data, Random *random, int playerBonusLevel)
void DeadBushTile::playerDestroy(Level *level, shared_ptr<Player> player, int x, int y, int z, int data)
{
if (!level->isClientSide && player->getSelectedItem() != NULL && player->getSelectedItem()->id == Item::shears_Id)
{
player->awardStat(
GenericStats::blocksMined(id),
GenericStats::param_blocksMined(id,data,1)
);
// drop leaf block instead of sapling
popResource(level, x, y, z, shared_ptr<ItemInstance>(new ItemInstance(Tile::deadBush, 1, data)));
}
else
{
Bush::playerDestroy(level, player, x, y, z, data);
}
Bush::playerDestroy(level, player, x, y, z, data);
}
Minecraft.World/DiggingEnchantment.cpp
-1
View File
@@ -24,6 +24,5 @@ int DiggingEnchantment::getMaxLevel()
bool DiggingEnchantment::canEnchant(shared_ptr<ItemInstance> item)
{
if (item->getItem()->id == Item::shears_Id) return true;
return Enchantment::canEnchant(item);
}
Minecraft.World/FenceTile.cpp
-4
View File
@@ -101,10 +101,6 @@ int FenceTile::getRenderShape()
bool FenceTile::connectsTo(LevelSource *level, int x, int y, int z)
{
int tile = level->getTile(x, y, z);
if (tile == id || tile == Tile::fenceGate_Id)
{
return true;
}
Tile *tileInstance = Tile::tiles[tile];
if (tileInstance != NULL)
{
Minecraft.World/Item.cpp
-1
View File
@@ -1049,7 +1049,6 @@ const int Item::bed_Id ;
const int Item::diode_Id ;
const int Item::cookie_Id ;
const int Item::map_Id ;
const int Item::shears_Id ;
const int Item::melon_Id ;
const int Item::seeds_pumpkin_Id ;
const int Item::seeds_melon_Id ;
Minecraft.World/Item.h
-3
View File
@@ -494,9 +494,6 @@ public:
static const int cookie_Id = 357;
static const int map_Id = 358;
// 1.7.3
static const int shears_Id = 359;
// 1.8.2
static const int melon_Id = 360;
static const int seeds_pumpkin_Id = 361;
Minecraft.World/MushroomCow.cpp
-21
View File
@@ -37,27 +37,6 @@ bool MushroomCow::interact(shared_ptr<Player> player)
return true;
}
}
if (item != NULL && item->id == Item::shears_Id && getAge() >= 0)
{
remove();
level->addParticle(eParticleType_largeexplode, x, y + bbHeight / 2, z, 0, 0, 0);
if(!level->isClientSide)
{
// 4J Stu - We don't need to check spawn limits when adding the new cow, as we are removing the MushroomCow
remove();
shared_ptr<Cow> cow = shared_ptr<Cow>( new Cow(level) );
cow->moveTo(x, y, z, yRot, xRot);
cow->setHealth(getHealth());
cow->yBodyRot = yBodyRot;
level->addEntity(cow);
for (int i = 0; i < 5; i++)
{
level->addEntity( shared_ptr<ItemEntity>( new ItemEntity(level, x, y + bbHeight, z, shared_ptr<ItemInstance>( new ItemInstance(Tile::mushroom2))) ));
}
return true;
}
return true;
}
return Cow::interact(player);
}
Minecraft.World/PathFinder.cpp
+1 -1
View File
@@ -232,7 +232,7 @@ int PathFinder::isFree(Entity *entity, int x, int y, int z, Node *size, bool avo
if (canOpenDoors && tileId == Tile::door_wood_Id) continue;
int renderShape = tile->getRenderShape();
if (renderShape == Tile::SHAPE_FENCE || tileId == Tile::fenceGate_Id || renderShape == Tile::SHAPE_WALL) return TYPE_FENCE;
if (renderShape == Tile::SHAPE_FENCE || renderShape == Tile::SHAPE_WALL) return TYPE_FENCE;
if (tileId == Tile::trapdoor_Id) return TYPE_TRAP;
Material *m = tile->material;
if (m == Material::lava)
Minecraft.World/Tile.cpp
-1
View File
@@ -1574,7 +1574,6 @@ const int Tile::melon_Id;
const int Tile::pumpkinStem_Id;
const int Tile::melonStem_Id;
const int Tile::vine_Id;
const int Tile::fenceGate_Id;
const int Tile::stairs_bricks_Id;
const int Tile::stairs_stoneBrickSmooth_Id;
const int Tile::mycel_Id;
Minecraft.World/Tile.h
-1
View File
@@ -267,7 +267,6 @@ public:
static const int pumpkinStem_Id = 104;
static const int melonStem_Id = 105;
static const int vine_Id = 106;
static const int fenceGate_Id = 107;
static const int stairs_bricks_Id = 108;
static const int stairs_stoneBrickSmooth_Id = 109;
Minecraft.World/TripWireTile.cpp
-5
View File
@@ -105,11 +105,6 @@ void TripWireTile::onRemove(Level *level, int x, int y, int z, int id, int data)
void TripWireTile::playerWillDestroy(Level *level, int x, int y, int z, int data, shared_ptr<Player> player)
{
if (level->isClientSide) return;
if (player->getSelectedItem() != NULL && player->getSelectedItem()->id == Item::shears_Id)
{
level->setData(x, y, z, data | MASK_DISARMED);
}
}
void TripWireTile::updateSource(Level *level, int x, int y, int z, int data)
Minecraft.World/UntouchingEnchantment.cpp
-1
View File
@@ -29,6 +29,5 @@ bool UntouchingEnchantment::isCompatibleWith(Enchantment *other) const
bool UntouchingEnchantment::canEnchant(shared_ptr<ItemInstance> item)
{
if (item->getItem()->id == Item::shears_Id) return true;
return Enchantment::canEnchant(item);
}
Minecraft.World/Villager.cpp
-2
View File
@@ -430,7 +430,6 @@ void Villager::addOffers(int addCount)
addItemForPurchase(newOffers, Item::melon_Id, random, getRecipeChance(.3f));
addItemForPurchase(newOffers, Item::apple_Id, random, getRecipeChance(.3f));
addItemForPurchase(newOffers, Item::cookie_Id, random, getRecipeChance(.3f));
addItemForPurchase(newOffers, Item::shears_Id, random, getRecipeChance(.3f));
addItemForPurchase(newOffers, Item::flintAndSteel_Id, random, getRecipeChance(.3f));
addItemForPurchase(newOffers, Item::chicken_cooked_Id, random, getRecipeChance(.3f));
addItemForPurchase(newOffers, Item::arrow_Id, random, getRecipeChance(.5f));
@@ -573,7 +572,6 @@ void Villager::staticCtor()
MIN_MAX_VALUES[Item::rotten_flesh_Id] = pair<int,int>(36, 64);
MIN_MAX_PRICES[Item::flintAndSteel_Id] = pair<int,int>(3, 4);
MIN_MAX_PRICES[Item::shears_Id] = pair<int,int>(3, 4);
MIN_MAX_PRICES[Item::sword_iron_Id] = pair<int,int>(7, 11);
MIN_MAX_PRICES[Item::sword_diamond_Id] = pair<int,int>(12, 14);
MIN_MAX_PRICES[Item::hatchet_iron_Id] = pair<int,int>(6, 8);
Minecraft.World/WallTile.cpp
+1 -1
View File
@@ -154,7 +154,7 @@ AABB *WallTile::getAABB(Level *level, int x, int y, int z)
bool WallTile::connectsTo(LevelSource *level, int x, int y, int z)
{
int tile = level->getTile(x, y, z);
if (tile == id || tile == Tile::fenceGate_Id)
if (tile == id)
{
return true;
}