CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-2352 Add Minecraft folder button for instances, rearrange buttons by importance

Browse Source
This commit is contained in:
Petr Mrázek
2018-07-27 23:57:09 +02:00
parent 14f85813c8
commit e4c33458f2
12 changed files with 84 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
api/logic/minecraft/legacy/LegacyInstance.cpp
View File

@ -112,7 +112,7 @@ QList<Mod> LegacyInstance::getJarMods() const
return jarModList()->allMods();
}
QString LegacyInstance::minecraftRoot() const
QString LegacyInstance::gameRoot() const
{
QFileInfo mcDir(FS::PathCombine(instanceRoot(), "minecraft"));
QFileInfo dotMCDir(FS::PathCombine(instanceRoot(), ".minecraft"));
@ -125,7 +125,7 @@ QString LegacyInstance::minecraftRoot() const
QString LegacyInstance::binRoot() const
{
return FS::PathCombine(minecraftRoot(), "bin");
return FS::PathCombine(gameRoot(), "bin");
}
QString LegacyInstance::jarModsDir() const
@ -135,31 +135,31 @@ QString LegacyInstance::jarModsDir() const
QString LegacyInstance::libDir() const
{
return FS::PathCombine(minecraftRoot(), "lib");
return FS::PathCombine(gameRoot(), "lib");
}
QString LegacyInstance::savesDir() const
{
return FS::PathCombine(minecraftRoot(), "saves");
return FS::PathCombine(gameRoot(), "saves");
}
QString LegacyInstance::loaderModsDir() const
{
return FS::PathCombine(minecraftRoot(), "mods");
return FS::PathCombine(gameRoot(), "mods");
}
QString LegacyInstance::coreModsDir() const
{
return FS::PathCombine(minecraftRoot(), "coremods");
return FS::PathCombine(gameRoot(), "coremods");
}
QString LegacyInstance::resourceDir() const
{
return FS::PathCombine(minecraftRoot(), "resources");
return FS::PathCombine(gameRoot(), "resources");
}
QString LegacyInstance::texturePacksDir() const
{
return FS::PathCombine(minecraftRoot(), "texturepacks");
return FS::PathCombine(gameRoot(), "texturepacks");
}
QString LegacyInstance::runnableJar() const
@ -174,7 +174,7 @@ QString LegacyInstance::modListFile() const
QString LegacyInstance::instanceConfigFolder() const
{
return FS::PathCombine(minecraftRoot(), "config");
return FS::PathCombine(gameRoot(), "config");
}
bool LegacyInstance::shouldRebuild() const

4
api/logic/minecraft/legacy/LegacyInstance.h
View File

@ -52,7 +52,7 @@ public:
QString coreModsDir() const;
QString resourceDir() const;
virtual QString instanceConfigFolder() const override;
QString minecraftRoot() const; // Path to the instance's minecraft directory.
QString gameRoot() const; // Path to the instance's minecraft directory.
QString binRoot() const; // Path to the instance's minecraft bin directory.
/// Get the curent base jar of this instance. By default, it's the
@ -123,7 +123,7 @@ public:
}
QString getLogFileRoot() override
{
return minecraftRoot();
return gameRoot();
}
QString getStatusbarDescription() override;

2
api/logic/minecraft/legacy/LegacyUpgradeTask.cpp
View File

@ -126,7 +126,7 @@ void LegacyUpgradeTask::copyFinished()
QStringList rootRemovables = {"modlist", "version", "instMods"};
QStringList mcRemovables = {"bin", "MultiMCLauncher.jar", "icon.png"};
removeAll(inst.instanceRoot(), rootRemovables);
removeAll(inst.minecraftRoot(), mcRemovables);
removeAll(inst.gameRoot(), mcRemovables);
}
emitSucceeded();
}