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

GH-1778: Fix placement of modded Minecraft.jar in OneSix instances.

Browse Source
This commit is contained in:
Petr Mrázek
2017-01-10 23:03:00 +01:00
parent 12c3683ec0
commit 858b490c74
7 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -291,11 +291,6 @@ QString LegacyInstance::jarModsDir() const
return FS::PathCombine(instanceRoot(), "instMods");
}
QString LegacyInstance::binDir() const
{
return FS::PathCombine(minecraftRoot(), "bin");
}
QString LegacyInstance::libDir() const
{
return FS::PathCombine(minecraftRoot(), "lib");
@ -327,7 +322,7 @@ QString LegacyInstance::texturePacksDir() const
QString LegacyInstance::runnableJar() const
{
return FS::PathCombine(binDir(), "minecraft.jar");
return FS::PathCombine(binRoot(), "minecraft.jar");
}
QString LegacyInstance::modListFile() const
@ -399,7 +394,7 @@ QString LegacyInstance::defaultBaseJar() const
QString LegacyInstance::defaultCustomBaseJar() const
{
return FS::PathCombine(binDir(), "mcbackup.jar");
return FS::PathCombine(binRoot(), "mcbackup.jar");
}
QString LegacyInstance::lwjglFolder() const

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

@ -57,7 +57,6 @@ public:
QString savesDir() const;
QString texturePacksDir() const;
QString jarModsDir() const;
QString binDir() const;
QString loaderModsDir() const;
QString coreModsDir() const;
QString resourceDir() const;

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

@ -356,7 +356,7 @@ void LegacyUpdate::jarStart()
setStatus(tr("Checking for jar updates..."));
// Make directories
QDir binDir(inst->binDir());
QDir binDir(inst->binRoot());
if (!binDir.exists() && !binDir.mkpath("."))
{
emitFailed("Failed to create bin folder.");