Skip to content

Commit

Permalink
Update to latest bins
Browse files Browse the repository at this point in the history
  • Loading branch information
Lacyway committed Jun 14, 2024
1 parent a5ee9cd commit 95e535d
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions Fika.Core/Coop/ClientClasses/CoopClientInventoryController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ public override void Execute(GClass2854 operation, [CanBeNull] Callback callback
#endif

// Do not replicate picking up quest items, throws an error on the other clients
if (operation is GClass2856 pickupOperation)
if (operation is MoveOperationClass moveOperation)
{
Item lootedItem = pickupOperation.Item;
Item lootedItem = moveOperation.Item;
if (lootedItem.Template.QuestItem)
{
if (CoopPlayer.GClass3227_0 is CoopSharedQuestController sharedQuestController)
Expand All @@ -62,7 +62,7 @@ public override void Execute(GClass2854 operation, [CanBeNull] Callback callback

// Do not replicate quest operations
// Check for GClass increments
if (operation is GClass2883 or GClass2896)
if (operation is GClass2897 or GClass2898 or QuestHandoverOperationClass)
{
base.Execute(operation, callback);
return;
Expand Down
2 changes: 1 addition & 1 deletion Fika.Core/Coop/ClientClasses/CoopSharedQuestController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
namespace Fika.Core.Coop.ClientClasses
{
public sealed class CoopSharedQuestController(Profile profile, InventoryControllerClass inventoryController,
GInterface161 session, CoopPlayer player, bool fromServer = true) : GClass3229(profile, inventoryController, session, fromServer)
IQuestActions session, CoopPlayer player, bool fromServer = true) : GClass3229(profile, inventoryController, session, fromServer)
{
private readonly CoopPlayer player = player;
private readonly List<string> lastFromNetwork = [];
Expand Down
2 changes: 1 addition & 1 deletion Fika.Core/Coop/GameMode/CoopGame.cs
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public IWeatherCurve WeatherCurve

private static ManualLogSource Logger;

internal static CoopGame Create(GInterface171 inputTree, Profile profile, GameDateTime backendDateTime,
internal static CoopGame Create(IInputTree inputTree, Profile profile, GameDateTime backendDateTime,
InsuranceCompanyClass insurance, MenuUI menuUI, GameUI gameUI, LocationSettingsClass.Location location,
TimeAndWeatherSettings timeAndWeather, WavesSettings wavesSettings, EDateTime dateTime,
Callback<ExitStatus, TimeSpan, MetricsClass> callback, float fixedDeltaTime, EUpdateQueue updateQueue,
Expand Down
8 changes: 4 additions & 4 deletions Fika.Core/Coop/Players/CoopPlayer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ public override void Proceed(MedsClass meds, EBodyPart bodyPart, Callback<GInter
handler.process.method_0(new(handler.HandleResult), callback, scheduled);
}

public override void Proceed(GrenadeClass throwWeap, Callback<IGrenadeController> callback, bool scheduled = true)
public override void Proceed(GrenadeClass throwWeap, Callback<GInterface145> callback, bool scheduled = true)
{
QuickGrenadeControllerHandler handler = new(this, throwWeap);

Expand Down Expand Up @@ -1054,7 +1054,7 @@ public virtual void HandleInventoryPacket(in InventoryPacket packet)
// Unknown what problems this might cause so far.
if (result.Value is GClass2878 unloadOperation)
{
if (unloadOperation.InternalOperation is GClass2889 internalSplitOperation)
if (unloadOperation.InternalOperation is SplitOperationClass internalSplitOperation)
{
Item item = internalSplitOperation.To.Item;
if (item != null)
Expand All @@ -1076,7 +1076,7 @@ public virtual void HandleInventoryPacket(in InventoryPacket packet)
}

// TODO: Same as above.
if (result.Value is GClass2889 splitOperation)
if (result.Value is SplitOperationClass splitOperation)
{
Item item = splitOperation.To.Item;
if (item != null)
Expand Down Expand Up @@ -1746,7 +1746,7 @@ private class QuickGrenadeControllerHandler(CoopPlayer coopPlayer, GrenadeClass
{
private readonly CoopPlayer coopPlayer = coopPlayer;
private readonly GrenadeClass throwWeap = throwWeap;
public Process<QuickGrenadeThrowController, IGrenadeController> process;
public Process<QuickGrenadeThrowController, GInterface145> process;
public Action confirmCallback;

internal CoopClientQuickGrenadeController ReturnController()
Expand Down
4 changes: 2 additions & 2 deletions Fika.Core/Coop/Players/ObservedCoopPlayer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -556,11 +556,11 @@ public override void Proceed(GrenadeClass throwWeap, Callback<IHandsThrowControl
new Process<GrenadeController, IHandsThrowController>(this, func, throwWeap, false).method_0(null, callback, scheduled);
}

public override void Proceed(GrenadeClass throwWeap, Callback<IGrenadeController> callback, bool scheduled = true)
public override void Proceed(GrenadeClass throwWeap, Callback<GInterface145> callback, bool scheduled = true)
{
HandsControllerFactory factory = new(this, throwWeap);
Func<QuickGrenadeThrowController> func = new(factory.CreateObservedQuickGrenadeController);
new Process<QuickGrenadeThrowController, IGrenadeController>(this, func, throwWeap, false).method_0(null, callback, scheduled);
new Process<QuickGrenadeThrowController, GInterface145>(this, func, throwWeap, false).method_0(null, callback, scheduled);
}

public override void Proceed(Weapon weapon, Callback<IFirearmHandsController> callback, bool scheduled = true)
Expand Down
4 changes: 2 additions & 2 deletions Fika.Core/Networking/FikaServer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ private void OnInventoryPacketReceived(InventoryPacket packet, NetPeer peer)
// Unknown what problems this might cause so far.
if (result.Value is GClass2878 unloadOperation)
{
if (unloadOperation.InternalOperation is GClass2889 internalSplitOperation)
if (unloadOperation.InternalOperation is SplitOperationClass internalSplitOperation)
{
Item item = internalSplitOperation.To.Item;
if (item != null)
Expand All @@ -589,7 +589,7 @@ private void OnInventoryPacketReceived(InventoryPacket packet, NetPeer peer)
}

// TODO: Same as above.
if (result.Value is GClass2889 splitOperation)
if (result.Value is SplitOperationClass splitOperation)
{
Item item = splitOperation.To.Item;
if (item != null)
Expand Down
Binary file modified References/hollowed.dll
Binary file not shown.

0 comments on commit 95e535d

Please sign in to comment.