Merge pull request #923 from CBATeam/cba_loadorder

CfgPatches sorting
CBATeam · Jun 6, 2018 · 35fa884 · 35fa884
2 parents f887136 + 7999435
commit 35fa884
Show file tree

Hide file tree

Showing 34 changed files with 101 additions and 82 deletions.
diff --git a/addons/accessory/MRT_AccFncs/config.cpp b/addons/accessory/MRT_AccFncs/config.cpp
@@ -0,0 +1,6 @@
+class CfgPatches {
+    class MRT_AccFncs {
+        requiredAddons[] = {"cba_accessory"};
+        versionDesc = "MRT Attachment Functions";
+    };
+};
diff --git a/addons/accessory/config.cpp b/addons/accessory/config.cpp
@@ -8,16 +8,9 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"CBA_main"};
+        requiredAddons[] = {"cba_common", "cba_events"};
         authors[] = {"da12thMonkey", "Robalo", "Tupolov"};
         version = VERSION;
-        versionDesc = "MRT Attachment Functions";
-    };
-    class MRT_AccFncs { //compat
-        units[] = {};
-        weapons[] = {};
-        requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"CBA_main"};
     };
 };
 

diff --git a/addons/ai/config.cpp b/addons/ai/config.cpp
@@ -7,7 +7,7 @@ class CfgPatches {
         url = "$STR_CBA_URL";
         units[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"CBA_common"};
+        requiredAddons[] = {"cba_common"};
         version = VERSION;
         authors[] = {"Rommel"};
     };

diff --git a/addons/arrays/config.cpp b/addons/arrays/config.cpp
@@ -7,7 +7,7 @@ class CfgPatches {
         url = "$STR_CBA_URL";
         units[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"CBA_common"};
+        requiredAddons[] = {"cba_common"};
         version = VERSION;
         authors[] = {"Spooner"};
     };

diff --git a/addons/common/config.cpp b/addons/common/config.cpp
@@ -8,7 +8,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"A3_BaseConfig_F","A3_3DEN"};
+        requiredAddons[] = {"A3_Data_F_Tank_Loadorder"};
         version = VERSION;
         authors[] = {"Spooner","Sickboy","Rocko"};
     };

diff --git a/addons/diagnostic/config.cpp b/addons/diagnostic/config.cpp
@@ -7,7 +7,7 @@ class CfgPatches {
         url = "$STR_CBA_URL";
         units[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"CBA_common", "CBA_events", "3DEN", "A3_Functions_F"};
+        requiredAddons[] = {"cba_common", "cba_events"};
         version = VERSION;
         authors[] = {"Spooner", "Sickboy"};
     };

diff --git a/addons/events/config.cpp b/addons/events/config.cpp
@@ -7,7 +7,7 @@ class CfgPatches {
         url = "$STR_CBA_URL";
         units[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"CBA_common"};
+        requiredAddons[] = {"cba_common"};
         version = VERSION;
         authors[] = {"Spooner", "Sickboy", "Xeno", "commy2"};
     };

diff --git a/addons/hashes/config.cpp b/addons/hashes/config.cpp
@@ -7,7 +7,7 @@ class CfgPatches {
         url = "$STR_CBA_URL";
         units[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"CBA_common"};
+        requiredAddons[] = {"cba_common"};
         version = VERSION;
         authors[] = {"Spooner"};
     };

diff --git a/addons/help/config.cpp b/addons/help/config.cpp
@@ -8,7 +8,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"cba_common", "cba_hashes", "cba_keybinding", "A3_UI_F"};
+        requiredAddons[] = {"cba_common", "cba_hashes", "cba_keybinding"};
         version = VERSION;
         authors[] = {"alef", "Rocko", "Sickboy"};
     };

diff --git a/addons/jr/asdg_jointmuzzles/config.cpp b/addons/jr/asdg_jointmuzzles/config.cpp
@@ -0,0 +1,5 @@
+class CfgPatches {
+    class asdg_jointmuzzles {
+        requiredAddons[] = {"cba_jr"};
+    };
+};
diff --git a/addons/jr/asdg_jointrails/config.cpp b/addons/jr/asdg_jointrails/config.cpp
@@ -0,0 +1,5 @@
+class CfgPatches {
+    class asdg_jointrails {
+        requiredAddons[] = {"cba_jr"};
+    };
+};
diff --git a/addons/jr/config.cpp b/addons/jr/config.cpp
@@ -17,22 +17,10 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"CBA_jr_prep"};
+        requiredAddons[] = {"cba_jr_prep"};
         version = VERSION;
         authors[] = {"Robalo"};
     };
-    class asdg_jointrails { //compat
-        units[] = {};
-        weapons[] = {};
-        requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"A3_Weapons_F", "A3_Weapons_F_Mark"};
-    };
-    class asdg_jointmuzzles { //compat
-        units[] = {};
-        weapons[] = {};
-        requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"A3_Weapons_F", "A3_Weapons_F_Mark"};
-    };
 };
 
 #include "jr_classes.hpp"

diff --git a/addons/jr_prep/config.cpp → addons/jr/jr_prep/CfgWeapons.hpp b/addons/jr_prep/config.cpp → addons/jr/jr_prep/CfgWeapons.hpp
@@ -1,18 +1,3 @@
-#include "script_component.hpp"
-
-class CfgPatches {
-    class ADDON {
-        author = "$STR_CBA_Author";
-        name = ECSTRING(jr,component);
-        url = "$STR_CBA_URL";
-        units[] = {};
-        weapons[] = {};
-        requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"A3_Data_F_Tank_Loadorder"};
-        version = VERSION;
-    };
-};
-
 class CfgWeapons {
     class Rifle;
     class Rifle_Base_F : Rifle {
@@ -248,7 +233,6 @@ class CfgWeapons {
     };
 
     class Pistol;
-
     class Pistol_Base_F : Pistol {
         class WeaponSlotsInfo;
     };

diff --git a/addons/jr/jr_prep/config.cpp b/addons/jr/jr_prep/config.cpp
@@ -0,0 +1,16 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class ADDON {
+        author = "$STR_CBA_Author";
+        name = ECSTRING(jr,component);
+        url = "$STR_CBA_URL";
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {"cba_common"};
+        version = VERSION;
+    };
+};
+
+#include "CfgWeapons.hpp"
diff --git a/addons/jr_prep/script_component.hpp → addons/jr/jr_prep/script_component.hpp b/addons/jr_prep/script_component.hpp → addons/jr/jr_prep/script_component.hpp
diff --git a/addons/jr_prep/$PBOPREFIX$ b/addons/jr_prep/$PBOPREFIX$
diff --git a/addons/keybinding/config.cpp b/addons/keybinding/config.cpp
@@ -7,7 +7,7 @@ class CfgPatches {
         url = "$STR_CBA_URL";
         units[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"CBA_common", "A3_UI_F"};
+        requiredAddons[] = {"cba_common", "cba_events"};
         version = VERSION;
         authors[] = {"Taosenai"};
     };

diff --git a/addons/main/config.cpp b/addons/main/config.cpp
@@ -9,28 +9,35 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        // "CBA_XEH",  would create circular dependency, however XEH is required by CBA common in any case :)
-        requiredAddons[] = {"cba_common", "cba_arrays", "cba_hashes", "cba_strings", "cba_events", "cba_diagnostic", "cba_network", "cba_ai", "cba_vectors", "cba_ui", "cba_help"};
+        requiredAddons[] = {
+            "cba_common",
+            "cba_events",
+            "cba_hashes",
+            "cba_jr_prep",
+            "cba_keybinding",
+            "cba_modules",
+            "cba_music",
+            "cba_network",
+            "cba_settings",
+            "cba_statemachine",
+            "cba_strings",
+            "cba_vectors",
+            "cba_xeh",
+            "cba_accessory",
+            "cba_ai",
+            "cba_arrays",
+            "cba_diagnostic",
+            "cba_help",
+            "cba_jr",
+            "cba_ui",
+            "cba_versioning"
+        };
         versionDesc = "C.B.A.";
         VERSION_CONFIG;
         authors[] = {};
     };
 };
 
-/*
-class CfgMods {
-    class PREFIX {
-        dir = "@CBA";
-        name = "Community Base Addons";
-        picture = "x\cba\addons\main\logo_cba_ca.paa";
-        hidePicture = "true";
-        hideName = "true";
-        actionName = "Website";
-        action = "http://dev-heaven.net/projects/cca";
-        description = "Bugtracker: http://dev-heaven.net/projects/cca<br />Documentation: http://dev-heaven.net/projects/cca";
-    };
-};
-*/
 class CfgSettings {
     class CBA {
         class Caching {

diff --git a/addons/main_a3/config.cpp b/addons/main_a3/config.cpp
@@ -8,7 +8,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"CBA_Main"};
+        requiredAddons[] = {"cba_main"};
         VERSION_CONFIG;
         authors[] = {};
     };

diff --git a/addons/modules/config.cpp b/addons/modules/config.cpp
@@ -7,7 +7,7 @@ class CfgPatches {
         url = "$STR_CBA_URL";
         units[] = {"CBA_ModuleAttack", "CBA_ModuleDefend", "CBA_ModulePatrol"};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"A3_Modules_F", "CBA_common"};
+        requiredAddons[] = {"cba_common"};
         version = VERSION;
         authors[] = {"WiredTiger"};
 

diff --git a/addons/music/config.cpp b/addons/music/config.cpp
@@ -7,7 +7,7 @@ class CfgPatches {
         url = "$STR_CBA_URL";
         units[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"CBA_common"};
+        requiredAddons[] = {"cba_common"};
         version = VERSION;
         authors[] = {"Dedmen", "Dorbedo", "Fishy"};
     };

diff --git a/addons/network/config.cpp b/addons/network/config.cpp
@@ -8,7 +8,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"CBA_common", "CBA_events"};
+        requiredAddons[] = {"cba_common", "cba_events"};
         version = VERSION;
         authors[] = {"Sickboy"};
     };

diff --git a/addons/settings/config.cpp b/addons/settings/config.cpp
@@ -8,7 +8,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"CBA_common", "A3_UI_F", "3DEN"};
+        requiredAddons[] = {"cba_common", "cba_events"};
         version = VERSION;
         authors[] = {"commy2"};
     };

diff --git a/addons/statemachine/config.cpp b/addons/statemachine/config.cpp
@@ -7,7 +7,7 @@ class CfgPatches {
         url = "$STR_CBA_URL";
         units[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"CBA_common"};
+        requiredAddons[] = {"cba_common"};
         version = VERSION;
         authors[] = {"BaerMitUmlaut"};
     };

diff --git a/addons/strings/config.cpp b/addons/strings/config.cpp
@@ -7,7 +7,7 @@ class CfgPatches {
         url = "$STR_CBA_URL";
         units[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = { "CBA_common" };
+        requiredAddons[] = {"cba_common"};
         version = VERSION;
         authors[] = {"Spooner", "Kronzky"};
     };

diff --git a/addons/ui/config.cpp b/addons/ui/config.cpp
@@ -7,13 +7,10 @@ class CfgPatches {
         url = "$STR_CBA_URL";
         units[] = {};
         requiredVersion = 1;
-        requiredAddons[] = {"CBA_common", "CBA_arrays", "A3_Ui_F"};
+        requiredAddons[] = {"cba_common", "cba_arrays"};
         version = VERSION;
         authors[] = {"Dr Eyeball", "commy2"};
     };
-
-    // Backwards compatibility
-    class cba_ui_helper: ADDON {author = "";};
 };
 
 #include "CfgEventHandlers.hpp"

diff --git a/addons/ui/ui_helper/config.cpp b/addons/ui/ui_helper/config.cpp
@@ -0,0 +1,5 @@
+class CfgPatches {
+    class cba_ui_helper {
+        requiredAddons[] = {"cba_ui"};
+    };
+};
diff --git a/addons/vectors/config.cpp b/addons/vectors/config.cpp
@@ -7,7 +7,7 @@ class CfgPatches {
         url = "$STR_CBA_URL";
         units[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"CBA_common"};
+        requiredAddons[] = {"cba_common"};
         version = VERSION;
         authors[] = {"Vigilante"};
     };

diff --git a/addons/versioning/config.cpp b/addons/versioning/config.cpp
@@ -7,7 +7,7 @@ class CfgPatches {
         url = "$STR_CBA_URL";
         units[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"CBA_common", "CBA_strings", "CBA_hashes", "CBA_diagnostic", "CBA_events", "CBA_network"};
+        requiredAddons[] = {"cba_common", "cba_strings", "cba_hashes", "cba_diagnostic", "cba_events", "cba_network"};
         version = VERSION;
         authors[] = {"Sickboy"};
     };

diff --git a/addons/xeh/CBA_Extended_EventHandlers/config.cpp b/addons/xeh/CBA_Extended_EventHandlers/config.cpp
@@ -0,0 +1,5 @@
+class CfgPatches {
+    class CBA_Extended_EventHandlers {
+        requiredAddons[] = {"cba_xeh"};
+    };
+};
diff --git a/addons/xeh/Extended_EventHandlers/config.cpp b/addons/xeh/Extended_EventHandlers/config.cpp
@@ -0,0 +1,5 @@
+class CfgPatches {
+    class Extended_EventHandlers {
+        requiredAddons[] = {"cba_xeh"};
+    };
+};
diff --git a/addons/xeh/config.cpp b/addons/xeh/config.cpp
@@ -7,7 +7,7 @@ class CfgPatches {
         url = "$STR_CBA_URL";
         units[] = {};
         weapons[] = {};
-        requiredAddons[] = {"A3_Data_F", "A3_Characters_F", "A3_Air_F", "A3_Armor_F", "A3_Boat_F", "A3_Soft_F", "A3_Air_F_Heli_Heli_Transport_04", "A3_Characters_F_exp", "A3_Props_F_Argo", "A3_Props_F_Orange", "A3_Characters_F_Orange"};
+        requiredAddons[] = {"cba_common"};
         requiredVersion = 0.1;
         version = "4.0.0"; // Due to older mod versions requiring > 3,3,3 etc
         versionStr = "4.0.0";
@@ -17,12 +17,6 @@ class CfgPatches {
         // this prevents any patched class from requiring XEH
         addonRootClass = "A3_Characters_F";
     };
-
-    // Backwards compatibility
-    class cba_xeh_a3: ADDON {author = "";};
-    class Extended_EventHandlers: ADDON {author = "";};
-    class CBA_Extended_EventHandlers: ADDON {author = "";};
-    class cba_ee: ADDON {author = "";};
 };
 
 #include "CfgEventHandlers.hpp"

diff --git a/addons/xeh/ee/config.cpp b/addons/xeh/ee/config.cpp
@@ -0,0 +1,5 @@
+class CfgPatches {
+    class cba_ee {
+        requiredAddons[] = {"cba_xeh"};
+    };
+};
diff --git a/addons/xeh/xeh_a3/config.cpp b/addons/xeh/xeh_a3/config.cpp
@@ -0,0 +1,5 @@
+class CfgPatches {
+    class cba_xeh_a3 {
+        requiredAddons[] = {"cba_xeh"};
+    };
+};