Update JoE to work with SdV 1.6

.gitignore

@@ -353,4 +353,7 @@ MigrationBackup/
 .ionide/
 
 *.DotSettings
-codepage.txt
+codepage.txt
+
+# IDEA / JetBrains Rider
+.idea/

JoysOfEfficiency.sln → GloryOfEfficiency.sln

@@ -1,8 +1,8 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29424.173
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34714.143
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JoysOfEfficiency", "JoysOfEfficiency\JoysOfEfficiency.csproj", "{0302444C-4190-4C5D-A873-A1F80267961A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GloryOfEfficiency", "GloryOfEfficiency\GloryOfEfficiency.csproj", "{0302444C-4190-4C5D-A873-A1F80267961A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -12,14 +12,15 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0302444C-4190-4C5D-A873-A1F80267961A}.Debug|Any CPU.ActiveCfg = Release|x86
-		{0302444C-4190-4C5D-A873-A1F80267961A}.Debug|Any CPU.Build.0 = Release|x86
-		{0302444C-4190-4C5D-A873-A1F80267961A}.Debug|x86.ActiveCfg = Debug|x86
-		{0302444C-4190-4C5D-A873-A1F80267961A}.Debug|x86.Build.0 = Debug|x86
+		{0302444C-4190-4C5D-A873-A1F80267961A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0302444C-4190-4C5D-A873-A1F80267961A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0302444C-4190-4C5D-A873-A1F80267961A}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{0302444C-4190-4C5D-A873-A1F80267961A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0302444C-4190-4C5D-A873-A1F80267961A}.Debug|x86.Build.0 = Debug|Any CPU
 		{0302444C-4190-4C5D-A873-A1F80267961A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0302444C-4190-4C5D-A873-A1F80267961A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0302444C-4190-4C5D-A873-A1F80267961A}.Release|x86.ActiveCfg = Release|x86
-		{0302444C-4190-4C5D-A873-A1F80267961A}.Release|x86.Build.0 = Release|x86
+		{0302444C-4190-4C5D-A873-A1F80267961A}.Release|x86.ActiveCfg = Release|Any CPU
+		{0302444C-4190-4C5D-A873-A1F80267961A}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

JoysOfEfficiency/Automation/AnimalAutomation.cs → GloryOfEfficiency/Automation/AnimalAutomation.cs

@@ -1,20 +1,18 @@
 using System.Collections.Generic;
 using System.Linq;
-using JoysOfEfficiency.Core;
-using JoysOfEfficiency.Utils;
+using GloryOfEfficiency.Core;
+using GloryOfEfficiency.Utils;
 using Microsoft.Xna.Framework;
-using Netcode;
-using StardewModdingAPI;
 using StardewValley;
 using StardewValley.Buildings;
 using StardewValley.Characters;
+using StardewValley.Extensions;
 using StardewValley.Tools;
 
-namespace JoysOfEfficiency.Automation
+namespace GloryOfEfficiency.Automation
 {
     internal class AnimalAutomation
     {
-        private static IReflectionHelper Reflection => InstanceHolder.Reflection;
         private static Config Config => InstanceHolder.Config;
 
         private static readonly Logger Logger = new Logger("AnimalAutomation");
@@ -26,8 +24,8 @@ public static void LetAnimalsInHome()
             {
                 FarmAnimal animal = kv.Value;
                 Logger.Log(
-                    $"Warped {animal.displayName}({animal.shortDisplayType()}) to {animal.displayHouse}@[{animal.homeLocation.X}, {animal.homeLocation.Y}]");
-                animal.warpHome(farm, animal);
+                    $"Warped {animal.displayName}({animal.shortDisplayType()}) to {animal.displayHouse}@[{animal.home.animalDoor.X}, {animal.home.animalDoor.Y}]");
+                animal.warpHome();
             }
         }
 
@@ -49,34 +47,18 @@ public static void AutoOpenAnimalDoor()
             Farm farm = Game1.getFarm();
             foreach (Building building in farm.buildings)
             {
-                switch (building)
+                switch (building.buildingType.Value)
                 {
-                    case Coop coop:
+                    case "Coop":
+                    case "Barn":
                     {
-                        if (coop.indoors.Value is AnimalHouse house)
+                        if (building.indoors.Value is AnimalHouse house)
                         {
-                            if (house.animals.Any() && !coop.animalDoorOpen.Value)
+                            if (house.animals.Any() && !building.animalDoorOpen.Value)
                             {
-                                Logger.Log($"Opening coop door @[{coop.animalDoor.X},{coop.animalDoor.Y}]");
-                                coop.animalDoorOpen.Value = true;
-                                Reflection.GetField<NetInt>(coop, "animalDoorMotion").SetValue(new NetInt(-2));
+                                building.ToggleAnimalDoor(Game1.player);
                             }
                         }
-
-                        break;
-                    }
-                    case Barn barn:
-                    {
-                        if (barn.indoors.Value is AnimalHouse house)
-                        {
-                            if (house.animals.Any() && !barn.animalDoorOpen.Value)
-                            {
-                                Logger.Log($"Opening barn door @[{barn.animalDoor.X},{barn.animalDoor.Y}]");
-                                barn.animalDoorOpen.Value = true;
-                                Reflection.GetField<NetInt>(barn, "animalDoorMotion").SetValue(new NetInt(-3));
-                            }
-                        }
-
                         break;
                     }
                 }
@@ -88,32 +70,18 @@ public static void AutoCloseAnimalDoor()
             Farm farm = Game1.getFarm();
             foreach (Building building in farm.buildings)
             {
-                switch (building)
+                switch (building.buildingType.Value)
                 {
-                    case Coop coop:
+                    case "Coop":
+                    case "Barn":
                     {
-                        if (coop.indoors.Value is AnimalHouse house)
+                        if (building.indoors.Value is AnimalHouse house)
                         {
-                            if (house.animals.Any() && coop.animalDoorOpen.Value)
+                            if (house.animals.Any() && building.animalDoorOpen.Value)
                             {
-                                coop.animalDoorOpen.Value = false;
-                                Reflection.GetField<NetInt>(coop, "animalDoorMotion").SetValue(new NetInt(2));
+                                building.ToggleAnimalDoor(Game1.player);
                             }
                         }
-
-                        break;
-                    }
-                    case Barn barn:
-                    {
-                        if (barn.indoors.Value is AnimalHouse house)
-                        {
-                            if (house.animals.Any() && barn.animalDoorOpen.Value)
-                            {
-                                barn.animalDoorOpen.Value = false;
-                                Reflection.GetField<NetInt>(barn, "animalDoorMotion").SetValue(new NetInt(2));
-                            }
-                        }
-
                         break;
                     }
                 }
@@ -132,8 +100,9 @@ public static void PetNearbyPets()
                 bool wasPet = WasPetToday(pet);
                 if (!wasPet)
                 {
-                    Logger.Log($"Petted {(pet is Dog ? "Dog" : "Cat")}'{pet.Name}' @{pet.getTileLocationPoint()}");
+                    Logger.Log($"Petted {(pet.petType.Value == "Dog" ? "Dog" : "Cat")}'{pet.Name}' @{pet.position}");
                     pet.checkAction(player, location); // Pet pet... lol
+
                 }
             }
         }
@@ -142,18 +111,18 @@ public static void PetNearbyAnimals()
         {
             int radius = Config.AutoPetRadius * Game1.tileSize;
             Rectangle bb = Util.Expand(Game1.player.GetBoundingBox(), radius);
-            foreach (FarmAnimal animal in Util.GetAnimalsList(Game1.player))
+            foreach (FarmAnimal animal in GetAnimalsList(Game1.player))
             {
-                if (!bb.Contains((int) animal.Position.X, (int) animal.Position.Y) || animal.wasPet.Value)
+                if (Game1.timeOfDay >= 1900 && !animal.isMoving())
                 {
                     continue;
                 }
-
-                if (Game1.timeOfDay >= 1900 && !animal.isMoving())
+                if (!bb.Contains((int) animal.Position.X, (int) animal.Position.Y) || animal.wasPet.Value)
                 {
                     continue;
                 }
-                Logger.Log($"Petted {animal.displayType}'{animal.Name}' @{animal.getTileLocationPoint()}");
+
+                Logger.Log($"Petted {animal.displayType}'{animal.Name}' @{animal.position}");
                 animal.pet(Game1.player);
             }
         }
@@ -162,10 +131,10 @@ public static void ShearingAndMilking(Farmer player)
         {
             int radius = InstanceHolder.Config.AnimalHarvestRadius * Game1.tileSize;
             Rectangle bb = Util.Expand(player.GetBoundingBox(), radius);
-            foreach (FarmAnimal animal in Util.GetAnimalsList(player))
+            foreach (FarmAnimal animal in GetAnimalsList(player))
             {
                 string lowerType = animal.type.Value.ToLower();
-                if (animal.currentProduce.Value < 0 || animal.age.Value < animal.ageWhenMature.Value ||
+                if (animal.currentProduce.Value is null || animal.isBaby() ||
                     player.CurrentTool == null || !animal.GetBoundingBox().Intersects(bb))
                 {
                     continue;
@@ -177,20 +146,21 @@ public static void ShearingAndMilking(Farmer player)
                     continue;
 
                 if (!player.addItemToInventoryBool(
-                    new Object(Vector2.Zero, animal.currentProduce.Value, null, false, true, false, false)
-                    {
-                        Quality = animal.produceQuality.Value
-                    }))
+                    new StardewValley.Object(animal.currentProduce.Value,
+                        animal.hasEatenAnimalCracker.Value ? 2 : 1,
+                        false,
+                        -1,
+                        animal.produceQuality.Value)))
                 {
                     continue;
                 }
 
                 switch (player.CurrentTool)
                 {
-                    case Shears _:
+                    case Shears:
                         Shears.playSnip(player);
                         break;
-                    case MilkPail _:
+                    case MilkPail:
                         player.currentLocation.localSound("Milking");
                         DelayedAction.playSoundAfterDelay("fishingRodBend", 300);
                         DelayedAction.playSoundAfterDelay("fishingRodBend", 1200);
@@ -200,12 +170,8 @@ public static void ShearingAndMilking(Farmer player)
 
                 animal.doEmote(20);
                 Game1.playSound("coin");
-                animal.currentProduce.Value = -1;
-                if (animal.showDifferentTextureWhenReadyForHarvest.Value)
-                {
-                    animal.Sprite.LoadTexture("Animals\\Sheared" + animal.type.Value);
-                }
-
+                animal.currentProduce.Value = null;
+                animal.ReloadTextureIfNeeded();
                 player.gainExperience(0, 5);
             }
         }
@@ -215,5 +181,27 @@ private static bool WasPetToday(Pet pet)
             return pet.lastPetDay.ContainsKey(Game1.player.UniqueMultiplayerID) &&
                    pet.lastPetDay[Game1.player.UniqueMultiplayerID] == Game1.Date.TotalDays;
         }
+
+
+        private static IEnumerable<FarmAnimal> GetAnimalsList(Character player)
+        {
+            HashSet<FarmAnimal> list = new HashSet<FarmAnimal>();
+            switch (player.currentLocation)
+            {
+                case Farm farm:
+                {
+                    list.AddRange(farm.animals.Values);
+                    break;
+                }
+
+                case AnimalHouse house:
+                {
+                    list.AddRange(house.animals.Values);
+                    break;
+                }
+            }
+            return list;
+        }
+
     }
-}
+}