From 82a95d668390bf691d424a0712b91513288e6b91 Mon Sep 17 00:00:00 2001 From: Lord Cambion Date: Thu, 19 Mar 2026 23:06:22 +0100 Subject: [PATCH] FIXED ID MATCHING THE LCE --- Minecraft.World/DoorTile.cpp | 2 +- Minecraft.World/Item.h | 30 +++++++++++++++++++----------- Minecraft.World/Tile.cpp | 12 +++++------- Minecraft.World/Tile.h | 23 ++++++++++++++++------- 4 files changed, 41 insertions(+), 26 deletions(-) diff --git a/Minecraft.World/DoorTile.cpp b/Minecraft.World/DoorTile.cpp index f257f327..59e7a14e 100644 --- a/Minecraft.World/DoorTile.cpp +++ b/Minecraft.World/DoorTile.cpp @@ -339,7 +339,7 @@ int DoorTile::getCompositeData(LevelSource *level, int x, int y, int z) int DoorTile::cloneTileId(Level *level, int x, int y, int z) { - return material == Material::metal ? Item::door_iron_Id : Item::door_wood_Id; + return doorItemMap[doorType]; } void DoorTile::playerWillDestroy(Level *level, int x, int y, int z, int data, shared_ptr player) diff --git a/Minecraft.World/Item.h b/Minecraft.World/Item.h index 86d28e98..7581117b 100644 --- a/Minecraft.World/Item.h +++ b/Minecraft.World/Item.h @@ -642,10 +642,25 @@ public: static const int horseArmorDiamond_Id = 419; static const int lead_Id = 420; static const int nameTag_Id = 421; - // TU25 + + //422 command_block_minecart + static const int prismarine_shard_Id = 409; + static const int prismarine_cystal_Id = 410; + static const int rabbit_raw_Id = 411; + static const int rabbit_cooked_Id = 412; + static const int rabbitStew_Id = 413; + static const int rabbits_foot_Id = 414; + static const int rabbit_hide_Id = 415; + static const int armor_stand_Id = 416; + + static const int mutton_raw_Id = 423; + static const int mutton_cooked_Id = 424; + //425 banner + //426 end_crystal + static const int door_spruce_Id = 427; static const int door_birch_Id = 428; static const int door_jungle_Id = 429; @@ -653,18 +668,11 @@ public: static const int door_dark_Id = 431; //TU31 - static const int mutton_raw_Id = 423; - static const int mutton_cooked_Id = 424; - static const int rabbit_raw_Id = 411; - static const int rabbit_cooked_Id = 412; - static const int rabbitStew_Id = 413; - static const int rabbits_foot_Id = 414; - static const int rabbit_hide_Id = 415; - static const int armor_stand_Id = 416; + + - static const int prismarine_cystal_Id = 410; - static const int prismarine_shard_Id = 409; + public: diff --git a/Minecraft.World/Tile.cpp b/Minecraft.World/Tile.cpp index fdff6101..1f324fc7 100644 --- a/Minecraft.World/Tile.cpp +++ b/Minecraft.World/Tile.cpp @@ -374,7 +374,11 @@ void Tile::staticCtor() Tile::wallSign = (new SignTile(68, eTYPE_SIGNTILEENTITY, false)) ->setDestroyTime(1.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"sign")->setDescriptionId(IDS_TILE_SIGN)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_SIGN); Tile::lever = (new LeverTile(69)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_lever, Item::eMaterial_wood)->setDestroyTime(0.5f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"lever")->setDescriptionId(IDS_TILE_LEVER)->sendTileData()->setUseDescriptionId(IDS_DESC_LEVER); Tile::pressurePlate_stone = (Tile *)(new PressurePlateTile(70, L"stone", Material::stone, PressurePlateTile::mobs)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_pressureplate, Item::eMaterial_stone)->setDestroyTime(0.5f)->setSoundType(Tile::SOUND_STONE)->setDescriptionId(IDS_TILE_PRESSURE_PLATE)->sendTileData()->setUseDescriptionId(IDS_DESC_PRESSUREPLATE); - + Tile::door_spruce = (new DoorTile(193, Material::wood, L"doorSpruce"))->setDestroyTime(3.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"door_spruce")->setDescriptionId(IDS_TILE_DOOR_SPRUCE)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_DOOR_WOOD); + Tile::door_birch = (new DoorTile(194, Material::wood, L"doorBirch"))->setDestroyTime(3.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"door_birch")->setDescriptionId(IDS_TILE_DOOR_SPRUCE)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_DOOR_WOOD); + Tile::door_jungle = (new DoorTile(195, Material::wood, L"doorJungle"))->setDestroyTime(3.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"door_jungle")->setDescriptionId(IDS_TILE_DOOR_SPRUCE)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_DOOR_WOOD); + Tile::door_acacia = (new DoorTile(196, Material::wood, L"doorAcacia"))->setDestroyTime(3.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"door_acacia")->setDescriptionId(IDS_TILE_DOOR_SPRUCE)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_DOOR_WOOD); + Tile::door_dark = (new DoorTile(197, Material::wood, L"doorDark"))->setDestroyTime(3.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"door_dark")->setDescriptionId(IDS_TILE_DOOR_SPRUCE)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_DOOR_WOOD); Tile::door_iron = (new DoorTile(71, Material::metal, L"doorIron"))->setDestroyTime(5.0f)->setSoundType(Tile::SOUND_METAL)->setIconName(L"door_iron")->setDescriptionId(IDS_TILE_DOOR_IRON)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_DOOR_IRON); Tile::pressurePlate_wood = (new PressurePlateTile(72, L"planks_oak", Material::wood, PressurePlateTile::everything)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_pressureplate, Item::eMaterial_wood)->setDestroyTime(0.5f)->setSoundType(Tile::SOUND_WOOD)->setDescriptionId(IDS_TILE_PRESSURE_PLATE)->sendTileData()->setUseDescriptionId(IDS_DESC_PRESSUREPLATE); Tile::redStoneOre = (new RedStoneOreTile(73,false)) ->setDestroyTime(3.0f)->setExplodeable(5)->setSoundType(Tile::SOUND_STONE)->setIconName(L"redstone_ore")->setDescriptionId(IDS_TILE_ORE_REDSTONE)->sendTileData()->setUseDescriptionId(IDS_DESC_ORE_REDSTONE); @@ -502,12 +506,6 @@ void Tile::staticCtor() Tile::jungleFence = (new FenceTile(190, L"planks_jungle", Material::wood))->setBaseItemTypeAndMaterial(Item::eBaseItemType_fence, Item::eMaterial_junglewood)->setDestroyTime(2.0f)->setExplodeable(5)->setSoundType(Tile::SOUND_WOOD)->setDescriptionId(IDS_TILE_JUNGLE_FENCE)->setUseDescriptionId(IDS_DESC_FENCE); Tile::darkFence = (new FenceTile(191, L"planks_dark", Material::wood))->setBaseItemTypeAndMaterial(Item::eBaseItemType_fence, Item::eMaterial_darkwood)->setDestroyTime(2.0f)->setExplodeable(5)->setSoundType(Tile::SOUND_WOOD)->setDescriptionId(IDS_TILE_DARK_FENCE)->setUseDescriptionId(IDS_DESC_FENCE); Tile::acaciaFence = (new FenceTile(192, L"planks_acacia", Material::wood))->setBaseItemTypeAndMaterial(Item::eBaseItemType_fence, Item::eMaterial_acaciawood)->setDestroyTime(2.0f)->setExplodeable(5)->setSoundType(Tile::SOUND_WOOD)->setDescriptionId(IDS_TILE_ACACIA_FENCE)->setUseDescriptionId(IDS_DESC_FENCE); - - Tile::door_spruce = (new DoorTile(193, Material::wood, L"doorSpruce"))->setDestroyTime(3.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"door_spruce")->setDescriptionId(IDS_TILE_DOOR_SPRUCE)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_DOOR_WOOD); - Tile::door_birch = (new DoorTile(194, Material::wood, L"doorBirch"))->setDestroyTime(3.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"door_birch")->setDescriptionId(IDS_TILE_DOOR_BIRCH)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_DOOR_WOOD); - Tile::door_jungle = (new DoorTile(195, Material::wood, L"doorJungle"))->setDestroyTime(3.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"door_jungle")->setDescriptionId(IDS_TILE_DOOR_JUNGLE)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_DOOR_WOOD); - Tile::door_acacia = (new DoorTile(196, Material::wood, L"doorAcacia"))->setDestroyTime(3.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"door_acacia")->setDescriptionId(IDS_TILE_DOOR_ACACIA)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_DOOR_WOOD); - Tile::door_dark = (new DoorTile(197, Material::wood, L"doorDark"))->setDestroyTime(3.0f)->setSoundType(Tile::SOUND_WOOD)->setIconName(L"door_dark")->setDescriptionId(IDS_TILE_DOOR_DARK)->setNotCollectStatistics()->sendTileData()->setUseDescriptionId(IDS_DESC_DOOR_WOOD); Tile::seaLantern = (new SeaLanternTile(169, Material::glass))->setBaseItemTypeAndMaterial(Item::eBaseItemType_torch, Item::eMaterial_glowstone)->setDestroyTime(0.3f)->setSoundType(Tile::SOUND_GLASS)->setLightEmission(1.0f)->setIconName(L"glowstone")->setDescriptionId(IDS_TILE_SEA_LANTERN)->setUseDescriptionId(IDS_DESC_GLOWSTONE); Tile::prismarine = (new PrismarineTile(168))->setBaseItemTypeAndMaterial(Item::eBaseItemType_structblock, Item::eMaterial_stone)->setDestroyTime(1.5f)->setExplodeable(10)->setSoundType(SOUND_STONE)->setIconName(L"prismarine")->setDescriptionId(IDS_TILE_PRISMARINE)->setUseDescriptionId(IDS_ITEM_PRISMARINE_DESC); diff --git a/Minecraft.World/Tile.h b/Minecraft.World/Tile.h index 0de6c46c..2a3464ff 100644 --- a/Minecraft.World/Tile.h +++ b/Minecraft.World/Tile.h @@ -370,33 +370,42 @@ public: static const int stairs_acaciawood_Id = 163; static const int stairs_darkwood_Id = 164; - + //165 slimeblock + //166 barrier static const int iron_trapdoor_Id = 167; - + static const int prismarine_Id = 168; + static const int seaLantern_Id = 169; static const int hayBlock_Id = 170; static const int woolCarpet_Id = 171; static const int clayHardened_Id = 172; static const int coalBlock_Id = 173; static const int packed_ice_Id = 174; - + //175 double_plant + //176 standing_banner + //177 wall_banner static const int invertedDaylightDetector_Id = 178; static const int red_sandstone_Id = 179; static const int stairs_red_sandstone_Id = 180; - + //181 double_stone_slab2 : sandstoneslab + //182 stone_slab2 : sandstoneslab static const int spruceGate_Id = 183; static const int birchGate_Id = 184; static const int jungleGate_Id = 185; static const int darkGate_Id = 186; static const int acaciaGate_Id = 187; - static const int spruceFence_Id = 188; static const int birchFence_Id = 189; static const int jungleFence_Id = 190; static const int darkFence_Id = 191; static const int acaciaFence_Id = 192; + static const int spruce_door_Id = 193; + static const int birch_door_Id = 194; + static const int jungle_door_Id = 195; + static const int acacia_door_Id = 196; + static const int dark_oak_door_Id = 197; - static const int seaLantern_Id = 169; - static const int prismarine_Id = 168; + + static Tile *stone; static GrassTile *grass;