summaryrefslogtreecommitdiffstats
path: root/logic/minecraft/MinecraftProfile.h
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2016-03-13 02:28:55 +0100
committerPetr Mrázek <peterix@gmail.com>2016-03-26 17:05:27 +0100
commit576d808d7197b4b7ef798891dfd138e2e8aae54f (patch)
tree1499c6ec2e2d0430bed906dd32ab1b75876d3e80 /logic/minecraft/MinecraftProfile.h
parentf63d1bc99c93705bdadb8221430bda60c89cc062 (diff)
downloadMultiMC-576d808d7197b4b7ef798891dfd138e2e8aae54f.tar
MultiMC-576d808d7197b4b7ef798891dfd138e2e8aae54f.tar.gz
MultiMC-576d808d7197b4b7ef798891dfd138e2e8aae54f.tar.lz
MultiMC-576d808d7197b4b7ef798891dfd138e2e8aae54f.tar.xz
MultiMC-576d808d7197b4b7ef798891dfd138e2e8aae54f.zip
NOISSUE resolve library activeness during application to profile
Diffstat (limited to 'logic/minecraft/MinecraftProfile.h')
-rw-r--r--logic/minecraft/MinecraftProfile.h23
1 files changed, 7 insertions, 16 deletions
diff --git a/logic/minecraft/MinecraftProfile.h b/logic/minecraft/MinecraftProfile.h
index 24d13609..529274d6 100644
--- a/logic/minecraft/MinecraftProfile.h
+++ b/logic/minecraft/MinecraftProfile.h
@@ -92,21 +92,15 @@ public:
void applyMinecraftVersion(const QString& id);
void applyMainClass(const QString& mainClass);
void applyAppletClass(const QString& appletClass);
- void applyMinecraftArguments(const QString& minecraftArguments, bool isMinecraft);
+ void applyMinecraftArguments(const QString& minecraftArguments);
void applyMinecraftVersionType(const QString& type);
void applyMinecraftAssets(const QString& assets);
void applyTraits(const QSet<QString> &traits);
void applyTweakers(const QStringList &tweakers);
- void applyJarMods(const QList<JarmodPtr>&jarMods);
- void applyLibrary(LibraryPtr library, bool isMinecraft);
+ void applyJarMods(const QList<JarmodPtr> &jarMods);
+ void applyLibrary(LibraryPtr library);
public:
- /// get all java libraries that belong to the classpath
- QList<LibraryPtr> getActiveNormalLibs() const;
-
- /// get all native libraries that need to be available to the process
- QList<LibraryPtr> getActiveNativeLibs() const;
-
QString getMinecraftVersion() const;
QString getMainClass() const;
QString getAppletClass() const;
@@ -118,7 +112,7 @@ public:
const QStringList & getTweakers() const;
const QList<JarmodPtr> & getJarMods() const;
const QList<LibraryPtr> & getLibraries() const;
- const QList<LibraryPtr> & getVanillaLibraries() const;
+ const QList<LibraryPtr> & getNativeLibraries() const;
bool hasTrait(const QString & trait) const;
public:
@@ -158,9 +152,6 @@ protected: /* data */
*/
QString minecraftArguments;
- /// Same as above, but only for vanilla
- QString vanillaMinecraftArguments;
-
/// A list of all tweaker classes
QStringList tweakers;
@@ -170,11 +161,11 @@ protected: /* data */
/// The applet class, for some very old minecraft releases
QString appletClass;
- /// the list of libs - both active and inactive, native and java
+ /// the list of libraries
QList<LibraryPtr> libraries;
- /// same, but only vanilla.
- QList<LibraryPtr> vanillaLibraries;
+ /// the list of native libraries
+ QList<LibraryPtr> nativeLibraries;
/// traits, collected from all the version files (version files can only add)
QSet<QString> traits;