From ab868df50eb6f9f3958bdc0a7ab9199dcdf46b3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 11 Mar 2017 01:39:45 +0100 Subject: NOISSUE Wonko is the new Meta And then Wonko was the Meta. --- api/logic/CMakeLists.txt | 50 ++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 25 deletions(-) (limited to 'api/logic/CMakeLists.txt') diff --git a/api/logic/CMakeLists.txt b/api/logic/CMakeLists.txt index bcf4b65a..1827b497 100644 --- a/api/logic/CMakeLists.txt +++ b/api/logic/CMakeLists.txt @@ -430,32 +430,32 @@ set(TOOLS_SOURCES tools/MCEditTool.h ) -set(WONKO_SOURCES - # Wonko - wonko/tasks/BaseWonkoEntityRemoteLoadTask.cpp - wonko/tasks/BaseWonkoEntityRemoteLoadTask.h - wonko/tasks/BaseWonkoEntityLocalLoadTask.cpp - wonko/tasks/BaseWonkoEntityLocalLoadTask.h - wonko/format/WonkoFormatV1.cpp - wonko/format/WonkoFormatV1.h - wonko/format/WonkoFormat.cpp - wonko/format/WonkoFormat.h - wonko/BaseWonkoEntity.cpp - wonko/BaseWonkoEntity.h - wonko/WonkoVersionList.cpp - wonko/WonkoVersionList.h - wonko/WonkoVersion.cpp - wonko/WonkoVersion.h - wonko/WonkoIndex.cpp - wonko/WonkoIndex.h - wonko/WonkoUtil.cpp - wonko/WonkoUtil.h - wonko/WonkoReference.cpp - wonko/WonkoReference.h +set(META_SOURCES + # Metadata sources + meta/tasks/RemoteLoadTask.cpp + meta/tasks/RemoteLoadTask.h + meta/tasks/LocalLoadTask.cpp + meta/tasks/LocalLoadTask.h + meta/format/FormatV1.cpp + meta/format/FormatV1.h + meta/format/Format.cpp + meta/format/Format.h + meta/BaseEntity.cpp + meta/BaseEntity.h + meta/VersionList.cpp + meta/VersionList.h + meta/Version.cpp + meta/Version.h + meta/Index.cpp + meta/Index.h + meta/Util.cpp + meta/Util.h + meta/Reference.cpp + meta/Reference.h ) -add_unit_test(WonkoIndex - SOURCES wonko/WonkoIndex_test.cpp +add_unit_test(Index + SOURCES meta/Index_test.cpp LIBS MultiMC_logic ) @@ -480,7 +480,7 @@ set(LOGIC_SOURCES ${JAVA_SOURCES} ${TRANSLATIONS_SOURCES} ${TOOLS_SOURCES} - ${WONKO_SOURCES} + ${META_SOURCES} ${ICONS_SOURCES} ) -- cgit v1.2.3 From 2980322c3b34b252ead838daee7a844853feccf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 12 Mar 2017 19:45:28 +0100 Subject: NOISSUE Remove Minecraft version list and versions. --- api/logic/CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) (limited to 'api/logic/CMakeLists.txt') diff --git a/api/logic/CMakeLists.txt b/api/logic/CMakeLists.txt index 1827b497..f14b8662 100644 --- a/api/logic/CMakeLists.txt +++ b/api/logic/CMakeLists.txt @@ -252,10 +252,6 @@ set(MINECRAFT_SOURCES minecraft/JarMod.h minecraft/MinecraftInstance.cpp minecraft/MinecraftInstance.h - minecraft/MinecraftVersion.cpp - minecraft/MinecraftVersion.h - minecraft/MinecraftVersionList.cpp - minecraft/MinecraftVersionList.h minecraft/Rule.cpp minecraft/Rule.h minecraft/OpSys.cpp -- cgit v1.2.3 From 40cf38bc3225c614e7e81d074f890e6f9da0507b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 12 Mar 2017 23:19:45 +0100 Subject: NOISSUE remove liteloader and forge --- api/logic/CMakeLists.txt | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'api/logic/CMakeLists.txt') diff --git a/api/logic/CMakeLists.txt b/api/logic/CMakeLists.txt index f14b8662..b605fbd3 100644 --- a/api/logic/CMakeLists.txt +++ b/api/logic/CMakeLists.txt @@ -296,22 +296,10 @@ set(MINECRAFT_SOURCES minecraft/AssetsUtils.cpp # Forge and all things forge related - minecraft/forge/ForgeVersion.h - minecraft/forge/ForgeVersion.cpp - minecraft/forge/ForgeVersionList.h - minecraft/forge/ForgeVersionList.cpp minecraft/forge/ForgeXzDownload.h minecraft/forge/ForgeXzDownload.cpp - minecraft/forge/LegacyForge.h - minecraft/forge/LegacyForge.cpp - minecraft/forge/ForgeInstaller.h - minecraft/forge/ForgeInstaller.cpp - - # Liteloader and related things - minecraft/liteloader/LiteLoaderInstaller.h - minecraft/liteloader/LiteLoaderInstaller.cpp - minecraft/liteloader/LiteLoaderVersionList.h - minecraft/liteloader/LiteLoaderVersionList.cpp + + # Skin upload utilities minecraft/SkinUpload.cpp minecraft/SkinUpload.h ) -- cgit v1.2.3 From 0060b506257b906d40ef53d1e23404dba76afcee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Fri, 17 Mar 2017 01:48:54 +0100 Subject: NOISSUE simplify. --- api/logic/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) (limited to 'api/logic/CMakeLists.txt') diff --git a/api/logic/CMakeLists.txt b/api/logic/CMakeLists.txt index b605fbd3..42754157 100644 --- a/api/logic/CMakeLists.txt +++ b/api/logic/CMakeLists.txt @@ -420,8 +420,6 @@ set(META_SOURCES meta/tasks/RemoteLoadTask.h meta/tasks/LocalLoadTask.cpp meta/tasks/LocalLoadTask.h - meta/format/FormatV1.cpp - meta/format/FormatV1.h meta/format/Format.cpp meta/format/Format.h meta/BaseEntity.cpp -- cgit v1.2.3 From e46aba9da584338db8d8a1a8a487bdcc6cf84343 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 18 Mar 2017 02:22:36 +0100 Subject: NOISSUE sanitize loading and downloading of metadata files --- api/logic/CMakeLists.txt | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'api/logic/CMakeLists.txt') diff --git a/api/logic/CMakeLists.txt b/api/logic/CMakeLists.txt index 42754157..544ace80 100644 --- a/api/logic/CMakeLists.txt +++ b/api/logic/CMakeLists.txt @@ -416,12 +416,8 @@ set(TOOLS_SOURCES set(META_SOURCES # Metadata sources - meta/tasks/RemoteLoadTask.cpp - meta/tasks/RemoteLoadTask.h - meta/tasks/LocalLoadTask.cpp - meta/tasks/LocalLoadTask.h - meta/format/Format.cpp - meta/format/Format.h + meta/JsonFormat.cpp + meta/JsonFormat.h meta/BaseEntity.cpp meta/BaseEntity.h meta/VersionList.cpp @@ -430,8 +426,6 @@ set(META_SOURCES meta/Version.h meta/Index.cpp meta/Index.h - meta/Util.cpp - meta/Util.h meta/Reference.cpp meta/Reference.h ) -- cgit v1.2.3 From da4ae1bc1ec74cdb4e75f4ebac30886ba4a1909c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Fri, 24 Mar 2017 02:26:06 +0100 Subject: NOISSUE reimplement package dependencies It is now stored as a hashmap There is also a parentUid to limit depsolving by encapsulating by version --- api/logic/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) (limited to 'api/logic/CMakeLists.txt') diff --git a/api/logic/CMakeLists.txt b/api/logic/CMakeLists.txt index 544ace80..7f04a41e 100644 --- a/api/logic/CMakeLists.txt +++ b/api/logic/CMakeLists.txt @@ -426,8 +426,6 @@ set(META_SOURCES meta/Version.h meta/Index.cpp meta/Index.h - meta/Reference.cpp - meta/Reference.h ) add_unit_test(Index -- cgit v1.2.3 From 5fabb4f2546fa6b79a4e2c29679f506e587a0070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 27 Mar 2017 03:34:39 +0200 Subject: NOISSUE Rough refactor of ProfilePatch and VersionFile internals. They are now distinct classes with distinct responsibilities. * ProfilePatch is an entry in MinecraftProfile and can hold VersionFile or Meta::Version. * VersionFile is the basic element that holds version information loaded from JSON. * Meta::Version is the loader class for VersionFile(s) from a server. --- api/logic/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'api/logic/CMakeLists.txt') diff --git a/api/logic/CMakeLists.txt b/api/logic/CMakeLists.txt index 7f04a41e..da673c13 100644 --- a/api/logic/CMakeLists.txt +++ b/api/logic/CMakeLists.txt @@ -267,6 +267,7 @@ set(MINECRAFT_SOURCES minecraft/VersionBuildError.h minecraft/VersionFile.cpp minecraft/VersionFile.h + minecraft/ProfilePatch.cpp minecraft/ProfilePatch.h minecraft/VersionFilterData.h minecraft/VersionFilterData.cpp -- cgit v1.2.3