Change directory structure and `CoreAPI` naming

sources/Avarice/AvariceLink.uc

@@ -241,7 +241,7 @@ public final function StartUp()
 
     if (tcpStream == none)          return;
     if (tcpStream.Get() != none)    return;
-    core = __core().GetLevelCore();
+    core = __level().GetLevelCore();
     if (core == none)               return;
 
     newStream = AvariceTcpStream(core.Allocate(class'AvariceTcpStream'));

sources/BaseAPI/API/Memory/Tests/TEST_Memory.uc

@@ -93,9 +93,9 @@ protected static function Test_ActorConstructorsFinalizers() {
 
     Context("Testing that Acedia actor's constructors and finalizers are called properly.");
     Issue("Actor's constructor is not called.");
-    act1 = MockActor(__core().GetLevelCore().Allocate(class'MockActor'));
+    act1 = MockActor(__level().GetLevelCore().Allocate(class'MockActor'));
     TEST_ExpectTrue(class'MockActor'.default.actorCount == 1);
-    act2 = MockActor(__core().GetLevelCore().Allocate(class'MockActor'));
+    act2 = MockActor(__level().GetLevelCore().Allocate(class'MockActor'));
     TEST_ExpectTrue(class'MockActor'.default.actorCount == 2);
 
     Issue("Actor's finalizer is not called.");

sources/Data/Database/DBAPI.uc

@@ -329,7 +329,7 @@ private function EraseAllPackageData(BaseText packageToErase)
     if (packageName == "") {
         return;
     }
-    game = __core().unreal_api().GetGameType();
+    game = __level().unreal_api().GetGameType();
     game.DeletePackage(packageName);
     //  Delete any leftover objects. This has to be done *after*
     //  `DeletePackage()` call, otherwise removed garbage can reappear.

sources/Data/Database/Local/DBRecord.uc

@@ -267,7 +267,7 @@ public static final function Global __()
     return class'Global'.static.GetInstance();
 }
 
-public static final function CoreGlobal __core()
+public static final function CoreGlobal __level()
 {
     return class'CoreGlobal'.static.GetGenericInstance();
 }
@@ -307,7 +307,7 @@ private final static function DBRecord NewRecordFor(string dbPackageName)
         if (recordCandidate != none) {
             continue;
         }
-        recordCandidate = __core().unreal_api().GetGameType()
+        recordCandidate = __level().unreal_api().GetGameType()
             .CreateDataObject(class'DBRecord', nextName, dbPackageName);
         recordCandidate.package = dbPackageName;
         return recordCandidate;
@@ -333,7 +333,7 @@ private final static function DBRecord LoadRecordFor(
     string name,
     string package)
 {
-    return __core().unreal_api().GetGameType()
+    return __level().unreal_api().GetGameType()
         .LoadDataObject(class'DBRecord', name, package);
 }
 
@@ -692,7 +692,7 @@ private final function SetItem(
             if (oldRecord != none) {
                 oldRecord.EmptySelf();
             }
-            __core().unreal_api().GetGameType()
+            __level().unreal_api().GetGameType()
                 .DeleteDataObject(class'DBRecord', oldItem.s, package);
         }
     }
@@ -726,7 +726,7 @@ private final function RemoveItem(int index)
         if (oldRecord != none) {
             oldRecord.EmptySelf();
         }
-        __core().unreal_api().GetGameType()
+        __level().unreal_api().GetGameType()
             .DeleteDataObject(class'DBRecord', oldItem.s, package);
     }
     storage.Remove(index, 1);
@@ -875,7 +875,7 @@ public final function EmptySelf()
         return;
     }
     lockEraseSelf = true;
-    game = __core().unreal_api().GetGameType();
+    game = __level().unreal_api().GetGameType();
     for (i = 0; i < storage.length; i += 1)
     {
         if (storage[i].t != DBAT_Reference) continue;

sources/Data/Database/Local/LocalDatabaseInstance.uc

@@ -83,7 +83,7 @@ var private int     lastTaskLifeVersion;
 
 protected function Constructor()
 {
-    __core().unreal_api().OnTick(self).connect = CompleteAllTasks;
+    __level().unreal_api().OnTick(self).connect = CompleteAllTasks;
 }
 
 protected function Finalizer()
@@ -93,7 +93,7 @@ protected function Finalizer()
     CompleteAllTasks();
     WriteToDisk();
     rootRecord = none;
-    __core().unreal_api().OnTick(self).Disconnect();
+    __level().unreal_api().OnTick(self).Disconnect();
     configEntry = none;
 }
 
@@ -130,7 +130,7 @@ public final function WriteToDisk()
         packageName = _.text.IntoString(configEntry.GetPackageName());
     }
     if (packageName != "") {
-        __core().unreal_api().GetGameType().SavePackage(packageName);
+        __level().unreal_api().GetGameType().SavePackage(packageName);
     }
 }
 

sources/Data/Database/Tests/TEST_DatabaseCommon.uc

@@ -25,20 +25,20 @@ protected static function TESTS()
     local JSONPointer pointer;
     Context("Testing extracting `JSONPointer` from database link.");
     Issue("`JSONPointer` is incorrectly extracted.");
-    pointer = __core().db.GetPointer(
+    pointer = __level().db.GetPointer(
         __().text.FromString("[local]default:/huh/what/is/"));
     TEST_ExpectNotNone(pointer);
     TEST_ExpectTrue(pointer.ToText().ToString() == "/huh/what/is/");
-    pointer = __core().db.GetPointer(__().text.FromString("[remote]db:"));
+    pointer = __level().db.GetPointer(__().text.FromString("[remote]db:"));
     TEST_ExpectNotNone(pointer);
     TEST_ExpectTrue(pointer.ToText().ToString() == "");
-    pointer = __core().db.GetPointer(__().text.FromString("[remote]:"));
+    pointer = __level().db.GetPointer(__().text.FromString("[remote]:"));
     TEST_ExpectNotNone(pointer);
     TEST_ExpectTrue(pointer.ToText().ToString() == "");
-    pointer = __core().db.GetPointer(__().text.FromString("db:/just/a/pointer"));
+    pointer = __level().db.GetPointer(__().text.FromString("db:/just/a/pointer"));
     TEST_ExpectNotNone(pointer);
     TEST_ExpectTrue(pointer.ToText().ToString() == "/just/a/pointer");
-    pointer = __core().db.GetPointer(__().text.FromString(":/just/a/pointer"));
+    pointer = __level().db.GetPointer(__().text.FromString(":/just/a/pointer"));
     TEST_ExpectNotNone(pointer);
     TEST_ExpectTrue(pointer.ToText().ToString() == "/just/a/pointer");
 }

sources/Data/Database/Tests/TEST_LocalDatabase.uc

@@ -132,7 +132,7 @@ local LocalDatabaseInstance db;
 source = GetJSONTemplateString();
 parser = __().text.ParseString(source);
 root = HashTable(__().json.ParseWith(parser));
-db = __core().db.NewLocal(P("TEST_ReadOnly"));
+db = __level().db.NewLocal(P("TEST_ReadOnly"));
 db.WriteData(__().json.Pointer(), root);
 */
 protected static function string GetJSONTemplateString()
@@ -241,14 +241,14 @@ protected static function TESTS()
 protected static function Test_LoadingPrepared()
 {
     local LocalDatabaseInstance db;
-    db = __core().db.LoadLocal(P("TEST_ReadOnly"));
+    db = __level().db.LoadLocal(P("TEST_ReadOnly"));
     Context("Testing reading prepared data from the local database.");
     Issue("Existing database reported as missing.");
-    TEST_ExpectTrue(__core().db.ExistsLocal(P("TEST_ReadOnly")));
+    TEST_ExpectTrue(__level().db.ExistsLocal(P("TEST_ReadOnly")));
 
     Issue("Loading same database several times produces different"
         @ "`LocalDatabaseInstance` objects.");
-    TEST_ExpectTrue(__core().db.LoadLocal(P("TEST_ReadOnly")) ==  db);
+    TEST_ExpectTrue(__level().db.LoadLocal(P("TEST_ReadOnly")) ==  db);
     //  Groups of read-only tests
     SubTest_LoadingPreparedSuccessRoot(db);
     SubTest_LoadingPreparedSuccessSubValues(db);
@@ -487,18 +487,18 @@ protected static function SubTest_LoadingPreparedGetKeysFail(
 protected static function Test_Writing()
 {
     local LocalDatabaseInstance db;
-    db = __core().db.NewLocal(P("TEST_DB"));
+    db = __level().db.NewLocal(P("TEST_DB"));
     Context("Testing (re-)creating and writing into a new local database.");
     Issue("Cannot create a new database.");
     TEST_ExpectNotNone(db);
-    TEST_ExpectTrue(__core().db.ExistsLocal(P("TEST_DB")));
+    TEST_ExpectTrue(__level().db.ExistsLocal(P("TEST_DB")));
 
     Issue("Freshly created database is not empty.");
     TEST_ExpectTrue(CountRecordsInPackage("TEST_DB") == 1); //  1 root object
 
     Issue("Loading just created database produces different"
         @ "`LocalDatabaseInstance` object.");
-    TEST_ExpectTrue(__core().db.LoadLocal(P("TEST_DB")) == db);
+    TEST_ExpectTrue(__level().db.LoadLocal(P("TEST_DB")) == db);
     //  This set of tests fills our test database with objects
     SubTest_WritingSuccess(db);
     SubTest_WritingDataCheck(db);
@@ -511,33 +511,33 @@ protected static function Test_Writing()
         @ "local database.");
     __().memory.Free(db);   //  For `NewLocal()` call
     __().memory.Free(db);   //  For `LoadLocal()` call
-    TEST_ExpectTrue(__core().db.DeleteLocal(P("TEST_DB")));
+    TEST_ExpectTrue(__level().db.DeleteLocal(P("TEST_DB")));
 
     Issue("Newly created database is reported to still exist after deletion.");
-    TEST_ExpectFalse(__core().db.ExistsLocal(P("TEST_DB")));
+    TEST_ExpectFalse(__level().db.ExistsLocal(P("TEST_DB")));
     TEST_ExpectFalse(db.IsAllocated());
 
     Issue("`DeleteLocal()` does not return `false` after trying to delete"
         @ "non-existing local database.");
-    TEST_ExpectFalse(__core().db.DeleteLocal(P("TEST_DB")));
+    TEST_ExpectFalse(__level().db.DeleteLocal(P("TEST_DB")));
 }
 
 protected static function Test_Recreate()
 {
     local LocalDatabaseInstance db;
     Issue("Freshly created database is not empty.");
-    db = __core().db.NewLocal(P("TEST_DB"));
+    db = __level().db.NewLocal(P("TEST_DB"));
     TEST_ExpectTrue(CountRecordsInPackage("TEST_DB") == 1);
 
     Issue("Cannot create a database after database with the same name was"
         @ "just deleted.");
     TEST_ExpectNotNone(db);
-    TEST_ExpectTrue(__core().db.ExistsLocal(P("TEST_DB")));
+    TEST_ExpectTrue(__level().db.ExistsLocal(P("TEST_DB")));
     SubTest_WritingArrayIndicies(db);
-    __core().db.DeleteLocal(P("TEST_DB"));
+    __level().db.DeleteLocal(P("TEST_DB"));
     Issue("Newly created database is reported to still exist after deletion.");
     __().memory.Free(db);
-    TEST_ExpectFalse(__core().db.ExistsLocal(P("TEST_DB")));
+    TEST_ExpectFalse(__level().db.ExistsLocal(P("TEST_DB")));
     TEST_ExpectFalse(db.IsAllocated());
 }
 
@@ -546,15 +546,15 @@ protected static function Test_TaskChaining()
     local LocalDatabaseInstance db;
     Context("Testing (re-)creating and writing into a new local database.");
     Issue("Freshly created database is not empty.");
-    db = __core().db.NewLocal(P("TEST_DB"));
+    db = __level().db.NewLocal(P("TEST_DB"));
     TEST_ExpectTrue(CountRecordsInPackage("TEST_DB") == 1);
 
     Issue("Cannot create a database after database with the same name was"
         @ "just deleted.");
     TEST_ExpectNotNone(db);
-    TEST_ExpectTrue(__core().db.ExistsLocal(P("TEST_DB")));
+    TEST_ExpectTrue(__level().db.ExistsLocal(P("TEST_DB")));
     SubTest_TaskChaining(db);
-    __core().db.DeleteLocal(P("TEST_DB"));
+    __level().db.DeleteLocal(P("TEST_DB"));
 }
 
 protected static function HashTable GetJSONSubTemplateObject()
@@ -792,7 +792,7 @@ protected static function Test_Removal()
     local HashTable             templateObject;
     templateObject = GetJSONSubTemplateObject();
     templateArray = GetJSONSubTemplateArray();
-    db = __core().db.NewLocal(P("TEST_DB"));
+    db = __level().db.NewLocal(P("TEST_DB"));
     db.WriteData(__().json.Pointer(P("")), templateObject);
     db.WriteData(__().json.Pointer(P("/B")), templateObject);
     db.WriteData(__().json.Pointer(P("/B/A")), templateArray);
@@ -803,7 +803,7 @@ protected static function Test_Removal()
     SubTest_RemovalResult(db);
     SubTest_RemovalCheckValuesAfter(db);
     SubTest_RemovalRoot(db);
-    __core().db.DeleteLocal(P("TEST_DB"));
+    __level().db.DeleteLocal(P("TEST_DB"));
 }
 
 protected static function SubTest_RemovalResult(LocalDatabaseInstance db)
@@ -877,7 +877,7 @@ protected static function Test_Increment()
     local HashTable             templateObject;
     templateObject = GetJSONSubTemplateObject();
     templateArray = GetJSONSubTemplateArray();
-    db = __core().db.NewLocal(P("TEST_DB"));
+    db = __level().db.NewLocal(P("TEST_DB"));
     db.WriteData(__().json.Pointer(P("")), templateObject);
     db.WriteData(__().json.Pointer(P("/B")), templateObject);
     db.WriteData(__().json.Pointer(P("/C")), __().box.int(-5));
@@ -920,7 +920,7 @@ protected static function Test_Increment()
     Issue("Incrementing database values has created garbage objects.");
     //  5 initial records + 1 made for a new array in `SubTest_IncrementNull()`
     TEST_ExpectTrue(CountRecordsInPackage("TEST_DB") == 6);
-    __core().db.DeleteLocal(P("TEST_DB"));
+    __level().db.DeleteLocal(P("TEST_DB"));
 }
 
 protected static function SubTest_IncrementNull(LocalDatabaseInstance db)
@@ -1280,7 +1280,7 @@ protected static function Test_RequestID()
     local HashTable             templateObject;
     templateObject = GetJSONSubTemplateObject();
     templateArray = GetJSONSubTemplateArray();
-    db = __core().db.NewLocal(P("TEST_DB"));
+    db = __level().db.NewLocal(P("TEST_DB"));
     db.WriteData(__().json.Pointer(P("")), templateObject);
     db.WriteData(__().json.Pointer(P("/B")), templateObject);
     db.WriteData(__().json.Pointer(P("/C")), __().box.int(-5));
@@ -1315,7 +1315,7 @@ protected static function Test_RequestID()
     SubTest_RequestIDForRemove(db);
     SubTest_RequestIDForSize(db);
     SubTest_RequestIDForWrite(db);
-    __core().db.DeleteLocal(P("TEST_DB"));
+    __level().db.DeleteLocal(P("TEST_DB"));
 }
 
 protected static function SubTest_RequestIDForCheck(LocalDatabaseInstance db)

sources/KFImplementation/Server/Unreal/GameRulesAPI/KF1_GameRulesAPI.uc

@@ -173,7 +173,7 @@ public function GameRules Add(class<GameRules> newRulesClass)
     if (AreAdded(newRulesClass)) {
         return none;
     }
-    newGameRules = GameRules(__core().GetLevelCore().Allocate(newRulesClass));
+    newGameRules = GameRules(__level().GetLevelCore().Allocate(newRulesClass));
     _server.unreal.GetGameType().AddGameModifier(newGameRules);
     return newGameRules;
 }

sources/KFImplementation/Server/Unreal/Tests/TEST_ServerUnrealAPI.uc

@@ -139,21 +139,21 @@ protected static function Test_InventoryChainFetching()
     //  where   A = `MockInventoryA`
     //          a = `MockInventoryAChild`
     //          B = `MockInventoryB`
-    chainStart = Inventory(__core().GetLevelCore().Allocate(class'MockInventoryAChild'));
+    chainStart = Inventory(__level().GetLevelCore().Allocate(class'MockInventoryAChild'));
     chainEnd = chainStart;
-    chainEnd.inventory = Inventory(__core().GetLevelCore().Allocate(class'MockInventoryB'));
+    chainEnd.inventory = Inventory(__level().GetLevelCore().Allocate(class'MockInventoryB'));
     chainEnd = chainEnd.inventory;
-    chainEnd.inventory = Inventory(__core().GetLevelCore().Allocate(class'MockInventoryA'));
+    chainEnd.inventory = Inventory(__level().GetLevelCore().Allocate(class'MockInventoryA'));
     chainEnd = chainEnd.inventory;
     chainEnd.inventory =
-        Inventory(__core().GetLevelCore().Allocate(class'MockInventoryAChild'));
+        Inventory(__level().GetLevelCore().Allocate(class'MockInventoryAChild'));
     chainEnd = chainEnd.inventory;
-    chainEnd.inventory = Inventory(__core().GetLevelCore().Allocate(class'MockInventoryB'));
+    chainEnd.inventory = Inventory(__level().GetLevelCore().Allocate(class'MockInventoryB'));
     chainEnd = chainEnd.inventory;
     chainEnd.inventory =
-        Inventory(__core().GetLevelCore().Allocate(class'MockInventoryAChild'));
+        Inventory(__level().GetLevelCore().Allocate(class'MockInventoryAChild'));
     chainEnd = chainEnd.inventory;
-    chainEnd.inventory = Inventory(__core().GetLevelCore().Allocate(class'MockInventoryA'));
+    chainEnd.inventory = Inventory(__level().GetLevelCore().Allocate(class'MockInventoryA'));
     chainEnd = chainEnd.inventory;
     Context("Testing auxiliary methods for working with inventory chains.");
     SubTest_InventoryChainFetchingSingle(chainStart);