diff options
| author | daoge <3523206925@qq.com> | 2026-03-03 03:04:10 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-03 03:04:10 +0800 |
| commit | b3feddfef372618c8a9d7a0abcaf18cfad866c18 (patch) | |
| tree | 267761c3bb39241ba5c347bfbe2254d06686e287 /Minecraft.Client/User.cpp | |
| parent | 84c31a2331f7a0ec85b9d438992e244f60e5020f (diff) | |
feat: TU19 (Dec 2014) Features & Content (#155)
* try to resolve merge conflict
* feat: TU19 (Dec 2014) Features & Content (#32)
* December 2014 files
* Working release build
* Fix compilation issues
* Add sound to Windows64Media
* Add DLC content and force Tutorial DLC
* Revert "Add DLC content and force Tutorial DLC"
This reverts commit 97a43994725008e35fceb984d5549df9c8cea470.
* Disable broken light packing
* Disable breakpoint during DLC texture map load
Allows DLC loading but the DLC textures are still broken
* Fix post build not working
* ...
* fix vs2022 build
* fix cmake build
---------
Co-authored-by: Loki <lokirautio@gmail.com>
Diffstat (limited to 'Minecraft.Client/User.cpp')
| -rw-r--r-- | Minecraft.Client/User.cpp | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/Minecraft.Client/User.cpp b/Minecraft.Client/User.cpp index a359bfd3..b8e2f2c0 100644 --- a/Minecraft.Client/User.cpp +++ b/Minecraft.Client/User.cpp @@ -6,40 +6,40 @@ vector<Tile *> User::allowedTiles; void User::staticCtor() { - allowedTiles.push_back(Tile::rock); - allowedTiles.push_back(Tile::stoneBrick); - allowedTiles.push_back(Tile::redBrick); - allowedTiles.push_back(Tile::dirt); - allowedTiles.push_back(Tile::wood); - allowedTiles.push_back(Tile::treeTrunk); - allowedTiles.push_back(Tile::leaves); - allowedTiles.push_back(Tile::torch); - allowedTiles.push_back(Tile::stoneSlabHalf); + allowedTiles.push_back(Tile::stone); + allowedTiles.push_back(Tile::cobblestone); + allowedTiles.push_back(Tile::redBrick); + allowedTiles.push_back(Tile::dirt); + allowedTiles.push_back(Tile::wood); + allowedTiles.push_back(Tile::treeTrunk); + allowedTiles.push_back(Tile::leaves); + allowedTiles.push_back(Tile::torch); + allowedTiles.push_back(Tile::stoneSlabHalf); - allowedTiles.push_back(Tile::glass); - allowedTiles.push_back(Tile::mossStone); - allowedTiles.push_back(Tile::sapling); - allowedTiles.push_back(Tile::flower); - allowedTiles.push_back(Tile::rose); - allowedTiles.push_back(Tile::mushroom1); - allowedTiles.push_back(Tile::mushroom2); - allowedTiles.push_back(Tile::sand); - allowedTiles.push_back(Tile::gravel); - allowedTiles.push_back(Tile::sponge); + allowedTiles.push_back(Tile::glass); + allowedTiles.push_back(Tile::mossyCobblestone); + allowedTiles.push_back(Tile::sapling); + allowedTiles.push_back(Tile::flower); + allowedTiles.push_back(Tile::rose); + allowedTiles.push_back(Tile::mushroom_brown); + allowedTiles.push_back(Tile::mushroom_red); + allowedTiles.push_back(Tile::sand); + allowedTiles.push_back(Tile::gravel); + allowedTiles.push_back(Tile::sponge); - allowedTiles.push_back(Tile::cloth); - allowedTiles.push_back(Tile::coalOre); - allowedTiles.push_back(Tile::ironOre); - allowedTiles.push_back(Tile::goldOre); - allowedTiles.push_back(Tile::ironBlock); - allowedTiles.push_back(Tile::goldBlock); - allowedTiles.push_back(Tile::bookshelf); - allowedTiles.push_back(Tile::tnt); - allowedTiles.push_back(Tile::obsidian); + allowedTiles.push_back(Tile::wool); + allowedTiles.push_back(Tile::coalOre); + allowedTiles.push_back(Tile::ironOre); + allowedTiles.push_back(Tile::goldOre); + allowedTiles.push_back(Tile::ironBlock); + allowedTiles.push_back(Tile::goldBlock); + allowedTiles.push_back(Tile::bookshelf); + allowedTiles.push_back(Tile::tnt); + allowedTiles.push_back(Tile::obsidian); } User::User(const wstring& name, const wstring& sessionId) { - this->name = name; - this->sessionId = sessionId; + this->name = name; + this->sessionId = sessionId; } |