X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fmods.h;h=af7777d18444eb5a6130288f5ba8f6671404ef15;hb=78ff5c193683fc643fbec85dc398da91d91a9e44;hp=59dffdade544ffab4a75ad1c8c36ccfcf42d8636;hpb=13358c29b8a754709c49b0ba997f029af26134bc;p=dragonfireclient.git diff --git a/src/mods.h b/src/mods.h index 59dffdade..af7777d18 100644 --- a/src/mods.h +++ b/src/mods.h @@ -1,6 +1,6 @@ /* -Minetest-c55 -Copyright (C) 2011 celeron55, Perttu Ahola +Minetest +Copyright (C) 2013 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -21,30 +21,15 @@ with this program; if not, write to the Free Software Foundation, Inc., #define MODS_HEADER #include "irrlichttypes.h" -#include #include #include #include #include #include -#include +#include +#include "config.h" -class ModError : public std::exception -{ -public: - ModError(const std::string &s) - { - m_s = "ModError: "; - m_s += s; - } - virtual ~ModError() throw() - {} - virtual const char * what() const throw() - { - return m_s.c_str(); - } - std::string m_s; -}; +#define MODNAME_ALLOWED_CHARS "abcdefghijklmnopqrstuvwxyz0123456789_" struct ModSpec { @@ -52,24 +37,32 @@ struct ModSpec std::string path; //if normal mod: std::set depends; + std::set optdepends; std::set unsatisfied_depends; + bool part_of_modpack; bool is_modpack; // if modpack: std::map modpack_content; - ModSpec(const std::string name_="", const std::string path_="", - const std::set depends_=std::set()): + ModSpec(const std::string &name_="", const std::string &path_=""): name(name_), path(path_), - depends(depends_), - unsatisfied_depends(depends_), - is_modpack(false), - modpack_content() + depends(), + optdepends(), + unsatisfied_depends(), + part_of_modpack(false), + is_modpack(false), + modpack_content() {} }; +// Retrieves depends, optdepends, is_modpack and modpack_content +void parseModContents(ModSpec &mod); + +std::map getModsInPath(std::string path, bool part_of_modpack = false); -std::map getModsInPath(std::string path); +// If failed, returned modspec has name=="" +ModSpec findCommonMod(const std::string &modname); // expands modpack contents, but does not replace them. std::map flattenModTree(std::map mods); @@ -77,10 +70,6 @@ std::map flattenModTree(std::map mod // replaces modpack Modspecs with their content std::vector flattenMods(std::map mods); -// removes Mods mentioned in exclude_mod_names -std::vector filterMods(std::vector mods, - std::set exclude_mod_names); - // a ModConfiguration is a subset of installed mods, expected to have // all dependencies fullfilled, so it can be used as a list of mods to // load when the game starts. @@ -89,25 +78,12 @@ class ModConfiguration public: ModConfiguration(): m_unsatisfied_mods(), - m_sorted_mods() + m_sorted_mods(), + m_name_conflicts() {} - - ModConfiguration(std::string worldpath); - // adds all mods in the given path. used for games, modpacks - // and world-specific mods (worldmods-folders) - void addModsInPath(std::string path) - { - addMods(flattenMods(getModsInPath(path))); - } - - // adds all mods in the given path whose name does not appear - // in the exclude_mods set. - void addModsInPathFiltered(std::string path, std::set exclude_mods); - - // adds all mods in the set. - void addMods(std::vector mods); + ModConfiguration(std::string worldpath); // checks if all dependencies are fullfilled. bool isConsistent() @@ -120,17 +96,27 @@ class ModConfiguration return m_sorted_mods; } - std::list getUnsatisfiedMods() + std::vector getUnsatisfiedMods() { return m_unsatisfied_mods; } private: + // adds all mods in the given path. used for games, modpacks + // and world-specific mods (worldmods-folders) + void addModsInPath(std::string path); - // mods with unmet dependencies. This is a list and not a - // vector because we want easy removal of elements at every - // position. - std::list m_unsatisfied_mods; + // adds all mods in the set. + void addMods(std::vector new_mods); + + // move mods from m_unsatisfied_mods to m_sorted_mods + // in an order that satisfies dependencies + void resolveDependencies(); + + // mods with unmet dependencies. Before dependencies are resolved, + // this is where all mods are stored. Afterwards this contains + // only the ones with really unsatisfied dependencies. + std::vector m_unsatisfied_mods; // list of mods sorted such that they can be loaded in the // given order with all dependencies being fullfilled. I.e., @@ -138,8 +124,85 @@ class ModConfiguration // appear earlier in the vector. std::vector m_sorted_mods; -}; + // set of mod names for which an unresolved name conflict + // exists. A name conflict happens when two or more mods + // at the same level have the same name but different paths. + // Levels (mods in higher levels override mods in lower levels): + // 1. game mod in modpack; 2. game mod; + // 3. world mod in modpack; 4. world mod; + // 5. addon mod in modpack; 6. addon mod. + std::set m_name_conflicts; +}; +#if USE_CURL +Json::Value getModstoreUrl(std::string url); +#else +inline Json::Value getModstoreUrl(std::string url) { + return Json::Value(); +} #endif +struct ModLicenseInfo { + int id; + std::string shortinfo; + std::string url; +}; + +struct ModAuthorInfo { + int id; + std::string username; +}; + +struct ModStoreMod { + int id; + std::string title; + std::string basename; + ModAuthorInfo author; + float rating; + bool valid; +}; + +struct ModStoreCategoryInfo { + int id; + std::string name; +}; + +struct ModStoreVersionEntry { + int id; + std::string date; + std::string file; + bool approved; + //ugly version number + int mtversion; +}; + +struct ModStoreTitlePic { + int id; + std::string file; + std::string description; + int mod; +}; + +struct ModStoreModDetails { + /* version_set?? */ + std::vector categories; + ModAuthorInfo author; + ModLicenseInfo license; + ModStoreTitlePic titlepic; + int id; + std::string title; + std::string basename; + std::string description; + std::string repository; + float rating; + std::vector depends; + std::vector softdeps; + + std::string download_url; + std::string screenshot_url; + std::vector versions; + bool valid; +}; + +#endif