diff --git a/.gitmodules b/.gitmodules index db3e347e..e70d0919 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "depends/libnbtplusplus"] - path = depends/libnbtplusplus + path = libraries/libnbtplusplus url = https://github.com/MultiMC/libnbtplusplus.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c021578..a82c3695 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,30 +95,27 @@ else() set(QUAZIP_LIBRARIES -L"${CMAKE_CURRENT_BINARY_DIR}/External/Install/QuaZIP/lib" quazip) endif() -add_subdirectory(depends/hoedown) # markdown parser -add_subdirectory(depends/launcher) # java based launcher part for Minecraft -add_subdirectory(depends/javacheck) # java compatibility checker -add_subdirectory(depends/xz-embedded) # xz compression -add_subdirectory(depends/pack200) # java pack200 compression -add_subdirectory(depends/rainbow) # Qt extension for colors - option(NBT_BUILD_SHARED "Build NBT shared library" ON) option(NBT_USE_ZLIB "Build NBT library with zlib support" OFF) option(NBT_BUILD_TESTS "Build NBT library tests" OFF) #FIXME: fix unit tests. -add_subdirectory(depends/libnbtplusplus) +add_subdirectory(libraries/libnbtplusplus) -######## MultiMC Libs ######## - -add_subdirectory(depends/LogicalGui) # GUI -> Logic connection -add_subdirectory(depends/iconfix) # fork of Qt's QIcon loader +add_subdirectory(libraries/hoedown) # markdown parser +add_subdirectory(libraries/launcher) # java based launcher part for Minecraft +add_subdirectory(libraries/javacheck) # java compatibility checker +add_subdirectory(libraries/xz-embedded) # xz compression +add_subdirectory(libraries/pack200) # java pack200 compression +add_subdirectory(libraries/rainbow) # Qt extension for colors +add_subdirectory(libraries/iconfix) # fork of Qt's QIcon loader include(Coverity) ############################### Built Artifacts ############################### add_subdirectory(tests) -add_subdirectory(libraries/logic) -add_subdirectory(libraries/gui) + +add_subdirectory(api/logic) +add_subdirectory(api/gui) add_subdirectory(application) add_subdirectory(wonkoclient) diff --git a/libraries/gui/CMakeLists.txt b/api/gui/CMakeLists.txt similarity index 100% rename from libraries/gui/CMakeLists.txt rename to api/gui/CMakeLists.txt diff --git a/libraries/gui/DesktopServices.cpp b/api/gui/DesktopServices.cpp similarity index 100% rename from libraries/gui/DesktopServices.cpp rename to api/gui/DesktopServices.cpp diff --git a/libraries/gui/DesktopServices.h b/api/gui/DesktopServices.h similarity index 100% rename from libraries/gui/DesktopServices.h rename to api/gui/DesktopServices.h diff --git a/libraries/gui/SkinUtils.cpp b/api/gui/SkinUtils.cpp similarity index 100% rename from libraries/gui/SkinUtils.cpp rename to api/gui/SkinUtils.cpp diff --git a/libraries/gui/SkinUtils.h b/api/gui/SkinUtils.h similarity index 100% rename from libraries/gui/SkinUtils.h rename to api/gui/SkinUtils.h diff --git a/libraries/gui/icons/IconList.cpp b/api/gui/icons/IconList.cpp similarity index 100% rename from libraries/gui/icons/IconList.cpp rename to api/gui/icons/IconList.cpp diff --git a/libraries/gui/icons/IconList.h b/api/gui/icons/IconList.h similarity index 100% rename from libraries/gui/icons/IconList.h rename to api/gui/icons/IconList.h diff --git a/libraries/gui/icons/MMCIcon.cpp b/api/gui/icons/MMCIcon.cpp similarity index 100% rename from libraries/gui/icons/MMCIcon.cpp rename to api/gui/icons/MMCIcon.cpp diff --git a/libraries/gui/icons/MMCIcon.h b/api/gui/icons/MMCIcon.h similarity index 100% rename from libraries/gui/icons/MMCIcon.h rename to api/gui/icons/MMCIcon.h diff --git a/libraries/logic/AbstractCommonModel.cpp b/api/logic/AbstractCommonModel.cpp similarity index 100% rename from libraries/logic/AbstractCommonModel.cpp rename to api/logic/AbstractCommonModel.cpp diff --git a/libraries/logic/AbstractCommonModel.h b/api/logic/AbstractCommonModel.h similarity index 100% rename from libraries/logic/AbstractCommonModel.h rename to api/logic/AbstractCommonModel.h diff --git a/libraries/logic/BaseConfigObject.cpp b/api/logic/BaseConfigObject.cpp similarity index 100% rename from libraries/logic/BaseConfigObject.cpp rename to api/logic/BaseConfigObject.cpp diff --git a/libraries/logic/BaseConfigObject.h b/api/logic/BaseConfigObject.h similarity index 100% rename from libraries/logic/BaseConfigObject.h rename to api/logic/BaseConfigObject.h diff --git a/libraries/logic/BaseInstaller.cpp b/api/logic/BaseInstaller.cpp similarity index 100% rename from libraries/logic/BaseInstaller.cpp rename to api/logic/BaseInstaller.cpp diff --git a/libraries/logic/BaseInstaller.h b/api/logic/BaseInstaller.h similarity index 100% rename from libraries/logic/BaseInstaller.h rename to api/logic/BaseInstaller.h diff --git a/libraries/logic/BaseInstance.cpp b/api/logic/BaseInstance.cpp similarity index 100% rename from libraries/logic/BaseInstance.cpp rename to api/logic/BaseInstance.cpp diff --git a/libraries/logic/BaseInstance.h b/api/logic/BaseInstance.h similarity index 100% rename from libraries/logic/BaseInstance.h rename to api/logic/BaseInstance.h diff --git a/libraries/logic/BaseVersion.h b/api/logic/BaseVersion.h similarity index 100% rename from libraries/logic/BaseVersion.h rename to api/logic/BaseVersion.h diff --git a/libraries/logic/BaseVersionList.cpp b/api/logic/BaseVersionList.cpp similarity index 100% rename from libraries/logic/BaseVersionList.cpp rename to api/logic/BaseVersionList.cpp diff --git a/libraries/logic/BaseVersionList.h b/api/logic/BaseVersionList.h similarity index 100% rename from libraries/logic/BaseVersionList.h rename to api/logic/BaseVersionList.h diff --git a/libraries/logic/CMakeLists.txt b/api/logic/CMakeLists.txt similarity index 100% rename from libraries/logic/CMakeLists.txt rename to api/logic/CMakeLists.txt diff --git a/libraries/logic/Commandline.cpp b/api/logic/Commandline.cpp similarity index 100% rename from libraries/logic/Commandline.cpp rename to api/logic/Commandline.cpp diff --git a/libraries/logic/Commandline.h b/api/logic/Commandline.h similarity index 100% rename from libraries/logic/Commandline.h rename to api/logic/Commandline.h diff --git a/libraries/logic/DefaultVariable.h b/api/logic/DefaultVariable.h similarity index 100% rename from libraries/logic/DefaultVariable.h rename to api/logic/DefaultVariable.h diff --git a/libraries/logic/Env.cpp b/api/logic/Env.cpp similarity index 100% rename from libraries/logic/Env.cpp rename to api/logic/Env.cpp diff --git a/libraries/logic/Env.h b/api/logic/Env.h similarity index 100% rename from libraries/logic/Env.h rename to api/logic/Env.h diff --git a/libraries/logic/Exception.h b/api/logic/Exception.h similarity index 100% rename from libraries/logic/Exception.h rename to api/logic/Exception.h diff --git a/libraries/logic/FileSystem.cpp b/api/logic/FileSystem.cpp similarity index 100% rename from libraries/logic/FileSystem.cpp rename to api/logic/FileSystem.cpp diff --git a/libraries/logic/FileSystem.h b/api/logic/FileSystem.h similarity index 100% rename from libraries/logic/FileSystem.h rename to api/logic/FileSystem.h diff --git a/libraries/logic/GZip.cpp b/api/logic/GZip.cpp similarity index 100% rename from libraries/logic/GZip.cpp rename to api/logic/GZip.cpp diff --git a/libraries/logic/GZip.h b/api/logic/GZip.h similarity index 100% rename from libraries/logic/GZip.h rename to api/logic/GZip.h diff --git a/libraries/logic/InstanceList.cpp b/api/logic/InstanceList.cpp similarity index 100% rename from libraries/logic/InstanceList.cpp rename to api/logic/InstanceList.cpp diff --git a/libraries/logic/InstanceList.h b/api/logic/InstanceList.h similarity index 100% rename from libraries/logic/InstanceList.h rename to api/logic/InstanceList.h diff --git a/libraries/logic/Json.cpp b/api/logic/Json.cpp similarity index 100% rename from libraries/logic/Json.cpp rename to api/logic/Json.cpp diff --git a/libraries/logic/Json.h b/api/logic/Json.h similarity index 100% rename from libraries/logic/Json.h rename to api/logic/Json.h diff --git a/libraries/logic/MMCStrings.cpp b/api/logic/MMCStrings.cpp similarity index 100% rename from libraries/logic/MMCStrings.cpp rename to api/logic/MMCStrings.cpp diff --git a/libraries/logic/MMCStrings.h b/api/logic/MMCStrings.h similarity index 100% rename from libraries/logic/MMCStrings.h rename to api/logic/MMCStrings.h diff --git a/libraries/logic/MMCZip.cpp b/api/logic/MMCZip.cpp similarity index 100% rename from libraries/logic/MMCZip.cpp rename to api/logic/MMCZip.cpp diff --git a/libraries/logic/MMCZip.h b/api/logic/MMCZip.h similarity index 100% rename from libraries/logic/MMCZip.h rename to api/logic/MMCZip.h diff --git a/libraries/logic/NullInstance.h b/api/logic/NullInstance.h similarity index 100% rename from libraries/logic/NullInstance.h rename to api/logic/NullInstance.h diff --git a/libraries/logic/QObjectPtr.h b/api/logic/QObjectPtr.h similarity index 100% rename from libraries/logic/QObjectPtr.h rename to api/logic/QObjectPtr.h diff --git a/libraries/logic/RWStorage.h b/api/logic/RWStorage.h similarity index 100% rename from libraries/logic/RWStorage.h rename to api/logic/RWStorage.h diff --git a/libraries/logic/RecursiveFileSystemWatcher.cpp b/api/logic/RecursiveFileSystemWatcher.cpp similarity index 100% rename from libraries/logic/RecursiveFileSystemWatcher.cpp rename to api/logic/RecursiveFileSystemWatcher.cpp diff --git a/libraries/logic/RecursiveFileSystemWatcher.h b/api/logic/RecursiveFileSystemWatcher.h similarity index 100% rename from libraries/logic/RecursiveFileSystemWatcher.h rename to api/logic/RecursiveFileSystemWatcher.h diff --git a/libraries/logic/SeparatorPrefixTree.h b/api/logic/SeparatorPrefixTree.h similarity index 100% rename from libraries/logic/SeparatorPrefixTree.h rename to api/logic/SeparatorPrefixTree.h diff --git a/libraries/logic/TypeMagic.h b/api/logic/TypeMagic.h similarity index 100% rename from libraries/logic/TypeMagic.h rename to api/logic/TypeMagic.h diff --git a/libraries/logic/Version.cpp b/api/logic/Version.cpp similarity index 100% rename from libraries/logic/Version.cpp rename to api/logic/Version.cpp diff --git a/libraries/logic/Version.h b/api/logic/Version.h similarity index 100% rename from libraries/logic/Version.h rename to api/logic/Version.h diff --git a/libraries/logic/java/JavaChecker.cpp b/api/logic/java/JavaChecker.cpp similarity index 100% rename from libraries/logic/java/JavaChecker.cpp rename to api/logic/java/JavaChecker.cpp diff --git a/libraries/logic/java/JavaChecker.h b/api/logic/java/JavaChecker.h similarity index 100% rename from libraries/logic/java/JavaChecker.h rename to api/logic/java/JavaChecker.h diff --git a/libraries/logic/java/JavaCheckerJob.cpp b/api/logic/java/JavaCheckerJob.cpp similarity index 100% rename from libraries/logic/java/JavaCheckerJob.cpp rename to api/logic/java/JavaCheckerJob.cpp diff --git a/libraries/logic/java/JavaCheckerJob.h b/api/logic/java/JavaCheckerJob.h similarity index 100% rename from libraries/logic/java/JavaCheckerJob.h rename to api/logic/java/JavaCheckerJob.h diff --git a/libraries/logic/java/JavaInstall.cpp b/api/logic/java/JavaInstall.cpp similarity index 100% rename from libraries/logic/java/JavaInstall.cpp rename to api/logic/java/JavaInstall.cpp diff --git a/libraries/logic/java/JavaInstall.h b/api/logic/java/JavaInstall.h similarity index 100% rename from libraries/logic/java/JavaInstall.h rename to api/logic/java/JavaInstall.h diff --git a/libraries/logic/java/JavaInstallList.cpp b/api/logic/java/JavaInstallList.cpp similarity index 100% rename from libraries/logic/java/JavaInstallList.cpp rename to api/logic/java/JavaInstallList.cpp diff --git a/libraries/logic/java/JavaInstallList.h b/api/logic/java/JavaInstallList.h similarity index 100% rename from libraries/logic/java/JavaInstallList.h rename to api/logic/java/JavaInstallList.h diff --git a/libraries/logic/java/JavaUtils.cpp b/api/logic/java/JavaUtils.cpp similarity index 100% rename from libraries/logic/java/JavaUtils.cpp rename to api/logic/java/JavaUtils.cpp diff --git a/libraries/logic/java/JavaUtils.h b/api/logic/java/JavaUtils.h similarity index 100% rename from libraries/logic/java/JavaUtils.h rename to api/logic/java/JavaUtils.h diff --git a/libraries/logic/java/JavaVersion.cpp b/api/logic/java/JavaVersion.cpp similarity index 100% rename from libraries/logic/java/JavaVersion.cpp rename to api/logic/java/JavaVersion.cpp diff --git a/libraries/logic/java/JavaVersion.h b/api/logic/java/JavaVersion.h similarity index 100% rename from libraries/logic/java/JavaVersion.h rename to api/logic/java/JavaVersion.h diff --git a/libraries/logic/launch/LaunchStep.cpp b/api/logic/launch/LaunchStep.cpp similarity index 100% rename from libraries/logic/launch/LaunchStep.cpp rename to api/logic/launch/LaunchStep.cpp diff --git a/libraries/logic/launch/LaunchStep.h b/api/logic/launch/LaunchStep.h similarity index 100% rename from libraries/logic/launch/LaunchStep.h rename to api/logic/launch/LaunchStep.h diff --git a/libraries/logic/launch/LaunchTask.cpp b/api/logic/launch/LaunchTask.cpp similarity index 100% rename from libraries/logic/launch/LaunchTask.cpp rename to api/logic/launch/LaunchTask.cpp diff --git a/libraries/logic/launch/LaunchTask.h b/api/logic/launch/LaunchTask.h similarity index 100% rename from libraries/logic/launch/LaunchTask.h rename to api/logic/launch/LaunchTask.h diff --git a/libraries/logic/launch/LoggedProcess.cpp b/api/logic/launch/LoggedProcess.cpp similarity index 100% rename from libraries/logic/launch/LoggedProcess.cpp rename to api/logic/launch/LoggedProcess.cpp diff --git a/libraries/logic/launch/LoggedProcess.h b/api/logic/launch/LoggedProcess.h similarity index 100% rename from libraries/logic/launch/LoggedProcess.h rename to api/logic/launch/LoggedProcess.h diff --git a/libraries/logic/launch/MessageLevel.cpp b/api/logic/launch/MessageLevel.cpp similarity index 100% rename from libraries/logic/launch/MessageLevel.cpp rename to api/logic/launch/MessageLevel.cpp diff --git a/libraries/logic/launch/MessageLevel.h b/api/logic/launch/MessageLevel.h similarity index 100% rename from libraries/logic/launch/MessageLevel.h rename to api/logic/launch/MessageLevel.h diff --git a/libraries/logic/launch/steps/CheckJava.cpp b/api/logic/launch/steps/CheckJava.cpp similarity index 100% rename from libraries/logic/launch/steps/CheckJava.cpp rename to api/logic/launch/steps/CheckJava.cpp diff --git a/libraries/logic/launch/steps/CheckJava.h b/api/logic/launch/steps/CheckJava.h similarity index 100% rename from libraries/logic/launch/steps/CheckJava.h rename to api/logic/launch/steps/CheckJava.h diff --git a/libraries/logic/launch/steps/LaunchMinecraft.cpp b/api/logic/launch/steps/LaunchMinecraft.cpp similarity index 99% rename from libraries/logic/launch/steps/LaunchMinecraft.cpp rename to api/logic/launch/steps/LaunchMinecraft.cpp index 77a89f17..9b8cc0fb 100644 --- a/libraries/logic/launch/steps/LaunchMinecraft.cpp +++ b/api/logic/launch/steps/LaunchMinecraft.cpp @@ -110,6 +110,7 @@ void LaunchMinecraft::on_state(LoggedProcess::State state) m_parent->instance()->setLastLaunch(); // send the launch script to the launcher part m_process.write(m_launchScript.toUtf8()); + qDebug() << m_launchScript; mayProceed = true; emit readyForLaunch(); diff --git a/libraries/logic/launch/steps/LaunchMinecraft.h b/api/logic/launch/steps/LaunchMinecraft.h similarity index 100% rename from libraries/logic/launch/steps/LaunchMinecraft.h rename to api/logic/launch/steps/LaunchMinecraft.h diff --git a/libraries/logic/launch/steps/ModMinecraftJar.cpp b/api/logic/launch/steps/ModMinecraftJar.cpp similarity index 100% rename from libraries/logic/launch/steps/ModMinecraftJar.cpp rename to api/logic/launch/steps/ModMinecraftJar.cpp diff --git a/libraries/logic/launch/steps/ModMinecraftJar.h b/api/logic/launch/steps/ModMinecraftJar.h similarity index 100% rename from libraries/logic/launch/steps/ModMinecraftJar.h rename to api/logic/launch/steps/ModMinecraftJar.h diff --git a/libraries/logic/launch/steps/PostLaunchCommand.cpp b/api/logic/launch/steps/PostLaunchCommand.cpp similarity index 100% rename from libraries/logic/launch/steps/PostLaunchCommand.cpp rename to api/logic/launch/steps/PostLaunchCommand.cpp diff --git a/libraries/logic/launch/steps/PostLaunchCommand.h b/api/logic/launch/steps/PostLaunchCommand.h similarity index 100% rename from libraries/logic/launch/steps/PostLaunchCommand.h rename to api/logic/launch/steps/PostLaunchCommand.h diff --git a/libraries/logic/launch/steps/PreLaunchCommand.cpp b/api/logic/launch/steps/PreLaunchCommand.cpp similarity index 100% rename from libraries/logic/launch/steps/PreLaunchCommand.cpp rename to api/logic/launch/steps/PreLaunchCommand.cpp diff --git a/libraries/logic/launch/steps/PreLaunchCommand.h b/api/logic/launch/steps/PreLaunchCommand.h similarity index 100% rename from libraries/logic/launch/steps/PreLaunchCommand.h rename to api/logic/launch/steps/PreLaunchCommand.h diff --git a/libraries/logic/launch/steps/TextPrint.cpp b/api/logic/launch/steps/TextPrint.cpp similarity index 100% rename from libraries/logic/launch/steps/TextPrint.cpp rename to api/logic/launch/steps/TextPrint.cpp diff --git a/libraries/logic/launch/steps/TextPrint.h b/api/logic/launch/steps/TextPrint.h similarity index 100% rename from libraries/logic/launch/steps/TextPrint.h rename to api/logic/launch/steps/TextPrint.h diff --git a/libraries/logic/launch/steps/Update.cpp b/api/logic/launch/steps/Update.cpp similarity index 100% rename from libraries/logic/launch/steps/Update.cpp rename to api/logic/launch/steps/Update.cpp diff --git a/libraries/logic/launch/steps/Update.h b/api/logic/launch/steps/Update.h similarity index 100% rename from libraries/logic/launch/steps/Update.h rename to api/logic/launch/steps/Update.h diff --git a/libraries/logic/minecraft/AssetsUtils.cpp b/api/logic/minecraft/AssetsUtils.cpp similarity index 100% rename from libraries/logic/minecraft/AssetsUtils.cpp rename to api/logic/minecraft/AssetsUtils.cpp diff --git a/libraries/logic/minecraft/AssetsUtils.h b/api/logic/minecraft/AssetsUtils.h similarity index 100% rename from libraries/logic/minecraft/AssetsUtils.h rename to api/logic/minecraft/AssetsUtils.h diff --git a/libraries/logic/minecraft/GradleSpecifier.h b/api/logic/minecraft/GradleSpecifier.h similarity index 100% rename from libraries/logic/minecraft/GradleSpecifier.h rename to api/logic/minecraft/GradleSpecifier.h diff --git a/libraries/logic/minecraft/JarMod.h b/api/logic/minecraft/JarMod.h similarity index 100% rename from libraries/logic/minecraft/JarMod.h rename to api/logic/minecraft/JarMod.h diff --git a/libraries/logic/minecraft/Library.cpp b/api/logic/minecraft/Library.cpp similarity index 100% rename from libraries/logic/minecraft/Library.cpp rename to api/logic/minecraft/Library.cpp diff --git a/libraries/logic/minecraft/Library.h b/api/logic/minecraft/Library.h similarity index 100% rename from libraries/logic/minecraft/Library.h rename to api/logic/minecraft/Library.h diff --git a/libraries/logic/minecraft/MinecraftInstance.cpp b/api/logic/minecraft/MinecraftInstance.cpp similarity index 100% rename from libraries/logic/minecraft/MinecraftInstance.cpp rename to api/logic/minecraft/MinecraftInstance.cpp diff --git a/libraries/logic/minecraft/MinecraftInstance.h b/api/logic/minecraft/MinecraftInstance.h similarity index 100% rename from libraries/logic/minecraft/MinecraftInstance.h rename to api/logic/minecraft/MinecraftInstance.h diff --git a/libraries/logic/minecraft/MinecraftProfile.cpp b/api/logic/minecraft/MinecraftProfile.cpp similarity index 100% rename from libraries/logic/minecraft/MinecraftProfile.cpp rename to api/logic/minecraft/MinecraftProfile.cpp diff --git a/libraries/logic/minecraft/MinecraftProfile.h b/api/logic/minecraft/MinecraftProfile.h similarity index 100% rename from libraries/logic/minecraft/MinecraftProfile.h rename to api/logic/minecraft/MinecraftProfile.h diff --git a/libraries/logic/minecraft/MinecraftVersion.cpp b/api/logic/minecraft/MinecraftVersion.cpp similarity index 100% rename from libraries/logic/minecraft/MinecraftVersion.cpp rename to api/logic/minecraft/MinecraftVersion.cpp diff --git a/libraries/logic/minecraft/MinecraftVersion.h b/api/logic/minecraft/MinecraftVersion.h similarity index 100% rename from libraries/logic/minecraft/MinecraftVersion.h rename to api/logic/minecraft/MinecraftVersion.h diff --git a/libraries/logic/minecraft/MinecraftVersionList.cpp b/api/logic/minecraft/MinecraftVersionList.cpp similarity index 100% rename from libraries/logic/minecraft/MinecraftVersionList.cpp rename to api/logic/minecraft/MinecraftVersionList.cpp diff --git a/libraries/logic/minecraft/MinecraftVersionList.h b/api/logic/minecraft/MinecraftVersionList.h similarity index 100% rename from libraries/logic/minecraft/MinecraftVersionList.h rename to api/logic/minecraft/MinecraftVersionList.h diff --git a/libraries/logic/minecraft/Mod.cpp b/api/logic/minecraft/Mod.cpp similarity index 100% rename from libraries/logic/minecraft/Mod.cpp rename to api/logic/minecraft/Mod.cpp diff --git a/libraries/logic/minecraft/Mod.h b/api/logic/minecraft/Mod.h similarity index 100% rename from libraries/logic/minecraft/Mod.h rename to api/logic/minecraft/Mod.h diff --git a/libraries/logic/minecraft/ModList.cpp b/api/logic/minecraft/ModList.cpp similarity index 100% rename from libraries/logic/minecraft/ModList.cpp rename to api/logic/minecraft/ModList.cpp diff --git a/libraries/logic/minecraft/ModList.h b/api/logic/minecraft/ModList.h similarity index 100% rename from libraries/logic/minecraft/ModList.h rename to api/logic/minecraft/ModList.h diff --git a/libraries/logic/minecraft/MojangDownloadInfo.h b/api/logic/minecraft/MojangDownloadInfo.h similarity index 100% rename from libraries/logic/minecraft/MojangDownloadInfo.h rename to api/logic/minecraft/MojangDownloadInfo.h diff --git a/libraries/logic/minecraft/MojangVersionFormat.cpp b/api/logic/minecraft/MojangVersionFormat.cpp similarity index 100% rename from libraries/logic/minecraft/MojangVersionFormat.cpp rename to api/logic/minecraft/MojangVersionFormat.cpp diff --git a/libraries/logic/minecraft/MojangVersionFormat.h b/api/logic/minecraft/MojangVersionFormat.h similarity index 100% rename from libraries/logic/minecraft/MojangVersionFormat.h rename to api/logic/minecraft/MojangVersionFormat.h diff --git a/libraries/logic/minecraft/OpSys.cpp b/api/logic/minecraft/OpSys.cpp similarity index 100% rename from libraries/logic/minecraft/OpSys.cpp rename to api/logic/minecraft/OpSys.cpp diff --git a/libraries/logic/minecraft/OpSys.h b/api/logic/minecraft/OpSys.h similarity index 100% rename from libraries/logic/minecraft/OpSys.h rename to api/logic/minecraft/OpSys.h diff --git a/libraries/logic/minecraft/ParseUtils.cpp b/api/logic/minecraft/ParseUtils.cpp similarity index 100% rename from libraries/logic/minecraft/ParseUtils.cpp rename to api/logic/minecraft/ParseUtils.cpp diff --git a/libraries/logic/minecraft/ParseUtils.h b/api/logic/minecraft/ParseUtils.h similarity index 100% rename from libraries/logic/minecraft/ParseUtils.h rename to api/logic/minecraft/ParseUtils.h diff --git a/libraries/logic/minecraft/ProfilePatch.h b/api/logic/minecraft/ProfilePatch.h similarity index 100% rename from libraries/logic/minecraft/ProfilePatch.h rename to api/logic/minecraft/ProfilePatch.h diff --git a/libraries/logic/minecraft/ProfileStrategy.h b/api/logic/minecraft/ProfileStrategy.h similarity index 100% rename from libraries/logic/minecraft/ProfileStrategy.h rename to api/logic/minecraft/ProfileStrategy.h diff --git a/libraries/logic/minecraft/ProfileUtils.cpp b/api/logic/minecraft/ProfileUtils.cpp similarity index 100% rename from libraries/logic/minecraft/ProfileUtils.cpp rename to api/logic/minecraft/ProfileUtils.cpp diff --git a/libraries/logic/minecraft/ProfileUtils.h b/api/logic/minecraft/ProfileUtils.h similarity index 100% rename from libraries/logic/minecraft/ProfileUtils.h rename to api/logic/minecraft/ProfileUtils.h diff --git a/libraries/logic/minecraft/Rule.cpp b/api/logic/minecraft/Rule.cpp similarity index 100% rename from libraries/logic/minecraft/Rule.cpp rename to api/logic/minecraft/Rule.cpp diff --git a/libraries/logic/minecraft/Rule.h b/api/logic/minecraft/Rule.h similarity index 100% rename from libraries/logic/minecraft/Rule.h rename to api/logic/minecraft/Rule.h diff --git a/libraries/logic/minecraft/VersionBuildError.h b/api/logic/minecraft/VersionBuildError.h similarity index 100% rename from libraries/logic/minecraft/VersionBuildError.h rename to api/logic/minecraft/VersionBuildError.h diff --git a/libraries/logic/minecraft/VersionFile.cpp b/api/logic/minecraft/VersionFile.cpp similarity index 100% rename from libraries/logic/minecraft/VersionFile.cpp rename to api/logic/minecraft/VersionFile.cpp diff --git a/libraries/logic/minecraft/VersionFile.h b/api/logic/minecraft/VersionFile.h similarity index 100% rename from libraries/logic/minecraft/VersionFile.h rename to api/logic/minecraft/VersionFile.h diff --git a/libraries/logic/minecraft/VersionFilterData.cpp b/api/logic/minecraft/VersionFilterData.cpp similarity index 100% rename from libraries/logic/minecraft/VersionFilterData.cpp rename to api/logic/minecraft/VersionFilterData.cpp diff --git a/libraries/logic/minecraft/VersionFilterData.h b/api/logic/minecraft/VersionFilterData.h similarity index 100% rename from libraries/logic/minecraft/VersionFilterData.h rename to api/logic/minecraft/VersionFilterData.h diff --git a/libraries/logic/minecraft/World.cpp b/api/logic/minecraft/World.cpp similarity index 100% rename from libraries/logic/minecraft/World.cpp rename to api/logic/minecraft/World.cpp diff --git a/libraries/logic/minecraft/World.h b/api/logic/minecraft/World.h similarity index 100% rename from libraries/logic/minecraft/World.h rename to api/logic/minecraft/World.h diff --git a/libraries/logic/minecraft/WorldList.cpp b/api/logic/minecraft/WorldList.cpp similarity index 100% rename from libraries/logic/minecraft/WorldList.cpp rename to api/logic/minecraft/WorldList.cpp diff --git a/libraries/logic/minecraft/WorldList.h b/api/logic/minecraft/WorldList.h similarity index 100% rename from libraries/logic/minecraft/WorldList.h rename to api/logic/minecraft/WorldList.h diff --git a/libraries/logic/minecraft/auth/AuthSession.cpp b/api/logic/minecraft/auth/AuthSession.cpp similarity index 100% rename from libraries/logic/minecraft/auth/AuthSession.cpp rename to api/logic/minecraft/auth/AuthSession.cpp diff --git a/libraries/logic/minecraft/auth/AuthSession.h b/api/logic/minecraft/auth/AuthSession.h similarity index 100% rename from libraries/logic/minecraft/auth/AuthSession.h rename to api/logic/minecraft/auth/AuthSession.h diff --git a/libraries/logic/minecraft/auth/MojangAccount.cpp b/api/logic/minecraft/auth/MojangAccount.cpp similarity index 100% rename from libraries/logic/minecraft/auth/MojangAccount.cpp rename to api/logic/minecraft/auth/MojangAccount.cpp diff --git a/libraries/logic/minecraft/auth/MojangAccount.h b/api/logic/minecraft/auth/MojangAccount.h similarity index 100% rename from libraries/logic/minecraft/auth/MojangAccount.h rename to api/logic/minecraft/auth/MojangAccount.h diff --git a/libraries/logic/minecraft/auth/MojangAccountList.cpp b/api/logic/minecraft/auth/MojangAccountList.cpp similarity index 100% rename from libraries/logic/minecraft/auth/MojangAccountList.cpp rename to api/logic/minecraft/auth/MojangAccountList.cpp diff --git a/libraries/logic/minecraft/auth/MojangAccountList.h b/api/logic/minecraft/auth/MojangAccountList.h similarity index 100% rename from libraries/logic/minecraft/auth/MojangAccountList.h rename to api/logic/minecraft/auth/MojangAccountList.h diff --git a/libraries/logic/minecraft/auth/YggdrasilTask.cpp b/api/logic/minecraft/auth/YggdrasilTask.cpp similarity index 100% rename from libraries/logic/minecraft/auth/YggdrasilTask.cpp rename to api/logic/minecraft/auth/YggdrasilTask.cpp diff --git a/libraries/logic/minecraft/auth/YggdrasilTask.h b/api/logic/minecraft/auth/YggdrasilTask.h similarity index 100% rename from libraries/logic/minecraft/auth/YggdrasilTask.h rename to api/logic/minecraft/auth/YggdrasilTask.h diff --git a/libraries/logic/minecraft/auth/flows/AuthenticateTask.cpp b/api/logic/minecraft/auth/flows/AuthenticateTask.cpp similarity index 100% rename from libraries/logic/minecraft/auth/flows/AuthenticateTask.cpp rename to api/logic/minecraft/auth/flows/AuthenticateTask.cpp diff --git a/libraries/logic/minecraft/auth/flows/AuthenticateTask.h b/api/logic/minecraft/auth/flows/AuthenticateTask.h similarity index 100% rename from libraries/logic/minecraft/auth/flows/AuthenticateTask.h rename to api/logic/minecraft/auth/flows/AuthenticateTask.h diff --git a/libraries/logic/minecraft/auth/flows/RefreshTask.cpp b/api/logic/minecraft/auth/flows/RefreshTask.cpp similarity index 100% rename from libraries/logic/minecraft/auth/flows/RefreshTask.cpp rename to api/logic/minecraft/auth/flows/RefreshTask.cpp diff --git a/libraries/logic/minecraft/auth/flows/RefreshTask.h b/api/logic/minecraft/auth/flows/RefreshTask.h similarity index 100% rename from libraries/logic/minecraft/auth/flows/RefreshTask.h rename to api/logic/minecraft/auth/flows/RefreshTask.h diff --git a/libraries/logic/minecraft/auth/flows/ValidateTask.cpp b/api/logic/minecraft/auth/flows/ValidateTask.cpp similarity index 100% rename from libraries/logic/minecraft/auth/flows/ValidateTask.cpp rename to api/logic/minecraft/auth/flows/ValidateTask.cpp diff --git a/libraries/logic/minecraft/auth/flows/ValidateTask.h b/api/logic/minecraft/auth/flows/ValidateTask.h similarity index 100% rename from libraries/logic/minecraft/auth/flows/ValidateTask.h rename to api/logic/minecraft/auth/flows/ValidateTask.h diff --git a/libraries/logic/minecraft/forge/ForgeInstaller.cpp b/api/logic/minecraft/forge/ForgeInstaller.cpp similarity index 100% rename from libraries/logic/minecraft/forge/ForgeInstaller.cpp rename to api/logic/minecraft/forge/ForgeInstaller.cpp diff --git a/libraries/logic/minecraft/forge/ForgeInstaller.h b/api/logic/minecraft/forge/ForgeInstaller.h similarity index 100% rename from libraries/logic/minecraft/forge/ForgeInstaller.h rename to api/logic/minecraft/forge/ForgeInstaller.h diff --git a/libraries/logic/minecraft/forge/ForgeVersion.cpp b/api/logic/minecraft/forge/ForgeVersion.cpp similarity index 100% rename from libraries/logic/minecraft/forge/ForgeVersion.cpp rename to api/logic/minecraft/forge/ForgeVersion.cpp diff --git a/libraries/logic/minecraft/forge/ForgeVersion.h b/api/logic/minecraft/forge/ForgeVersion.h similarity index 100% rename from libraries/logic/minecraft/forge/ForgeVersion.h rename to api/logic/minecraft/forge/ForgeVersion.h diff --git a/libraries/logic/minecraft/forge/ForgeVersionList.cpp b/api/logic/minecraft/forge/ForgeVersionList.cpp similarity index 100% rename from libraries/logic/minecraft/forge/ForgeVersionList.cpp rename to api/logic/minecraft/forge/ForgeVersionList.cpp diff --git a/libraries/logic/minecraft/forge/ForgeVersionList.h b/api/logic/minecraft/forge/ForgeVersionList.h similarity index 100% rename from libraries/logic/minecraft/forge/ForgeVersionList.h rename to api/logic/minecraft/forge/ForgeVersionList.h diff --git a/libraries/logic/minecraft/forge/ForgeXzDownload.cpp b/api/logic/minecraft/forge/ForgeXzDownload.cpp similarity index 100% rename from libraries/logic/minecraft/forge/ForgeXzDownload.cpp rename to api/logic/minecraft/forge/ForgeXzDownload.cpp diff --git a/libraries/logic/minecraft/forge/ForgeXzDownload.h b/api/logic/minecraft/forge/ForgeXzDownload.h similarity index 100% rename from libraries/logic/minecraft/forge/ForgeXzDownload.h rename to api/logic/minecraft/forge/ForgeXzDownload.h diff --git a/libraries/logic/minecraft/forge/LegacyForge.cpp b/api/logic/minecraft/forge/LegacyForge.cpp similarity index 100% rename from libraries/logic/minecraft/forge/LegacyForge.cpp rename to api/logic/minecraft/forge/LegacyForge.cpp diff --git a/libraries/logic/minecraft/forge/LegacyForge.h b/api/logic/minecraft/forge/LegacyForge.h similarity index 100% rename from libraries/logic/minecraft/forge/LegacyForge.h rename to api/logic/minecraft/forge/LegacyForge.h diff --git a/libraries/logic/minecraft/ftb/FTBPlugin.cpp b/api/logic/minecraft/ftb/FTBPlugin.cpp similarity index 100% rename from libraries/logic/minecraft/ftb/FTBPlugin.cpp rename to api/logic/minecraft/ftb/FTBPlugin.cpp diff --git a/libraries/logic/minecraft/ftb/FTBPlugin.h b/api/logic/minecraft/ftb/FTBPlugin.h similarity index 100% rename from libraries/logic/minecraft/ftb/FTBPlugin.h rename to api/logic/minecraft/ftb/FTBPlugin.h diff --git a/libraries/logic/minecraft/ftb/FTBProfileStrategy.cpp b/api/logic/minecraft/ftb/FTBProfileStrategy.cpp similarity index 100% rename from libraries/logic/minecraft/ftb/FTBProfileStrategy.cpp rename to api/logic/minecraft/ftb/FTBProfileStrategy.cpp diff --git a/libraries/logic/minecraft/ftb/FTBProfileStrategy.h b/api/logic/minecraft/ftb/FTBProfileStrategy.h similarity index 100% rename from libraries/logic/minecraft/ftb/FTBProfileStrategy.h rename to api/logic/minecraft/ftb/FTBProfileStrategy.h diff --git a/libraries/logic/minecraft/ftb/FTBVersion.h b/api/logic/minecraft/ftb/FTBVersion.h similarity index 100% rename from libraries/logic/minecraft/ftb/FTBVersion.h rename to api/logic/minecraft/ftb/FTBVersion.h diff --git a/libraries/logic/minecraft/ftb/LegacyFTBInstance.cpp b/api/logic/minecraft/ftb/LegacyFTBInstance.cpp similarity index 100% rename from libraries/logic/minecraft/ftb/LegacyFTBInstance.cpp rename to api/logic/minecraft/ftb/LegacyFTBInstance.cpp diff --git a/libraries/logic/minecraft/ftb/LegacyFTBInstance.h b/api/logic/minecraft/ftb/LegacyFTBInstance.h similarity index 100% rename from libraries/logic/minecraft/ftb/LegacyFTBInstance.h rename to api/logic/minecraft/ftb/LegacyFTBInstance.h diff --git a/libraries/logic/minecraft/ftb/OneSixFTBInstance.cpp b/api/logic/minecraft/ftb/OneSixFTBInstance.cpp similarity index 100% rename from libraries/logic/minecraft/ftb/OneSixFTBInstance.cpp rename to api/logic/minecraft/ftb/OneSixFTBInstance.cpp diff --git a/libraries/logic/minecraft/ftb/OneSixFTBInstance.h b/api/logic/minecraft/ftb/OneSixFTBInstance.h similarity index 100% rename from libraries/logic/minecraft/ftb/OneSixFTBInstance.h rename to api/logic/minecraft/ftb/OneSixFTBInstance.h diff --git a/libraries/logic/minecraft/legacy/LegacyInstance.cpp b/api/logic/minecraft/legacy/LegacyInstance.cpp similarity index 100% rename from libraries/logic/minecraft/legacy/LegacyInstance.cpp rename to api/logic/minecraft/legacy/LegacyInstance.cpp diff --git a/libraries/logic/minecraft/legacy/LegacyInstance.h b/api/logic/minecraft/legacy/LegacyInstance.h similarity index 100% rename from libraries/logic/minecraft/legacy/LegacyInstance.h rename to api/logic/minecraft/legacy/LegacyInstance.h diff --git a/libraries/logic/minecraft/legacy/LegacyUpdate.cpp b/api/logic/minecraft/legacy/LegacyUpdate.cpp similarity index 100% rename from libraries/logic/minecraft/legacy/LegacyUpdate.cpp rename to api/logic/minecraft/legacy/LegacyUpdate.cpp diff --git a/libraries/logic/minecraft/legacy/LegacyUpdate.h b/api/logic/minecraft/legacy/LegacyUpdate.h similarity index 100% rename from libraries/logic/minecraft/legacy/LegacyUpdate.h rename to api/logic/minecraft/legacy/LegacyUpdate.h diff --git a/libraries/logic/minecraft/legacy/LwjglVersionList.cpp b/api/logic/minecraft/legacy/LwjglVersionList.cpp similarity index 100% rename from libraries/logic/minecraft/legacy/LwjglVersionList.cpp rename to api/logic/minecraft/legacy/LwjglVersionList.cpp diff --git a/libraries/logic/minecraft/legacy/LwjglVersionList.h b/api/logic/minecraft/legacy/LwjglVersionList.h similarity index 100% rename from libraries/logic/minecraft/legacy/LwjglVersionList.h rename to api/logic/minecraft/legacy/LwjglVersionList.h diff --git a/libraries/logic/minecraft/liteloader/LiteLoaderInstaller.cpp b/api/logic/minecraft/liteloader/LiteLoaderInstaller.cpp similarity index 100% rename from libraries/logic/minecraft/liteloader/LiteLoaderInstaller.cpp rename to api/logic/minecraft/liteloader/LiteLoaderInstaller.cpp diff --git a/libraries/logic/minecraft/liteloader/LiteLoaderInstaller.h b/api/logic/minecraft/liteloader/LiteLoaderInstaller.h similarity index 100% rename from libraries/logic/minecraft/liteloader/LiteLoaderInstaller.h rename to api/logic/minecraft/liteloader/LiteLoaderInstaller.h diff --git a/libraries/logic/minecraft/liteloader/LiteLoaderVersionList.cpp b/api/logic/minecraft/liteloader/LiteLoaderVersionList.cpp similarity index 100% rename from libraries/logic/minecraft/liteloader/LiteLoaderVersionList.cpp rename to api/logic/minecraft/liteloader/LiteLoaderVersionList.cpp diff --git a/libraries/logic/minecraft/liteloader/LiteLoaderVersionList.h b/api/logic/minecraft/liteloader/LiteLoaderVersionList.h similarity index 100% rename from libraries/logic/minecraft/liteloader/LiteLoaderVersionList.h rename to api/logic/minecraft/liteloader/LiteLoaderVersionList.h diff --git a/libraries/logic/minecraft/onesix/OneSixInstance.cpp b/api/logic/minecraft/onesix/OneSixInstance.cpp similarity index 100% rename from libraries/logic/minecraft/onesix/OneSixInstance.cpp rename to api/logic/minecraft/onesix/OneSixInstance.cpp diff --git a/libraries/logic/minecraft/onesix/OneSixInstance.h b/api/logic/minecraft/onesix/OneSixInstance.h similarity index 100% rename from libraries/logic/minecraft/onesix/OneSixInstance.h rename to api/logic/minecraft/onesix/OneSixInstance.h diff --git a/libraries/logic/minecraft/onesix/OneSixProfileStrategy.cpp b/api/logic/minecraft/onesix/OneSixProfileStrategy.cpp similarity index 100% rename from libraries/logic/minecraft/onesix/OneSixProfileStrategy.cpp rename to api/logic/minecraft/onesix/OneSixProfileStrategy.cpp diff --git a/libraries/logic/minecraft/onesix/OneSixProfileStrategy.h b/api/logic/minecraft/onesix/OneSixProfileStrategy.h similarity index 100% rename from libraries/logic/minecraft/onesix/OneSixProfileStrategy.h rename to api/logic/minecraft/onesix/OneSixProfileStrategy.h diff --git a/libraries/logic/minecraft/onesix/OneSixUpdate.cpp b/api/logic/minecraft/onesix/OneSixUpdate.cpp similarity index 100% rename from libraries/logic/minecraft/onesix/OneSixUpdate.cpp rename to api/logic/minecraft/onesix/OneSixUpdate.cpp diff --git a/libraries/logic/minecraft/onesix/OneSixUpdate.h b/api/logic/minecraft/onesix/OneSixUpdate.h similarity index 100% rename from libraries/logic/minecraft/onesix/OneSixUpdate.h rename to api/logic/minecraft/onesix/OneSixUpdate.h diff --git a/libraries/logic/minecraft/onesix/OneSixVersionFormat.cpp b/api/logic/minecraft/onesix/OneSixVersionFormat.cpp similarity index 100% rename from libraries/logic/minecraft/onesix/OneSixVersionFormat.cpp rename to api/logic/minecraft/onesix/OneSixVersionFormat.cpp diff --git a/libraries/logic/minecraft/onesix/OneSixVersionFormat.h b/api/logic/minecraft/onesix/OneSixVersionFormat.h similarity index 100% rename from libraries/logic/minecraft/onesix/OneSixVersionFormat.h rename to api/logic/minecraft/onesix/OneSixVersionFormat.h diff --git a/libraries/logic/net/ByteArrayDownload.cpp b/api/logic/net/ByteArrayDownload.cpp similarity index 100% rename from libraries/logic/net/ByteArrayDownload.cpp rename to api/logic/net/ByteArrayDownload.cpp diff --git a/libraries/logic/net/ByteArrayDownload.h b/api/logic/net/ByteArrayDownload.h similarity index 100% rename from libraries/logic/net/ByteArrayDownload.h rename to api/logic/net/ByteArrayDownload.h diff --git a/libraries/logic/net/CacheDownload.cpp b/api/logic/net/CacheDownload.cpp similarity index 100% rename from libraries/logic/net/CacheDownload.cpp rename to api/logic/net/CacheDownload.cpp diff --git a/libraries/logic/net/CacheDownload.h b/api/logic/net/CacheDownload.h similarity index 100% rename from libraries/logic/net/CacheDownload.h rename to api/logic/net/CacheDownload.h diff --git a/libraries/logic/net/HttpMetaCache.cpp b/api/logic/net/HttpMetaCache.cpp similarity index 100% rename from libraries/logic/net/HttpMetaCache.cpp rename to api/logic/net/HttpMetaCache.cpp diff --git a/libraries/logic/net/HttpMetaCache.h b/api/logic/net/HttpMetaCache.h similarity index 100% rename from libraries/logic/net/HttpMetaCache.h rename to api/logic/net/HttpMetaCache.h diff --git a/libraries/logic/net/MD5EtagDownload.cpp b/api/logic/net/MD5EtagDownload.cpp similarity index 100% rename from libraries/logic/net/MD5EtagDownload.cpp rename to api/logic/net/MD5EtagDownload.cpp diff --git a/libraries/logic/net/MD5EtagDownload.h b/api/logic/net/MD5EtagDownload.h similarity index 100% rename from libraries/logic/net/MD5EtagDownload.h rename to api/logic/net/MD5EtagDownload.h diff --git a/libraries/logic/net/NetAction.h b/api/logic/net/NetAction.h similarity index 100% rename from libraries/logic/net/NetAction.h rename to api/logic/net/NetAction.h diff --git a/libraries/logic/net/NetJob.cpp b/api/logic/net/NetJob.cpp similarity index 100% rename from libraries/logic/net/NetJob.cpp rename to api/logic/net/NetJob.cpp diff --git a/libraries/logic/net/NetJob.h b/api/logic/net/NetJob.h similarity index 100% rename from libraries/logic/net/NetJob.h rename to api/logic/net/NetJob.h diff --git a/libraries/logic/net/PasteUpload.cpp b/api/logic/net/PasteUpload.cpp similarity index 100% rename from libraries/logic/net/PasteUpload.cpp rename to api/logic/net/PasteUpload.cpp diff --git a/libraries/logic/net/PasteUpload.h b/api/logic/net/PasteUpload.h similarity index 100% rename from libraries/logic/net/PasteUpload.h rename to api/logic/net/PasteUpload.h diff --git a/libraries/logic/net/URLConstants.cpp b/api/logic/net/URLConstants.cpp similarity index 100% rename from libraries/logic/net/URLConstants.cpp rename to api/logic/net/URLConstants.cpp diff --git a/libraries/logic/net/URLConstants.h b/api/logic/net/URLConstants.h similarity index 100% rename from libraries/logic/net/URLConstants.h rename to api/logic/net/URLConstants.h diff --git a/libraries/logic/news/NewsChecker.cpp b/api/logic/news/NewsChecker.cpp similarity index 100% rename from libraries/logic/news/NewsChecker.cpp rename to api/logic/news/NewsChecker.cpp diff --git a/libraries/logic/news/NewsChecker.h b/api/logic/news/NewsChecker.h similarity index 100% rename from libraries/logic/news/NewsChecker.h rename to api/logic/news/NewsChecker.h diff --git a/libraries/logic/news/NewsEntry.cpp b/api/logic/news/NewsEntry.cpp similarity index 100% rename from libraries/logic/news/NewsEntry.cpp rename to api/logic/news/NewsEntry.cpp diff --git a/libraries/logic/news/NewsEntry.h b/api/logic/news/NewsEntry.h similarity index 100% rename from libraries/logic/news/NewsEntry.h rename to api/logic/news/NewsEntry.h diff --git a/libraries/logic/notifications/NotificationChecker.cpp b/api/logic/notifications/NotificationChecker.cpp similarity index 100% rename from libraries/logic/notifications/NotificationChecker.cpp rename to api/logic/notifications/NotificationChecker.cpp diff --git a/libraries/logic/notifications/NotificationChecker.h b/api/logic/notifications/NotificationChecker.h similarity index 100% rename from libraries/logic/notifications/NotificationChecker.h rename to api/logic/notifications/NotificationChecker.h diff --git a/libraries/logic/pathmatcher/FSTreeMatcher.h b/api/logic/pathmatcher/FSTreeMatcher.h similarity index 100% rename from libraries/logic/pathmatcher/FSTreeMatcher.h rename to api/logic/pathmatcher/FSTreeMatcher.h diff --git a/libraries/logic/pathmatcher/IPathMatcher.h b/api/logic/pathmatcher/IPathMatcher.h similarity index 100% rename from libraries/logic/pathmatcher/IPathMatcher.h rename to api/logic/pathmatcher/IPathMatcher.h diff --git a/libraries/logic/pathmatcher/MultiMatcher.h b/api/logic/pathmatcher/MultiMatcher.h similarity index 100% rename from libraries/logic/pathmatcher/MultiMatcher.h rename to api/logic/pathmatcher/MultiMatcher.h diff --git a/libraries/logic/pathmatcher/RegexpMatcher.h b/api/logic/pathmatcher/RegexpMatcher.h similarity index 100% rename from libraries/logic/pathmatcher/RegexpMatcher.h rename to api/logic/pathmatcher/RegexpMatcher.h diff --git a/libraries/logic/resources/Resource.cpp b/api/logic/resources/Resource.cpp similarity index 100% rename from libraries/logic/resources/Resource.cpp rename to api/logic/resources/Resource.cpp diff --git a/libraries/logic/resources/Resource.h b/api/logic/resources/Resource.h similarity index 100% rename from libraries/logic/resources/Resource.h rename to api/logic/resources/Resource.h diff --git a/libraries/logic/resources/ResourceHandler.cpp b/api/logic/resources/ResourceHandler.cpp similarity index 100% rename from libraries/logic/resources/ResourceHandler.cpp rename to api/logic/resources/ResourceHandler.cpp diff --git a/libraries/logic/resources/ResourceHandler.h b/api/logic/resources/ResourceHandler.h similarity index 100% rename from libraries/logic/resources/ResourceHandler.h rename to api/logic/resources/ResourceHandler.h diff --git a/libraries/logic/resources/ResourceObserver.cpp b/api/logic/resources/ResourceObserver.cpp similarity index 100% rename from libraries/logic/resources/ResourceObserver.cpp rename to api/logic/resources/ResourceObserver.cpp diff --git a/libraries/logic/resources/ResourceObserver.h b/api/logic/resources/ResourceObserver.h similarity index 100% rename from libraries/logic/resources/ResourceObserver.h rename to api/logic/resources/ResourceObserver.h diff --git a/libraries/logic/resources/ResourceProxyModel.cpp b/api/logic/resources/ResourceProxyModel.cpp similarity index 100% rename from libraries/logic/resources/ResourceProxyModel.cpp rename to api/logic/resources/ResourceProxyModel.cpp diff --git a/libraries/logic/resources/ResourceProxyModel.h b/api/logic/resources/ResourceProxyModel.h similarity index 100% rename from libraries/logic/resources/ResourceProxyModel.h rename to api/logic/resources/ResourceProxyModel.h diff --git a/libraries/logic/screenshots/ImgurAlbumCreation.cpp b/api/logic/screenshots/ImgurAlbumCreation.cpp similarity index 100% rename from libraries/logic/screenshots/ImgurAlbumCreation.cpp rename to api/logic/screenshots/ImgurAlbumCreation.cpp diff --git a/libraries/logic/screenshots/ImgurAlbumCreation.h b/api/logic/screenshots/ImgurAlbumCreation.h similarity index 100% rename from libraries/logic/screenshots/ImgurAlbumCreation.h rename to api/logic/screenshots/ImgurAlbumCreation.h diff --git a/libraries/logic/screenshots/ImgurUpload.cpp b/api/logic/screenshots/ImgurUpload.cpp similarity index 100% rename from libraries/logic/screenshots/ImgurUpload.cpp rename to api/logic/screenshots/ImgurUpload.cpp diff --git a/libraries/logic/screenshots/ImgurUpload.h b/api/logic/screenshots/ImgurUpload.h similarity index 100% rename from libraries/logic/screenshots/ImgurUpload.h rename to api/logic/screenshots/ImgurUpload.h diff --git a/libraries/logic/screenshots/Screenshot.h b/api/logic/screenshots/Screenshot.h similarity index 100% rename from libraries/logic/screenshots/Screenshot.h rename to api/logic/screenshots/Screenshot.h diff --git a/libraries/logic/settings/INIFile.cpp b/api/logic/settings/INIFile.cpp similarity index 100% rename from libraries/logic/settings/INIFile.cpp rename to api/logic/settings/INIFile.cpp diff --git a/libraries/logic/settings/INIFile.h b/api/logic/settings/INIFile.h similarity index 100% rename from libraries/logic/settings/INIFile.h rename to api/logic/settings/INIFile.h diff --git a/libraries/logic/settings/INISettingsObject.cpp b/api/logic/settings/INISettingsObject.cpp similarity index 100% rename from libraries/logic/settings/INISettingsObject.cpp rename to api/logic/settings/INISettingsObject.cpp diff --git a/libraries/logic/settings/INISettingsObject.h b/api/logic/settings/INISettingsObject.h similarity index 100% rename from libraries/logic/settings/INISettingsObject.h rename to api/logic/settings/INISettingsObject.h diff --git a/libraries/logic/settings/OverrideSetting.cpp b/api/logic/settings/OverrideSetting.cpp similarity index 100% rename from libraries/logic/settings/OverrideSetting.cpp rename to api/logic/settings/OverrideSetting.cpp diff --git a/libraries/logic/settings/OverrideSetting.h b/api/logic/settings/OverrideSetting.h similarity index 100% rename from libraries/logic/settings/OverrideSetting.h rename to api/logic/settings/OverrideSetting.h diff --git a/libraries/logic/settings/PassthroughSetting.cpp b/api/logic/settings/PassthroughSetting.cpp similarity index 100% rename from libraries/logic/settings/PassthroughSetting.cpp rename to api/logic/settings/PassthroughSetting.cpp diff --git a/libraries/logic/settings/PassthroughSetting.h b/api/logic/settings/PassthroughSetting.h similarity index 100% rename from libraries/logic/settings/PassthroughSetting.h rename to api/logic/settings/PassthroughSetting.h diff --git a/libraries/logic/settings/Setting.cpp b/api/logic/settings/Setting.cpp similarity index 100% rename from libraries/logic/settings/Setting.cpp rename to api/logic/settings/Setting.cpp diff --git a/libraries/logic/settings/Setting.h b/api/logic/settings/Setting.h similarity index 100% rename from libraries/logic/settings/Setting.h rename to api/logic/settings/Setting.h diff --git a/libraries/logic/settings/SettingsObject.cpp b/api/logic/settings/SettingsObject.cpp similarity index 100% rename from libraries/logic/settings/SettingsObject.cpp rename to api/logic/settings/SettingsObject.cpp diff --git a/libraries/logic/settings/SettingsObject.h b/api/logic/settings/SettingsObject.h similarity index 100% rename from libraries/logic/settings/SettingsObject.h rename to api/logic/settings/SettingsObject.h diff --git a/libraries/logic/status/StatusChecker.cpp b/api/logic/status/StatusChecker.cpp similarity index 100% rename from libraries/logic/status/StatusChecker.cpp rename to api/logic/status/StatusChecker.cpp diff --git a/libraries/logic/status/StatusChecker.h b/api/logic/status/StatusChecker.h similarity index 100% rename from libraries/logic/status/StatusChecker.h rename to api/logic/status/StatusChecker.h diff --git a/libraries/logic/tasks/SequentialTask.cpp b/api/logic/tasks/SequentialTask.cpp similarity index 100% rename from libraries/logic/tasks/SequentialTask.cpp rename to api/logic/tasks/SequentialTask.cpp diff --git a/libraries/logic/tasks/SequentialTask.h b/api/logic/tasks/SequentialTask.h similarity index 100% rename from libraries/logic/tasks/SequentialTask.h rename to api/logic/tasks/SequentialTask.h diff --git a/libraries/logic/tasks/Task.cpp b/api/logic/tasks/Task.cpp similarity index 100% rename from libraries/logic/tasks/Task.cpp rename to api/logic/tasks/Task.cpp diff --git a/libraries/logic/tasks/Task.h b/api/logic/tasks/Task.h similarity index 100% rename from libraries/logic/tasks/Task.h rename to api/logic/tasks/Task.h diff --git a/libraries/logic/tasks/ThreadTask.cpp b/api/logic/tasks/ThreadTask.cpp similarity index 100% rename from libraries/logic/tasks/ThreadTask.cpp rename to api/logic/tasks/ThreadTask.cpp diff --git a/libraries/logic/tasks/ThreadTask.h b/api/logic/tasks/ThreadTask.h similarity index 100% rename from libraries/logic/tasks/ThreadTask.h rename to api/logic/tasks/ThreadTask.h diff --git a/libraries/logic/tools/BaseExternalTool.cpp b/api/logic/tools/BaseExternalTool.cpp similarity index 100% rename from libraries/logic/tools/BaseExternalTool.cpp rename to api/logic/tools/BaseExternalTool.cpp diff --git a/libraries/logic/tools/BaseExternalTool.h b/api/logic/tools/BaseExternalTool.h similarity index 100% rename from libraries/logic/tools/BaseExternalTool.h rename to api/logic/tools/BaseExternalTool.h diff --git a/libraries/logic/tools/BaseProfiler.cpp b/api/logic/tools/BaseProfiler.cpp similarity index 100% rename from libraries/logic/tools/BaseProfiler.cpp rename to api/logic/tools/BaseProfiler.cpp diff --git a/libraries/logic/tools/BaseProfiler.h b/api/logic/tools/BaseProfiler.h similarity index 100% rename from libraries/logic/tools/BaseProfiler.h rename to api/logic/tools/BaseProfiler.h diff --git a/libraries/logic/tools/JProfiler.cpp b/api/logic/tools/JProfiler.cpp similarity index 100% rename from libraries/logic/tools/JProfiler.cpp rename to api/logic/tools/JProfiler.cpp diff --git a/libraries/logic/tools/JProfiler.h b/api/logic/tools/JProfiler.h similarity index 100% rename from libraries/logic/tools/JProfiler.h rename to api/logic/tools/JProfiler.h diff --git a/libraries/logic/tools/JVisualVM.cpp b/api/logic/tools/JVisualVM.cpp similarity index 100% rename from libraries/logic/tools/JVisualVM.cpp rename to api/logic/tools/JVisualVM.cpp diff --git a/libraries/logic/tools/JVisualVM.h b/api/logic/tools/JVisualVM.h similarity index 100% rename from libraries/logic/tools/JVisualVM.h rename to api/logic/tools/JVisualVM.h diff --git a/libraries/logic/tools/MCEditTool.cpp b/api/logic/tools/MCEditTool.cpp similarity index 100% rename from libraries/logic/tools/MCEditTool.cpp rename to api/logic/tools/MCEditTool.cpp index 32695c8d..f3d550d0 100644 --- a/libraries/logic/tools/MCEditTool.cpp +++ b/api/logic/tools/MCEditTool.cpp @@ -15,7 +15,6 @@ MCEditTool::MCEditTool(SettingsObjectPtr settings, InstancePtr instance, QObject QString MCEditTool::getSave() const { - // FIXME: mixing logic and UI!!!! auto mcInstance = std::dynamic_pointer_cast(m_instance); if(!mcInstance) { @@ -33,6 +32,7 @@ QString MCEditTool::getSave() const } } bool ok = true; + // FIXME: mixing logic and UI!!!! /* const QString save = QInputDialog::getItem(QApplication::activeWindow(), tr("MCEdit"), tr("Choose which world to open:"), worlds, 0, false, &ok); diff --git a/libraries/logic/tools/MCEditTool.h b/api/logic/tools/MCEditTool.h similarity index 100% rename from libraries/logic/tools/MCEditTool.h rename to api/logic/tools/MCEditTool.h diff --git a/libraries/logic/trans/TranslationDownloader.cpp b/api/logic/trans/TranslationDownloader.cpp similarity index 100% rename from libraries/logic/trans/TranslationDownloader.cpp rename to api/logic/trans/TranslationDownloader.cpp diff --git a/libraries/logic/trans/TranslationDownloader.h b/api/logic/trans/TranslationDownloader.h similarity index 100% rename from libraries/logic/trans/TranslationDownloader.h rename to api/logic/trans/TranslationDownloader.h diff --git a/libraries/logic/updater/DownloadTask.cpp b/api/logic/updater/DownloadTask.cpp similarity index 100% rename from libraries/logic/updater/DownloadTask.cpp rename to api/logic/updater/DownloadTask.cpp diff --git a/libraries/logic/updater/DownloadTask.h b/api/logic/updater/DownloadTask.h similarity index 100% rename from libraries/logic/updater/DownloadTask.h rename to api/logic/updater/DownloadTask.h diff --git a/libraries/logic/updater/GoUpdate.cpp b/api/logic/updater/GoUpdate.cpp similarity index 99% rename from libraries/logic/updater/GoUpdate.cpp rename to api/logic/updater/GoUpdate.cpp index 60d50e04..4e465d5c 100644 --- a/libraries/logic/updater/GoUpdate.cpp +++ b/api/logic/updater/GoUpdate.cpp @@ -2,7 +2,6 @@ #include #include #include -#include #include namespace GoUpdate diff --git a/libraries/logic/updater/GoUpdate.h b/api/logic/updater/GoUpdate.h similarity index 100% rename from libraries/logic/updater/GoUpdate.h rename to api/logic/updater/GoUpdate.h diff --git a/libraries/logic/updater/UpdateChecker.cpp b/api/logic/updater/UpdateChecker.cpp similarity index 100% rename from libraries/logic/updater/UpdateChecker.cpp rename to api/logic/updater/UpdateChecker.cpp diff --git a/libraries/logic/updater/UpdateChecker.h b/api/logic/updater/UpdateChecker.h similarity index 100% rename from libraries/logic/updater/UpdateChecker.h rename to api/logic/updater/UpdateChecker.h diff --git a/libraries/logic/wonko/BaseWonkoEntity.cpp b/api/logic/wonko/BaseWonkoEntity.cpp similarity index 100% rename from libraries/logic/wonko/BaseWonkoEntity.cpp rename to api/logic/wonko/BaseWonkoEntity.cpp diff --git a/libraries/logic/wonko/BaseWonkoEntity.h b/api/logic/wonko/BaseWonkoEntity.h similarity index 100% rename from libraries/logic/wonko/BaseWonkoEntity.h rename to api/logic/wonko/BaseWonkoEntity.h diff --git a/libraries/logic/wonko/WonkoIndex.cpp b/api/logic/wonko/WonkoIndex.cpp similarity index 100% rename from libraries/logic/wonko/WonkoIndex.cpp rename to api/logic/wonko/WonkoIndex.cpp diff --git a/libraries/logic/wonko/WonkoIndex.h b/api/logic/wonko/WonkoIndex.h similarity index 100% rename from libraries/logic/wonko/WonkoIndex.h rename to api/logic/wonko/WonkoIndex.h diff --git a/libraries/logic/wonko/WonkoReference.cpp b/api/logic/wonko/WonkoReference.cpp similarity index 100% rename from libraries/logic/wonko/WonkoReference.cpp rename to api/logic/wonko/WonkoReference.cpp diff --git a/libraries/logic/wonko/WonkoReference.h b/api/logic/wonko/WonkoReference.h similarity index 100% rename from libraries/logic/wonko/WonkoReference.h rename to api/logic/wonko/WonkoReference.h diff --git a/libraries/logic/wonko/WonkoUtil.cpp b/api/logic/wonko/WonkoUtil.cpp similarity index 100% rename from libraries/logic/wonko/WonkoUtil.cpp rename to api/logic/wonko/WonkoUtil.cpp diff --git a/libraries/logic/wonko/WonkoUtil.h b/api/logic/wonko/WonkoUtil.h similarity index 100% rename from libraries/logic/wonko/WonkoUtil.h rename to api/logic/wonko/WonkoUtil.h diff --git a/libraries/logic/wonko/WonkoVersion.cpp b/api/logic/wonko/WonkoVersion.cpp similarity index 100% rename from libraries/logic/wonko/WonkoVersion.cpp rename to api/logic/wonko/WonkoVersion.cpp diff --git a/libraries/logic/wonko/WonkoVersion.h b/api/logic/wonko/WonkoVersion.h similarity index 100% rename from libraries/logic/wonko/WonkoVersion.h rename to api/logic/wonko/WonkoVersion.h diff --git a/libraries/logic/wonko/WonkoVersionList.cpp b/api/logic/wonko/WonkoVersionList.cpp similarity index 100% rename from libraries/logic/wonko/WonkoVersionList.cpp rename to api/logic/wonko/WonkoVersionList.cpp diff --git a/libraries/logic/wonko/WonkoVersionList.h b/api/logic/wonko/WonkoVersionList.h similarity index 100% rename from libraries/logic/wonko/WonkoVersionList.h rename to api/logic/wonko/WonkoVersionList.h diff --git a/libraries/logic/wonko/format/WonkoFormat.cpp b/api/logic/wonko/format/WonkoFormat.cpp similarity index 100% rename from libraries/logic/wonko/format/WonkoFormat.cpp rename to api/logic/wonko/format/WonkoFormat.cpp diff --git a/libraries/logic/wonko/format/WonkoFormat.h b/api/logic/wonko/format/WonkoFormat.h similarity index 100% rename from libraries/logic/wonko/format/WonkoFormat.h rename to api/logic/wonko/format/WonkoFormat.h diff --git a/libraries/logic/wonko/format/WonkoFormatV1.cpp b/api/logic/wonko/format/WonkoFormatV1.cpp similarity index 100% rename from libraries/logic/wonko/format/WonkoFormatV1.cpp rename to api/logic/wonko/format/WonkoFormatV1.cpp diff --git a/libraries/logic/wonko/format/WonkoFormatV1.h b/api/logic/wonko/format/WonkoFormatV1.h similarity index 100% rename from libraries/logic/wonko/format/WonkoFormatV1.h rename to api/logic/wonko/format/WonkoFormatV1.h diff --git a/libraries/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.cpp b/api/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.cpp similarity index 100% rename from libraries/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.cpp rename to api/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.cpp diff --git a/libraries/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.h b/api/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.h similarity index 100% rename from libraries/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.h rename to api/logic/wonko/tasks/BaseWonkoEntityLocalLoadTask.h diff --git a/libraries/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.cpp b/api/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.cpp similarity index 100% rename from libraries/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.cpp rename to api/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.cpp diff --git a/libraries/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.h b/api/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.h similarity index 100% rename from libraries/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.h rename to api/logic/wonko/tasks/BaseWonkoEntityRemoteLoadTask.h diff --git a/depends/LogicalGui/CMakeLists.txt b/depends/LogicalGui/CMakeLists.txt deleted file mode 100644 index 12665738..00000000 --- a/depends/LogicalGui/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -project(LogicalGui) -add_library(LogicalGui STATIC LogicalGui.h) -target_include_directories(LogicalGui PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") -qt5_use_modules(LogicalGui Core) diff --git a/depends/LogicalGui/LogicalGui.h b/depends/LogicalGui/LogicalGui.h deleted file mode 100644 index 729f0353..00000000 --- a/depends/LogicalGui/LogicalGui.h +++ /dev/null @@ -1,254 +0,0 @@ -/* Copyright 2013-2015 Jan Dalheimer - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -#include -#include -#include -#include -#include -#include - -#if QT_VERSION == QT_VERSION_CHECK(5, 1, 1) -#include <5.1.1/QtCore/private/qobject_p.h> -#elif QT_VERSION == QT_VERSION_CHECK(5, 2, 0) -#include <5.2.0/QtCore/private/qobject_p.h> -#elif QT_VERSION == QT_VERSION_CHECK(5, 2, 1) -#include <5.2.1/QtCore/private/qobject_p.h> -#elif QT_VERSION == QT_VERSION_CHECK(5, 3, 0) -#include <5.3.0/QtCore/private/qobject_p.h> -#elif QT_VERSION == QT_VERSION_CHECK(5, 3, 1) -#include <5.3.1/QtCore/private/qobject_p.h> -#else -#error Please add support for this version of Qt -#endif - -class Bindable -{ - friend class tst_LogicalGui; - -public: - Bindable(Bindable *parent = 0) : m_parent(parent) - { - } - virtual ~Bindable() - { - } - - void setBindableParent(Bindable *parent) - { - m_parent = parent; - } - - void bind(const QString &id, const QObject *receiver, const char *methodSignature) - { - auto mo = receiver->metaObject(); - Q_ASSERT_X(mo, "Bindable::bind", - "Invalid metaobject. Did you forget the QObject macro?"); - const QMetaMethod method = mo->method(mo->indexOfMethod( - QMetaObject::normalizedSignature(methodSignature + 1).constData())); - Q_ASSERT_X(method.isValid(), "Bindable::bind", "Invalid method signature"); - m_bindings.insert(id, Binding(receiver, method)); - } - template - void bind(const QString &id, - const typename QtPrivate::FunctionPointer::Object *receiver, Func slot) - { - typedef QtPrivate::FunctionPointer SlotType; - m_bindings.insert( - id, - Binding(receiver, new QtPrivate::QSlotObject(slot))); - } - template void bind(const QString &id, Func slot) - { - typedef QtPrivate::FunctionPointer SlotType; - m_bindings.insert( - id, - Binding(nullptr, new QtPrivate::QSlotObject(slot))); - } - void unbind(const QString &id) - { - m_bindings.remove(id); - } - -private: - struct Binding - { - Binding(const QObject *receiver, const QMetaMethod &method) - : receiver(receiver), method(method) - { - } - Binding(const QObject *receiver, QtPrivate::QSlotObjectBase *object) - : receiver(receiver), object(object) - { - } - Binding() - { - } - const QObject *receiver; - QMetaMethod method; - QtPrivate::QSlotObjectBase *object = nullptr; - }; - QMap m_bindings; - - Bindable *m_parent; - -private: - inline Qt::ConnectionType connectionType(const QObject *receiver) - { - return receiver == nullptr ? Qt::DirectConnection - : (QThread::currentThread() == receiver->thread() - ? Qt::DirectConnection - : Qt::BlockingQueuedConnection); - } - -protected: - template Ret wait(const QString &id, Params... params) - { - static_assert(!std::is_same::value, "You need to use Bindable::waitVoid"); - - if (!m_bindings.contains(id) && m_parent) - { - return m_parent->wait(id, params...); - } - Q_ASSERT(m_bindings.contains(id)); - const auto binding = m_bindings[id]; - const Qt::ConnectionType type = connectionType(binding.receiver); - Ret ret; - if (binding.object) - { - void *args[] = {&ret, - const_cast(reinterpret_cast(¶ms))...}; - if (type == Qt::BlockingQueuedConnection) - { - QSemaphore semaphore; - QMetaCallEvent *ev = - new QMetaCallEvent(binding.object, nullptr, -1, 0, 0, args, &semaphore); - QCoreApplication::postEvent(const_cast(binding.receiver), ev); - semaphore.acquire(); - } - else - { - binding.object->call(const_cast(binding.receiver), args); - } - } - else - { - const QMetaMethod method = binding.method; - Q_ASSERT_X(method.parameterCount() == sizeof...(params), "Bindable::wait", - qPrintable(QString("Incompatible argument count (expected %1, got %2)") - .arg(method.parameterCount(), sizeof...(params)))); - Q_ASSERT_X( - qMetaTypeId() != QMetaType::UnknownType, "Bindable::wait", - "Requested return type is not registered, please use the Q_DECLARE_METATYPE " - "macro to make it known to Qt's meta-object system"); - Q_ASSERT_X( - method.returnType() == qMetaTypeId() || - QMetaType::hasRegisteredConverterFunction(method.returnType(), - qMetaTypeId()), - "Bindable::wait", - qPrintable( - QString( - "Requested return type (%1) is incompatible method return type (%2)") - .arg(QMetaType::typeName(qMetaTypeId()), - QMetaType::typeName(method.returnType())))); - const auto retArg = QReturnArgument( - QMetaType::typeName(qMetaTypeId()), - ret); // because Q_RETURN_ARG doesn't work with templates... - method.invoke(const_cast(binding.receiver), type, retArg, - Q_ARG(Params, params)...); - } - return ret; - } - template - typename std::enable_if::type waitVoid(const QString &id, - Params... params) - { - if (!m_bindings.contains(id) && m_parent) - { - m_parent->waitVoid(id, params...); - return; - } - Q_ASSERT(m_bindings.contains(id)); - const auto binding = m_bindings[id]; - const Qt::ConnectionType type = connectionType(binding.receiver); - if (binding.object) - { - void *args[] = {0, const_cast(reinterpret_cast(¶ms))...}; - if (type == Qt::BlockingQueuedConnection) - { - QSemaphore semaphore; - QMetaCallEvent *ev = - new QMetaCallEvent(binding.object, nullptr, -1, 0, 0, args, &semaphore); - QCoreApplication::postEvent(const_cast(binding.receiver), ev); - semaphore.acquire(); - } - else - { - binding.object->call(const_cast(binding.receiver), args); - } - } - else - { - const QMetaMethod method = binding.method; - Q_ASSERT_X(method.parameterCount() == sizeof...(params), "Bindable::wait", - qPrintable(QString("Incompatible argument count (expected %1, got %2)") - .arg(method.parameterCount(), sizeof...(params)))); - method.invoke(const_cast(binding.receiver), type, - Q_ARG(Params, params)...); - } - } - void waitVoid(const QString &id) - { - if (!m_bindings.contains(id) && m_parent) - { - m_parent->waitVoid(id); - return; - } - Q_ASSERT(m_bindings.contains(id)); - const auto binding = m_bindings[id]; - const Qt::ConnectionType type = connectionType(binding.receiver); - if (binding.object) - { - void *args[] = {0}; - if (type == Qt::BlockingQueuedConnection) - { - QSemaphore semaphore; - QMetaCallEvent *ev = - new QMetaCallEvent(binding.object, nullptr, -1, 0, 0, args, &semaphore); - QCoreApplication::postEvent(const_cast(binding.receiver), ev); - semaphore.acquire(); - } - else - { - binding.object->call(const_cast(binding.receiver), args); - } - } - else - { - const QMetaMethod method = binding.method; - Q_ASSERT_X(method.parameterCount() == 0, "Bindable::wait", - qPrintable(QString("Incompatible argument count (expected %1, got %2)") - .arg(method.parameterCount(), 0))); - method.invoke(const_cast(binding.receiver), type); - } - } -}; - -// used frequently -Q_DECLARE_METATYPE(bool *) diff --git a/libraries/README.md b/libraries/README.md new file mode 100644 index 00000000..809acb16 --- /dev/null +++ b/libraries/README.md @@ -0,0 +1,145 @@ +# Third-party libraries + +This folder has third-party or otherwise external libraries needed for other parts to work. + +## classparser +A simplistic parser for Java class files. + +This library has served as a base for some (much more full-featured and advanced) work under NDA for AVG. It, however, should NOT be confused with that work. + +Copyright belongs to Petr Mrázek, unless explicitly stated otherwise in the source files. Available under the Apache 2.0 license. + +## hoedown +Hoedown is a revived fork of Sundown, the Markdown parser based on the original code of the Upskirt library by Natacha Porté. + +See [github repo](https://github.com/hoedown/hoedown). + +## iconfix +This was originally part of the razor-qt project and the Qt toolkit, respecitvely. Its sole purpose is to reimplement Qt's icon loading logic to prevent it from using any platform plugins that could break icon loading. + +Licensed under LGPL 2.1 + +## javacheck +Simple Java tool that prints the JVM details - version and platform bitness. + +Do what you want with it. It is so trivial that noone cares. + +## launcher +Java launcher part for Minecraft. + +It: +* Starts a process +* Waits for a launch script on stdin +* Consumes the launch script you feed it +* Proceeds with launch when it gets the `launcher` command + +This means the process is essentially idle until the final command is sent. You can, for example, attach a profiler before you send it. + +A `legacy` and `onesix` launchers are available. + +* `legacy` is intended for use with Minecraft versions < 1.6 and is deprecated. +* `onesix` can handle launching any Minecraft version, at the cost of some extra features `legacy` enables (custom window icon and title). + +Example (some parts have been censored): +``` +mod legacyjavafixer-1.0 +mainClass net.minecraft.launchwrapper.Launch +param --username +param CENSORED +param --version +param MultiMC5 +param --gameDir +param /home/peterix/minecraft/FTB/17ForgeTest/minecraft +param --assetsDir +param /home/peterix/minecraft/mmc5/assets +param --assetIndex +param 1.7.10 +param --uuid +param CENSORED +param --accessToken +param CENSORED +param --userProperties +param {} +param --userType +param mojang +param --tweakClass +param cpw.mods.fml.common.launcher.FMLTweaker +windowTitle MultiMC: 172ForgeTest +windowParams 854x480 +userName CENSORED +sessionId token:CENSORED:CENSORED +cp /home/peterix/minecraft/FTB/libraries/com/mojang/realms/1.3.5/realms-1.3.5.jar +cp /home/peterix/minecraft/FTB/libraries/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar +cp /home/peterix/minecraft/FTB/libraries/org/apache/httpcomponents/httpclient/4.3.3/httpclient-4.3.3.jar +cp /home/peterix/minecraft/FTB/libraries/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar +cp /home/peterix/minecraft/FTB/libraries/org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2.jar +cp /home/peterix/minecraft/FTB/libraries/java3d/vecmath/1.3.1/vecmath-1.3.1.jar +cp /home/peterix/minecraft/FTB/libraries/net/sf/trove4j/trove4j/3.0.3/trove4j-3.0.3.jar +cp /home/peterix/minecraft/FTB/libraries/com/ibm/icu/icu4j-core-mojang/51.2/icu4j-core-mojang-51.2.jar +cp /home/peterix/minecraft/FTB/libraries/net/sf/jopt-simple/jopt-simple/4.5/jopt-simple-4.5.jar +cp /home/peterix/minecraft/FTB/libraries/com/paulscode/codecjorbis/20101023/codecjorbis-20101023.jar +cp /home/peterix/minecraft/FTB/libraries/com/paulscode/codecwav/20101023/codecwav-20101023.jar +cp /home/peterix/minecraft/FTB/libraries/com/paulscode/libraryjavasound/20101123/libraryjavasound-20101123.jar +cp /home/peterix/minecraft/FTB/libraries/com/paulscode/librarylwjglopenal/20100824/librarylwjglopenal-20100824.jar +cp /home/peterix/minecraft/FTB/libraries/com/paulscode/soundsystem/20120107/soundsystem-20120107.jar +cp /home/peterix/minecraft/FTB/libraries/io/netty/netty-all/4.0.10.Final/netty-all-4.0.10.Final.jar +cp /home/peterix/minecraft/FTB/libraries/com/google/guava/guava/16.0/guava-16.0.jar +cp /home/peterix/minecraft/FTB/libraries/org/apache/commons/commons-lang3/3.2.1/commons-lang3-3.2.1.jar +cp /home/peterix/minecraft/FTB/libraries/commons-io/commons-io/2.4/commons-io-2.4.jar +cp /home/peterix/minecraft/FTB/libraries/commons-codec/commons-codec/1.9/commons-codec-1.9.jar +cp /home/peterix/minecraft/FTB/libraries/net/java/jinput/jinput/2.0.5/jinput-2.0.5.jar +cp /home/peterix/minecraft/FTB/libraries/net/java/jutils/jutils/1.0.0/jutils-1.0.0.jar +cp /home/peterix/minecraft/FTB/libraries/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar +cp /home/peterix/minecraft/FTB/libraries/com/mojang/authlib/1.5.16/authlib-1.5.16.jar +cp /home/peterix/minecraft/FTB/libraries/org/apache/logging/log4j/log4j-api/2.0-beta9/log4j-api-2.0-beta9.jar +cp /home/peterix/minecraft/FTB/libraries/org/apache/logging/log4j/log4j-core/2.0-beta9/log4j-core-2.0-beta9.jar +cp /home/peterix/minecraft/FTB/libraries/org/lwjgl/lwjgl/lwjgl/2.9.1/lwjgl-2.9.1.jar +cp /home/peterix/minecraft/FTB/libraries/org/lwjgl/lwjgl/lwjgl_util/2.9.1/lwjgl_util-2.9.1.jar +cp /home/peterix/minecraft/FTB/libraries/tv/twitch/twitch/5.16/twitch-5.16.jar +cp /home/peterix/minecraft/FTB/libraries/net/minecraftforge/forge/1.7.10-10.13.0.1178/forge-1.7.10-10.13.0.1178.jar +cp /home/peterix/minecraft/FTB/libraries/net/minecraft/launchwrapper/1.9/launchwrapper-1.9.jar +cp /home/peterix/minecraft/FTB/libraries/org/ow2/asm/asm-all/4.1/asm-all-4.1.jar +cp /home/peterix/minecraft/FTB/libraries/com/typesafe/akka/akka-actor_2.11/2.3.3/akka-actor_2.11-2.3.3.jar +cp /home/peterix/minecraft/FTB/libraries/com/typesafe/config/1.2.1/config-1.2.1.jar +cp /home/peterix/minecraft/FTB/libraries/org/scala-lang/scala-actors-migration_2.11/1.1.0/scala-actors-migration_2.11-1.1.0.jar +cp /home/peterix/minecraft/FTB/libraries/org/scala-lang/scala-compiler/2.11.1/scala-compiler-2.11.1.jar +cp /home/peterix/minecraft/FTB/libraries/org/scala-lang/plugins/scala-continuations-library_2.11/1.0.2/scala-continuations-library_2.11-1.0.2.jar +cp /home/peterix/minecraft/FTB/libraries/org/scala-lang/plugins/scala-continuations-plugin_2.11.1/1.0.2/scala-continuations-plugin_2.11.1-1.0.2.jar +cp /home/peterix/minecraft/FTB/libraries/org/scala-lang/scala-library/2.11.1/scala-library-2.11.1.jar +cp /home/peterix/minecraft/FTB/libraries/org/scala-lang/scala-parser-combinators_2.11/1.0.1/scala-parser-combinators_2.11-1.0.1.jar +cp /home/peterix/minecraft/FTB/libraries/org/scala-lang/scala-reflect/2.11.1/scala-reflect-2.11.1.jar +cp /home/peterix/minecraft/FTB/libraries/org/scala-lang/scala-swing_2.11/1.0.1/scala-swing_2.11-1.0.1.jar +cp /home/peterix/minecraft/FTB/libraries/org/scala-lang/scala-xml_2.11/1.0.2/scala-xml_2.11-1.0.2.jar +cp /home/peterix/minecraft/FTB/libraries/lzma/lzma/0.0.1/lzma-0.0.1.jar +ext /home/peterix/minecraft/FTB/libraries/org/lwjgl/lwjgl/lwjgl-platform/2.9.1/lwjgl-platform-2.9.1-natives-linux.jar +ext /home/peterix/minecraft/FTB/libraries/net/java/jinput/jinput-platform/2.0.5/jinput-platform-2.0.5-natives-linux.jar +natives /home/peterix/minecraft/FTB/17ForgeTest/natives +cp /home/peterix/minecraft/FTB/versions/1.7.10/1.7.10.jar +launcher onesix +``` + +Available under the Apache 2.0 license. + +## libnbtplusplus +libnbt++ is a free C++ library for Minecraft's file format Named Binary Tag (NBT). It can read and write compressed and uncompressed NBT files and provides a code interface for working with NBT data. + +See [github repo](https://github.com/ljfa-ag/libnbtplusplus). + +Available either under LGPL version 3 or later. + +## pack200 +Unpacks pack200 archives (squished, compression-optimized Java jars). This format is only used by Forge to save bandwidth. + +A horrible little thing extracted from the depths of the OpenJDK codebase. Please don't look at it, or you will praise Cthulhu for his clean code for the rest of your days. + +Available under GPL 2 with classpath exception. + +## rainbow +Color functions extracted from [KGuiAddons](https://inqlude.org/libraries/kguiaddons.html). Used for adaptive text coloring. + +Available either under LGPL version 2.1 or later. + +## xz-embedded +Tiny implementation of LZMA2 de/compression. This format is only used by Forge to save bandwidth. + +Public domain. \ No newline at end of file diff --git a/depends/classparser/CMakeLists.txt b/libraries/classparser/CMakeLists.txt similarity index 100% rename from depends/classparser/CMakeLists.txt rename to libraries/classparser/CMakeLists.txt diff --git a/depends/classparser/include/classparser_config.h b/libraries/classparser/include/classparser_config.h similarity index 100% rename from depends/classparser/include/classparser_config.h rename to libraries/classparser/include/classparser_config.h diff --git a/depends/classparser/include/javautils.h b/libraries/classparser/include/javautils.h similarity index 100% rename from depends/classparser/include/javautils.h rename to libraries/classparser/include/javautils.h diff --git a/depends/classparser/src/annotations.cpp b/libraries/classparser/src/annotations.cpp similarity index 100% rename from depends/classparser/src/annotations.cpp rename to libraries/classparser/src/annotations.cpp diff --git a/depends/classparser/src/annotations.h b/libraries/classparser/src/annotations.h similarity index 100% rename from depends/classparser/src/annotations.h rename to libraries/classparser/src/annotations.h diff --git a/depends/classparser/src/classfile.h b/libraries/classparser/src/classfile.h similarity index 100% rename from depends/classparser/src/classfile.h rename to libraries/classparser/src/classfile.h diff --git a/depends/classparser/src/constants.h b/libraries/classparser/src/constants.h similarity index 100% rename from depends/classparser/src/constants.h rename to libraries/classparser/src/constants.h diff --git a/depends/classparser/src/errors.h b/libraries/classparser/src/errors.h similarity index 100% rename from depends/classparser/src/errors.h rename to libraries/classparser/src/errors.h diff --git a/depends/classparser/src/javaendian.h b/libraries/classparser/src/javaendian.h similarity index 100% rename from depends/classparser/src/javaendian.h rename to libraries/classparser/src/javaendian.h diff --git a/depends/classparser/src/javautils.cpp b/libraries/classparser/src/javautils.cpp similarity index 100% rename from depends/classparser/src/javautils.cpp rename to libraries/classparser/src/javautils.cpp diff --git a/depends/classparser/src/membuffer.h b/libraries/classparser/src/membuffer.h similarity index 100% rename from depends/classparser/src/membuffer.h rename to libraries/classparser/src/membuffer.h diff --git a/depends/hoedown/CMakeLists.txt b/libraries/hoedown/CMakeLists.txt similarity index 100% rename from depends/hoedown/CMakeLists.txt rename to libraries/hoedown/CMakeLists.txt diff --git a/depends/hoedown/LICENSE b/libraries/hoedown/LICENSE similarity index 100% rename from depends/hoedown/LICENSE rename to libraries/hoedown/LICENSE diff --git a/depends/hoedown/README.md b/libraries/hoedown/README.md similarity index 100% rename from depends/hoedown/README.md rename to libraries/hoedown/README.md diff --git a/depends/hoedown/include/hoedown/autolink.h b/libraries/hoedown/include/hoedown/autolink.h similarity index 100% rename from depends/hoedown/include/hoedown/autolink.h rename to libraries/hoedown/include/hoedown/autolink.h diff --git a/depends/hoedown/include/hoedown/buffer.h b/libraries/hoedown/include/hoedown/buffer.h similarity index 100% rename from depends/hoedown/include/hoedown/buffer.h rename to libraries/hoedown/include/hoedown/buffer.h diff --git a/depends/hoedown/include/hoedown/document.h b/libraries/hoedown/include/hoedown/document.h similarity index 100% rename from depends/hoedown/include/hoedown/document.h rename to libraries/hoedown/include/hoedown/document.h diff --git a/depends/hoedown/include/hoedown/escape.h b/libraries/hoedown/include/hoedown/escape.h similarity index 100% rename from depends/hoedown/include/hoedown/escape.h rename to libraries/hoedown/include/hoedown/escape.h diff --git a/depends/hoedown/include/hoedown/html.h b/libraries/hoedown/include/hoedown/html.h similarity index 100% rename from depends/hoedown/include/hoedown/html.h rename to libraries/hoedown/include/hoedown/html.h diff --git a/depends/hoedown/include/hoedown/stack.h b/libraries/hoedown/include/hoedown/stack.h similarity index 100% rename from depends/hoedown/include/hoedown/stack.h rename to libraries/hoedown/include/hoedown/stack.h diff --git a/depends/hoedown/include/hoedown/version.h b/libraries/hoedown/include/hoedown/version.h similarity index 100% rename from depends/hoedown/include/hoedown/version.h rename to libraries/hoedown/include/hoedown/version.h diff --git a/depends/hoedown/src/autolink.c b/libraries/hoedown/src/autolink.c similarity index 100% rename from depends/hoedown/src/autolink.c rename to libraries/hoedown/src/autolink.c diff --git a/depends/hoedown/src/buffer.c b/libraries/hoedown/src/buffer.c similarity index 100% rename from depends/hoedown/src/buffer.c rename to libraries/hoedown/src/buffer.c diff --git a/depends/hoedown/src/document.c b/libraries/hoedown/src/document.c similarity index 100% rename from depends/hoedown/src/document.c rename to libraries/hoedown/src/document.c diff --git a/depends/hoedown/src/escape.c b/libraries/hoedown/src/escape.c similarity index 100% rename from depends/hoedown/src/escape.c rename to libraries/hoedown/src/escape.c diff --git a/depends/hoedown/src/html.c b/libraries/hoedown/src/html.c similarity index 100% rename from depends/hoedown/src/html.c rename to libraries/hoedown/src/html.c diff --git a/depends/hoedown/src/html_blocks.c b/libraries/hoedown/src/html_blocks.c similarity index 100% rename from depends/hoedown/src/html_blocks.c rename to libraries/hoedown/src/html_blocks.c diff --git a/depends/hoedown/src/html_smartypants.c b/libraries/hoedown/src/html_smartypants.c similarity index 100% rename from depends/hoedown/src/html_smartypants.c rename to libraries/hoedown/src/html_smartypants.c diff --git a/depends/hoedown/src/stack.c b/libraries/hoedown/src/stack.c similarity index 100% rename from depends/hoedown/src/stack.c rename to libraries/hoedown/src/stack.c diff --git a/depends/hoedown/src/version.c b/libraries/hoedown/src/version.c similarity index 100% rename from depends/hoedown/src/version.c rename to libraries/hoedown/src/version.c diff --git a/depends/iconfix/CMakeLists.txt b/libraries/iconfix/CMakeLists.txt similarity index 100% rename from depends/iconfix/CMakeLists.txt rename to libraries/iconfix/CMakeLists.txt diff --git a/depends/iconfix/internal/qhexstring_p.h b/libraries/iconfix/internal/qhexstring_p.h similarity index 100% rename from depends/iconfix/internal/qhexstring_p.h rename to libraries/iconfix/internal/qhexstring_p.h diff --git a/depends/iconfix/internal/qiconloader.cpp b/libraries/iconfix/internal/qiconloader.cpp similarity index 100% rename from depends/iconfix/internal/qiconloader.cpp rename to libraries/iconfix/internal/qiconloader.cpp diff --git a/depends/iconfix/internal/qiconloader_p.h b/libraries/iconfix/internal/qiconloader_p.h similarity index 100% rename from depends/iconfix/internal/qiconloader_p.h rename to libraries/iconfix/internal/qiconloader_p.h diff --git a/depends/iconfix/xdgicon.cpp b/libraries/iconfix/xdgicon.cpp similarity index 100% rename from depends/iconfix/xdgicon.cpp rename to libraries/iconfix/xdgicon.cpp diff --git a/depends/iconfix/xdgicon.h b/libraries/iconfix/xdgicon.h similarity index 100% rename from depends/iconfix/xdgicon.h rename to libraries/iconfix/xdgicon.h diff --git a/depends/javacheck/.gitignore b/libraries/javacheck/.gitignore similarity index 100% rename from depends/javacheck/.gitignore rename to libraries/javacheck/.gitignore diff --git a/depends/javacheck/CMakeLists.txt b/libraries/javacheck/CMakeLists.txt similarity index 100% rename from depends/javacheck/CMakeLists.txt rename to libraries/javacheck/CMakeLists.txt diff --git a/depends/javacheck/JavaCheck.java b/libraries/javacheck/JavaCheck.java similarity index 100% rename from depends/javacheck/JavaCheck.java rename to libraries/javacheck/JavaCheck.java diff --git a/depends/launcher/.gitignore b/libraries/launcher/.gitignore similarity index 100% rename from depends/launcher/.gitignore rename to libraries/launcher/.gitignore diff --git a/depends/launcher/CMakeLists.txt b/libraries/launcher/CMakeLists.txt similarity index 100% rename from depends/launcher/CMakeLists.txt rename to libraries/launcher/CMakeLists.txt diff --git a/depends/launcher/net/minecraft/Launcher.java b/libraries/launcher/net/minecraft/Launcher.java similarity index 100% rename from depends/launcher/net/minecraft/Launcher.java rename to libraries/launcher/net/minecraft/Launcher.java diff --git a/depends/launcher/org/multimc/EntryPoint.java b/libraries/launcher/org/multimc/EntryPoint.java similarity index 100% rename from depends/launcher/org/multimc/EntryPoint.java rename to libraries/launcher/org/multimc/EntryPoint.java diff --git a/depends/launcher/org/multimc/IconLoader.java b/libraries/launcher/org/multimc/IconLoader.java similarity index 100% rename from depends/launcher/org/multimc/IconLoader.java rename to libraries/launcher/org/multimc/IconLoader.java diff --git a/depends/launcher/org/multimc/Launcher.java b/libraries/launcher/org/multimc/Launcher.java similarity index 100% rename from depends/launcher/org/multimc/Launcher.java rename to libraries/launcher/org/multimc/Launcher.java diff --git a/depends/launcher/org/multimc/LegacyFrame.java b/libraries/launcher/org/multimc/LegacyFrame.java similarity index 100% rename from depends/launcher/org/multimc/LegacyFrame.java rename to libraries/launcher/org/multimc/LegacyFrame.java diff --git a/depends/launcher/org/multimc/NotFoundException.java b/libraries/launcher/org/multimc/NotFoundException.java similarity index 100% rename from depends/launcher/org/multimc/NotFoundException.java rename to libraries/launcher/org/multimc/NotFoundException.java diff --git a/depends/launcher/org/multimc/ParamBucket.java b/libraries/launcher/org/multimc/ParamBucket.java similarity index 100% rename from depends/launcher/org/multimc/ParamBucket.java rename to libraries/launcher/org/multimc/ParamBucket.java diff --git a/depends/launcher/org/multimc/ParseException.java b/libraries/launcher/org/multimc/ParseException.java similarity index 100% rename from depends/launcher/org/multimc/ParseException.java rename to libraries/launcher/org/multimc/ParseException.java diff --git a/depends/launcher/org/multimc/Utils.java b/libraries/launcher/org/multimc/Utils.java similarity index 100% rename from depends/launcher/org/multimc/Utils.java rename to libraries/launcher/org/multimc/Utils.java diff --git a/depends/launcher/org/multimc/legacy/LegacyLauncher.java b/libraries/launcher/org/multimc/legacy/LegacyLauncher.java similarity index 100% rename from depends/launcher/org/multimc/legacy/LegacyLauncher.java rename to libraries/launcher/org/multimc/legacy/LegacyLauncher.java diff --git a/depends/launcher/org/multimc/onesix/OneSixLauncher.java b/libraries/launcher/org/multimc/onesix/OneSixLauncher.java similarity index 100% rename from depends/launcher/org/multimc/onesix/OneSixLauncher.java rename to libraries/launcher/org/multimc/onesix/OneSixLauncher.java diff --git a/depends/launcher/org/simplericity/macify/eawt/Application.java b/libraries/launcher/org/simplericity/macify/eawt/Application.java similarity index 100% rename from depends/launcher/org/simplericity/macify/eawt/Application.java rename to libraries/launcher/org/simplericity/macify/eawt/Application.java diff --git a/depends/launcher/org/simplericity/macify/eawt/ApplicationAdapter.java b/libraries/launcher/org/simplericity/macify/eawt/ApplicationAdapter.java similarity index 100% rename from depends/launcher/org/simplericity/macify/eawt/ApplicationAdapter.java rename to libraries/launcher/org/simplericity/macify/eawt/ApplicationAdapter.java diff --git a/depends/launcher/org/simplericity/macify/eawt/ApplicationEvent.java b/libraries/launcher/org/simplericity/macify/eawt/ApplicationEvent.java similarity index 100% rename from depends/launcher/org/simplericity/macify/eawt/ApplicationEvent.java rename to libraries/launcher/org/simplericity/macify/eawt/ApplicationEvent.java diff --git a/depends/launcher/org/simplericity/macify/eawt/ApplicationListener.java b/libraries/launcher/org/simplericity/macify/eawt/ApplicationListener.java similarity index 100% rename from depends/launcher/org/simplericity/macify/eawt/ApplicationListener.java rename to libraries/launcher/org/simplericity/macify/eawt/ApplicationListener.java diff --git a/depends/launcher/org/simplericity/macify/eawt/DefaultApplication.java b/libraries/launcher/org/simplericity/macify/eawt/DefaultApplication.java similarity index 100% rename from depends/launcher/org/simplericity/macify/eawt/DefaultApplication.java rename to libraries/launcher/org/simplericity/macify/eawt/DefaultApplication.java diff --git a/depends/libnbtplusplus b/libraries/libnbtplusplus similarity index 100% rename from depends/libnbtplusplus rename to libraries/libnbtplusplus diff --git a/depends/pack200/CMakeLists.txt b/libraries/pack200/CMakeLists.txt similarity index 100% rename from depends/pack200/CMakeLists.txt rename to libraries/pack200/CMakeLists.txt diff --git a/depends/pack200/LICENSE b/libraries/pack200/LICENSE similarity index 100% rename from depends/pack200/LICENSE rename to libraries/pack200/LICENSE diff --git a/depends/pack200/anti200.cpp b/libraries/pack200/anti200.cpp similarity index 100% rename from depends/pack200/anti200.cpp rename to libraries/pack200/anti200.cpp diff --git a/depends/pack200/include/unpack200.h b/libraries/pack200/include/unpack200.h similarity index 100% rename from depends/pack200/include/unpack200.h rename to libraries/pack200/include/unpack200.h diff --git a/depends/pack200/src/bands.cpp b/libraries/pack200/src/bands.cpp similarity index 100% rename from depends/pack200/src/bands.cpp rename to libraries/pack200/src/bands.cpp diff --git a/depends/pack200/src/bands.h b/libraries/pack200/src/bands.h similarity index 100% rename from depends/pack200/src/bands.h rename to libraries/pack200/src/bands.h diff --git a/depends/pack200/src/bytes.cpp b/libraries/pack200/src/bytes.cpp similarity index 100% rename from depends/pack200/src/bytes.cpp rename to libraries/pack200/src/bytes.cpp diff --git a/depends/pack200/src/bytes.h b/libraries/pack200/src/bytes.h similarity index 100% rename from depends/pack200/src/bytes.h rename to libraries/pack200/src/bytes.h diff --git a/depends/pack200/src/coding.cpp b/libraries/pack200/src/coding.cpp similarity index 100% rename from depends/pack200/src/coding.cpp rename to libraries/pack200/src/coding.cpp diff --git a/depends/pack200/src/coding.h b/libraries/pack200/src/coding.h similarity index 100% rename from depends/pack200/src/coding.h rename to libraries/pack200/src/coding.h diff --git a/depends/pack200/src/constants.h b/libraries/pack200/src/constants.h similarity index 100% rename from depends/pack200/src/constants.h rename to libraries/pack200/src/constants.h diff --git a/depends/pack200/src/defines.h b/libraries/pack200/src/defines.h similarity index 100% rename from depends/pack200/src/defines.h rename to libraries/pack200/src/defines.h diff --git a/depends/pack200/src/unpack.cpp b/libraries/pack200/src/unpack.cpp similarity index 100% rename from depends/pack200/src/unpack.cpp rename to libraries/pack200/src/unpack.cpp diff --git a/depends/pack200/src/unpack.h b/libraries/pack200/src/unpack.h similarity index 100% rename from depends/pack200/src/unpack.h rename to libraries/pack200/src/unpack.h diff --git a/depends/pack200/src/unpack200.cpp b/libraries/pack200/src/unpack200.cpp similarity index 100% rename from depends/pack200/src/unpack200.cpp rename to libraries/pack200/src/unpack200.cpp diff --git a/depends/pack200/src/utils.cpp b/libraries/pack200/src/utils.cpp similarity index 100% rename from depends/pack200/src/utils.cpp rename to libraries/pack200/src/utils.cpp diff --git a/depends/pack200/src/utils.h b/libraries/pack200/src/utils.h similarity index 100% rename from depends/pack200/src/utils.h rename to libraries/pack200/src/utils.h diff --git a/depends/pack200/src/zip.cpp b/libraries/pack200/src/zip.cpp similarity index 100% rename from depends/pack200/src/zip.cpp rename to libraries/pack200/src/zip.cpp diff --git a/depends/pack200/src/zip.h b/libraries/pack200/src/zip.h similarity index 100% rename from depends/pack200/src/zip.h rename to libraries/pack200/src/zip.h diff --git a/depends/rainbow/CMakeLists.txt b/libraries/rainbow/CMakeLists.txt similarity index 100% rename from depends/rainbow/CMakeLists.txt rename to libraries/rainbow/CMakeLists.txt diff --git a/depends/rainbow/COPYING.LIB b/libraries/rainbow/COPYING.LIB similarity index 100% rename from depends/rainbow/COPYING.LIB rename to libraries/rainbow/COPYING.LIB diff --git a/depends/rainbow/include/rainbow.h b/libraries/rainbow/include/rainbow.h similarity index 100% rename from depends/rainbow/include/rainbow.h rename to libraries/rainbow/include/rainbow.h diff --git a/depends/rainbow/include/rainbow_config.h b/libraries/rainbow/include/rainbow_config.h similarity index 100% rename from depends/rainbow/include/rainbow_config.h rename to libraries/rainbow/include/rainbow_config.h diff --git a/depends/rainbow/src/rainbow.cpp b/libraries/rainbow/src/rainbow.cpp similarity index 100% rename from depends/rainbow/src/rainbow.cpp rename to libraries/rainbow/src/rainbow.cpp diff --git a/depends/xz-embedded/CMakeLists.txt b/libraries/xz-embedded/CMakeLists.txt similarity index 100% rename from depends/xz-embedded/CMakeLists.txt rename to libraries/xz-embedded/CMakeLists.txt diff --git a/depends/xz-embedded/include/xz.h b/libraries/xz-embedded/include/xz.h similarity index 100% rename from depends/xz-embedded/include/xz.h rename to libraries/xz-embedded/include/xz.h diff --git a/depends/xz-embedded/src/xz_config.h b/libraries/xz-embedded/src/xz_config.h similarity index 100% rename from depends/xz-embedded/src/xz_config.h rename to libraries/xz-embedded/src/xz_config.h diff --git a/depends/xz-embedded/src/xz_crc32.c b/libraries/xz-embedded/src/xz_crc32.c similarity index 100% rename from depends/xz-embedded/src/xz_crc32.c rename to libraries/xz-embedded/src/xz_crc32.c diff --git a/depends/xz-embedded/src/xz_crc64.c b/libraries/xz-embedded/src/xz_crc64.c similarity index 100% rename from depends/xz-embedded/src/xz_crc64.c rename to libraries/xz-embedded/src/xz_crc64.c diff --git a/depends/xz-embedded/src/xz_dec_bcj.c b/libraries/xz-embedded/src/xz_dec_bcj.c similarity index 100% rename from depends/xz-embedded/src/xz_dec_bcj.c rename to libraries/xz-embedded/src/xz_dec_bcj.c diff --git a/depends/xz-embedded/src/xz_dec_lzma2.c b/libraries/xz-embedded/src/xz_dec_lzma2.c similarity index 100% rename from depends/xz-embedded/src/xz_dec_lzma2.c rename to libraries/xz-embedded/src/xz_dec_lzma2.c diff --git a/depends/xz-embedded/src/xz_dec_stream.c b/libraries/xz-embedded/src/xz_dec_stream.c similarity index 100% rename from depends/xz-embedded/src/xz_dec_stream.c rename to libraries/xz-embedded/src/xz_dec_stream.c diff --git a/depends/xz-embedded/src/xz_lzma2.h b/libraries/xz-embedded/src/xz_lzma2.h similarity index 100% rename from depends/xz-embedded/src/xz_lzma2.h rename to libraries/xz-embedded/src/xz_lzma2.h diff --git a/depends/xz-embedded/src/xz_private.h b/libraries/xz-embedded/src/xz_private.h similarity index 100% rename from depends/xz-embedded/src/xz_private.h rename to libraries/xz-embedded/src/xz_private.h diff --git a/depends/xz-embedded/src/xz_stream.h b/libraries/xz-embedded/src/xz_stream.h similarity index 100% rename from depends/xz-embedded/src/xz_stream.h rename to libraries/xz-embedded/src/xz_stream.h diff --git a/depends/xz-embedded/xzminidec.c b/libraries/xz-embedded/xzminidec.c similarity index 100% rename from depends/xz-embedded/xzminidec.c rename to libraries/xz-embedded/xzminidec.c