New filters, sorting and organization, ItemCheckList integration, item testdrive, restock and other QoL improvements

.gitattributes

@@ -0,0 +1,2 @@
+[code]
+*	text=auto

.gitignore

@@ -0,0 +1,6 @@
+*.csproj
+*.sln
+*.user
+obj/
+bin/
+.vs/

Components/TEAbstractStorageUnit.cs

@@ -56,7 +56,7 @@ public TEStorageHeart GetHeart()
 
 		public abstract bool HasSpaceInStackFor(Item check, bool locked = false);
 
-		public abstract  bool HasItem(Item check, bool locked = false);
+		public abstract  bool HasItem(Item check, bool locked = false, bool ignorePrefix = false);
 
 		public abstract IEnumerable<Item> GetItems();
 
@@ -95,4 +95,4 @@ public override void NetReceive(BinaryReader reader, bool lightReceive)
 			center = new Point16(reader.ReadInt16(), reader.ReadInt16());
 		}
 	}
-}
+}

Components/TECreativeStorageUnit.cs

@@ -29,7 +29,7 @@ public override bool HasSpaceInStackFor(Item check, bool locked = false)
 			return false;
 		}
 
-		public override bool HasItem(Item check, bool locked = false)
+		public override bool HasItem(Item check, bool locked = false, bool ignorePrefix = false)
 		{
 			return !Inactive;
 		}
@@ -125,4 +125,4 @@ public void Dispose()
 		{
 		}
 	}
-}
+}

Components/TEStorageHeart.cs

@@ -20,7 +20,14 @@ public class TEStorageHeart : TEStorageCenter
 		private int updateTimer = 60;
 		private int compactStage = 0;
 
-		public override bool ValidTile(Tile tile)
+	    public bool IsAlive { get; private set; } = true;
+
+	    public override void OnKill()
+	    {
+	        IsAlive = false;
+	    }
+
+	    public override bool ValidTile(Tile tile)
 		{
 			return tile.type == mod.TileType("StorageHeart") && tile.frameX == 0 && tile.frameY == 0;
 		}
@@ -256,7 +263,10 @@ public void ResetCompactStage(int stage = 0)
 			}
 		}
 
-		public void DepositItem(Item toDeposit)
+	    ItemTypeOrderedSet _uniqueItemsPutHistory = new ItemTypeOrderedSet("UniqueItemsPutHistory");
+	    public IEnumerable<Item> UniqueItemsPutHistory { get { return _uniqueItemsPutHistory.Items; } }
+
+        public void DepositItem(Item toDeposit)
 		{
 			if (Main.netMode == 2)
 			{
@@ -265,6 +275,7 @@ public void DepositItem(Item toDeposit)
 			int oldStack = toDeposit.stack;
 			try
 			{
+                var remember = toDeposit.type;
 				foreach (TEAbstractStorageUnit storageUnit in GetStorageUnits())
 				{
 					if (!storageUnit.Inactive && storageUnit.HasSpaceInStackFor(toDeposit, true))
@@ -276,17 +287,21 @@ public void DepositItem(Item toDeposit)
 						}
 					}
 				}
-				foreach (TEAbstractStorageUnit storageUnit in GetStorageUnits())
+                var prevNewAndShiny = toDeposit.newAndShiny;
+                toDeposit.newAndShiny = !_uniqueItemsPutHistory.Contains(toDeposit);
+                foreach (TEAbstractStorageUnit storageUnit in GetStorageUnits())
 				{
 					if (!storageUnit.Inactive && !storageUnit.IsFull)
 					{
 						storageUnit.DepositItem(toDeposit, true);
 						if (toDeposit.IsAir)
 						{
-							return;
+                            _uniqueItemsPutHistory.Add(remember);
+                            return;
 						}
 					}
 				}
+                toDeposit.newAndShiny = prevNewAndShiny;
 			}
 			finally
 			{
@@ -352,6 +367,30 @@ public Item TryWithdraw(Item lookFor)
 			}
 		}
 
+		public bool HasItem(Item lookFor, bool ignorePrefix = false)
+		{
+			if (Main.netMode == 2)
+			{
+				EnterReadLock();
+			}
+			try
+			{
+				foreach (TEAbstractStorageUnit storageUnit in GetStorageUnits())
+				{
+				    if (storageUnit.HasItem(lookFor, true, ignorePrefix))
+				        return true;
+				}
+				return false;
+			}
+			finally
+			{
+				if (Main.netMode == 2)
+				{
+                    ExitReadLock();
+				}
+			}
+		}
+
 		public override TagCompound Save()
 		{
 			TagCompound tag = base.Save();
@@ -364,6 +403,7 @@ public override TagCompound Save()
 				tagRemotes.Add(tagRemote);
 			}
 			tag.Set("RemoteAccesses", tagRemotes);
+            _uniqueItemsPutHistory.Save(tag);
 			return tag;
 		}
 
@@ -374,6 +414,7 @@ public override void Load(TagCompound tag)
 			{
 				remoteAccesses.Add(new Point16(tagRemote.GetShort("X"), tagRemote.GetShort("Y")));
 			}
+            _uniqueItemsPutHistory.Load(tag);
 		}
 
 		public override void NetSend(BinaryWriter writer, bool lightSend)
@@ -397,4 +438,4 @@ public override void NetReceive(BinaryReader reader, bool lightReceive)
 			}
 		}
 	}
-}
+}

Components/TEStorageUnit.cs

@@ -21,6 +21,7 @@ public class TEStorageUnit : TEAbstractStorageUnit
 		//metadata
 		private HashSet<ItemData> hasSpaceInStack = new HashSet<ItemData>();
 		private HashSet<ItemData> hasItem = new HashSet<ItemData>();
+		private HashSet<int> hasItemNoPrefix = new HashSet<int>();
 
 		public int Capacity
 		{
@@ -106,16 +107,17 @@ public bool HasSpaceFor(Item check, bool locked = false)
 			return !IsFull || HasSpaceInStackFor(check, locked);
 		}
 
-		public override bool HasItem(Item check, bool locked = false)
+		public override bool HasItem(Item check, bool locked = false, bool ignorePrefix = false)
 		{
 			if (Main.netMode == 2 && !locked)
 			{
 				GetHeart().EnterReadLock();
 			}
 			try
 			{
+			    if (ignorePrefix) return hasItemNoPrefix.Contains(check.type);
 				ItemData data = new ItemData(check);
-				return hasItem.Contains(data);
+                return hasItem.Contains(data);
 			}
 			finally
 			{
@@ -143,7 +145,7 @@ public override void DepositItem(Item toDeposit, bool locked = false)
 			}
 			try
 			{
-				Item original = toDeposit.Clone();
+                Item original = toDeposit.Clone();
 				bool finished = false;
 				bool hasChange = false;
 				foreach (Item item in items)
@@ -157,6 +159,7 @@ public override void DepositItem(Item toDeposit, bool locked = false)
 							newStack = item.maxStack;
 						}
 						item.stack = newStack;
+                        if (toDeposit.newAndShiny) item.newAndShiny = true;
 						hasChange = true;
 						toDeposit.stack = total - newStack;
 						if (toDeposit.stack <= 0)
@@ -316,8 +319,11 @@ internal static void SwapItems(TEStorageUnit unit1, TEStorageUnit unit2)
 			unit1.hasSpaceInStack = unit2.hasSpaceInStack;
 			unit2.hasSpaceInStack = dict;
 			dict = unit1.hasItem;
-			unit1.hasItem = unit2.hasItem;
-			unit2.hasItem = dict;
+		    unit1.hasItem = unit2.hasItem;
+		    unit2.hasItem = dict;
+		    var temp = unit1.hasItemNoPrefix;
+		    unit1.hasItemNoPrefix = unit2.hasItemNoPrefix;
+		    unit2.hasItemNoPrefix = temp;
 			if (Main.netMode == 2)
 			{
 				unit1.netQueue.Clear();
@@ -375,6 +381,7 @@ public override void Load(TagCompound tag)
 					hasSpaceInStack.Add(data);
 				}
 				hasItem.Add(data);
+			    hasItemNoPrefix.Add(data.Type);
 			}
 			if (Main.netMode == 2)
 			{
@@ -447,6 +454,7 @@ public override void NetReceive(BinaryReader trueReader, bool lightReceive)
 				items = other.items;
 				hasSpaceInStack = other.hasSpaceInStack;
 				hasItem = other.hasItem;
+			    hasItemNoPrefix = other.hasItemNoPrefix;
 			}
 			receiving = true;
 			int count = reader.ReadUInt16();
@@ -473,12 +481,14 @@ private void ClearItemsData()
 			items.Clear();
 			hasSpaceInStack.Clear();
 			hasItem.Clear();
+		    hasItemNoPrefix.Clear();
 		}
 
 		private void RepairMetadata()
 		{
 			hasSpaceInStack.Clear();
 			hasItem.Clear();
+		    hasItemNoPrefix.Clear();
 			foreach (Item item in items)
 			{
 				ItemData data = new ItemData(item);
@@ -487,6 +497,7 @@ private void RepairMetadata()
 					hasSpaceInStack.Add(data);
 				}
 				hasItem.Add(data);
+			    hasItemNoPrefix.Add(data.Type);
 			}
 		}
 
@@ -578,6 +589,7 @@ protected override bool ReceiveData(BinaryReader reader, TEStorageUnit unit)
 						unit.hasSpaceInStack.Add(data);
 					}
 					unit.hasItem.Add(data);
+				    unit.hasItemNoPrefix.Add(data.Type);
 				}
 				return false;
 			}
@@ -625,3 +637,4 @@ protected override bool ReceiveData(BinaryReader reader, TEStorageUnit unit)
 		}
 	}
 }
+