From ed3884fd38c26185522248994c79c9525b8892ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 10 Apr 2016 17:43:41 +0200 Subject: [PATCH] NOISSUE move Java and Minecraft launch tasks to the proper places Minecraft and Java are not generic. --- api/logic/CMakeLists.txt | 12 ++++++------ .../{launch/steps => java/launch}/CheckJava.cpp | 0 api/logic/{launch/steps => java/launch}/CheckJava.h | 0 .../steps => minecraft/launch}/LaunchMinecraft.cpp | 0 .../steps => minecraft/launch}/LaunchMinecraft.h | 0 .../steps => minecraft/launch}/ModMinecraftJar.cpp | 0 .../steps => minecraft/launch}/ModMinecraftJar.h | 0 api/logic/minecraft/legacy/LegacyInstance.cpp | 6 +++--- api/logic/minecraft/onesix/OneSixInstance.cpp | 6 +++--- 9 files changed, 12 insertions(+), 12 deletions(-) rename api/logic/{launch/steps => java/launch}/CheckJava.cpp (100%) rename api/logic/{launch/steps => java/launch}/CheckJava.h (100%) rename api/logic/{launch/steps => minecraft/launch}/LaunchMinecraft.cpp (100%) rename api/logic/{launch/steps => minecraft/launch}/LaunchMinecraft.h (100%) rename api/logic/{launch/steps => minecraft/launch}/ModMinecraftJar.cpp (100%) rename api/logic/{launch/steps => minecraft/launch}/ModMinecraftJar.h (100%) diff --git a/api/logic/CMakeLists.txt b/api/logic/CMakeLists.txt index a7013c9de..abae7b904 100644 --- a/api/logic/CMakeLists.txt +++ b/api/logic/CMakeLists.txt @@ -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 diff --git a/api/logic/launch/steps/CheckJava.cpp b/api/logic/java/launch/CheckJava.cpp similarity index 100% rename from api/logic/launch/steps/CheckJava.cpp rename to api/logic/java/launch/CheckJava.cpp diff --git a/api/logic/launch/steps/CheckJava.h b/api/logic/java/launch/CheckJava.h similarity index 100% rename from api/logic/launch/steps/CheckJava.h rename to api/logic/java/launch/CheckJava.h diff --git a/api/logic/launch/steps/LaunchMinecraft.cpp b/api/logic/minecraft/launch/LaunchMinecraft.cpp similarity index 100% rename from api/logic/launch/steps/LaunchMinecraft.cpp rename to api/logic/minecraft/launch/LaunchMinecraft.cpp diff --git a/api/logic/launch/steps/LaunchMinecraft.h b/api/logic/minecraft/launch/LaunchMinecraft.h similarity index 100% rename from api/logic/launch/steps/LaunchMinecraft.h rename to api/logic/minecraft/launch/LaunchMinecraft.h diff --git a/api/logic/launch/steps/ModMinecraftJar.cpp b/api/logic/minecraft/launch/ModMinecraftJar.cpp similarity index 100% rename from api/logic/launch/steps/ModMinecraftJar.cpp rename to api/logic/minecraft/launch/ModMinecraftJar.cpp diff --git a/api/logic/launch/steps/ModMinecraftJar.h b/api/logic/minecraft/launch/ModMinecraftJar.h similarity index 100% rename from api/logic/launch/steps/ModMinecraftJar.h rename to api/logic/minecraft/launch/ModMinecraftJar.h diff --git a/api/logic/minecraft/legacy/LegacyInstance.cpp b/api/logic/minecraft/legacy/LegacyInstance.cpp index f8264f204..c64bcb09f 100644 --- a/api/logic/minecraft/legacy/LegacyInstance.cpp +++ b/api/logic/minecraft/legacy/LegacyInstance.cpp @@ -21,13 +21,13 @@ #include "minecraft/legacy/LegacyUpdate.h" #include "launch/LaunchTask.h" -#include #include -#include #include #include #include -#include +#include "minecraft/launch/LaunchMinecraft.h" +#include "minecraft/launch/ModMinecraftJar.h" +#include "java/launch/CheckJava.h" #include "minecraft/ModList.h" #include "minecraft/WorldList.h" #include diff --git a/api/logic/minecraft/onesix/OneSixInstance.cpp b/api/logic/minecraft/onesix/OneSixInstance.cpp index 258e26c5f..a96704c84 100644 --- a/api/logic/minecraft/onesix/OneSixInstance.cpp +++ b/api/logic/minecraft/onesix/OneSixInstance.cpp @@ -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"