Legacy jar reassembly, base of proper custom jar support

1 files changed, 4 insertions, 33 deletions

diff --git a/logic/LegacyInstance.h b/logic/LegacyInstance.h
index 4c8d8f69..46c531d9 100644
--- a/logic/LegacyInstance.h
+++ b/logic/LegacyInstance.h
@@ -13,10 +13,7 @@ public:
 	explicit LegacyInstance(const QString &rootDir, SettingsObject * settings, QObject *parent = 0);
 	
 	/// Path to the instance's minecraft.jar
-	QString mcJar() const;
-	
-	//! Path to the instance's mcbackup.jar
-	QString mcBackup() const;
+	QString runnableJar() const;
 	
 	//! Path to the instance's modlist file.
 	QString modListFile() const;
@@ -35,35 +32,6 @@ public:
 	QString resourceDir() const;
 	
 	/*!
-	 * \brief Checks whether or not the currentVersion of the instance needs to be updated. 
-	 *        If this returns true, updateCurrentVersion is called. In the 
-	 *        standard instance, this is determined by checking a timestamp 
-	 *        stored in the instance config file against the last modified time of Minecraft.jar.
-	 * \return True if updateCurrentVersion() should be called.
-	 */
-	bool shouldUpdateCurrentVersion() const;
-	
-	/*!
-	 * \brief Updates the current version. 
-	 *        This function should first set the current version timestamp 
-	 *        (setCurrentVersionTimestamp()) to the current time. Next, if 
-	 *        keepCurrent is false, this function should check what the 
-	 *        instance's current version is and call setCurrentVersion() to 
-	 *        update it. This function will automatically be called when the 
-	 *        instance is loaded if shouldUpdateCurrentVersion returns true.
-	 * \param keepCurrent If true, only the version timestamp will be updated.
-	 */
-	void updateCurrentVersion(bool keepCurrent = false); 
-	
-	/*!
-	 * Gets the last time that the current version was checked.
-	 * This is checked against the last modified time on the jar file to see if
-	 * the current version needs to be checked again.
-	 */
-	qint64 lastCurrentVersionUpdate() const;
-	void setLastCurrentVersionUpdate(qint64 val);
-	
-	/*!
 	 * Whether or not the instance's minecraft.jar needs to be rebuilt.
 	 * If this is true, when the instance launches, its jar mods will be 
 	 * re-added to a fresh minecraft.jar file.
@@ -90,6 +58,9 @@ public:
 	virtual void cleanupAfterRun();
 	virtual QDialog * createModEditDialog ( QWidget* parent );
 	
+	virtual QString defaultBaseJar() const;
+	virtual QString defaultCustomBaseJar() const;
+	
 protected slots:
 	virtual void jarModsChanged();
 };
\ No newline at end of file