aboutsummaryrefslogtreecommitdiff
path: root/libmultimc/src
diff options
context:
space:
mode:
Diffstat (limited to 'libmultimc/src')
-rw-r--r--libmultimc/src/instance.cpp24
-rw-r--r--libmultimc/src/instversionlist.cpp17
-rw-r--r--libmultimc/src/task.cpp5
3 files changed, 41 insertions, 5 deletions
diff --git a/libmultimc/src/instance.cpp b/libmultimc/src/instance.cpp
index 377acd32..1af359d1 100644
--- a/libmultimc/src/instance.cpp
+++ b/libmultimc/src/instance.cpp
@@ -27,7 +27,7 @@ Instance::Instance(const QString &rootDir, QObject *parent) :
QObject(parent)
{
m_rootDir = rootDir;
- m_settings = new INISettingsObject(PathCombine(rootDir, "instance.cfg"), this);
+ m_settings = new INISettingsObject(configFile(), this);
settings().registerSetting(new Setting("name", "Unnamed Instance"));
settings().registerSetting(new Setting("iconKey", "default"));
@@ -82,7 +82,12 @@ QString Instance::minecraftDir() const
if (dotMCDir.exists() && !mcDir.exists())
return dotMCDir.filePath();
else
- return mcDir.filePath();
+ return mcDir.filePath();
+}
+
+QString Instance::instModsDir() const
+{
+ return PathCombine(rootDir(), "instMods");
}
QString Instance::binDir() const
@@ -125,6 +130,21 @@ QString Instance::mcJar() const
return PathCombine(binDir(), "minecraft.jar");
}
+QString Instance::mcBackup() const
+{
+ return PathCombine(binDir(), "mcbackup.jar");
+}
+
+QString Instance::configFile() const
+{
+ return PathCombine(rootDir(), "instance.cfg");
+}
+
+QString Instance::modListFile() const
+{
+ return PathCombine(rootDir(), "modlist");
+}
+
SettingsObject &Instance::settings() const
{
return *m_settings;
diff --git a/libmultimc/src/instversionlist.cpp b/libmultimc/src/instversionlist.cpp
index e171cfa5..301b9969 100644
--- a/libmultimc/src/instversionlist.cpp
+++ b/libmultimc/src/instversionlist.cpp
@@ -13,9 +13,20 @@
* limitations under the License.
*/
-#include "include/instversionlist.h"
+#include "instversionlist.h"
+#include "instversion.h"
-InstVersionList::InstVersionList() :
- QObject(NULL)
+InstVersionList::InstVersionList(QObject *parent) :
+ QObject(parent)
{
}
+
+const InstVersion *InstVersionList::findVersion(const QString &descriptor)
+{
+ for (int i = 0; i < count(); i++)
+ {
+ if (at(i)->descriptor() == descriptor)
+ return at(i);
+ }
+ return NULL;
+}
diff --git a/libmultimc/src/task.cpp b/libmultimc/src/task.cpp
index d581a1dd..3e30827b 100644
--- a/libmultimc/src/task.cpp
+++ b/libmultimc/src/task.cpp
@@ -37,6 +37,11 @@ int Task::getProgress() const
return progress;
}
+void Task::calcProgress(int parts, int whole)
+{
+ setProgress((int)((((float)parts) / ((float)whole))*100)); // Not sure if C++ or LISP...
+}
+
void Task::setProgress(int progress)
{
this->progress = progress;