mirror of
https://github.com/UltimMC/Launcher.git
synced 2026-01-03 06:10:03 +00:00
WIP remove jank previously added for a minimal forge hack
This commit is contained in:
@@ -45,10 +45,6 @@ void Library::getApplicableFiles(
|
||||
native += actualPath(raw_storage);
|
||||
}
|
||||
}
|
||||
else if (!presenceOnly)
|
||||
{
|
||||
jar += actualPath(raw_storage);
|
||||
}
|
||||
}
|
||||
|
||||
QList< std::shared_ptr< NetAction > > Library::getDownloads(
|
||||
@@ -61,7 +57,6 @@ QList< std::shared_ptr< NetAction > > Library::getDownloads(
|
||||
QList<NetActionPtr> out;
|
||||
bool stale = isAlwaysStale();
|
||||
bool instanceLocal = isInstanceLocal();
|
||||
bool launcherLocal = isLocalBuilt();
|
||||
|
||||
auto check_instance_local_file = [&](QString storage)
|
||||
{
|
||||
@@ -77,27 +72,12 @@ QList< std::shared_ptr< NetAction > > Library::getDownloads(
|
||||
return true;
|
||||
};
|
||||
|
||||
auto check_launcher_local_file = [&](QString storage)
|
||||
{
|
||||
QFileInfo localFileInfo("libraries/" + storage);
|
||||
if(!localFileInfo.exists())
|
||||
{
|
||||
failedLocalFiles.append(localFileInfo.filePath());
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
};
|
||||
|
||||
auto add_download = [&](QString storage, QString url, QString sha1)
|
||||
{
|
||||
if(instanceLocal)
|
||||
{
|
||||
return check_instance_local_file(storage);
|
||||
}
|
||||
else if(launcherLocal)
|
||||
{
|
||||
return check_launcher_local_file(storage);
|
||||
}
|
||||
auto entry = cache->resolveEntry("libraries", storage);
|
||||
if(stale)
|
||||
{
|
||||
@@ -262,11 +242,6 @@ bool Library::isInstanceLocal() const
|
||||
return m_hint == "local";
|
||||
}
|
||||
|
||||
bool Library::isLocalBuilt() const
|
||||
{
|
||||
return localBuild;
|
||||
}
|
||||
|
||||
bool Library::isAlwaysStale() const
|
||||
{
|
||||
return m_hint == "always-stale";
|
||||
|
||||
Reference in New Issue
Block a user