diff --git a/Fika.Core/Coop/ClientClasses/FikaClientTransitController.cs b/Fika.Core/Coop/ClientClasses/FikaClientTransitController.cs index 17639003..d42ec358 100644 --- a/Fika.Core/Coop/ClientClasses/FikaClientTransitController.cs +++ b/Fika.Core/Coop/ClientClasses/FikaClientTransitController.cs @@ -59,7 +59,7 @@ public override void Dispose() public void HandleClientExtract(int transitId, int playerId) { - if (!smethod_0(playerId, out Player myPlayer)) + if (smethod_2(playerId, out Player myPlayer)) { return; } diff --git a/Fika.Core/Coop/ClientClasses/HandsControllers/CoopClientGrenadeController.cs b/Fika.Core/Coop/ClientClasses/HandsControllers/CoopClientGrenadeController.cs index a405c53b..8d2c134c 100644 --- a/Fika.Core/Coop/ClientClasses/HandsControllers/CoopClientGrenadeController.cs +++ b/Fika.Core/Coop/ClientClasses/HandsControllers/CoopClientGrenadeController.cs @@ -139,12 +139,12 @@ public override void ChangeFireMode(Weapon.EFireMode fireMode) } // Check for GClass increments - Class1157 currentOperation = CurrentOperation; + Class1154 currentOperation = CurrentOperation; if (currentOperation != null) { - if (currentOperation is not Class1162) + if (currentOperation is not Class1159) { - if (currentOperation is Class1163) + if (currentOperation is Class1160) { player.PacketSender.FirearmPackets.Enqueue(new() { diff --git a/Fika.Core/Coop/GameMode/CoopGame.cs b/Fika.Core/Coop/GameMode/CoopGame.cs index eabdbe0a..616245bc 100644 --- a/Fika.Core/Coop/GameMode/CoopGame.cs +++ b/Fika.Core/Coop/GameMode/CoopGame.cs @@ -1379,7 +1379,7 @@ private async Task CreateLocalPlayer() IEnumerable items = Profile_0.Inventory.GetPlayerItems(EPlayerItems.Equipment); if (items != null) { - Class1513 keyFinder = new() + Class1510 keyFinder = new() { accessKeys = Location_0.AccessKeys }; @@ -2567,7 +2567,7 @@ private void CleanUpFikaBackendUtils() FikaBackendUtils.ReconnectPosition = Vector3.zero; } - private class ExitManager : Class1515 + private class ExitManager : Class1512 { public new CoopGame baseLocalGame_0; @@ -2598,7 +2598,7 @@ public void ExitOverride() baseLocalGame_0.gparam_0.Player.OnGameSessionEnd(exitStatus, baseLocalGame_0.PastTime, baseLocalGame_0.Location_0.Id, exitName); baseLocalGame_0.CleanUp(); - Class1516 exitCallback = new() + Class1513 exitCallback = new() { baseLocalGame_0 = baseLocalGame_0, duration = EFTDateTimeClass.Now - baseLocalGame_0.dateTime_0, @@ -2612,7 +2612,7 @@ public void ExitOverride() /// /// Used to manage the stopping of the gracefully when cancelling /// - private class CancelExitManager : Class1515 + private class CancelExitManager : Class1512 { public void ExitOverride() { diff --git a/Fika.Core/Coop/ObservedClasses/HandsControllers/CoopObservedGrenadeController.cs b/Fika.Core/Coop/ObservedClasses/HandsControllers/CoopObservedGrenadeController.cs index 8ffab869..45f0c923 100644 --- a/Fika.Core/Coop/ObservedClasses/HandsControllers/CoopObservedGrenadeController.cs +++ b/Fika.Core/Coop/ObservedClasses/HandsControllers/CoopObservedGrenadeController.cs @@ -26,7 +26,7 @@ public override Dictionary GetOperationFactoryDe { // Check for GClass increments.. Dictionary operationFactoryDelegates = base.GetOperationFactoryDelegates(); - operationFactoryDelegates[typeof(Class1163)] = new OperationFactoryDelegate(Grenade1); + operationFactoryDelegates[typeof(Class1160)] = new OperationFactoryDelegate(Grenade1); return operationFactoryDelegates; } @@ -82,7 +82,7 @@ public void SpawnGrenade(float timeSinceSafetyLevelRemoved, Vector3 position, Qu } } - public class ObservedTripwireState(Player.GrenadeHandsController controller, CoopPlayer player) : Player.GrenadeHandsController.Class1163(controller) + public class ObservedTripwireState(Player.GrenadeHandsController controller, CoopPlayer player) : Player.GrenadeHandsController.Class1160(controller) { private readonly CoopPlayer coopPlayer = player; diff --git a/Fika.Core/Coop/ObservedClasses/HandsControllers/CoopObservedMedsController.cs b/Fika.Core/Coop/ObservedClasses/HandsControllers/CoopObservedMedsController.cs index ea56f4a0..9c087584 100644 --- a/Fika.Core/Coop/ObservedClasses/HandsControllers/CoopObservedMedsController.cs +++ b/Fika.Core/Coop/ObservedClasses/HandsControllers/CoopObservedMedsController.cs @@ -32,7 +32,7 @@ public override Dictionary GetOperationFactoryDe { return new Dictionary { { - typeof(Class1176), + typeof(Class1173), new OperationFactoryDelegate(GetObservedMedsOperation) }, { @@ -91,7 +91,7 @@ public override void IEventsConsumerOnWeapOut() ObservedObsOperation.HideObservedWeaponComplete(); } - private class ObservedMedsOperation(Player.MedsController controller) : Class1176(controller) + private class ObservedMedsOperation(Player.MedsController controller) : Class1173(controller) { private readonly CoopObservedMedsController observedMedsController = (CoopObservedMedsController)controller; diff --git a/Fika.Core/Coop/ObservedClasses/ObservedInventoryController.cs b/Fika.Core/Coop/ObservedClasses/ObservedInventoryController.cs index 0a41f669..8c6a416d 100644 --- a/Fika.Core/Coop/ObservedClasses/ObservedInventoryController.cs +++ b/Fika.Core/Coop/ObservedClasses/ObservedInventoryController.cs @@ -132,7 +132,7 @@ public override void InProcess(TraderControllerClass executor, Item item, ItemAd private void HandleInProcess(Item item, ItemAddress to, GInterface411 operation, Callback callback) { - Player.Class1234 handler = new() + Player.Class1231 handler = new() { player_0 = coopPlayer, callback = callback diff --git a/Fika.Core/Coop/Patches/Class1395_ReloadBackendLocale_Patch.cs b/Fika.Core/Coop/Patches/Class1392_ReloadBackendLocale_Patch.cs similarity index 81% rename from Fika.Core/Coop/Patches/Class1395_ReloadBackendLocale_Patch.cs rename to Fika.Core/Coop/Patches/Class1392_ReloadBackendLocale_Patch.cs index 7359185e..b6e89ff3 100644 --- a/Fika.Core/Coop/Patches/Class1395_ReloadBackendLocale_Patch.cs +++ b/Fika.Core/Coop/Patches/Class1392_ReloadBackendLocale_Patch.cs @@ -4,13 +4,13 @@ namespace Fika.Core.Coop.Patches { - internal class Class1395_ReloadBackendLocale_Patch : ModulePatch + internal class Class1392_ReloadBackendLocale_Patch : ModulePatch { private static bool HasBeenSet = false; protected override MethodBase GetTargetMethod() { - return typeof(Class1395).GetMethod(nameof(Class1395.ReloadBackendLocale)); + return typeof(Class1392).GetMethod(nameof(Class1392.ReloadBackendLocale)); } [PatchPostfix] diff --git a/Fika.Core/Coop/Patches/Overrides/OfflineRaidSettingsMenuPatch_Override.cs b/Fika.Core/Coop/Patches/Overrides/OfflineRaidSettingsMenuPatch_Override.cs index 9b0b217d..b2ff7dad 100644 --- a/Fika.Core/Coop/Patches/Overrides/OfflineRaidSettingsMenuPatch_Override.cs +++ b/Fika.Core/Coop/Patches/Overrides/OfflineRaidSettingsMenuPatch_Override.cs @@ -76,7 +76,7 @@ private static void PatchPostfix(RaidSettingsWindow __instance, RaidSettings rai } // Remove redundant settings and add our own "Random" to make the setting clear, while also renaming index 0 to "Together" - List labelList = Traverse.Create(____playersSpawnPlaceDropdown).Field>("list_0").Value; + List labelList = Traverse.Create(____playersSpawnPlaceDropdown).Field>("list_0").Value; labelList.Clear(); labelList.Add(new() { diff --git a/Fika.Core/Coop/Players/CoopPlayer.cs b/Fika.Core/Coop/Players/CoopPlayer.cs index bb130e55..6c29ff88 100644 --- a/Fika.Core/Coop/Players/CoopPlayer.cs +++ b/Fika.Core/Coop/Players/CoopPlayer.cs @@ -149,7 +149,7 @@ await player.Init(rotation, layerName, pointOfView, profile, inventoryController } player._handsController = EmptyHandsController.smethod_6(player); - player._handsController.Spawn(1f, LocalPlayer.Class1658.class1658_0.method_0); + player._handsController.Spawn(1f, LocalPlayer.Class1655.class1655_0.method_0); player.AIData = new GClass563(null, player); diff --git a/Fika.Core/Coop/Players/ObservedCoopPlayer.cs b/Fika.Core/Coop/Players/ObservedCoopPlayer.cs index 5726c002..0a930d05 100644 --- a/Fika.Core/Coop/Players/ObservedCoopPlayer.cs +++ b/Fika.Core/Coop/Players/ObservedCoopPlayer.cs @@ -1736,13 +1736,13 @@ public void Handle(Result result) } } - private class CreateHandsControllerHandler(Class1196 setInHandsOperation) + private class CreateHandsControllerHandler(Class1193 setInHandsOperation) { - public readonly Class1196 setInHandsOperation = setInHandsOperation; + public readonly Class1193 setInHandsOperation = setInHandsOperation; internal void DisposeHandler() { - Class1196 handler = setInHandsOperation; + Class1193 handler = setInHandsOperation; if (handler == null) { return; diff --git a/Fika.Core/FikaPlugin.cs b/Fika.Core/FikaPlugin.cs index a705224f..2b5696e0 100644 --- a/Fika.Core/FikaPlugin.cs +++ b/Fika.Core/FikaPlugin.cs @@ -344,7 +344,7 @@ private static void EnableFikaPatches() new RaidSettingsWindow_Show_Patch().Enable(); new TransitControllerAbstractClass_Exist_Patch().Enable(); new BotReload_method_1_Patch().Enable(); - new Class1395_ReloadBackendLocale_Patch().Enable(); + new Class1392_ReloadBackendLocale_Patch().Enable(); new GClass2047_method_0_Patch().Enable(); #if DEBUG TasksExtensions_HandleFinishedTask_Patches.Enable(); diff --git a/Fika.Core/Networking/FikaClient.cs b/Fika.Core/Networking/FikaClient.cs index 79a9ad98..fb85637d 100644 --- a/Fika.Core/Networking/FikaClient.cs +++ b/Fika.Core/Networking/FikaClient.cs @@ -892,7 +892,7 @@ private void OnBorderZonePacketReceived(BorderZonePacket packet) private void OnMinePacketReceived(MinePacket packet) { - NetworkGame.Class1533 mineSeeker = new() + NetworkGame.Class1530 mineSeeker = new() { minePosition = packet.MinePositon }; diff --git a/Fika.Core/Networking/FikaSerializationExtensions.cs b/Fika.Core/Networking/FikaSerializationExtensions.cs index 8d6fbc4b..f8802c46 100644 --- a/Fika.Core/Networking/FikaSerializationExtensions.cs +++ b/Fika.Core/Networking/FikaSerializationExtensions.cs @@ -246,8 +246,8 @@ public static Item GetAirdropItem(this NetDataReader reader) enumerable[0].Item = item; Item[] array = enumerable.Select(FikaGlobals.GetLootItemPositionItem).ToArray(); ResourceKey[] resourceKeys = array.OfType().GetAllItemsFromCollections() - .Concat(array.Where(AirdropSynchronizableObject.Class2013.class2013_0.method_1)) - .SelectMany(AirdropSynchronizableObject.Class2013.class2013_0.method_2) + .Concat(array.Where(AirdropSynchronizableObject.Class2010.class2010_0.method_1)) + .SelectMany(AirdropSynchronizableObject.Class2010.class2010_0.method_2) .ToArray(); Singleton.Instance.LoadBundlesAndCreatePools(PoolManagerClass.PoolsCategory.Raid, PoolManagerClass.AssemblyType.Online, resourceKeys, JobPriorityClass.Immediate, null, default).HandleExceptions(); diff --git a/Fika.Core/Networking/FikaServer.cs b/Fika.Core/Networking/FikaServer.cs index 73c66878..e65619b2 100644 --- a/Fika.Core/Networking/FikaServer.cs +++ b/Fika.Core/Networking/FikaServer.cs @@ -947,7 +947,7 @@ private void OnMinePacketReceived(MinePacket packet, NetPeer peer) { if (Singleton.Instance.MineManager != null) { - NetworkGame.Class1533 mineSeeker = new() + NetworkGame.Class1530 mineSeeker = new() { minePosition = packet.MinePositon }; diff --git a/Fika.Core/UI/FikaUIGlobals.cs b/Fika.Core/UI/FikaUIGlobals.cs index b282cda8..1e366617 100644 --- a/Fika.Core/UI/FikaUIGlobals.cs +++ b/Fika.Core/UI/FikaUIGlobals.cs @@ -55,7 +55,7 @@ public static GClass3540 ShowFikaMessage(this PreloaderUI preloaderUI, string he { Traverse preloaderUiTraverse = Traverse.Create(preloaderUI); - PreloaderUI.Class2824 messageHandler = new() + PreloaderUI.Class2821 messageHandler = new() { preloaderUI_0 = preloaderUI }; @@ -80,7 +80,7 @@ public static GClass3540 ShowFikaMessage(this ErrorScreen errorScreen, string ti { Traverse errorScreenTraverse = Traverse.Create(errorScreen); - ErrorScreen.Class2586 errorScreenHandler = new() + ErrorScreen.Class2583 errorScreenHandler = new() { errorScreen_0 = errorScreen }; diff --git a/References/hollowed.dll b/References/hollowed.dll index 2828c5f9..22ab80dc 100644 Binary files a/References/hollowed.dll and b/References/hollowed.dll differ