From 1bf91df4523782b1bb47b9276d3b475ca3c93fe4 Mon Sep 17 00:00:00 2001 From: str1k3r <115313679+S1l3ntStr1ke87@users.noreply.github.com> Date: Sat, 3 Oct 2026 01:32:49 -0400 Subject: [PATCH] feat: remove shears & fencegate --- Minecraft.Client/Common/Tutorial/Tutorial.cpp | 3 --- .../Common/UI/IUIScene_CreativeMenu.cpp | 2 -- .../SPU_Tasks/ChunkUpdate/FenceTile_SPU.cpp | 4 ---- .../PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp | 2 -- .../PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.h | 1 - Minecraft.World/DeadBushTile.cpp | 15 +------------ Minecraft.World/DiggingEnchantment.cpp | 1 - Minecraft.World/FenceTile.cpp | 4 ---- Minecraft.World/Item.cpp | 1 - Minecraft.World/Item.h | 3 --- Minecraft.World/MushroomCow.cpp | 21 ------------------- Minecraft.World/PathFinder.cpp | 2 +- Minecraft.World/Tile.cpp | 1 - Minecraft.World/Tile.h | 1 - Minecraft.World/TripWireTile.cpp | 5 ----- Minecraft.World/UntouchingEnchantment.cpp | 1 - Minecraft.World/Villager.cpp | 2 -- Minecraft.World/WallTile.cpp | 2 +- 18 files changed, 3 insertions(+), 68 deletions(-) diff --git a/Minecraft.Client/Common/Tutorial/Tutorial.cpp b/Minecraft.Client/Common/Tutorial/Tutorial.cpp index b0a0d665..fe0bfa2b 100644 --- a/Minecraft.Client/Common/Tutorial/Tutorial.cpp +++ b/Minecraft.Client/Common/Tutorial/Tutorial.cpp @@ -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 ) ); diff --git a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp index 854b1ce3..0aa69e19 100644 --- a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp @@ -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) diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FenceTile_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FenceTile_SPU.cpp index fcb3baef..78148477 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FenceTile_SPU.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/FenceTile_SPU.cpp @@ -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) { diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp index f2dfeaac..bbb5f6bb 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.cpp @@ -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); diff --git a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.h b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.h index 484823ef..2b4846c0 100644 --- a/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.h +++ b/Minecraft.Client/PS3/SPU_Tasks/ChunkUpdate/Tile_SPU.h @@ -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; diff --git a/Minecraft.World/DeadBushTile.cpp b/Minecraft.World/DeadBushTile.cpp index 33fdfe6c..c7db6dbd 100644 --- a/Minecraft.World/DeadBushTile.cpp +++ b/Minecraft.World/DeadBushTile.cpp @@ -29,18 +29,5 @@ int DeadBushTile::getResource(int data, Random *random, int playerBonusLevel) void DeadBushTile::playerDestroy(Level *level, shared_ptr 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(new ItemInstance(Tile::deadBush, 1, data))); - } - else - { - Bush::playerDestroy(level, player, x, y, z, data); - } + Bush::playerDestroy(level, player, x, y, z, data); } diff --git a/Minecraft.World/DiggingEnchantment.cpp b/Minecraft.World/DiggingEnchantment.cpp index b3775623..44c92fbb 100644 --- a/Minecraft.World/DiggingEnchantment.cpp +++ b/Minecraft.World/DiggingEnchantment.cpp @@ -24,6 +24,5 @@ int DiggingEnchantment::getMaxLevel() bool DiggingEnchantment::canEnchant(shared_ptr item) { - if (item->getItem()->id == Item::shears_Id) return true; return Enchantment::canEnchant(item); } \ No newline at end of file diff --git a/Minecraft.World/FenceTile.cpp b/Minecraft.World/FenceTile.cpp index 0d1f9bc4..c49f4a31 100644 --- a/Minecraft.World/FenceTile.cpp +++ b/Minecraft.World/FenceTile.cpp @@ -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) { diff --git a/Minecraft.World/Item.cpp b/Minecraft.World/Item.cpp index 6657b64b..493e9378 100644 --- a/Minecraft.World/Item.cpp +++ b/Minecraft.World/Item.cpp @@ -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 ; diff --git a/Minecraft.World/Item.h b/Minecraft.World/Item.h index dd5eaae6..fb531d3e 100644 --- a/Minecraft.World/Item.h +++ b/Minecraft.World/Item.h @@ -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; diff --git a/Minecraft.World/MushroomCow.cpp b/Minecraft.World/MushroomCow.cpp index a2aef158..de3da3f5 100644 --- a/Minecraft.World/MushroomCow.cpp +++ b/Minecraft.World/MushroomCow.cpp @@ -37,27 +37,6 @@ bool MushroomCow::interact(shared_ptr 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 = shared_ptr( 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( new ItemEntity(level, x, y + bbHeight, z, shared_ptr( new ItemInstance(Tile::mushroom2))) )); - } - return true; - } - return true; - } return Cow::interact(player); } diff --git a/Minecraft.World/PathFinder.cpp b/Minecraft.World/PathFinder.cpp index 878c74f1..e0df02a3 100644 --- a/Minecraft.World/PathFinder.cpp +++ b/Minecraft.World/PathFinder.cpp @@ -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) diff --git a/Minecraft.World/Tile.cpp b/Minecraft.World/Tile.cpp index 33c3ba32..e1e1a222 100644 --- a/Minecraft.World/Tile.cpp +++ b/Minecraft.World/Tile.cpp @@ -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; diff --git a/Minecraft.World/Tile.h b/Minecraft.World/Tile.h index a401d965..bb4fec98 100644 --- a/Minecraft.World/Tile.h +++ b/Minecraft.World/Tile.h @@ -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; diff --git a/Minecraft.World/TripWireTile.cpp b/Minecraft.World/TripWireTile.cpp index 40ad93f8..79e16676 100644 --- a/Minecraft.World/TripWireTile.cpp +++ b/Minecraft.World/TripWireTile.cpp @@ -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) { 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) diff --git a/Minecraft.World/UntouchingEnchantment.cpp b/Minecraft.World/UntouchingEnchantment.cpp index 1e5a41b7..30f92c3d 100644 --- a/Minecraft.World/UntouchingEnchantment.cpp +++ b/Minecraft.World/UntouchingEnchantment.cpp @@ -29,6 +29,5 @@ bool UntouchingEnchantment::isCompatibleWith(Enchantment *other) const bool UntouchingEnchantment::canEnchant(shared_ptr item) { - if (item->getItem()->id == Item::shears_Id) return true; return Enchantment::canEnchant(item); } \ No newline at end of file diff --git a/Minecraft.World/Villager.cpp b/Minecraft.World/Villager.cpp index 7deadc67..45a42322 100644 --- a/Minecraft.World/Villager.cpp +++ b/Minecraft.World/Villager.cpp @@ -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(36, 64); MIN_MAX_PRICES[Item::flintAndSteel_Id] = pair(3, 4); - MIN_MAX_PRICES[Item::shears_Id] = pair(3, 4); MIN_MAX_PRICES[Item::sword_iron_Id] = pair(7, 11); MIN_MAX_PRICES[Item::sword_diamond_Id] = pair(12, 14); MIN_MAX_PRICES[Item::hatchet_iron_Id] = pair(6, 8); diff --git a/Minecraft.World/WallTile.cpp b/Minecraft.World/WallTile.cpp index 6275eef7..a92b2d49 100644 --- a/Minecraft.World/WallTile.cpp +++ b/Minecraft.World/WallTile.cpp @@ -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; }