summaryrefslogtreecommitdiffstats
path: root/api/logic
diff options
context:
space:
mode:
Diffstat (limited to 'api/logic')
-rw-r--r--api/logic/CMakeLists.txt12
-rw-r--r--api/logic/java/launch/CheckJava.cpp (renamed from api/logic/launch/steps/CheckJava.cpp)0
-rw-r--r--api/logic/java/launch/CheckJava.h (renamed from api/logic/launch/steps/CheckJava.h)0
-rw-r--r--api/logic/minecraft/launch/LaunchMinecraft.cpp (renamed from api/logic/launch/steps/LaunchMinecraft.cpp)0
-rw-r--r--api/logic/minecraft/launch/LaunchMinecraft.h (renamed from api/logic/launch/steps/LaunchMinecraft.h)0
-rw-r--r--api/logic/minecraft/launch/ModMinecraftJar.cpp (renamed from api/logic/launch/steps/ModMinecraftJar.cpp)0
-rw-r--r--api/logic/minecraft/launch/ModMinecraftJar.h (renamed from api/logic/launch/steps/ModMinecraftJar.h)0
-rw-r--r--api/logic/minecraft/legacy/LegacyInstance.cpp6
-rw-r--r--api/logic/minecraft/onesix/OneSixInstance.cpp6
9 files changed, 12 insertions, 12 deletions
diff --git a/api/logic/CMakeLists.txt b/api/logic/CMakeLists.txt
index a7013c9d..abae7b90 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
index a4eaa307..a4eaa307 100644
--- a/api/logic/launch/steps/CheckJava.cpp
+++ b/api/logic/java/launch/CheckJava.cpp
diff --git a/api/logic/launch/steps/CheckJava.h b/api/logic/java/launch/CheckJava.h
index b63dd4f4..b63dd4f4 100644
--- a/api/logic/launch/steps/CheckJava.h
+++ b/api/logic/java/launch/CheckJava.h
diff --git a/api/logic/launch/steps/LaunchMinecraft.cpp b/api/logic/minecraft/launch/LaunchMinecraft.cpp
index 9b8cc0fb..9b8cc0fb 100644
--- a/api/logic/launch/steps/LaunchMinecraft.cpp
+++ b/api/logic/minecraft/launch/LaunchMinecraft.cpp
diff --git a/api/logic/launch/steps/LaunchMinecraft.h b/api/logic/minecraft/launch/LaunchMinecraft.h
index 6b9f7919..6b9f7919 100644
--- a/api/logic/launch/steps/LaunchMinecraft.h
+++ b/api/logic/minecraft/launch/LaunchMinecraft.h
diff --git a/api/logic/launch/steps/ModMinecraftJar.cpp b/api/logic/minecraft/launch/ModMinecraftJar.cpp
index fce2d70a..fce2d70a 100644
--- a/api/logic/launch/steps/ModMinecraftJar.cpp
+++ b/api/logic/minecraft/launch/ModMinecraftJar.cpp
diff --git a/api/logic/launch/steps/ModMinecraftJar.h b/api/logic/minecraft/launch/ModMinecraftJar.h
index b35dfafa..b35dfafa 100644
--- a/api/logic/launch/steps/ModMinecraftJar.h
+++ b/api/logic/minecraft/launch/ModMinecraftJar.h
diff --git a/api/logic/minecraft/legacy/LegacyInstance.cpp b/api/logic/minecraft/legacy/LegacyInstance.cpp
index f8264f20..c64bcb09 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 <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>
diff --git a/api/logic/minecraft/onesix/OneSixInstance.cpp b/api/logic/minecraft/onesix/OneSixInstance.cpp
index 258e26c5..a96704c8 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"