diff --git a/Minecraft.Client/Chunk.cpp b/Minecraft.Client/Chunk.cpp index 42b32f56..0778b672 100644 --- a/Minecraft.Client/Chunk.cpp +++ b/Minecraft.Client/Chunk.cpp @@ -689,9 +689,9 @@ void Chunk::rebuild_SPU() vector > renderableTileEntities; // 4J - added -// List newTileEntities = new ArrayList(); -// newTileEntities.clear(); -// renderableTileEntities.clear(); +// List newTileEntities = new ArrayList(); +// newTileEntities.clear(); +// renderableTileEntities.clear(); int r = 1; diff --git a/Minecraft.Client/Common/Media/MediaWindows64.arc b/Minecraft.Client/Common/Media/MediaWindows64.arc index 41649401..6fdc6efd 100644 Binary files a/Minecraft.Client/Common/Media/MediaWindows64.arc and b/Minecraft.Client/Common/Media/MediaWindows64.arc differ diff --git a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp index 2623679f..48d09b1b 100644 --- a/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp +++ b/Minecraft.Client/Common/UI/IUIScene_CreativeMenu.cpp @@ -209,9 +209,6 @@ void IUIScene_CreativeMenu::staticCtor() ITEM_AUX(Tile::woolCarpet_Id,15) // Black ITEM_AUX(Tile::woolCarpet_Id,13) // Green ITEM_AUX(Tile::woolCarpet_Id,12) // Brown - - // TODO: Add in TU25 update -/* ITEM_AUX(Tile::stained_glass_Id,14) // Red ITEM_AUX(Tile::stained_glass_Id,1) // Orange ITEM_AUX(Tile::stained_glass_Id,4) // Yellow @@ -245,7 +242,6 @@ void IUIScene_CreativeMenu::staticCtor() ITEM_AUX(Tile::stained_glass_pane_Id,15) // Black ITEM_AUX(Tile::stained_glass_pane_Id,13) // Green ITEM_AUX(Tile::stained_glass_pane_Id,12) // Brown -*/ #ifndef _CONTENT_PACKAGE DEF(eCreativeInventory_ArtToolsDecorations) diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/items.png b/Minecraft.Client/Common/res/TitleUpdate/res/items.png index 5456083c..6513a386 100644 Binary files a/Minecraft.Client/Common/res/TitleUpdate/res/items.png and b/Minecraft.Client/Common/res/TitleUpdate/res/items.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/mob/alex.png b/Minecraft.Client/Common/res/TitleUpdate/res/mob/alex.png new file mode 100644 index 00000000..b643fe2d Binary files /dev/null and b/Minecraft.Client/Common/res/TitleUpdate/res/mob/alex.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/mob/alex1.png b/Minecraft.Client/Common/res/TitleUpdate/res/mob/alex1.png new file mode 100644 index 00000000..3f6abf7e Binary files /dev/null and b/Minecraft.Client/Common/res/TitleUpdate/res/mob/alex1.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/mob/alex2.png b/Minecraft.Client/Common/res/TitleUpdate/res/mob/alex2.png new file mode 100644 index 00000000..6f42db33 Binary files /dev/null and b/Minecraft.Client/Common/res/TitleUpdate/res/mob/alex2.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/mob/alex3.png b/Minecraft.Client/Common/res/TitleUpdate/res/mob/alex3.png new file mode 100644 index 00000000..a67a3c82 Binary files /dev/null and b/Minecraft.Client/Common/res/TitleUpdate/res/mob/alex3.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/mob/alex4.png b/Minecraft.Client/Common/res/TitleUpdate/res/mob/alex4.png new file mode 100644 index 00000000..a73a9314 Binary files /dev/null and b/Minecraft.Client/Common/res/TitleUpdate/res/mob/alex4.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/mob/alex5.png b/Minecraft.Client/Common/res/TitleUpdate/res/mob/alex5.png new file mode 100644 index 00000000..a81c05fc Binary files /dev/null and b/Minecraft.Client/Common/res/TitleUpdate/res/mob/alex5.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/mob/alex6.png b/Minecraft.Client/Common/res/TitleUpdate/res/mob/alex6.png new file mode 100644 index 00000000..eed41179 Binary files /dev/null and b/Minecraft.Client/Common/res/TitleUpdate/res/mob/alex6.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/mob/alex7.png b/Minecraft.Client/Common/res/TitleUpdate/res/mob/alex7.png new file mode 100644 index 00000000..cb20ba3a Binary files /dev/null and b/Minecraft.Client/Common/res/TitleUpdate/res/mob/alex7.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/mob/steve.png b/Minecraft.Client/Common/res/TitleUpdate/res/mob/steve.png new file mode 100644 index 00000000..90d4fa23 Binary files /dev/null and b/Minecraft.Client/Common/res/TitleUpdate/res/mob/steve.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/terrain.png b/Minecraft.Client/Common/res/TitleUpdate/res/terrain.png index 0246b41d..cbeca3f7 100644 Binary files a/Minecraft.Client/Common/res/TitleUpdate/res/terrain.png and b/Minecraft.Client/Common/res/TitleUpdate/res/terrain.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel2.png b/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel2.png index 32f489ec..c3e33a97 100644 Binary files a/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel2.png and b/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel2.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel3.png b/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel3.png index 02d73af2..991a2bee 100644 Binary files a/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel3.png and b/Minecraft.Client/Common/res/TitleUpdate/res/terrainMipMapLevel3.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/textures/blocks/barrier.png b/Minecraft.Client/Common/res/TitleUpdate/res/textures/blocks/barrier.png new file mode 100644 index 00000000..f426e273 Binary files /dev/null and b/Minecraft.Client/Common/res/TitleUpdate/res/textures/blocks/barrier.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/textures/blocks/barrier.txt b/Minecraft.Client/Common/res/TitleUpdate/res/textures/blocks/barrier.txt new file mode 100644 index 00000000..a67a4022 --- /dev/null +++ b/Minecraft.Client/Common/res/TitleUpdate/res/textures/blocks/barrier.txt @@ -0,0 +1,3 @@ +0, +1, + diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/textures/blocks/waterMipMapLevel2.png b/Minecraft.Client/Common/res/TitleUpdate/res/textures/blocks/waterMipMapLevel2.png new file mode 100644 index 00000000..07fa00b2 Binary files /dev/null and b/Minecraft.Client/Common/res/TitleUpdate/res/textures/blocks/waterMipMapLevel2.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/textures/blocks/waterMipMapLevel3.png b/Minecraft.Client/Common/res/TitleUpdate/res/textures/blocks/waterMipMapLevel3.png new file mode 100644 index 00000000..65079544 Binary files /dev/null and b/Minecraft.Client/Common/res/TitleUpdate/res/textures/blocks/waterMipMapLevel3.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/textures/blocks/waterMipMapLevel4.png b/Minecraft.Client/Common/res/TitleUpdate/res/textures/blocks/waterMipMapLevel4.png new file mode 100644 index 00000000..2ba1c3c8 Binary files /dev/null and b/Minecraft.Client/Common/res/TitleUpdate/res/textures/blocks/waterMipMapLevel4.png differ diff --git a/Minecraft.Client/Common/res/TitleUpdate/res/textures/blocks/waterMipMapLevel5.png b/Minecraft.Client/Common/res/TitleUpdate/res/textures/blocks/waterMipMapLevel5.png new file mode 100644 index 00000000..be1749e1 Binary files /dev/null and b/Minecraft.Client/Common/res/TitleUpdate/res/textures/blocks/waterMipMapLevel5.png differ diff --git a/Minecraft.Client/Gui.cpp b/Minecraft.Client/Gui.cpp index 82cfc797..a9959448 100644 --- a/Minecraft.Client/Gui.cpp +++ b/Minecraft.Client/Gui.cpp @@ -1068,7 +1068,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) { int renderDistance = app.GetGameSettings(iPad, eGameSetting_RenderDistance); - lines.push_back(L"Minecraft LCE TU24 " + minecraft->fpsString); + lines.push_back(L"Minecraft LCE TU25 " + minecraft->fpsString); lines.push_back(L"Seed: " + std::to_wstring(minecraft->level->getLevelData()->getSeed())); lines.push_back(minecraft->gatherStats1()); // Time to autosave lines.push_back(L"Render Distance: " + std::to_wstring(renderDistance)); diff --git a/Minecraft.Client/TileRenderer.cpp b/Minecraft.Client/TileRenderer.cpp index 17973849..0c31df83 100644 --- a/Minecraft.Client/TileRenderer.cpp +++ b/Minecraft.Client/TileRenderer.cpp @@ -8565,7 +8565,7 @@ bool TileRenderer::canRender( int renderShape ) if ( renderShape == Tile::SHAPE_WALL) return true; if ( renderShape == Tile::SHAPE_BEACON) return true; if ( renderShape == Tile::SHAPE_ANVIL) return true; -// if ( renderShape == Tile::SHAPE_THIN_PANE ) return true; // TU25 + if ( renderShape == Tile::SHAPE_THIN_PANE ) return true; if ( renderShape == Tile::SHAPE_WATER ) return true; return false; } diff --git a/Minecraft.Client/alphaTest.png b/Minecraft.Client/alphaTest.png deleted file mode 100644 index c731f8ee..00000000 Binary files a/Minecraft.Client/alphaTest.png and /dev/null differ