Move some of the modules in extras/ that arent really extra out of extras. Mark our modules as VENDOR and allow modules to have multple types.

7 files changed, 7 insertions, 14 deletions

diff --git a/modules/pseudoclients/botserv.cpp b/modules/pseudoclients/botserv.cpp
index 2f157b809..29c1b1143 100644
--- a/modules/pseudoclients/botserv.cpp
+++ b/modules/pseudoclients/botserv.cpp
@@ -16,9 +16,8 @@
 class BotServCore : public Module
 {
  public:
-	BotServCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE)
+	BotServCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PSEUDOCLIENT | VENDOR)
 	{
-		this->SetAuthor("Anope");
 
 		BotServ = BotInfo::Find(Config->BotServ);
 		if (!BotServ)
diff --git a/modules/pseudoclients/chanserv.cpp b/modules/pseudoclients/chanserv.cpp
index 21a2f75f7..2c5cffcea 100644
--- a/modules/pseudoclients/chanserv.cpp
+++ b/modules/pseudoclients/chanserv.cpp
@@ -67,9 +67,8 @@ class ChanServCore : public Module
 	ExpireCallback expires;
 
  public:
-	ChanServCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), expires(this)
+	ChanServCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PSEUDOCLIENT | VENDOR), expires(this)
 	{
-		this->SetAuthor("Anope");
 
 		ChanServ  = BotInfo::Find(Config->ChanServ);
 		if (!ChanServ)
diff --git a/modules/pseudoclients/global.cpp b/modules/pseudoclients/global.cpp
index 62a3d1609..02b199afa 100644
--- a/modules/pseudoclients/global.cpp
+++ b/modules/pseudoclients/global.cpp
@@ -48,10 +48,9 @@ class GlobalCore : public Module
 	MyGlobalService myglobalservice;
 
  public:
-	GlobalCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
+	GlobalCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PSEUDOCLIENT | VENDOR),
 		myglobalservice(this)
 	{
-		this->SetAuthor("Anope");
 
 		Global = BotInfo::Find(Config->Global);
 		if (!Global)
diff --git a/modules/pseudoclients/hostserv.cpp b/modules/pseudoclients/hostserv.cpp
index f11526e7a..d8cd74d69 100644
--- a/modules/pseudoclients/hostserv.cpp
+++ b/modules/pseudoclients/hostserv.cpp
@@ -16,9 +16,8 @@
 class HostServCore : public Module
 {
  public:
-	HostServCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE)
+	HostServCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PSEUDOCLIENT | VENDOR)
 	{
-		this->SetAuthor("Anope");
 
 		if (!IRCD || !IRCD->CanSetVHost)
 			throw ModuleException("Your IRCd does not support vhosts");
diff --git a/modules/pseudoclients/memoserv.cpp b/modules/pseudoclients/memoserv.cpp
index d28774e34..5eca5cd4e 100644
--- a/modules/pseudoclients/memoserv.cpp
+++ b/modules/pseudoclients/memoserv.cpp
@@ -140,10 +140,9 @@ class MemoServCore : public Module
 {
 	MyMemoServService mymemoserv;
  public:
-	MemoServCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
+	MemoServCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PSEUDOCLIENT | VENDOR),
 		mymemoserv(this)
 	{
-		this->SetAuthor("Anope");
 
 		MemoServ = BotInfo::Find(Config->MemoServ);
 		if (!MemoServ)
diff --git a/modules/pseudoclients/nickserv.cpp b/modules/pseudoclients/nickserv.cpp
index 35319e552..cde1fbbf7 100644
--- a/modules/pseudoclients/nickserv.cpp
+++ b/modules/pseudoclients/nickserv.cpp
@@ -189,9 +189,8 @@ class NickServCore : public Module
 	ExpireCallback expires;
 
  public:
-	NickServCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE), mynickserv(this), expires(this)
+	NickServCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PSEUDOCLIENT | VENDOR), mynickserv(this), expires(this)
 	{
-		this->SetAuthor("Anope");
 
 		NickServ = BotInfo::Find(Config->NickServ);
 		if (!NickServ)
diff --git a/modules/pseudoclients/operserv.cpp b/modules/pseudoclients/operserv.cpp
index b2463dc4f..ab67ceb47 100644
--- a/modules/pseudoclients/operserv.cpp
+++ b/modules/pseudoclients/operserv.cpp
@@ -158,10 +158,9 @@ class OperServCore : public Module
 	SNLineManager snlines;
 
  public:
-	OperServCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, CORE),
+	OperServCore(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator, PSEUDOCLIENT | VENDOR),
 		sglines(this), sqlines(this), snlines(this)
 	{
-		this->SetAuthor("Anope");
 
 		OperServ = BotInfo::Find(Config->OperServ);
 		if (!OperServ)