From b9c6c47db4666d2622c7c5f9c94922cb18e9c27a Mon Sep 17 00:00:00 2001
From: rtldg <55846624+rtldg@users.noreply.github.com>
Date: Thu, 28 Oct 2021 21:18:53 +0000
Subject: [PATCH] swap #include <shavit> with <shavit/core>

---
 addons/sourcemod/scripting/shavit-chat.sp            | 2 +-
 addons/sourcemod/scripting/shavit-checkpoints.sp     | 2 +-
 addons/sourcemod/scripting/shavit-core.sp            | 2 +-
 addons/sourcemod/scripting/shavit-hud.sp             | 2 +-
 addons/sourcemod/scripting/shavit-mapchooser.sp      | 4 +++-
 addons/sourcemod/scripting/shavit-misc.sp            | 2 +-
 addons/sourcemod/scripting/shavit-rankings.sp        | 2 +-
 addons/sourcemod/scripting/shavit-replay-playback.sp | 2 +-
 addons/sourcemod/scripting/shavit-replay-recorder.sp | 2 +-
 addons/sourcemod/scripting/shavit-sounds.sp          | 2 +-
 addons/sourcemod/scripting/shavit-stats.sp           | 3 +--
 addons/sourcemod/scripting/shavit-timelimit.sp       | 2 +-
 addons/sourcemod/scripting/shavit-wr.sp              | 2 +-
 addons/sourcemod/scripting/shavit-zones.sp           | 2 +-
 14 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/addons/sourcemod/scripting/shavit-chat.sp b/addons/sourcemod/scripting/shavit-chat.sp
index bba5b742..952f0595 100644
--- a/addons/sourcemod/scripting/shavit-chat.sp
+++ b/addons/sourcemod/scripting/shavit-chat.sp
@@ -25,7 +25,7 @@
 #include <convar_class>
 #include <dhooks>
 
-#include <shavit>
+#include <shavit/core>
 #include <shavit/chat>
 #include <shavit/chat-colors>
 #include <shavit/steamid-stocks>
diff --git a/addons/sourcemod/scripting/shavit-checkpoints.sp b/addons/sourcemod/scripting/shavit-checkpoints.sp
index 134e2860..821a156d 100644
--- a/addons/sourcemod/scripting/shavit-checkpoints.sp
+++ b/addons/sourcemod/scripting/shavit-checkpoints.sp
@@ -23,7 +23,7 @@
 #include <clientprefs>
 #include <dhooks>
 
-#include <shavit>
+#include <shavit/core>
 #include <shavit/checkpoints>
 #include <shavit/zones>
 #include <shavit/physicsuntouch>
diff --git a/addons/sourcemod/scripting/shavit-core.sp b/addons/sourcemod/scripting/shavit-core.sp
index 023eba35..18fcf990 100644
--- a/addons/sourcemod/scripting/shavit-core.sp
+++ b/addons/sourcemod/scripting/shavit-core.sp
@@ -28,7 +28,7 @@
 
 #define DEBUG 0
 
-#include <shavit>
+#include <shavit/core>
 
 #undef REQUIRE_PLUGIN
 #include <shavit/hud>
diff --git a/addons/sourcemod/scripting/shavit-hud.sp b/addons/sourcemod/scripting/shavit-hud.sp
index 8cc3a3d7..9ce719dd 100644
--- a/addons/sourcemod/scripting/shavit-hud.sp
+++ b/addons/sourcemod/scripting/shavit-hud.sp
@@ -25,7 +25,7 @@
 #include <convar_class>
 #include <dhooks>
 
-#include <shavit>
+#include <shavit/core>
 #include <shavit/hud>
 
 #undef REQUIRE_PLUGIN
diff --git a/addons/sourcemod/scripting/shavit-mapchooser.sp b/addons/sourcemod/scripting/shavit-mapchooser.sp
index f0fc428a..7c855894 100644
--- a/addons/sourcemod/scripting/shavit-mapchooser.sp
+++ b/addons/sourcemod/scripting/shavit-mapchooser.sp
@@ -5,7 +5,7 @@
 #include <sdktools_sound>
 #include <convar_class>
 
-#include <shavit>
+#include <shavit/core>
 #include <shavit/mapchooser>
 
 #include <shavit/maps-folder-stocks>
@@ -144,6 +144,8 @@ public APLRes AskPluginLoad2(Handle myself, bool late, char[] error, int err_max
 	g_hForward_OnUnRTV = CreateGlobalForward("SMC_OnUnRTV", ET_Event, Param_Cell);
 	g_hForward_OnSuccesfulRTV = CreateGlobalForward("SMC_OnSuccesfulRTV", ET_Event);
 
+	RegPluginLibrary("shavit-mapchooser");
+
 	gB_Late = late;
 
 	return APLRes_Success;
diff --git a/addons/sourcemod/scripting/shavit-misc.sp b/addons/sourcemod/scripting/shavit-misc.sp
index b0daf064..d70f2b89 100644
--- a/addons/sourcemod/scripting/shavit-misc.sp
+++ b/addons/sourcemod/scripting/shavit-misc.sp
@@ -31,7 +31,7 @@
 #include <tf2>
 #include <tf2_stocks>
 
-#include <shavit>
+#include <shavit/core>
 
 #undef REQUIRE_PLUGIN
 #include <shavit/chat>
diff --git a/addons/sourcemod/scripting/shavit-rankings.sp b/addons/sourcemod/scripting/shavit-rankings.sp
index 739522ce..be1f712f 100644
--- a/addons/sourcemod/scripting/shavit-rankings.sp
+++ b/addons/sourcemod/scripting/shavit-rankings.sp
@@ -42,7 +42,7 @@
 #include <convar_class>
 #include <dhooks>
 
-#include <shavit>
+#include <shavit/core>
 #include <shavit/rankings>
 #include <shavit/wr>
 
diff --git a/addons/sourcemod/scripting/shavit-replay-playback.sp b/addons/sourcemod/scripting/shavit-replay-playback.sp
index 98b2115b..068da5eb 100644
--- a/addons/sourcemod/scripting/shavit-replay-playback.sp
+++ b/addons/sourcemod/scripting/shavit-replay-playback.sp
@@ -25,7 +25,7 @@
 #include <profiler>
 #include <dhooks>
 
-#include <shavit>
+#include <shavit/core>
 #include <shavit/replay-playback>
 #include <shavit/wr>
 #include <shavit/zones>
diff --git a/addons/sourcemod/scripting/shavit-replay-recorder.sp b/addons/sourcemod/scripting/shavit-replay-recorder.sp
index c39a6761..2301f601 100644
--- a/addons/sourcemod/scripting/shavit-replay-recorder.sp
+++ b/addons/sourcemod/scripting/shavit-replay-recorder.sp
@@ -24,7 +24,7 @@
 
 #include <shavit/replay-recorder>
 
-#include <shavit>
+#include <shavit/core>
 
 #undef REQUIRE_PLUGIN
 #include <shavit/replay-playback>
diff --git a/addons/sourcemod/scripting/shavit-sounds.sp b/addons/sourcemod/scripting/shavit-sounds.sp
index d4b97d13..2123ebe4 100644
--- a/addons/sourcemod/scripting/shavit-sounds.sp
+++ b/addons/sourcemod/scripting/shavit-sounds.sp
@@ -23,7 +23,7 @@
 #include <convar_class>
 #include <dhooks>
 
-#include <shavit>
+#include <shavit/core>
 #include <shavit/wr>
 
 #undef REQUIRE_PLUGIN
diff --git a/addons/sourcemod/scripting/shavit-stats.sp b/addons/sourcemod/scripting/shavit-stats.sp
index c199b547..eef67f2f 100644
--- a/addons/sourcemod/scripting/shavit-stats.sp
+++ b/addons/sourcemod/scripting/shavit-stats.sp
@@ -23,8 +23,7 @@
 #include <convar_class>
 #include <dhooks>
 
-#include <shavit>
-//#include <shavit/stats>
+#include <shavit/core>
 
 #undef REQUIRE_PLUGIN
 #include <shavit/rankings>
diff --git a/addons/sourcemod/scripting/shavit-timelimit.sp b/addons/sourcemod/scripting/shavit-timelimit.sp
index 2c2d4613..0cc88aa3 100644
--- a/addons/sourcemod/scripting/shavit-timelimit.sp
+++ b/addons/sourcemod/scripting/shavit-timelimit.sp
@@ -24,7 +24,7 @@
 #include <convar_class>
 #include <dhooks>
 
-#include <shavit>
+#include <shavit/core>
 #include <shavit/wr>
 
 #undef REQUIRE_PLUGIN
diff --git a/addons/sourcemod/scripting/shavit-wr.sp b/addons/sourcemod/scripting/shavit-wr.sp
index fc4b120c..f1ed0204 100644
--- a/addons/sourcemod/scripting/shavit-wr.sp
+++ b/addons/sourcemod/scripting/shavit-wr.sp
@@ -22,7 +22,7 @@
 #include <convar_class>
 #include <dhooks>
 
-#include <shavit>
+#include <shavit/core>
 #include <shavit/wr>
 
 #undef REQUIRE_PLUGIN
diff --git a/addons/sourcemod/scripting/shavit-zones.sp b/addons/sourcemod/scripting/shavit-zones.sp
index f8c86fa8..7ae18ed5 100644
--- a/addons/sourcemod/scripting/shavit-zones.sp
+++ b/addons/sourcemod/scripting/shavit-zones.sp
@@ -24,7 +24,7 @@
 #include <convar_class>
 #include <dhooks>
 
-#include <shavit>
+#include <shavit/core>
 #include <shavit/zones>
 
 #undef REQUIRE_PLUGIN