From 29ce36c7bc2238cfed55eb81d439f030072beaad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Thu, 21 May 2015 22:38:31 +0200 Subject: GH-983 use 'minecraft.jar' for ancient jar-modded versions Fixes NEI in MC 1.4.7 and probably other obscure issues --- logic/minecraft/OneSixInstance.cpp | 2 +- logic/minecraft/OneSixUpdate.cpp | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'logic') diff --git a/logic/minecraft/OneSixInstance.cpp b/logic/minecraft/OneSixInstance.cpp index e9989f2e..8e2d1043 100644 --- a/logic/minecraft/OneSixInstance.cpp +++ b/logic/minecraft/OneSixInstance.cpp @@ -144,7 +144,7 @@ BaseProcess *OneSixInstance::prepareForLaunch(AuthSessionPtr session) auto jarMods = getJarMods(); if (!jarMods.isEmpty()) { - launchScript += "cp " + QDir(instanceRoot()).absoluteFilePath("temp.jar") + "\n"; + launchScript += "cp " + QDir(instanceRoot()).absoluteFilePath("minecraft.jar") + "\n"; } else { diff --git a/logic/minecraft/OneSixUpdate.cpp b/logic/minecraft/OneSixUpdate.cpp index 2177cf33..24ee5804 100644 --- a/logic/minecraft/OneSixUpdate.cpp +++ b/logic/minecraft/OneSixUpdate.cpp @@ -303,7 +303,13 @@ void OneSixUpdate::jarlibFinished() { strippedJar.remove(); } - auto finalJarPath = QDir(m_inst->instanceRoot()).absoluteFilePath("temp.jar"); + auto tempJarPath = QDir(m_inst->instanceRoot()).absoluteFilePath("temp.jar"); + QFile tempJar(tempJarPath); + if(tempJar.exists()) + { + tempJar.remove(); + } + auto finalJarPath = QDir(m_inst->instanceRoot()).absoluteFilePath("minecraft.jar"); QFile finalJar(finalJarPath); if(finalJar.exists()) { -- cgit v1.2.3