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

NOISSUE move Java and Minecraft launch tasks to the proper places

Browse Source 
Minecraft and Java are not generic.
This commit is contained in:
Petr Mrázek
2016-04-10 17:43:41 +02:00
parent 1be7d57332
commit ed3884fd38
9 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/logic/CMakeLists.txt
View File

@@ -94,12 +94,6 @@ set(LOGIC_SOURCES
minecraft/auth/flows/ValidateTask.cpp
# Game launch logic
launch/steps/CheckJava.cpp
launch/steps/CheckJava.h
launch/steps/LaunchMinecraft.cpp
launch/steps/LaunchMinecraft.h
launch/steps/ModMinecraftJar.cpp
launch/steps/ModMinecraftJar.h
launch/steps/PostLaunchCommand.cpp
launch/steps/PostLaunchCommand.h
launch/steps/PreLaunchCommand.cpp
@@ -148,6 +142,10 @@ set(LOGIC_SOURCES
minecraft/onesix/OneSixProfileStrategy.h
minecraft/onesix/OneSixVersionFormat.cpp
minecraft/onesix/OneSixVersionFormat.h
minecraft/launch/ModMinecraftJar.cpp
minecraft/launch/ModMinecraftJar.h
minecraft/launch/LaunchMinecraft.cpp
minecraft/launch/LaunchMinecraft.h
minecraft/legacy/LegacyUpdate.h
minecraft/legacy/LegacyUpdate.cpp
minecraft/legacy/LegacyInstance.h
@@ -237,6 +235,8 @@ set(LOGIC_SOURCES
settings/SettingsObject.h
# Java related code
java/launch/CheckJava.cpp
java/launch/CheckJava.h
java/JavaChecker.h
java/JavaChecker.cpp
java/JavaCheckerJob.h

0
api/logic/launch/steps/CheckJava.cpp → api/logic/java/launch/CheckJava.cpp
View File

0
api/logic/launch/steps/CheckJava.h → api/logic/java/launch/CheckJava.h
View File

0
api/logic/launch/steps/LaunchMinecraft.cpp → api/logic/minecraft/launch/LaunchMinecraft.cpp
View File

0
api/logic/launch/steps/LaunchMinecraft.h → api/logic/minecraft/launch/LaunchMinecraft.h
View File

0
api/logic/launch/steps/ModMinecraftJar.cpp → api/logic/minecraft/launch/ModMinecraftJar.cpp
View File

0
api/logic/launch/steps/ModMinecraftJar.h → api/logic/minecraft/launch/ModMinecraftJar.h
View File

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

@@ -21,13 +21,13 @@
#include "minecraft/legacy/LegacyUpdate.h"
#include "launch/LaunchTask.h"
#include <launch/steps/LaunchMinecraft.h>
#include <launch/steps/PostLaunchCommand.h>
#include <launch/steps/ModMinecraftJar.h>
#include <launch/steps/Update.h>
#include <launch/steps/PreLaunchCommand.h>
#include <launch/steps/TextPrint.h>
#include <launch/steps/CheckJava.h>
#include "minecraft/launch/LaunchMinecraft.h"
#include "minecraft/launch/ModMinecraftJar.h"
#include "java/launch/CheckJava.h"
#include "minecraft/ModList.h"
#include "minecraft/WorldList.h"
#include <MMCZip.h>

6
api/logic/minecraft/onesix/OneSixInstance.cpp
View File

@@ -25,11 +25,11 @@
#include "launch/LaunchTask.h"
#include "launch/steps/PreLaunchCommand.h"
#include "launch/steps/Update.h"
#include "launch/steps/LaunchMinecraft.h"
#include "launch/steps/PostLaunchCommand.h"
#include "launch/steps/TextPrint.h"
#include "launch/steps/ModMinecraftJar.h"
#include "launch/steps/CheckJava.h"
#include "minecraft/launch/LaunchMinecraft.h"
#include "minecraft/launch/ModMinecraftJar.h"
#include "java/launch/CheckJava.h"
#include "MMCZip.h"
#include "minecraft/AssetsUtils.h"