Working 1.6 modding (currently only forge)
This commit is contained in:
		@@ -260,8 +260,10 @@ void ForgeListLoadTask::list_downloaded()
 | 
			
		||||
			fVersion->installer_url = installer_url;
 | 
			
		||||
			fVersion->jobbuildver = jobbuildver;
 | 
			
		||||
			fVersion->mcver = mcver;
 | 
			
		||||
			fVersion->filename = filename;
 | 
			
		||||
			fVersion->filename = installer_filename;
 | 
			
		||||
			if(installer_filename.isEmpty())
 | 
			
		||||
				fVersion->filename = filename;
 | 
			
		||||
			else
 | 
			
		||||
				fVersion->filename = installer_filename;
 | 
			
		||||
			fVersion->m_buildnr = build_nr;
 | 
			
		||||
			tempList.append(fVersion);
 | 
			
		||||
		}
 | 
			
		||||
@@ -271,3 +273,8 @@ void ForgeListLoadTask::list_downloaded()
 | 
			
		||||
	emitSucceeded();
 | 
			
		||||
	return;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -3,7 +3,7 @@
 | 
			
		||||
 * Licensed under the Apache License, Version 2.0 (the "License");
 | 
			
		||||
 * you may not use this file except in compliance with the License.
 | 
			
		||||
 * You may obtain a copy of the License at
 | 
			
		||||
 * 
 | 
			
		||||
 *
 | 
			
		||||
 *     http://www.apache.org/licenses/LICENSE-2.0
 | 
			
		||||
 *
 | 
			
		||||
 * Unless required by applicable law or agreed to in writing, software
 | 
			
		||||
@@ -33,19 +33,22 @@ struct ForgeVersion : public BaseVersion
 | 
			
		||||
	virtual QString descriptor()
 | 
			
		||||
	{
 | 
			
		||||
		return filename;
 | 
			
		||||
	};
 | 
			
		||||
	}
 | 
			
		||||
	;
 | 
			
		||||
	virtual QString name()
 | 
			
		||||
	{
 | 
			
		||||
		return "Forge " + jobbuildver;
 | 
			
		||||
	};
 | 
			
		||||
	}
 | 
			
		||||
	;
 | 
			
		||||
	virtual QString typeString() const
 | 
			
		||||
	{
 | 
			
		||||
		if(installer_url.isEmpty())
 | 
			
		||||
		if (installer_url.isEmpty())
 | 
			
		||||
			return "Universal";
 | 
			
		||||
		else
 | 
			
		||||
			return "Installer";
 | 
			
		||||
	};
 | 
			
		||||
	
 | 
			
		||||
	}
 | 
			
		||||
	;
 | 
			
		||||
 | 
			
		||||
	int m_buildnr = 0;
 | 
			
		||||
	QString universal_url;
 | 
			
		||||
	QString changelog_url;
 | 
			
		||||
@@ -60,42 +63,45 @@ class ForgeVersionList : public BaseVersionList
 | 
			
		||||
	Q_OBJECT
 | 
			
		||||
public:
 | 
			
		||||
	friend class ForgeListLoadTask;
 | 
			
		||||
	
 | 
			
		||||
 | 
			
		||||
	explicit ForgeVersionList(QObject *parent = 0);
 | 
			
		||||
	
 | 
			
		||||
 | 
			
		||||
	virtual Task *getLoadTask();
 | 
			
		||||
	virtual bool isLoaded();
 | 
			
		||||
	virtual const BaseVersionPtr at(int i) const;
 | 
			
		||||
	virtual int count() const;
 | 
			
		||||
	virtual void sort();
 | 
			
		||||
	
 | 
			
		||||
 | 
			
		||||
	virtual BaseVersionPtr getLatestStable() const;
 | 
			
		||||
	
 | 
			
		||||
    virtual QVariant data(const QModelIndex& index, int role) const;
 | 
			
		||||
    virtual QVariant headerData(int section, Qt::Orientation orientation, int role) const;
 | 
			
		||||
    virtual int columnCount(const QModelIndex& parent) const;
 | 
			
		||||
	
 | 
			
		||||
 | 
			
		||||
	virtual QVariant data(const QModelIndex &index, int role) const;
 | 
			
		||||
	virtual QVariant headerData(int section, Qt::Orientation orientation,
 | 
			
		||||
								int role) const;
 | 
			
		||||
	virtual int columnCount(const QModelIndex &parent) const;
 | 
			
		||||
 | 
			
		||||
protected:
 | 
			
		||||
	QList<BaseVersionPtr> m_vlist;
 | 
			
		||||
	
 | 
			
		||||
 | 
			
		||||
	bool m_loaded;
 | 
			
		||||
	
 | 
			
		||||
protected slots:
 | 
			
		||||
	virtual void updateListData(QList<BaseVersionPtr > versions);
 | 
			
		||||
 | 
			
		||||
protected
 | 
			
		||||
slots:
 | 
			
		||||
	virtual void updateListData(QList<BaseVersionPtr> versions);
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
class ForgeListLoadTask : public Task
 | 
			
		||||
{
 | 
			
		||||
	Q_OBJECT
 | 
			
		||||
	
 | 
			
		||||
 | 
			
		||||
public:
 | 
			
		||||
	explicit ForgeListLoadTask(ForgeVersionList *vlist);
 | 
			
		||||
	
 | 
			
		||||
 | 
			
		||||
	virtual void executeTask();
 | 
			
		||||
	
 | 
			
		||||
protected slots:
 | 
			
		||||
 | 
			
		||||
protected
 | 
			
		||||
slots:
 | 
			
		||||
	void list_downloaded();
 | 
			
		||||
	
 | 
			
		||||
 | 
			
		||||
protected:
 | 
			
		||||
	DownloadJobPtr listJob;
 | 
			
		||||
	ForgeVersionList *m_list;
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user