1 files changed, 18 insertions, 4 deletions
diff --git a/api/logic/minecraft/MinecraftInstance.cpp b/api/logic/minecraft/MinecraftInstance.cpp
index a1341e69..dbf9f816 100644
--- a/api/logic/minecraft/MinecraftInstance.cpp
+++ b/api/logic/minecraft/MinecraftInstance.cpp
@@ -23,12 +23,15 @@
 #include "minecraft/launch/ClaimAccount.h"
 #include "minecraft/launch/ReconstructAssets.h"
 #include "minecraft/launch/ScanModFolders.h"
+#include "minecraft/launch/VerifyJavaInstall.h"
 #include "java/launch/CheckJava.h"
 #include "java/JavaUtils.h"
 #include "meta/Index.h"
 #include "meta/VersionList.h"
 
 #include "mod/ModFolderModel.h"
+#include "mod/ResourcePackFolderModel.h"
+#include "mod/TexturePackFolderModel.h"
 #include "WorldList.h"
 
 #include "icons/IIconList.h"
@@ -795,9 +798,15 @@ QString MinecraftInstance::getStatusbarDescription()
 
     QString description;
     description.append(tr("Minecraft %1 (%2)").arg(m_components->getComponentVersion("net.minecraft")).arg(typeName()));
-    if(m_settings->get("ShowGameTime").toBool() && totalTimePlayed() > 0)
+    if(m_settings->get("ShowGameTime").toBool())
     {
-        description.append(tr(", played for %1").arg(prettifyTimeDuration(totalTimePlayed())));
+        if (lastTimePlayed() > 0) {
+            description.append(tr(", last played for %1").arg(prettifyTimeDuration(lastTimePlayed())));
+        }
+
+        if (totalTimePlayed() > 0) {
+            description.append(tr(", total played for %1").arg(prettifyTimeDuration(totalTimePlayed())));
+        }
     }
     if(hasCrashed())
     {
@@ -913,6 +922,11 @@ shared_qobject_ptr<LaunchTask> MinecraftInstance::createLaunchTask(AuthSessionPt
         process->appendStep(new ReconstructAssets(pptr));
     }
 
+    // verify that minimum Java requirements are met
+    {
+        process->appendStep(new VerifyJavaInstall(pptr));
+    }
+
     {
         // actually launch the game
         auto method = launchMethod();
@@ -986,7 +1000,7 @@ std::shared_ptr<ModFolderModel> MinecraftInstance::resourcePackList() const
 {
     if (!m_resource_pack_list)
     {
-        m_resource_pack_list.reset(new ModFolderModel(resourcePacksDir()));
+        m_resource_pack_list.reset(new ResourcePackFolderModel(resourcePacksDir()));
         m_resource_pack_list->disableInteraction(isRunning());
         connect(this, &BaseInstance::runningStatusChanged, m_resource_pack_list.get(), &ModFolderModel::disableInteraction);
     }
@@ -997,7 +1011,7 @@ std::shared_ptr<ModFolderModel> MinecraftInstance::texturePackList() const
 {
     if (!m_texture_pack_list)
     {
-        m_texture_pack_list.reset(new ModFolderModel(texturePacksDir()));
+        m_texture_pack_list.reset(new TexturePackFolderModel(texturePacksDir()));
         m_texture_pack_list->disableInteraction(isRunning());
         connect(this, &BaseInstance::runningStatusChanged, m_texture_pack_list.get(), &ModFolderModel::disableInteraction);
     }