From f9482906ae7ce4dfd41bb4236e094be5d4fa7689 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sun, 2 Jul 2017 01:32:07 -0400
Subject: split TrainerMod commands into separate classes (#302)

---
 src/TrainerMod/Framework/ItemData/ISearchItem.cs   | 21 ++++++++++
 src/TrainerMod/Framework/ItemData/ItemType.cs      | 15 +++++++
 .../Framework/ItemData/SearchableObject.cs         | 48 ++++++++++++++++++++++
 .../Framework/ItemData/SearchableRing.cs           | 48 ++++++++++++++++++++++
 .../Framework/ItemData/SearchableWeapon.cs         | 48 ++++++++++++++++++++++
 5 files changed, 180 insertions(+)
 create mode 100644 src/TrainerMod/Framework/ItemData/ISearchItem.cs
 create mode 100644 src/TrainerMod/Framework/ItemData/ItemType.cs
 create mode 100644 src/TrainerMod/Framework/ItemData/SearchableObject.cs
 create mode 100644 src/TrainerMod/Framework/ItemData/SearchableRing.cs
 create mode 100644 src/TrainerMod/Framework/ItemData/SearchableWeapon.cs

(limited to 'src/TrainerMod/Framework/ItemData')

diff --git a/src/TrainerMod/Framework/ItemData/ISearchItem.cs b/src/TrainerMod/Framework/ItemData/ISearchItem.cs
new file mode 100644
index 00000000..db30da77
--- /dev/null
+++ b/src/TrainerMod/Framework/ItemData/ISearchItem.cs
@@ -0,0 +1,21 @@
+namespace TrainerMod.Framework.ItemData
+{
+    /// <summary>An item that can be searched and added to the player's inventory through the console.</summary>
+    internal interface ISearchItem
+    {
+        /*********
+        ** Accessors
+        *********/
+        /// <summary>Whether the item is valid.</summary>
+        bool IsValid { get; }
+
+        /// <summary>The item ID.</summary>
+        int ID { get; }
+
+        /// <summary>The item name.</summary>
+        string Name { get; }
+
+        /// <summary>The item type.</summary>
+        ItemType Type { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/TrainerMod/Framework/ItemData/ItemType.cs b/src/TrainerMod/Framework/ItemData/ItemType.cs
new file mode 100644
index 00000000..f93160a2
--- /dev/null
+++ b/src/TrainerMod/Framework/ItemData/ItemType.cs
@@ -0,0 +1,15 @@
+namespace TrainerMod.Framework.ItemData
+{
+    /// <summary>An item type that can be searched and added to the player through the console.</summary>
+    internal enum ItemType
+    {
+        /// <summary>Any object in <see cref="StardewValley.Game1.objectInformation"/> (except rings).</summary>
+        Object,
+
+        /// <summary>A ring in <see cref="StardewValley.Game1.objectInformation"/>.</summary>
+        Ring,
+
+        /// <summary>A weapon from <c>Data\weapons</c>.</summary>
+        Weapon
+    }
+}
diff --git a/src/TrainerMod/Framework/ItemData/SearchableObject.cs b/src/TrainerMod/Framework/ItemData/SearchableObject.cs
new file mode 100644
index 00000000..7e44a315
--- /dev/null
+++ b/src/TrainerMod/Framework/ItemData/SearchableObject.cs
@@ -0,0 +1,48 @@
+using StardewValley;
+
+namespace TrainerMod.Framework.ItemData
+{
+    /// <summary>An object that can be searched and added to the player's inventory through the console.</summary>
+    internal class SearchableObject : ISearchItem
+    {
+        /*********
+        ** Properties
+        *********/
+        /// <summary>The underlying item.</summary>
+        private readonly Item Item;
+
+
+        /*********
+        ** Accessors
+        *********/
+        /// <summary>Whether the item is valid.</summary>
+        public bool IsValid => this.Item != null && this.Item.Name != "Broken Item";
+
+        /// <summary>The item ID.</summary>
+        public int ID => this.Item.parentSheetIndex;
+
+        /// <summary>The item name.</summary>
+        public string Name => this.Item.Name;
+
+        /// <summary>The item type.</summary>
+        public ItemType Type => ItemType.Object;
+
+
+        /*********
+        ** Accessors
+        *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="id">The item ID.</param>
+        public SearchableObject(int id)
+        {
+            try
+            {
+                this.Item = new Object(id, 1);
+            }
+            catch
+            {
+                // invalid
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/TrainerMod/Framework/ItemData/SearchableRing.cs b/src/TrainerMod/Framework/ItemData/SearchableRing.cs
new file mode 100644
index 00000000..20b6aef2
--- /dev/null
+++ b/src/TrainerMod/Framework/ItemData/SearchableRing.cs
@@ -0,0 +1,48 @@
+using StardewValley.Objects;
+
+namespace TrainerMod.Framework.ItemData
+{
+    /// <summary>A ring that can be searched and added to the player's inventory through the console.</summary>
+    internal class SearchableRing : ISearchItem
+    {
+        /*********
+        ** Properties
+        *********/
+        /// <summary>The underlying item.</summary>
+        private readonly Ring Ring;
+
+
+        /*********
+        ** Accessors
+        *********/
+        /// <summary>Whether the item is valid.</summary>
+        public bool IsValid => this.Ring != null;
+
+        /// <summary>The item ID.</summary>
+        public int ID => this.Ring.parentSheetIndex;
+
+        /// <summary>The item name.</summary>
+        public string Name => this.Ring.Name;
+
+        /// <summary>The item type.</summary>
+        public ItemType Type => ItemType.Ring;
+
+
+        /*********
+        ** Accessors
+        *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="id">The ring ID.</param>
+        public SearchableRing(int id)
+        {
+            try
+            {
+                this.Ring = new Ring(id);
+            }
+            catch
+            {
+                // invalid
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/TrainerMod/Framework/ItemData/SearchableWeapon.cs b/src/TrainerMod/Framework/ItemData/SearchableWeapon.cs
new file mode 100644
index 00000000..70d659ee
--- /dev/null
+++ b/src/TrainerMod/Framework/ItemData/SearchableWeapon.cs
@@ -0,0 +1,48 @@
+using StardewValley.Tools;
+
+namespace TrainerMod.Framework.ItemData
+{
+    /// <summary>A weapon that can be searched and added to the player's inventory through the console.</summary>
+    internal class SearchableWeapon : ISearchItem
+    {
+        /*********
+        ** Properties
+        *********/
+        /// <summary>The underlying item.</summary>
+        private readonly MeleeWeapon Weapon;
+
+
+        /*********
+        ** Accessors
+        *********/
+        /// <summary>Whether the item is valid.</summary>
+        public bool IsValid => this.Weapon != null;
+
+        /// <summary>The item ID.</summary>
+        public int ID => this.Weapon.initialParentTileIndex;
+
+        /// <summary>The item name.</summary>
+        public string Name => this.Weapon.Name;
+
+        /// <summary>The item type.</summary>
+        public ItemType Type => ItemType.Weapon;
+
+
+        /*********
+        ** Accessors
+        *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="id">The weapon ID.</param>
+        public SearchableWeapon(int id)
+        {
+            try
+            {
+                this.Weapon = new MeleeWeapon(id);
+            }
+            catch
+            {
+                // invalid
+            }
+        }
+    }
+}
\ No newline at end of file
-- 
cgit 


From 5d5f7192dc49546610df13147f4e076eb199efc1 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sun, 2 Jul 2017 17:21:28 -0400
Subject: add item repository which returns all spawnable items in the game
 (#302)

Based on code I wrote for CJB Item Spawner.
---
 src/TrainerMod/Framework/ItemData/ItemType.cs      | 28 +++++++++++++--
 .../Framework/ItemData/SearchableItem.cs           | 41 ++++++++++++++++++++++
 2 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 src/TrainerMod/Framework/ItemData/SearchableItem.cs

(limited to 'src/TrainerMod/Framework/ItemData')

diff --git a/src/TrainerMod/Framework/ItemData/ItemType.cs b/src/TrainerMod/Framework/ItemData/ItemType.cs
index f93160a2..423455e9 100644
--- a/src/TrainerMod/Framework/ItemData/ItemType.cs
+++ b/src/TrainerMod/Framework/ItemData/ItemType.cs
@@ -3,13 +3,37 @@
     /// <summary>An item type that can be searched and added to the player through the console.</summary>
     internal enum ItemType
     {
+        /// <summary>A big craftable object in <see cref="StardewValley.Game1.bigCraftablesInformation"/></summary>
+        BigCraftable,
+
+        /// <summary>A <see cref="Boots"/> item.</summary>
+        Boots,
+
+        /// <summary>A fish item.</summary>
+        Fish,
+
+        /// <summary>A <see cref="Wallpaper"/> flooring item.</summary>
+        Flooring,
+
+        /// <summary>A <see cref="Furniture"/> item.</summary>
+        Furniture,
+
+        /// <summary>A <see cref="Hat"/> item.</summary>
+        Hat,
+
         /// <summary>Any object in <see cref="StardewValley.Game1.objectInformation"/> (except rings).</summary>
         Object,
 
-        /// <summary>A ring in <see cref="StardewValley.Game1.objectInformation"/>.</summary>
+        /// <summary>A <see cref="Ring"/> item.</summary>
         Ring,
 
-        /// <summary>A weapon from <c>Data\weapons</c>.</summary>
+        /// <summary>A <see cref="Tool"/> tool.</summary>
+        Tool,
+
+        /// <summary>A <see cref="Wallpaper"/> wall item.</summary>
+        Wallpaper,
+
+        /// <summary>A <see cref="StardewValley.Tools.MeleeWeapon"/> or <see cref="StardewValley.Tools.Slingshot"/> item.</summary>
         Weapon
     }
 }
diff --git a/src/TrainerMod/Framework/ItemData/SearchableItem.cs b/src/TrainerMod/Framework/ItemData/SearchableItem.cs
new file mode 100644
index 00000000..146da1a8
--- /dev/null
+++ b/src/TrainerMod/Framework/ItemData/SearchableItem.cs
@@ -0,0 +1,41 @@
+using StardewValley;
+
+namespace TrainerMod.Framework.ItemData
+{
+    /// <summary>A game item with metadata.</summary>
+    internal class SearchableItem
+    {
+        /*********
+        ** Accessors
+        *********/
+        /// <summary>The item type.</summary>
+        public ItemType Type { get; }
+
+        /// <summary>The item instance.</summary>
+        public Item Item { get; }
+
+        /// <summary>The item's unique ID for its type.</summary>
+        public int ID { get; }
+
+        /// <summary>The item's default name.</summary>
+        public string Name => this.Item.Name;
+
+        /// <summary>The item's display name for the current language.</summary>
+        public string DisplayName => this.Item.DisplayName;
+
+
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="type">The item type.</param>
+        /// <param name="id">The unique ID (if different from the item's parent sheet index).</param>
+        /// <param name="item">The item instance.</param>
+        public SearchableItem(ItemType type, int id, Item item)
+        {
+            this.Type = type;
+            this.ID = id;
+            this.Item = item;
+        }
+    }
+}
-- 
cgit 


From 40e8d3da0e204117d0a6de91b368ef420eb31df0 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <github@jplamondonw.com>
Date: Sun, 2 Jul 2017 17:37:30 -0400
Subject: migrate list_items command to new item repository (#302)

---
 src/TrainerMod/Framework/ItemData/ISearchItem.cs   | 21 ----------
 .../Framework/ItemData/SearchableObject.cs         | 48 ----------------------
 .../Framework/ItemData/SearchableRing.cs           | 48 ----------------------
 .../Framework/ItemData/SearchableWeapon.cs         | 48 ----------------------
 4 files changed, 165 deletions(-)
 delete mode 100644 src/TrainerMod/Framework/ItemData/ISearchItem.cs
 delete mode 100644 src/TrainerMod/Framework/ItemData/SearchableObject.cs
 delete mode 100644 src/TrainerMod/Framework/ItemData/SearchableRing.cs
 delete mode 100644 src/TrainerMod/Framework/ItemData/SearchableWeapon.cs

(limited to 'src/TrainerMod/Framework/ItemData')

diff --git a/src/TrainerMod/Framework/ItemData/ISearchItem.cs b/src/TrainerMod/Framework/ItemData/ISearchItem.cs
deleted file mode 100644
index db30da77..00000000
--- a/src/TrainerMod/Framework/ItemData/ISearchItem.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace TrainerMod.Framework.ItemData
-{
-    /// <summary>An item that can be searched and added to the player's inventory through the console.</summary>
-    internal interface ISearchItem
-    {
-        /*********
-        ** Accessors
-        *********/
-        /// <summary>Whether the item is valid.</summary>
-        bool IsValid { get; }
-
-        /// <summary>The item ID.</summary>
-        int ID { get; }
-
-        /// <summary>The item name.</summary>
-        string Name { get; }
-
-        /// <summary>The item type.</summary>
-        ItemType Type { get; }
-    }
-}
\ No newline at end of file
diff --git a/src/TrainerMod/Framework/ItemData/SearchableObject.cs b/src/TrainerMod/Framework/ItemData/SearchableObject.cs
deleted file mode 100644
index 7e44a315..00000000
--- a/src/TrainerMod/Framework/ItemData/SearchableObject.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using StardewValley;
-
-namespace TrainerMod.Framework.ItemData
-{
-    /// <summary>An object that can be searched and added to the player's inventory through the console.</summary>
-    internal class SearchableObject : ISearchItem
-    {
-        /*********
-        ** Properties
-        *********/
-        /// <summary>The underlying item.</summary>
-        private readonly Item Item;
-
-
-        /*********
-        ** Accessors
-        *********/
-        /// <summary>Whether the item is valid.</summary>
-        public bool IsValid => this.Item != null && this.Item.Name != "Broken Item";
-
-        /// <summary>The item ID.</summary>
-        public int ID => this.Item.parentSheetIndex;
-
-        /// <summary>The item name.</summary>
-        public string Name => this.Item.Name;
-
-        /// <summary>The item type.</summary>
-        public ItemType Type => ItemType.Object;
-
-
-        /*********
-        ** Accessors
-        *********/
-        /// <summary>Construct an instance.</summary>
-        /// <param name="id">The item ID.</param>
-        public SearchableObject(int id)
-        {
-            try
-            {
-                this.Item = new Object(id, 1);
-            }
-            catch
-            {
-                // invalid
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/TrainerMod/Framework/ItemData/SearchableRing.cs b/src/TrainerMod/Framework/ItemData/SearchableRing.cs
deleted file mode 100644
index 20b6aef2..00000000
--- a/src/TrainerMod/Framework/ItemData/SearchableRing.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using StardewValley.Objects;
-
-namespace TrainerMod.Framework.ItemData
-{
-    /// <summary>A ring that can be searched and added to the player's inventory through the console.</summary>
-    internal class SearchableRing : ISearchItem
-    {
-        /*********
-        ** Properties
-        *********/
-        /// <summary>The underlying item.</summary>
-        private readonly Ring Ring;
-
-
-        /*********
-        ** Accessors
-        *********/
-        /// <summary>Whether the item is valid.</summary>
-        public bool IsValid => this.Ring != null;
-
-        /// <summary>The item ID.</summary>
-        public int ID => this.Ring.parentSheetIndex;
-
-        /// <summary>The item name.</summary>
-        public string Name => this.Ring.Name;
-
-        /// <summary>The item type.</summary>
-        public ItemType Type => ItemType.Ring;
-
-
-        /*********
-        ** Accessors
-        *********/
-        /// <summary>Construct an instance.</summary>
-        /// <param name="id">The ring ID.</param>
-        public SearchableRing(int id)
-        {
-            try
-            {
-                this.Ring = new Ring(id);
-            }
-            catch
-            {
-                // invalid
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/TrainerMod/Framework/ItemData/SearchableWeapon.cs b/src/TrainerMod/Framework/ItemData/SearchableWeapon.cs
deleted file mode 100644
index 70d659ee..00000000
--- a/src/TrainerMod/Framework/ItemData/SearchableWeapon.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-using StardewValley.Tools;
-
-namespace TrainerMod.Framework.ItemData
-{
-    /// <summary>A weapon that can be searched and added to the player's inventory through the console.</summary>
-    internal class SearchableWeapon : ISearchItem
-    {
-        /*********
-        ** Properties
-        *********/
-        /// <summary>The underlying item.</summary>
-        private readonly MeleeWeapon Weapon;
-
-
-        /*********
-        ** Accessors
-        *********/
-        /// <summary>Whether the item is valid.</summary>
-        public bool IsValid => this.Weapon != null;
-
-        /// <summary>The item ID.</summary>
-        public int ID => this.Weapon.initialParentTileIndex;
-
-        /// <summary>The item name.</summary>
-        public string Name => this.Weapon.Name;
-
-        /// <summary>The item type.</summary>
-        public ItemType Type => ItemType.Weapon;
-
-
-        /*********
-        ** Accessors
-        *********/
-        /// <summary>Construct an instance.</summary>
-        /// <param name="id">The weapon ID.</param>
-        public SearchableWeapon(int id)
-        {
-            try
-            {
-                this.Weapon = new MeleeWeapon(id);
-            }
-            catch
-            {
-                // invalid
-            }
-        }
-    }
-}
\ No newline at end of file
-- 
cgit