dave/Tarkov-UIFixes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed mangled grids in hideout

Browse Source
This commit is contained in:
Tyfon
2024-07-11 11:59:13 -07:00
parent 0629ebae70
commit a4f1590b5d
3 changed files with 43 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ExtraProperties.cs Normal file
View File

@@ -0,0 +1,32 @@
using EFT.InventoryLogic;
using EFT.UI.DragAndDrop;
using System.Runtime.CompilerServices;
namespace UIFixes
{
public static class ExtraItemProperties
{
private static readonly ConditionalWeakTable<Item, Properties> properties = new();
private class Properties
{
public bool Reordered;
}
public static bool GetReordered(this Item item) => properties.GetOrCreateValue(item).Reordered;
public static void SetReordered(this Item item, bool value) => properties.GetOrCreateValue(item).Reordered = value;
}
public static class ExtraTemplatedGridsViewProperties
{
private static readonly ConditionalWeakTable<TemplatedGridsView, Properties> properties = new();
private class Properties
{
public bool Reordered;
}
public static bool GetReordered(this TemplatedGridsView gridsView) => properties.GetOrCreateValue(gridsView).Reordered;
public static void SetReordered(this TemplatedGridsView gridsView, bool value) => properties.GetOrCreateValue(gridsView).Reordered = value;
}
}

2
Patches/MultiSelectPatches.cs
View File

@@ -35,7 +35,7 @@ namespace UIFixes
// Used to prevent infinite recursion of CanAccept/AcceptItem
private static bool InPatch = false;
// If the can accept method should render highlights
// If the CanAccept method should render highlights
private static readonly List<Image> Previews = [];
// Point that various QuickFindPlace overrides should start at

67
Patches/ReorderGridsPatch.cs
View File

@@ -1,5 +1,4 @@
using EFT.InventoryLogic;
using EFT.UI.DragAndDrop;
using EFT.UI.DragAndDrop;
using HarmonyLib;
using SPT.Reflection.Patching;
using System;
@@ -12,12 +11,9 @@ namespace UIFixes
{
public static class ReorderGridsPatches
{
private static readonly HashSet<string> ReorderedItems = [];
public static void Enable()
{
new ReorderGridsPatch().Enable();
new ItemCreationPatch().Enable();
}
/* There are 3 cases to handle in TemplatedGridsView.Show
@@ -46,7 +42,7 @@ namespace UIFixes
// To properly support disabling this feature:
// 1. Items that sorted their Grids need to return them to original order
// 2. If this TemplatedGridsView was sorted, it needs to be unsorted to match
if (ReorderedItems.Contains(compoundItem.Id) && GridMaps.TryGetValue(compoundItem.TemplateId, out int[] unwantedMap))
if (compoundItem.GetReordered() && GridMaps.TryGetValue(compoundItem.TemplateId, out int[] unwantedMap))
{
StashGridClass[] orderedGrids = new StashGridClass[compoundItem.Grids.Length];
for (int i = 0; i < compoundItem.Grids.Length; i++)
@@ -55,9 +51,9 @@ namespace UIFixes
}
compoundItem.Grids = orderedGrids;
ReorderedItems.Remove(compoundItem.Id);
compoundItem.SetReordered(false);
if (IsSorted(__instance))
if (__instance.GetReordered())
{
GridView[] orderedGridView = new GridView[____presetGridViews.Length];
for (int i = 0; i < ____presetGridViews.Length; i++)
@@ -66,14 +62,14 @@ namespace UIFixes
}
____presetGridViews = orderedGridView;
MarkSorted(__instance, false);
__instance.SetReordered(false);
}
}
return;
}
if (ReorderedItems.Contains(compoundItem.Id) && !IsSorted(__instance))
if (compoundItem.GetReordered() && !__instance.GetReordered())
{
// This is a new context of a sorted Item, need to presort the GridViews
if (GridMaps.TryGetValue(compoundItem.TemplateId, out int[] map))
@@ -85,7 +81,7 @@ namespace UIFixes
}
____presetGridViews = orderedGridView;
MarkSorted(__instance);
__instance.SetReordered(true);
}
else
{
@@ -97,7 +93,7 @@ namespace UIFixes
[PatchPostfix]
public static void Postfix(TemplatedGridsView __instance, LootItemClass compoundItem, ref GridView[] ____presetGridViews)
{
if (!Settings.ReorderGrids.Value || ReorderedItems.Contains(compoundItem.Id))
if (!Settings.ReorderGrids.Value || compoundItem.GetReordered())
{
return;
}
@@ -139,51 +135,8 @@ namespace UIFixes
compoundItem.Grids = sorted.Select(pair => pair.Key).ToArray();
____presetGridViews = orderedGridViews;
ReorderedItems.Add(compoundItem.Id);
MarkSorted(__instance);
}
private static bool IsSorted(TemplatedGridsView view)
{
return view != null && view.GetComponent<SortedMarker>() != null;
}
private static void MarkSorted(TemplatedGridsView view, bool marked = true)
{
if (view == null)
{
return;
}
if (marked)
{
view.GetOrAddComponent<SortedMarker>();
}
else
{
SortedMarker marker = view.GetComponent<SortedMarker>();
if (marker != null)
{
UnityEngine.Object.DestroyImmediate(marker);
}
}
}
public class SortedMarker : MonoBehaviour { }
}
public class ItemCreationPatch : ModulePatch
{
protected override MethodBase GetTargetMethod()
{
return AccessTools.Constructor(typeof(Item), [typeof(string), typeof(ItemTemplate)]);
}
[PatchPostfix]
public static void Postfix(string id)
{
ReorderedItems.Remove(id);
compoundItem.SetReordered(true);
__instance.SetReordered(true);
}
}
}