diff --git a/sources/Avarice/AvariceLink.uc b/sources/Avarice/AvariceLink.uc index 21ceb17..b385b53 100644 --- a/sources/Avarice/AvariceLink.uc +++ b/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')); diff --git a/sources/BaseRealm/API/Math/BigInt.uc b/sources/BaseAPI/API/Math/BigInt.uc similarity index 100% rename from sources/BaseRealm/API/Math/BigInt.uc rename to sources/BaseAPI/API/Math/BigInt.uc diff --git a/sources/BaseRealm/API/Math/MathAPI.uc b/sources/BaseAPI/API/Math/MathAPI.uc similarity index 100% rename from sources/BaseRealm/API/Math/MathAPI.uc rename to sources/BaseAPI/API/Math/MathAPI.uc diff --git a/sources/BaseRealm/API/Math/Tests/TEST_BigInt.uc b/sources/BaseAPI/API/Math/Tests/TEST_BigInt.uc similarity index 100% rename from sources/BaseRealm/API/Math/Tests/TEST_BigInt.uc rename to sources/BaseAPI/API/Math/Tests/TEST_BigInt.uc diff --git a/sources/BaseRealm/API/Memory/AcediaObjectPool.uc b/sources/BaseAPI/API/Memory/AcediaObjectPool.uc similarity index 100% rename from sources/BaseRealm/API/Memory/AcediaObjectPool.uc rename to sources/BaseAPI/API/Memory/AcediaObjectPool.uc diff --git a/sources/BaseRealm/API/Memory/MemoryAPI.uc b/sources/BaseAPI/API/Memory/MemoryAPI.uc similarity index 100% rename from sources/BaseRealm/API/Memory/MemoryAPI.uc rename to sources/BaseAPI/API/Memory/MemoryAPI.uc diff --git a/sources/BaseRealm/API/Memory/Tests/MockActor.uc b/sources/BaseAPI/API/Memory/Tests/MockActor.uc similarity index 100% rename from sources/BaseRealm/API/Memory/Tests/MockActor.uc rename to sources/BaseAPI/API/Memory/Tests/MockActor.uc diff --git a/sources/BaseRealm/API/Memory/Tests/MockObject.uc b/sources/BaseAPI/API/Memory/Tests/MockObject.uc similarity index 100% rename from sources/BaseRealm/API/Memory/Tests/MockObject.uc rename to sources/BaseAPI/API/Memory/Tests/MockObject.uc diff --git a/sources/BaseRealm/API/Memory/Tests/MockObjectNoPool.uc b/sources/BaseAPI/API/Memory/Tests/MockObjectNoPool.uc similarity index 100% rename from sources/BaseRealm/API/Memory/Tests/MockObjectNoPool.uc rename to sources/BaseAPI/API/Memory/Tests/MockObjectNoPool.uc diff --git a/sources/BaseRealm/API/Memory/Tests/TEST_Memory.uc b/sources/BaseAPI/API/Memory/Tests/TEST_Memory.uc similarity index 98% rename from sources/BaseRealm/API/Memory/Tests/TEST_Memory.uc rename to sources/BaseAPI/API/Memory/Tests/TEST_Memory.uc index e3a1fa8..8094ccf 100644 --- a/sources/BaseRealm/API/Memory/Tests/TEST_Memory.uc +++ b/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."); diff --git a/sources/BaseRealm/API/Scheduler/SchedulerAPI.uc b/sources/BaseAPI/API/Scheduler/SchedulerAPI.uc similarity index 100% rename from sources/BaseRealm/API/Scheduler/SchedulerAPI.uc rename to sources/BaseAPI/API/Scheduler/SchedulerAPI.uc diff --git a/sources/BaseRealm/API/Scheduler/SchedulerDiskRequest.uc b/sources/BaseAPI/API/Scheduler/SchedulerDiskRequest.uc similarity index 100% rename from sources/BaseRealm/API/Scheduler/SchedulerDiskRequest.uc rename to sources/BaseAPI/API/Scheduler/SchedulerDiskRequest.uc diff --git a/sources/BaseRealm/API/Scheduler/SchedulerJob.uc b/sources/BaseAPI/API/Scheduler/SchedulerJob.uc similarity index 100% rename from sources/BaseRealm/API/Scheduler/SchedulerJob.uc rename to sources/BaseAPI/API/Scheduler/SchedulerJob.uc diff --git a/sources/BaseRealm/API/Scheduler/Tests/MockJob.uc b/sources/BaseAPI/API/Scheduler/Tests/MockJob.uc similarity index 100% rename from sources/BaseRealm/API/Scheduler/Tests/MockJob.uc rename to sources/BaseAPI/API/Scheduler/Tests/MockJob.uc diff --git a/sources/BaseRealm/API/Scheduler/Tests/TEST_SchedulerAPI.uc b/sources/BaseAPI/API/Scheduler/Tests/TEST_SchedulerAPI.uc similarity index 100% rename from sources/BaseRealm/API/Scheduler/Tests/TEST_SchedulerAPI.uc rename to sources/BaseAPI/API/Scheduler/Tests/TEST_SchedulerAPI.uc diff --git a/sources/BaseRealm/AcediaEnvironment/AcediaEnvironment.uc b/sources/BaseAPI/AcediaEnvironment/AcediaEnvironment.uc similarity index 100% rename from sources/BaseRealm/AcediaEnvironment/AcediaEnvironment.uc rename to sources/BaseAPI/AcediaEnvironment/AcediaEnvironment.uc diff --git a/sources/BaseRealm/AcediaEnvironment/Events/Environment_FeatureDisabled_Signal.uc b/sources/BaseAPI/AcediaEnvironment/Events/Environment_FeatureDisabled_Signal.uc similarity index 100% rename from sources/BaseRealm/AcediaEnvironment/Events/Environment_FeatureDisabled_Signal.uc rename to sources/BaseAPI/AcediaEnvironment/Events/Environment_FeatureDisabled_Signal.uc diff --git a/sources/BaseRealm/AcediaEnvironment/Events/Environment_FeatureDisabled_Slot.uc b/sources/BaseAPI/AcediaEnvironment/Events/Environment_FeatureDisabled_Slot.uc similarity index 100% rename from sources/BaseRealm/AcediaEnvironment/Events/Environment_FeatureDisabled_Slot.uc rename to sources/BaseAPI/AcediaEnvironment/Events/Environment_FeatureDisabled_Slot.uc diff --git a/sources/BaseRealm/AcediaEnvironment/Events/Environment_FeatureEnabled_Signal.uc b/sources/BaseAPI/AcediaEnvironment/Events/Environment_FeatureEnabled_Signal.uc similarity index 100% rename from sources/BaseRealm/AcediaEnvironment/Events/Environment_FeatureEnabled_Signal.uc rename to sources/BaseAPI/AcediaEnvironment/Events/Environment_FeatureEnabled_Signal.uc diff --git a/sources/BaseRealm/AcediaEnvironment/Events/Environment_FeatureEnabled_Slot.uc b/sources/BaseAPI/AcediaEnvironment/Events/Environment_FeatureEnabled_Slot.uc similarity index 100% rename from sources/BaseRealm/AcediaEnvironment/Events/Environment_FeatureEnabled_Slot.uc rename to sources/BaseAPI/AcediaEnvironment/Events/Environment_FeatureEnabled_Slot.uc diff --git a/sources/BaseRealm/Global.uc b/sources/BaseAPI/Global.uc similarity index 100% rename from sources/BaseRealm/Global.uc rename to sources/BaseAPI/Global.uc diff --git a/sources/BaseRealm/Iter.uc b/sources/BaseAPI/Iter.uc similarity index 100% rename from sources/BaseRealm/Iter.uc rename to sources/BaseAPI/Iter.uc diff --git a/sources/BaseRealm/_manifest.uc b/sources/BaseAPI/_manifest.uc similarity index 100% rename from sources/BaseRealm/_manifest.uc rename to sources/BaseAPI/_manifest.uc diff --git a/sources/ClientRealm/API/Unreal/ClientUnrealAPI.uc b/sources/ClientAPI/API/Unreal/ClientUnrealAPI.uc similarity index 100% rename from sources/ClientRealm/API/Unreal/ClientUnrealAPI.uc rename to sources/ClientAPI/API/Unreal/ClientUnrealAPI.uc diff --git a/sources/ClientRealm/API/Unreal/InteractionAPI/Events/Interaction_OnRender_Signal.uc b/sources/ClientAPI/API/Unreal/InteractionAPI/Events/Interaction_OnRender_Signal.uc similarity index 100% rename from sources/ClientRealm/API/Unreal/InteractionAPI/Events/Interaction_OnRender_Signal.uc rename to sources/ClientAPI/API/Unreal/InteractionAPI/Events/Interaction_OnRender_Signal.uc diff --git a/sources/ClientRealm/API/Unreal/InteractionAPI/Events/Interaction_OnRender_Slot.uc b/sources/ClientAPI/API/Unreal/InteractionAPI/Events/Interaction_OnRender_Slot.uc similarity index 100% rename from sources/ClientRealm/API/Unreal/InteractionAPI/Events/Interaction_OnRender_Slot.uc rename to sources/ClientAPI/API/Unreal/InteractionAPI/Events/Interaction_OnRender_Slot.uc diff --git a/sources/ClientRealm/API/Unreal/InteractionAPI/InteractionAPI.uc b/sources/ClientAPI/API/Unreal/InteractionAPI/InteractionAPI.uc similarity index 100% rename from sources/ClientRealm/API/Unreal/InteractionAPI/InteractionAPI.uc rename to sources/ClientAPI/API/Unreal/InteractionAPI/InteractionAPI.uc diff --git a/sources/ClientRealm/ClientAcediaAdapter.uc b/sources/ClientAPI/ClientAcediaAdapter.uc similarity index 100% rename from sources/ClientRealm/ClientAcediaAdapter.uc rename to sources/ClientAPI/ClientAcediaAdapter.uc diff --git a/sources/ClientRealm/ClientGlobal.uc b/sources/ClientAPI/ClientGlobal.uc similarity index 100% rename from sources/ClientRealm/ClientGlobal.uc rename to sources/ClientAPI/ClientGlobal.uc diff --git a/sources/ClientRealm/ClientLevelCore.uc b/sources/ClientAPI/ClientLevelCore.uc similarity index 100% rename from sources/ClientRealm/ClientLevelCore.uc rename to sources/ClientAPI/ClientLevelCore.uc diff --git a/sources/Data/Database/DBAPI.uc b/sources/Data/Database/DBAPI.uc index 54ab288..ed8d7cd 100644 --- a/sources/Data/Database/DBAPI.uc +++ b/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. diff --git a/sources/Data/Database/Local/DBRecord.uc b/sources/Data/Database/Local/DBRecord.uc index 0510ff1..8032001 100644 --- a/sources/Data/Database/Local/DBRecord.uc +++ b/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; diff --git a/sources/Data/Database/Local/LocalDatabaseInstance.uc b/sources/Data/Database/Local/LocalDatabaseInstance.uc index 0ccdea6..7ccd624 100644 --- a/sources/Data/Database/Local/LocalDatabaseInstance.uc +++ b/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); } } diff --git a/sources/Data/Database/Tests/TEST_DatabaseCommon.uc b/sources/Data/Database/Tests/TEST_DatabaseCommon.uc index 22f7014..b739218 100644 --- a/sources/Data/Database/Tests/TEST_DatabaseCommon.uc +++ b/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"); } diff --git a/sources/Data/Database/Tests/TEST_LocalDatabase.uc b/sources/Data/Database/Tests/TEST_LocalDatabase.uc index d983167..e0077fb 100644 --- a/sources/Data/Database/Tests/TEST_LocalDatabase.uc +++ b/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) diff --git a/sources/KFRealm/Client/API/Unreal/InteractionAPI/KF1_InteractionAPI.uc b/sources/KFImplementation/Client/API/Unreal/InteractionAPI/KF1_InteractionAPI.uc similarity index 100% rename from sources/KFRealm/Client/API/Unreal/InteractionAPI/KF1_InteractionAPI.uc rename to sources/KFImplementation/Client/API/Unreal/InteractionAPI/KF1_InteractionAPI.uc diff --git a/sources/KFRealm/Client/API/Unreal/KF1_ClientUnrealAPI.uc b/sources/KFImplementation/Client/API/Unreal/KF1_ClientUnrealAPI.uc similarity index 100% rename from sources/KFRealm/Client/API/Unreal/KF1_ClientUnrealAPI.uc rename to sources/KFImplementation/Client/API/Unreal/KF1_ClientUnrealAPI.uc diff --git a/sources/KFRealm/Client/AcediaInteraction.uc b/sources/KFImplementation/Client/AcediaInteraction.uc similarity index 100% rename from sources/KFRealm/Client/AcediaInteraction.uc rename to sources/KFImplementation/Client/AcediaInteraction.uc diff --git a/sources/KFRealm/Core/ActorStalker.uc b/sources/KFImplementation/Core/ActorStalker.uc similarity index 100% rename from sources/KFRealm/Core/ActorStalker.uc rename to sources/KFImplementation/Core/ActorStalker.uc diff --git a/sources/KFRealm/Core/KF1_SideEffectAPI.uc b/sources/KFImplementation/Core/KF1_SideEffectAPI.uc similarity index 100% rename from sources/KFRealm/Core/KF1_SideEffectAPI.uc rename to sources/KFImplementation/Core/KF1_SideEffectAPI.uc diff --git a/sources/KFRealm/Core/Time/KF1_RealTimer.uc b/sources/KFImplementation/Core/Time/KF1_RealTimer.uc similarity index 100% rename from sources/KFRealm/Core/Time/KF1_RealTimer.uc rename to sources/KFImplementation/Core/Time/KF1_RealTimer.uc diff --git a/sources/KFRealm/Core/Time/KF1_TimeAPI.uc b/sources/KFImplementation/Core/Time/KF1_TimeAPI.uc similarity index 100% rename from sources/KFRealm/Core/Time/KF1_TimeAPI.uc rename to sources/KFImplementation/Core/Time/KF1_TimeAPI.uc diff --git a/sources/KFRealm/Core/Time/KF1_Timer.uc b/sources/KFImplementation/Core/Time/KF1_Timer.uc similarity index 100% rename from sources/KFRealm/Core/Time/KF1_Timer.uc rename to sources/KFImplementation/Core/Time/KF1_Timer.uc diff --git a/sources/KFRealm/Server/Unreal/BroadcastsAPI/BroadcastEventsObserver.uc b/sources/KFImplementation/Server/Unreal/BroadcastsAPI/BroadcastEventsObserver.uc similarity index 100% rename from sources/KFRealm/Server/Unreal/BroadcastsAPI/BroadcastEventsObserver.uc rename to sources/KFImplementation/Server/Unreal/BroadcastsAPI/BroadcastEventsObserver.uc diff --git a/sources/KFRealm/Server/Unreal/BroadcastsAPI/BroadcastSideEffect.uc b/sources/KFImplementation/Server/Unreal/BroadcastsAPI/BroadcastSideEffect.uc similarity index 100% rename from sources/KFRealm/Server/Unreal/BroadcastsAPI/BroadcastSideEffect.uc rename to sources/KFImplementation/Server/Unreal/BroadcastsAPI/BroadcastSideEffect.uc diff --git a/sources/KFRealm/Server/Unreal/BroadcastsAPI/KF1_BroadcastAPI.uc b/sources/KFImplementation/Server/Unreal/BroadcastsAPI/KF1_BroadcastAPI.uc similarity index 100% rename from sources/KFRealm/Server/Unreal/BroadcastsAPI/KF1_BroadcastAPI.uc rename to sources/KFImplementation/Server/Unreal/BroadcastsAPI/KF1_BroadcastAPI.uc diff --git a/sources/KFRealm/Server/Unreal/Connections/ConnectionService.uc b/sources/KFImplementation/Server/Unreal/Connections/ConnectionService.uc similarity index 100% rename from sources/KFRealm/Server/Unreal/Connections/ConnectionService.uc rename to sources/KFImplementation/Server/Unreal/Connections/ConnectionService.uc diff --git a/sources/KFRealm/Server/Unreal/Connections/Events/Connection_Signal.uc b/sources/KFImplementation/Server/Unreal/Connections/Events/Connection_Signal.uc similarity index 100% rename from sources/KFRealm/Server/Unreal/Connections/Events/Connection_Signal.uc rename to sources/KFImplementation/Server/Unreal/Connections/Events/Connection_Signal.uc diff --git a/sources/KFRealm/Server/Unreal/Connections/Events/Connection_Slot.uc b/sources/KFImplementation/Server/Unreal/Connections/Events/Connection_Slot.uc similarity index 100% rename from sources/KFRealm/Server/Unreal/Connections/Events/Connection_Slot.uc rename to sources/KFImplementation/Server/Unreal/Connections/Events/Connection_Slot.uc diff --git a/sources/KFRealm/Server/Unreal/GameRulesAPI/AcediaGameRules.uc b/sources/KFImplementation/Server/Unreal/GameRulesAPI/AcediaGameRules.uc similarity index 100% rename from sources/KFRealm/Server/Unreal/GameRulesAPI/AcediaGameRules.uc rename to sources/KFImplementation/Server/Unreal/GameRulesAPI/AcediaGameRules.uc diff --git a/sources/KFRealm/Server/Unreal/GameRulesAPI/GameRulesSideEffect.uc b/sources/KFImplementation/Server/Unreal/GameRulesAPI/GameRulesSideEffect.uc similarity index 100% rename from sources/KFRealm/Server/Unreal/GameRulesAPI/GameRulesSideEffect.uc rename to sources/KFImplementation/Server/Unreal/GameRulesAPI/GameRulesSideEffect.uc diff --git a/sources/KFRealm/Server/Unreal/GameRulesAPI/KF1_GameRulesAPI.uc b/sources/KFImplementation/Server/Unreal/GameRulesAPI/KF1_GameRulesAPI.uc similarity index 99% rename from sources/KFRealm/Server/Unreal/GameRulesAPI/KF1_GameRulesAPI.uc rename to sources/KFImplementation/Server/Unreal/GameRulesAPI/KF1_GameRulesAPI.uc index 9018262..6cab0b4 100644 --- a/sources/KFRealm/Server/Unreal/GameRulesAPI/KF1_GameRulesAPI.uc +++ b/sources/KFImplementation/Server/Unreal/GameRulesAPI/KF1_GameRulesAPI.uc @@ -173,7 +173,7 @@ public function GameRules Add(class 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; } diff --git a/sources/KFRealm/Server/Unreal/InventoryAPI/InventoryService.uc b/sources/KFImplementation/Server/Unreal/InventoryAPI/InventoryService.uc similarity index 100% rename from sources/KFRealm/Server/Unreal/InventoryAPI/InventoryService.uc rename to sources/KFImplementation/Server/Unreal/InventoryAPI/InventoryService.uc diff --git a/sources/KFRealm/Server/Unreal/InventoryAPI/KF1_InventoryAPI.uc b/sources/KFImplementation/Server/Unreal/InventoryAPI/KF1_InventoryAPI.uc similarity index 100% rename from sources/KFRealm/Server/Unreal/InventoryAPI/KF1_InventoryAPI.uc rename to sources/KFImplementation/Server/Unreal/InventoryAPI/KF1_InventoryAPI.uc diff --git a/sources/KFRealm/Server/Unreal/KF1_ServerUnrealAPI.uc b/sources/KFImplementation/Server/Unreal/KF1_ServerUnrealAPI.uc similarity index 100% rename from sources/KFRealm/Server/Unreal/KF1_ServerUnrealAPI.uc rename to sources/KFImplementation/Server/Unreal/KF1_ServerUnrealAPI.uc diff --git a/sources/KFRealm/Server/Unreal/MutatorAPI/KF1_MutatorAPI.uc b/sources/KFImplementation/Server/Unreal/MutatorAPI/KF1_MutatorAPI.uc similarity index 100% rename from sources/KFRealm/Server/Unreal/MutatorAPI/KF1_MutatorAPI.uc rename to sources/KFImplementation/Server/Unreal/MutatorAPI/KF1_MutatorAPI.uc diff --git a/sources/KFRealm/Server/Unreal/NativeActorRef.uc b/sources/KFImplementation/Server/Unreal/NativeActorRef.uc similarity index 100% rename from sources/KFRealm/Server/Unreal/NativeActorRef.uc rename to sources/KFImplementation/Server/Unreal/NativeActorRef.uc diff --git a/sources/KFRealm/Server/Unreal/ServerUnrealService.uc b/sources/KFImplementation/Server/Unreal/ServerUnrealService.uc similarity index 100% rename from sources/KFRealm/Server/Unreal/ServerUnrealService.uc rename to sources/KFImplementation/Server/Unreal/ServerUnrealService.uc diff --git a/sources/KFRealm/Server/Unreal/Tests/MockGameRulesA.uc b/sources/KFImplementation/Server/Unreal/Tests/MockGameRulesA.uc similarity index 100% rename from sources/KFRealm/Server/Unreal/Tests/MockGameRulesA.uc rename to sources/KFImplementation/Server/Unreal/Tests/MockGameRulesA.uc diff --git a/sources/KFRealm/Server/Unreal/Tests/MockGameRulesB.uc b/sources/KFImplementation/Server/Unreal/Tests/MockGameRulesB.uc similarity index 100% rename from sources/KFRealm/Server/Unreal/Tests/MockGameRulesB.uc rename to sources/KFImplementation/Server/Unreal/Tests/MockGameRulesB.uc diff --git a/sources/KFRealm/Server/Unreal/Tests/MockInventoryA.uc b/sources/KFImplementation/Server/Unreal/Tests/MockInventoryA.uc similarity index 100% rename from sources/KFRealm/Server/Unreal/Tests/MockInventoryA.uc rename to sources/KFImplementation/Server/Unreal/Tests/MockInventoryA.uc diff --git a/sources/KFRealm/Server/Unreal/Tests/MockInventoryAChild.uc b/sources/KFImplementation/Server/Unreal/Tests/MockInventoryAChild.uc similarity index 100% rename from sources/KFRealm/Server/Unreal/Tests/MockInventoryAChild.uc rename to sources/KFImplementation/Server/Unreal/Tests/MockInventoryAChild.uc diff --git a/sources/KFRealm/Server/Unreal/Tests/MockInventoryB.uc b/sources/KFImplementation/Server/Unreal/Tests/MockInventoryB.uc similarity index 100% rename from sources/KFRealm/Server/Unreal/Tests/MockInventoryB.uc rename to sources/KFImplementation/Server/Unreal/Tests/MockInventoryB.uc diff --git a/sources/KFRealm/Server/Unreal/Tests/TEST_ServerUnrealAPI.uc b/sources/KFImplementation/Server/Unreal/Tests/TEST_ServerUnrealAPI.uc similarity index 93% rename from sources/KFRealm/Server/Unreal/Tests/TEST_ServerUnrealAPI.uc rename to sources/KFImplementation/Server/Unreal/Tests/TEST_ServerUnrealAPI.uc index 2eafefc..fa42de2 100644 --- a/sources/KFRealm/Server/Unreal/Tests/TEST_ServerUnrealAPI.uc +++ b/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); diff --git a/sources/CoreRealm/API/SideEffects/SideEffect.uc b/sources/LevelAPI/API/SideEffects/SideEffect.uc similarity index 100% rename from sources/CoreRealm/API/SideEffects/SideEffect.uc rename to sources/LevelAPI/API/SideEffects/SideEffect.uc diff --git a/sources/CoreRealm/API/SideEffects/SideEffectAPI.uc b/sources/LevelAPI/API/SideEffects/SideEffectAPI.uc similarity index 100% rename from sources/CoreRealm/API/SideEffects/SideEffectAPI.uc rename to sources/LevelAPI/API/SideEffects/SideEffectAPI.uc diff --git a/sources/CoreRealm/API/Time/Events/Timer_OnElapsed_Signal.uc b/sources/LevelAPI/API/Time/Events/Timer_OnElapsed_Signal.uc similarity index 100% rename from sources/CoreRealm/API/Time/Events/Timer_OnElapsed_Signal.uc rename to sources/LevelAPI/API/Time/Events/Timer_OnElapsed_Signal.uc diff --git a/sources/CoreRealm/API/Time/Events/Timer_OnElapsed_Slot.uc b/sources/LevelAPI/API/Time/Events/Timer_OnElapsed_Slot.uc similarity index 100% rename from sources/CoreRealm/API/Time/Events/Timer_OnElapsed_Slot.uc rename to sources/LevelAPI/API/Time/Events/Timer_OnElapsed_Slot.uc diff --git a/sources/CoreRealm/API/Time/TimeAPI.uc b/sources/LevelAPI/API/Time/TimeAPI.uc similarity index 100% rename from sources/CoreRealm/API/Time/TimeAPI.uc rename to sources/LevelAPI/API/Time/TimeAPI.uc diff --git a/sources/CoreRealm/API/Time/Timer.uc b/sources/LevelAPI/API/Time/Timer.uc similarity index 100% rename from sources/CoreRealm/API/Time/Timer.uc rename to sources/LevelAPI/API/Time/Timer.uc diff --git a/sources/CoreRealm/API/UnrealAPI/ActorService.uc b/sources/LevelAPI/API/UnrealAPI/ActorService.uc similarity index 100% rename from sources/CoreRealm/API/UnrealAPI/ActorService.uc rename to sources/LevelAPI/API/UnrealAPI/ActorService.uc diff --git a/sources/CoreRealm/API/UnrealAPI/Events/Unreal_OnTick_Signal.uc b/sources/LevelAPI/API/UnrealAPI/Events/Unreal_OnTick_Signal.uc similarity index 100% rename from sources/CoreRealm/API/UnrealAPI/Events/Unreal_OnTick_Signal.uc rename to sources/LevelAPI/API/UnrealAPI/Events/Unreal_OnTick_Signal.uc diff --git a/sources/CoreRealm/API/UnrealAPI/Events/Unreal_OnTick_Slot.uc b/sources/LevelAPI/API/UnrealAPI/Events/Unreal_OnTick_Slot.uc similarity index 100% rename from sources/CoreRealm/API/UnrealAPI/Events/Unreal_OnTick_Slot.uc rename to sources/LevelAPI/API/UnrealAPI/Events/Unreal_OnTick_Slot.uc diff --git a/sources/CoreRealm/API/UnrealAPI/UnrealAPI.uc b/sources/LevelAPI/API/UnrealAPI/UnrealAPI.uc similarity index 100% rename from sources/CoreRealm/API/UnrealAPI/UnrealAPI.uc rename to sources/LevelAPI/API/UnrealAPI/UnrealAPI.uc diff --git a/sources/CoreRealm/AcediaAdapter.uc b/sources/LevelAPI/AcediaAdapter.uc similarity index 100% rename from sources/CoreRealm/AcediaAdapter.uc rename to sources/LevelAPI/AcediaAdapter.uc diff --git a/sources/CoreRealm/CoreGlobal.uc b/sources/LevelAPI/CoreGlobal.uc similarity index 100% rename from sources/CoreRealm/CoreGlobal.uc rename to sources/LevelAPI/CoreGlobal.uc diff --git a/sources/CoreRealm/Features/Commands/BuiltInCommands/ACommandHelp.uc b/sources/LevelAPI/Features/Commands/BuiltInCommands/ACommandHelp.uc similarity index 100% rename from sources/CoreRealm/Features/Commands/BuiltInCommands/ACommandHelp.uc rename to sources/LevelAPI/Features/Commands/BuiltInCommands/ACommandHelp.uc diff --git a/sources/CoreRealm/Features/Commands/Command.uc b/sources/LevelAPI/Features/Commands/Command.uc similarity index 100% rename from sources/CoreRealm/Features/Commands/Command.uc rename to sources/LevelAPI/Features/Commands/Command.uc diff --git a/sources/CoreRealm/Features/Commands/CommandDataBuilder.uc b/sources/LevelAPI/Features/Commands/CommandDataBuilder.uc similarity index 100% rename from sources/CoreRealm/Features/Commands/CommandDataBuilder.uc rename to sources/LevelAPI/Features/Commands/CommandDataBuilder.uc diff --git a/sources/CoreRealm/Features/Commands/CommandParser.uc b/sources/LevelAPI/Features/Commands/CommandParser.uc similarity index 100% rename from sources/CoreRealm/Features/Commands/CommandParser.uc rename to sources/LevelAPI/Features/Commands/CommandParser.uc diff --git a/sources/CoreRealm/Features/Commands/Commands.uc b/sources/LevelAPI/Features/Commands/Commands.uc similarity index 100% rename from sources/CoreRealm/Features/Commands/Commands.uc rename to sources/LevelAPI/Features/Commands/Commands.uc diff --git a/sources/CoreRealm/Features/Commands/Commands_Feature.uc b/sources/LevelAPI/Features/Commands/Commands_Feature.uc similarity index 100% rename from sources/CoreRealm/Features/Commands/Commands_Feature.uc rename to sources/LevelAPI/Features/Commands/Commands_Feature.uc diff --git a/sources/CoreRealm/Features/Commands/PlayersParser.uc b/sources/LevelAPI/Features/Commands/PlayersParser.uc similarity index 100% rename from sources/CoreRealm/Features/Commands/PlayersParser.uc rename to sources/LevelAPI/Features/Commands/PlayersParser.uc diff --git a/sources/CoreRealm/Features/Commands/Tests/MockCommandA.uc b/sources/LevelAPI/Features/Commands/Tests/MockCommandA.uc similarity index 100% rename from sources/CoreRealm/Features/Commands/Tests/MockCommandA.uc rename to sources/LevelAPI/Features/Commands/Tests/MockCommandA.uc diff --git a/sources/CoreRealm/Features/Commands/Tests/MockCommandB.uc b/sources/LevelAPI/Features/Commands/Tests/MockCommandB.uc similarity index 100% rename from sources/CoreRealm/Features/Commands/Tests/MockCommandB.uc rename to sources/LevelAPI/Features/Commands/Tests/MockCommandB.uc diff --git a/sources/CoreRealm/Features/Commands/Tests/TEST_Command.uc b/sources/LevelAPI/Features/Commands/Tests/TEST_Command.uc similarity index 100% rename from sources/CoreRealm/Features/Commands/Tests/TEST_Command.uc rename to sources/LevelAPI/Features/Commands/Tests/TEST_Command.uc diff --git a/sources/CoreRealm/Features/Commands/Tests/TEST_CommandDataBuilder.uc b/sources/LevelAPI/Features/Commands/Tests/TEST_CommandDataBuilder.uc similarity index 100% rename from sources/CoreRealm/Features/Commands/Tests/TEST_CommandDataBuilder.uc rename to sources/LevelAPI/Features/Commands/Tests/TEST_CommandDataBuilder.uc diff --git a/sources/CoreRealm/LevelCore.uc b/sources/LevelAPI/LevelCore.uc similarity index 100% rename from sources/CoreRealm/LevelCore.uc rename to sources/LevelAPI/LevelCore.uc diff --git a/sources/CoreRealm/SideEffects.uc b/sources/LevelAPI/SideEffects.uc similarity index 100% rename from sources/CoreRealm/SideEffects.uc rename to sources/LevelAPI/SideEffects.uc diff --git a/sources/ServerRealm/API/Unreal/BroadcastsAPI/BroadcastAPI.uc b/sources/ServerAPI/API/Unreal/BroadcastsAPI/BroadcastAPI.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/BroadcastsAPI/BroadcastAPI.uc rename to sources/ServerAPI/API/Unreal/BroadcastsAPI/BroadcastAPI.uc diff --git a/sources/ServerRealm/API/Unreal/BroadcastsAPI/Events/Broadcast_OnBroadcastCheck_Signal.uc b/sources/ServerAPI/API/Unreal/BroadcastsAPI/Events/Broadcast_OnBroadcastCheck_Signal.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/BroadcastsAPI/Events/Broadcast_OnBroadcastCheck_Signal.uc rename to sources/ServerAPI/API/Unreal/BroadcastsAPI/Events/Broadcast_OnBroadcastCheck_Signal.uc diff --git a/sources/ServerRealm/API/Unreal/BroadcastsAPI/Events/Broadcast_OnBroadcastCheck_Slot.uc b/sources/ServerAPI/API/Unreal/BroadcastsAPI/Events/Broadcast_OnBroadcastCheck_Slot.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/BroadcastsAPI/Events/Broadcast_OnBroadcastCheck_Slot.uc rename to sources/ServerAPI/API/Unreal/BroadcastsAPI/Events/Broadcast_OnBroadcastCheck_Slot.uc diff --git a/sources/ServerRealm/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleLocalizedFor_Signal.uc b/sources/ServerAPI/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleLocalizedFor_Signal.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleLocalizedFor_Signal.uc rename to sources/ServerAPI/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleLocalizedFor_Signal.uc diff --git a/sources/ServerRealm/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleLocalizedFor_Slot.uc b/sources/ServerAPI/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleLocalizedFor_Slot.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleLocalizedFor_Slot.uc rename to sources/ServerAPI/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleLocalizedFor_Slot.uc diff --git a/sources/ServerRealm/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleLocalized_Signal.uc b/sources/ServerAPI/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleLocalized_Signal.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleLocalized_Signal.uc rename to sources/ServerAPI/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleLocalized_Signal.uc diff --git a/sources/ServerRealm/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleLocalized_Slot.uc b/sources/ServerAPI/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleLocalized_Slot.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleLocalized_Slot.uc rename to sources/ServerAPI/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleLocalized_Slot.uc diff --git a/sources/ServerRealm/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleTextFor_Signal.uc b/sources/ServerAPI/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleTextFor_Signal.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleTextFor_Signal.uc rename to sources/ServerAPI/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleTextFor_Signal.uc diff --git a/sources/ServerRealm/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleTextFor_Slot.uc b/sources/ServerAPI/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleTextFor_Slot.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleTextFor_Slot.uc rename to sources/ServerAPI/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleTextFor_Slot.uc diff --git a/sources/ServerRealm/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleText_Signal.uc b/sources/ServerAPI/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleText_Signal.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleText_Signal.uc rename to sources/ServerAPI/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleText_Signal.uc diff --git a/sources/ServerRealm/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleText_Slot.uc b/sources/ServerAPI/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleText_Slot.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleText_Slot.uc rename to sources/ServerAPI/API/Unreal/BroadcastsAPI/Events/Broadcast_OnHandleText_Slot.uc diff --git a/sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnCheckEndGame_Signal.uc b/sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnCheckEndGame_Signal.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnCheckEndGame_Signal.uc rename to sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnCheckEndGame_Signal.uc diff --git a/sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnCheckEndGame_Slot.uc b/sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnCheckEndGame_Slot.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnCheckEndGame_Slot.uc rename to sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnCheckEndGame_Slot.uc diff --git a/sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnCheckScore_Signal.uc b/sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnCheckScore_Signal.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnCheckScore_Signal.uc rename to sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnCheckScore_Signal.uc diff --git a/sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnCheckScore_Slot.uc b/sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnCheckScore_Slot.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnCheckScore_Slot.uc rename to sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnCheckScore_Slot.uc diff --git a/sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnFindPlayerStart_Signal.uc b/sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnFindPlayerStart_Signal.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnFindPlayerStart_Signal.uc rename to sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnFindPlayerStart_Signal.uc diff --git a/sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnFindPlayerStart_Slot.uc b/sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnFindPlayerStart_Slot.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnFindPlayerStart_Slot.uc rename to sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnFindPlayerStart_Slot.uc diff --git a/sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnHandleRestartGame_Signal.uc b/sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnHandleRestartGame_Signal.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnHandleRestartGame_Signal.uc rename to sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnHandleRestartGame_Signal.uc diff --git a/sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnHandleRestartGame_Slot.uc b/sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnHandleRestartGame_Slot.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnHandleRestartGame_Slot.uc rename to sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnHandleRestartGame_Slot.uc diff --git a/sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnNetDamage_Signal.uc b/sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnNetDamage_Signal.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnNetDamage_Signal.uc rename to sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnNetDamage_Signal.uc diff --git a/sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnNetDamage_Slot.uc b/sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnNetDamage_Slot.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnNetDamage_Slot.uc rename to sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnNetDamage_Slot.uc diff --git a/sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnOverridePickupQuery_Signal.uc b/sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnOverridePickupQuery_Signal.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnOverridePickupQuery_Signal.uc rename to sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnOverridePickupQuery_Signal.uc diff --git a/sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnOverridePickupQuery_Slot.uc b/sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnOverridePickupQuery_Slot.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnOverridePickupQuery_Slot.uc rename to sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnOverridePickupQuery_Slot.uc diff --git a/sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnPreventDeath_Signal.uc b/sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnPreventDeath_Signal.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnPreventDeath_Signal.uc rename to sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnPreventDeath_Signal.uc diff --git a/sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnPreventDeath_Slot.uc b/sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnPreventDeath_Slot.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnPreventDeath_Slot.uc rename to sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnPreventDeath_Slot.uc diff --git a/sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnScoreKill_Signal.uc b/sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnScoreKill_Signal.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnScoreKill_Signal.uc rename to sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnScoreKill_Signal.uc diff --git a/sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnScoreKill_Slot.uc b/sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnScoreKill_Slot.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/GameRulesAPI/Events/GameRules_OnScoreKill_Slot.uc rename to sources/ServerAPI/API/Unreal/GameRulesAPI/Events/GameRules_OnScoreKill_Slot.uc diff --git a/sources/ServerRealm/API/Unreal/GameRulesAPI/GameRulesAPI.uc b/sources/ServerAPI/API/Unreal/GameRulesAPI/GameRulesAPI.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/GameRulesAPI/GameRulesAPI.uc rename to sources/ServerAPI/API/Unreal/GameRulesAPI/GameRulesAPI.uc diff --git a/sources/ServerRealm/API/Unreal/InventoryAPI/InventoryAPI.uc b/sources/ServerAPI/API/Unreal/InventoryAPI/InventoryAPI.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/InventoryAPI/InventoryAPI.uc rename to sources/ServerAPI/API/Unreal/InventoryAPI/InventoryAPI.uc diff --git a/sources/ServerRealm/API/Unreal/MutatorsAPI/Events/Mutator_OnCheckReplacement_Signal.uc b/sources/ServerAPI/API/Unreal/MutatorsAPI/Events/Mutator_OnCheckReplacement_Signal.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/MutatorsAPI/Events/Mutator_OnCheckReplacement_Signal.uc rename to sources/ServerAPI/API/Unreal/MutatorsAPI/Events/Mutator_OnCheckReplacement_Signal.uc diff --git a/sources/ServerRealm/API/Unreal/MutatorsAPI/Events/Mutator_OnCheckReplacement_Slot.uc b/sources/ServerAPI/API/Unreal/MutatorsAPI/Events/Mutator_OnCheckReplacement_Slot.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/MutatorsAPI/Events/Mutator_OnCheckReplacement_Slot.uc rename to sources/ServerAPI/API/Unreal/MutatorsAPI/Events/Mutator_OnCheckReplacement_Slot.uc diff --git a/sources/ServerRealm/API/Unreal/MutatorsAPI/Events/Mutator_OnModifyLogin_Signal.uc b/sources/ServerAPI/API/Unreal/MutatorsAPI/Events/Mutator_OnModifyLogin_Signal.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/MutatorsAPI/Events/Mutator_OnModifyLogin_Signal.uc rename to sources/ServerAPI/API/Unreal/MutatorsAPI/Events/Mutator_OnModifyLogin_Signal.uc diff --git a/sources/ServerRealm/API/Unreal/MutatorsAPI/Events/Mutator_OnModifyLogin_Slot.uc b/sources/ServerAPI/API/Unreal/MutatorsAPI/Events/Mutator_OnModifyLogin_Slot.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/MutatorsAPI/Events/Mutator_OnModifyLogin_Slot.uc rename to sources/ServerAPI/API/Unreal/MutatorsAPI/Events/Mutator_OnModifyLogin_Slot.uc diff --git a/sources/ServerRealm/API/Unreal/MutatorsAPI/Events/Mutator_OnMutate_Signal.uc b/sources/ServerAPI/API/Unreal/MutatorsAPI/Events/Mutator_OnMutate_Signal.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/MutatorsAPI/Events/Mutator_OnMutate_Signal.uc rename to sources/ServerAPI/API/Unreal/MutatorsAPI/Events/Mutator_OnMutate_Signal.uc diff --git a/sources/ServerRealm/API/Unreal/MutatorsAPI/Events/Mutator_OnMutate_Slot.uc b/sources/ServerAPI/API/Unreal/MutatorsAPI/Events/Mutator_OnMutate_Slot.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/MutatorsAPI/Events/Mutator_OnMutate_Slot.uc rename to sources/ServerAPI/API/Unreal/MutatorsAPI/Events/Mutator_OnMutate_Slot.uc diff --git a/sources/ServerRealm/API/Unreal/MutatorsAPI/MutatorAPI.uc b/sources/ServerAPI/API/Unreal/MutatorsAPI/MutatorAPI.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/MutatorsAPI/MutatorAPI.uc rename to sources/ServerAPI/API/Unreal/MutatorsAPI/MutatorAPI.uc diff --git a/sources/ServerRealm/API/Unreal/ServerUnrealAPI.uc b/sources/ServerAPI/API/Unreal/ServerUnrealAPI.uc similarity index 100% rename from sources/ServerRealm/API/Unreal/ServerUnrealAPI.uc rename to sources/ServerAPI/API/Unreal/ServerUnrealAPI.uc diff --git a/sources/ServerRealm/ServerAcediaAdapter.uc b/sources/ServerAPI/ServerAcediaAdapter.uc similarity index 100% rename from sources/ServerRealm/ServerAcediaAdapter.uc rename to sources/ServerAPI/ServerAcediaAdapter.uc diff --git a/sources/ServerRealm/ServerGlobal.uc b/sources/ServerAPI/ServerGlobal.uc similarity index 100% rename from sources/ServerRealm/ServerGlobal.uc rename to sources/ServerAPI/ServerGlobal.uc diff --git a/sources/ServerRealm/ServerLevelCore.uc b/sources/ServerAPI/ServerLevelCore.uc similarity index 100% rename from sources/ServerRealm/ServerLevelCore.uc rename to sources/ServerAPI/ServerLevelCore.uc diff --git a/sources/Service.uc b/sources/Service.uc index 125ebe0..d0b4ef1 100644 --- a/sources/Service.uc +++ b/sources/Service.uc @@ -36,7 +36,7 @@ public simulated static final function Service Require() if (IsRunning()) { return Service(GetInstance()); } - core = __core().GetLevelCore(); + core = __level().GetLevelCore(); if (core == none) { return none; } diff --git a/sources/Singleton.uc b/sources/Singleton.uc index 9e7171d..95e0cc1 100644 --- a/sources/Singleton.uc +++ b/sources/Singleton.uc @@ -50,7 +50,7 @@ public simulated final static function Singleton GetInstance( } if (spawnIfMissing) { - core = __core().GetLevelCore(); + core = __level().GetLevelCore(); if (core != none) { return Singleton(core.Allocate(default.class)); } diff --git a/sources/Types/AcediaActor.uc b/sources/Types/AcediaActor.uc index 768d3d5..2acad9d 100644 --- a/sources/Types/AcediaActor.uc +++ b/sources/Types/AcediaActor.uc @@ -356,7 +356,7 @@ public simulated static final function Global __() * client one, depending on which is available), necessary for Acedia's * implementation. */ -public static final function CoreGlobal __core() +public static final function CoreGlobal __level() { local ServerGlobal serverAPI; local ClientGlobal clientAPI; diff --git a/sources/Types/AcediaObject.uc b/sources/Types/AcediaObject.uc index 3e0a4df..0f2972a 100644 --- a/sources/Types/AcediaObject.uc +++ b/sources/Types/AcediaObject.uc @@ -494,7 +494,7 @@ public static final function Global __() * client one, depending on which is available), necessary for Acedia's * implementation. */ -public static final function CoreGlobal __core() +public static final function CoreGlobal __level() { local ServerGlobal serverAPI; local ClientGlobal clientAPI; diff --git a/sources/Types/Tests/TEST_ActorService.uc b/sources/Types/Tests/TEST_ActorService.uc index 32793e9..1e84df1 100644 --- a/sources/Types/Tests/TEST_ActorService.uc +++ b/sources/Types/Tests/TEST_ActorService.uc @@ -47,7 +47,7 @@ protected static function Test_AddDestroy(class classToTest) Issue("Cannot retrieve recorded `Actor`s with `GetActor()`."); for (i = 0; i < 1000; i += 1) { - nativeActors[i] = __core().GetLevelCore().Allocate(classToTest); + nativeActors[i] = __level().GetLevelCore().Allocate(classToTest); actorRefs[i] = service.AddActor(nativeActors[i]); } for (i = 0; i < 1000; i += 1) @@ -72,7 +72,7 @@ protected static function Test_AddDestroy(class classToTest) { if (i % 2 == 0) { - nativeActors[i] = __core().GetLevelCore().Allocate(classToTest); + nativeActors[i] = __level().GetLevelCore().Allocate(classToTest); actorRefs[i] = service.AddActor(nativeActors[i]); } } @@ -92,7 +92,7 @@ protected static function Test_AddRemove(class classToTest) service = ActorService(class'ActorService'.static.Require()); for (i = 0; i < 1000; i += 1) { - nativeActors[i] = __core().GetLevelCore().Allocate(classToTest); + nativeActors[i] = __level().GetLevelCore().Allocate(classToTest); actorRefs[i] = service.AddActor(nativeActors[i]); } @@ -113,7 +113,7 @@ protected static function Test_AddRemove(class classToTest) { if (i % 2 == 0) { - nativeActors[i] = __core().GetLevelCore().Allocate(classToTest); + nativeActors[i] = __level().GetLevelCore().Allocate(classToTest); actorRefs[i] = service.AddActor(nativeActors[i]); } } @@ -133,7 +133,7 @@ protected static function Test_Update(class classToTest) service = ActorService(class'ActorService'.static.Require()); for (i = 0; i < 1000; i += 1) { - nativeActors[i] = __core().GetLevelCore().Allocate(classToTest); + nativeActors[i] = __level().GetLevelCore().Allocate(classToTest); actorRefs[i] = service.AddActor(nativeActors[i]); } @@ -142,7 +142,7 @@ protected static function Test_Update(class classToTest) { if (i % 2 == 0) { - nativeActors[i] = __core().GetLevelCore().Allocate(classToTest); + nativeActors[i] = __level().GetLevelCore().Allocate(classToTest); actorRefs[i] = service.UpdateActor(actorRefs[i], nativeActors[i]); } }