From f71479ec33562c9a0ebbdb335bef5e2824a12710 Mon Sep 17 00:00:00 2001 From: Andrew Date: Wed, 20 Feb 2013 08:32:26 -0600 Subject: Added stdinstance plugin and a ton of plugin stuff. --- plugins/stdinstance/CMakeLists.txt | 31 +++++++++++++++++++ plugins/stdinstance/stdinstance.cpp | 53 +++++++++++++++++++++++++++++++++ plugins/stdinstance/stdinstance.h | 36 ++++++++++++++++++++++ plugins/stdinstance/stdinstance.json | 1 + plugins/stdinstance/stdinstancetype.cpp | 34 +++++++++++++++++++++ plugins/stdinstance/stdinstancetype.h | 38 +++++++++++++++++++++++ plugins/stdinstance/stdinstplugin.cpp | 27 +++++++++++++++++ plugins/stdinstance/stdinstplugin.h | 33 ++++++++++++++++++++ 8 files changed, 253 insertions(+) create mode 100644 plugins/stdinstance/CMakeLists.txt create mode 100644 plugins/stdinstance/stdinstance.cpp create mode 100644 plugins/stdinstance/stdinstance.h create mode 100644 plugins/stdinstance/stdinstance.json create mode 100644 plugins/stdinstance/stdinstancetype.cpp create mode 100644 plugins/stdinstance/stdinstancetype.h create mode 100644 plugins/stdinstance/stdinstplugin.cpp create mode 100644 plugins/stdinstance/stdinstplugin.h (limited to 'plugins') diff --git a/plugins/stdinstance/CMakeLists.txt b/plugins/stdinstance/CMakeLists.txt new file mode 100644 index 00000000..503bda75 --- /dev/null +++ b/plugins/stdinstance/CMakeLists.txt @@ -0,0 +1,31 @@ +project(stdinstance) + +ADD_DEFINITIONS(-DQT_PLUGIN) + +# Find Qt +find_package(Qt5Core REQUIRED) +find_package(Qt5Network REQUIRED) + +# Include Qt headers. +include_directories(${Qt5Base_INCLUDE_DIRS}) +include_directories(${Qt5Network_INCLUDE_DIRS}) + +# Include MultiMC's headers. +include_directories(../../) + +SET(STDINST_HEADERS +stdinstplugin.h +stdinstancetype.h +stdinstance.h +) + +SET(STDINST_SOURCES +stdinstplugin.cpp +stdinstancetype.cpp +stdinstance.cpp +) + +add_library(stdinstance SHARED ${STDINST_SOURCES} ${STDINST_HEADERS}) +set_target_properties(stdinstance PROPERTIES PREFIX "") +qt5_use_modules(stdinstance Core Network) +target_link_libraries(stdinstance quazip patchlib) diff --git a/plugins/stdinstance/stdinstance.cpp b/plugins/stdinstance/stdinstance.cpp new file mode 100644 index 00000000..19490965 --- /dev/null +++ b/plugins/stdinstance/stdinstance.cpp @@ -0,0 +1,53 @@ +/* Copyright 2013 MultiMC Contributors + * + * 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. + */ + +#include "stdinstance.h" + +#include + +#include + +StdInstance::StdInstance(const QString &rootDir, QObject *parent) : + Instance(rootDir, parent) +{ + +} + +bool StdInstance::shouldUpdateCurrentVersion() +{ + QFileInfo jar(mcJar()); + return jar.lastModified().toUTC().toMSecsSinceEpoch() != lastVersionUpdate(); +} + +void StdInstance::updateCurrentVersion(bool keepCurrent) +{ + QFileInfo jar(mcJar()); + + if(!jar.exists()) + { + setLastVersionUpdate(0); + setCurrentVersion("Unknown"); + return; + } + + qint64 time = jar.lastModified().toUTC().toMSecsSinceEpoch(); + + setLastVersionUpdate(time); + if (!keepCurrent) + { + QString newVersion = javautils::GetMinecraftJarVersion(jar.absoluteFilePath()); + setCurrentVersion(newVersion); + } +} diff --git a/plugins/stdinstance/stdinstance.h b/plugins/stdinstance/stdinstance.h new file mode 100644 index 00000000..17c03f15 --- /dev/null +++ b/plugins/stdinstance/stdinstance.h @@ -0,0 +1,36 @@ +/* Copyright 2013 MultiMC Contributors + * + * 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. + */ + +#ifndef STDINSTANCE_H +#define STDINSTANCE_H + +#include + +class StdInstance : public Instance +{ + Q_OBJECT +public: + explicit StdInstance(const QString &rootDir, QObject *parent = 0); + + virtual bool shouldUpdateCurrentVersion(); + + virtual void updateCurrentVersion(bool keepCurrent); + + ////// TIMESTAMPS ////// + virtual qint64 lastVersionUpdate() { return getField("lastVersionUpdate", 0).value(); } + virtual void setLastVersionUpdate(qint64 val) { setField("lastVersionUpdate", val); } +}; + +#endif // STDINSTANCE_H diff --git a/plugins/stdinstance/stdinstance.json b/plugins/stdinstance/stdinstance.json new file mode 100644 index 00000000..0967ef42 --- /dev/null +++ b/plugins/stdinstance/stdinstance.json @@ -0,0 +1 @@ +{} diff --git a/plugins/stdinstance/stdinstancetype.cpp b/plugins/stdinstance/stdinstancetype.cpp new file mode 100644 index 00000000..3e9e00a0 --- /dev/null +++ b/plugins/stdinstance/stdinstancetype.cpp @@ -0,0 +1,34 @@ +/* Copyright 2013 MultiMC Contributors + * + * 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. + */ + +#include "stdinstancetype.h" + +StdInstanceType::StdInstanceType(QObject *parent) : + InstanceType(parent) +{ + +} + +InstanceLoader::InstTypeError StdInstanceType::createInstance(Instance *inst, + const QString &instDir) const +{ + return InstanceLoader::NoError; +} + +InstanceLoader::InstTypeError StdInstanceType::loadInstance(Instance *inst, + const QString &instDir) const +{ + return InstanceLoader::NoError; +} diff --git a/plugins/stdinstance/stdinstancetype.h b/plugins/stdinstance/stdinstancetype.h new file mode 100644 index 00000000..9516aa80 --- /dev/null +++ b/plugins/stdinstance/stdinstancetype.h @@ -0,0 +1,38 @@ +/* Copyright 2013 MultiMC Contributors + * + * 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. + */ + +#ifndef STDINSTANCETYPE_H +#define STDINSTANCETYPE_H + +#include + +class StdInstanceType : public InstanceType +{ + Q_OBJECT +public: + explicit StdInstanceType(QObject *parent = 0); + + virtual QString typeID() const { return "net.forkk.MultiMC.StdInstance"; } + + virtual QString displayName() const { return "Standard Instance"; } + + virtual QString description() const { return "A standard Minecraft instance."; } + + virtual InstanceLoader::InstTypeError createInstance(Instance *inst, const QString &instDir) const; + + virtual InstanceLoader::InstTypeError loadInstance(Instance *inst, const QString &instDir) const; +}; + +#endif // STDINSTANCETYPE_H diff --git a/plugins/stdinstance/stdinstplugin.cpp b/plugins/stdinstance/stdinstplugin.cpp new file mode 100644 index 00000000..98e12ae0 --- /dev/null +++ b/plugins/stdinstance/stdinstplugin.cpp @@ -0,0 +1,27 @@ +/* Copyright 2013 MultiMC Contributors + * + * 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. + */ + +#include "stdinstplugin.h" + +#include + +#include "stdinstancetype.h" + +QList StdInstPlugin::getInstanceTypes() +{ + QList types; + types.push_back(new StdInstanceType(this)); + return types; +} diff --git a/plugins/stdinstance/stdinstplugin.h b/plugins/stdinstance/stdinstplugin.h new file mode 100644 index 00000000..f44409bd --- /dev/null +++ b/plugins/stdinstance/stdinstplugin.h @@ -0,0 +1,33 @@ +/* Copyright 2013 MultiMC Contributors + * + * 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. + */ + +#ifndef STDINSTPLUGIN_H +#define STDINSTPLUGIN_H + +#include + +#include + +class StdInstPlugin : public QObject, InstanceTypePlugin +{ + Q_OBJECT + Q_INTERFACES(InstanceTypePlugin) + Q_PLUGIN_METADATA(IID "net.forkk.MultiMC.Plugins.StdInstance") + +public: + virtual QList getInstanceTypes(); +}; + +#endif // STDINSTPLUGIN_H -- cgit v1.2.3 From dd2e836b4cf4cfa043f9ea2911f58f1d22d4e282 Mon Sep 17 00:00:00 2001 From: Andrew Date: Wed, 20 Feb 2013 19:10:09 -0600 Subject: Split MultiMC up into a few separate libraries. Fixed plugin system. Tons of other stuff... --- plugins/stdinstance/CMakeLists.txt | 28 +++++++++++++++++++++++----- plugins/stdinstance/stdinstance.cpp | 5 +++-- plugins/stdinstance/stdinstance.h | 2 +- plugins/stdinstance/stdinstance.json | 9 ++++++++- plugins/stdinstance/stdinstancetype.cpp | 2 +- plugins/stdinstance/stdinstancetype.h | 8 ++++++-- plugins/stdinstance/stdinstplugin.cpp | 27 --------------------------- plugins/stdinstance/stdinstplugin.h | 33 --------------------------------- 8 files changed, 42 insertions(+), 72 deletions(-) delete mode 100644 plugins/stdinstance/stdinstplugin.cpp delete mode 100644 plugins/stdinstance/stdinstplugin.h (limited to 'plugins') diff --git a/plugins/stdinstance/CMakeLists.txt b/plugins/stdinstance/CMakeLists.txt index 503bda75..0bb466ec 100644 --- a/plugins/stdinstance/CMakeLists.txt +++ b/plugins/stdinstance/CMakeLists.txt @@ -10,22 +10,40 @@ find_package(Qt5Network REQUIRED) include_directories(${Qt5Base_INCLUDE_DIRS}) include_directories(${Qt5Network_INCLUDE_DIRS}) -# Include MultiMC's headers. -include_directories(../../) +# Include the Java library. +include_directories(${CMAKE_SOURCE_DIR}/java) + +# Include utils library headers. +include_directories(${CMAKE_SOURCE_DIR}/libutil/include) + +# Include settings library headers. +include_directories(${CMAKE_SOURCE_DIR}/libsettings/include) + +# Include instance library headers. +include_directories(${CMAKE_SOURCE_DIR}libinstance/include) SET(STDINST_HEADERS -stdinstplugin.h stdinstancetype.h stdinstance.h ) SET(STDINST_SOURCES -stdinstplugin.cpp stdinstancetype.cpp stdinstance.cpp ) add_library(stdinstance SHARED ${STDINST_SOURCES} ${STDINST_HEADERS}) + set_target_properties(stdinstance PROPERTIES PREFIX "") +set_target_properties(stdinstance PROPERTIES RUNTIME_OUTPUT_DIRECTORY "..") + qt5_use_modules(stdinstance Core Network) -target_link_libraries(stdinstance quazip patchlib) +target_link_libraries(stdinstance +quazip +patchlib + +# Link the util, settings, and instance libraries. +libmmcutil +libmmcsettings +libmmcinst +) diff --git a/plugins/stdinstance/stdinstance.cpp b/plugins/stdinstance/stdinstance.cpp index 19490965..12d86bbc 100644 --- a/plugins/stdinstance/stdinstance.cpp +++ b/plugins/stdinstance/stdinstance.cpp @@ -17,7 +17,7 @@ #include -#include +#include StdInstance::StdInstance(const QString &rootDir, QObject *parent) : Instance(rootDir, parent) @@ -47,7 +47,8 @@ void StdInstance::updateCurrentVersion(bool keepCurrent) setLastVersionUpdate(time); if (!keepCurrent) { - QString newVersion = javautils::GetMinecraftJarVersion(jar.absoluteFilePath()); + // TODO: Implement GetMinecraftJarVersion function. + QString newVersion = "Unknown";//javautils::GetMinecraftJarVersion(jar.absoluteFilePath()); setCurrentVersion(newVersion); } } diff --git a/plugins/stdinstance/stdinstance.h b/plugins/stdinstance/stdinstance.h index 17c03f15..d812a9b0 100644 --- a/plugins/stdinstance/stdinstance.h +++ b/plugins/stdinstance/stdinstance.h @@ -16,7 +16,7 @@ #ifndef STDINSTANCE_H #define STDINSTANCE_H -#include +#include class StdInstance : public Instance { diff --git a/plugins/stdinstance/stdinstance.json b/plugins/stdinstance/stdinstance.json index 0967ef42..704f0b73 100644 --- a/plugins/stdinstance/stdinstance.json +++ b/plugins/stdinstance/stdinstance.json @@ -1 +1,8 @@ -{} +{ + "api": "MultiMC5-API-1", + + "name": "Standard Instance Plugin", + "summary": "A plugin that provides standard Minecraft instances.", + "description": "This is a built-in plugin that provides the standard Minecraft instance.", + "version": "0.1" +} diff --git a/plugins/stdinstance/stdinstancetype.cpp b/plugins/stdinstance/stdinstancetype.cpp index 3e9e00a0..9b7aa994 100644 --- a/plugins/stdinstance/stdinstancetype.cpp +++ b/plugins/stdinstance/stdinstancetype.cpp @@ -16,7 +16,7 @@ #include "stdinstancetype.h" StdInstanceType::StdInstanceType(QObject *parent) : - InstanceType(parent) + QObject(parent) { } diff --git a/plugins/stdinstance/stdinstancetype.h b/plugins/stdinstance/stdinstancetype.h index 9516aa80..4f659ba7 100644 --- a/plugins/stdinstance/stdinstancetype.h +++ b/plugins/stdinstance/stdinstancetype.h @@ -16,11 +16,15 @@ #ifndef STDINSTANCETYPE_H #define STDINSTANCETYPE_H -#include +#include -class StdInstanceType : public InstanceType +#define StdInstanceType_IID "net.forkk.MultiMC.StdInstanceType/0.1" + +class StdInstanceType : public QObject, InstanceTypeInterface { Q_OBJECT + Q_PLUGIN_METADATA(IID StdInstanceType_IID FILE "stdinstance.json") + Q_INTERFACES(InstanceTypeInterface) public: explicit StdInstanceType(QObject *parent = 0); diff --git a/plugins/stdinstance/stdinstplugin.cpp b/plugins/stdinstance/stdinstplugin.cpp deleted file mode 100644 index 98e12ae0..00000000 --- a/plugins/stdinstance/stdinstplugin.cpp +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2013 MultiMC Contributors - * - * 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. - */ - -#include "stdinstplugin.h" - -#include - -#include "stdinstancetype.h" - -QList StdInstPlugin::getInstanceTypes() -{ - QList types; - types.push_back(new StdInstanceType(this)); - return types; -} diff --git a/plugins/stdinstance/stdinstplugin.h b/plugins/stdinstance/stdinstplugin.h deleted file mode 100644 index f44409bd..00000000 --- a/plugins/stdinstance/stdinstplugin.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2013 MultiMC Contributors - * - * 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. - */ - -#ifndef STDINSTPLUGIN_H -#define STDINSTPLUGIN_H - -#include - -#include - -class StdInstPlugin : public QObject, InstanceTypePlugin -{ - Q_OBJECT - Q_INTERFACES(InstanceTypePlugin) - Q_PLUGIN_METADATA(IID "net.forkk.MultiMC.Plugins.StdInstance") - -public: - virtual QList getInstanceTypes(); -}; - -#endif // STDINSTPLUGIN_H -- cgit v1.2.3 From f3b6eeeac4e1606a288c7f12fec271fbb7f120f6 Mon Sep 17 00:00:00 2001 From: Andrew Date: Wed, 20 Feb 2013 19:45:00 -0600 Subject: Got instance loading working. --- plugins/stdinstance/stdinstancetype.cpp | 28 ++++++++++++++++++++++++++-- plugins/stdinstance/stdinstancetype.h | 4 ++-- 2 files changed, 28 insertions(+), 4 deletions(-) (limited to 'plugins') diff --git a/plugins/stdinstance/stdinstancetype.cpp b/plugins/stdinstance/stdinstancetype.cpp index 9b7aa994..5a3a6649 100644 --- a/plugins/stdinstance/stdinstancetype.cpp +++ b/plugins/stdinstance/stdinstancetype.cpp @@ -15,20 +15,44 @@ #include "stdinstancetype.h" +#include +#include + +#include "stdinstance.h" + StdInstanceType::StdInstanceType(QObject *parent) : QObject(parent) { } -InstanceLoader::InstTypeError StdInstanceType::createInstance(Instance *inst, +InstanceLoader::InstTypeError StdInstanceType::createInstance(Instance *&inst, const QString &instDir) const { + QFileInfo rootDir(instDir); + + if (!rootDir.exists() && !QDir().mkdir(rootDir.path())) + { + return InstanceLoader::CantCreateDir; + } + + StdInstance *stdInst = new StdInstance(instDir); + + // TODO: Verify that the instance is valid. + + inst = stdInst; + return InstanceLoader::NoError; } -InstanceLoader::InstTypeError StdInstanceType::loadInstance(Instance *inst, +InstanceLoader::InstTypeError StdInstanceType::loadInstance(Instance *&inst, const QString &instDir) const { + StdInstance *stdInst = new StdInstance(instDir); + + // TODO: Verify that the instance is valid. + + inst = stdInst; + return InstanceLoader::NoError; } diff --git a/plugins/stdinstance/stdinstancetype.h b/plugins/stdinstance/stdinstancetype.h index 4f659ba7..b8382a97 100644 --- a/plugins/stdinstance/stdinstancetype.h +++ b/plugins/stdinstance/stdinstancetype.h @@ -34,9 +34,9 @@ public: virtual QString description() const { return "A standard Minecraft instance."; } - virtual InstanceLoader::InstTypeError createInstance(Instance *inst, const QString &instDir) const; + virtual InstanceLoader::InstTypeError createInstance(Instance *&inst, const QString &instDir) const; - virtual InstanceLoader::InstTypeError loadInstance(Instance *inst, const QString &instDir) const; + virtual InstanceLoader::InstTypeError loadInstance(Instance *&inst, const QString &instDir) const; }; #endif // STDINSTANCETYPE_H -- cgit v1.2.3