diff --git a/res/content/base/textures/blocks/dirt.png b/res/content/base/textures/blocks/dirt.png index 6239e67c..9fc51ad8 100644 Binary files a/res/content/base/textures/blocks/dirt.png and b/res/content/base/textures/blocks/dirt.png differ diff --git a/res/content/base/textures/blocks/flower.png b/res/content/base/textures/blocks/flower.png index 38f070eb..a69626de 100644 Binary files a/res/content/base/textures/blocks/flower.png and b/res/content/base/textures/blocks/flower.png differ diff --git a/res/content/base/textures/blocks/grass_side.png b/res/content/base/textures/blocks/grass_side.png index 802c1a87..553bd8b4 100644 Binary files a/res/content/base/textures/blocks/grass_side.png and b/res/content/base/textures/blocks/grass_side.png differ diff --git a/res/content/base/textures/blocks/leaves.png b/res/content/base/textures/blocks/leaves.png index 861fbcb7..3beaf7ab 100644 Binary files a/res/content/base/textures/blocks/leaves.png and b/res/content/base/textures/blocks/leaves.png differ diff --git a/res/content/base/textures/blocks/stone.png b/res/content/base/textures/blocks/stone.png index 5214e3e1..53620aa1 100644 Binary files a/res/content/base/textures/blocks/stone.png and b/res/content/base/textures/blocks/stone.png differ diff --git a/src/content/ContentPack.cpp b/src/content/ContentPack.cpp index 087eb6cb..b72930db 100644 --- a/src/content/ContentPack.cpp +++ b/src/content/ContentPack.cpp @@ -97,7 +97,14 @@ void ContentPack::scan(fs::path rootfolder, continue; if (!is_pack(folder)) continue; - packs.push_back(read(folder)); + try { + packs.push_back(read(folder)); + } catch (const contentpack_error& err) { + std::cerr << "package.json error at " << err.getFolder().u8string(); + std::cerr << ": " << err.what() << std::endl; + } catch (const std::runtime_error& err) { + std::cerr << err.what() << std::endl; + } } } diff --git a/src/files/engine_paths.cpp b/src/files/engine_paths.cpp index faea6438..10157ded 100644 --- a/src/files/engine_paths.cpp +++ b/src/files/engine_paths.cpp @@ -65,6 +65,11 @@ std::vector EnginePaths::scanForWorlds() { } folders.push_back(worldFolder); } + std::sort(folders.begin(), folders.end(), [](fs::path a, fs::path b) { + a = a/fs::u8path(WorldFiles::WORLD_FILE); + b = b/fs::u8path(WorldFiles::WORLD_FILE); + return fs::last_write_time(a) > fs::last_write_time(b); + }); return folders; } diff --git a/src/frontend/gui/GUI.cpp b/src/frontend/gui/GUI.cpp index 8f7118a0..f0049a92 100644 --- a/src/frontend/gui/GUI.cpp +++ b/src/frontend/gui/GUI.cpp @@ -23,7 +23,7 @@ GUI::GUI() { menu = std::make_shared(); container->add(menu); - container->scrollable(false); + container->setScrollable(false); } GUI::~GUI() { diff --git a/src/frontend/gui/controls.cpp b/src/frontend/gui/controls.cpp index 6b6c2441..e05c66d2 100644 --- a/src/frontend/gui/controls.cpp +++ b/src/frontend/gui/controls.cpp @@ -95,8 +95,9 @@ Button::Button(std::shared_ptr content, glm::vec4 padding) setSize(content->getSize()+vec2(padding[0]+padding[2]+margin[0]+margin[2], padding[1]+padding[3]+margin[1]+margin[3])); add(content); - scrollable(false); + setScrollable(false); setHoverColor(glm::vec4(0.05f, 0.1f, 0.15f, 0.75f)); + content->setInteractive(false); } Button::Button( @@ -117,11 +118,12 @@ Button::Button( if (action) { listenAction(action); } - scrollable(false); + setScrollable(false); label = std::make_shared