From 44ddc4ca42de69fe481d004dffa728c7f539083a Mon Sep 17 00:00:00 2001 From: yangzhi <@4F!xZpJwly&KbWq> Date: Wed, 10 Apr 2019 01:22:10 +0800 Subject: [PATCH 1/6] Android Mod Transportation --- Mods/AutoFish/AutoFish.csproj | 162 ++++++++ Mods/AutoFish/AutoFish/ModConfig.cs | 16 + Mods/AutoFish/AutoFish/ModEntry.cs | 138 +++++++ Mods/AutoFish/Properties/AssemblyInfo.cs | 36 ++ Mods/AutoSpeed/AutoSpeed.csproj | 175 +++++++++ Mods/AutoSpeed/AutoSpeed/AutoSpeed.cs | 58 +++ .../AutoSpeed/Framework/ModConfig.cs | 9 + Mods/AutoSpeed/AutoSpeed/ModConfig.cs | 14 + Mods/AutoSpeed/AutoSpeed/ModEntry.cs | 58 +++ Mods/AutoSpeed/AutoSpeed/README.md | 31 ++ Mods/AutoSpeed/AutoSpeed/manifest.json | 10 + Mods/AutoSpeed/Properties/AssemblyInfo.cs | 36 ++ Mods/Automate/Automate.csproj | 277 ++++++++++++++ .../Automate/Framework/AutomateAPI.cs | 98 +++++ .../Automate/Framework/AutomationFactory.cs | 247 +++++++++++++ .../Automate/Framework/BaseMachine.cs | 90 +++++ Mods/Automate/Automate/Framework/Connector.cs | 37 ++ .../Automate/Automate/Framework/Consumable.cs | 50 +++ .../Framework/GenericObjectMachine.cs | 63 ++++ .../Automate/Framework/MachineGroup.cs | 91 +++++ .../Automate/Framework/MachineGroupBuilder.cs | 90 +++++ .../Automate/Framework/MachineGroupFactory.cs | 176 +++++++++ .../Machines/Buildings/JunimoHutMachine.cs | 88 +++++ .../Machines/Buildings/MillMachine.cs | 173 +++++++++ .../Machines/Buildings/ShippingBinMachine.cs | 70 ++++ .../Machines/Objects/AutoGrabberMachine.cs | 92 +++++ .../Machines/Objects/BeeHouseMachine.cs | 103 ++++++ .../Framework/Machines/Objects/CaskMachine.cs | 99 +++++ .../Machines/Objects/CharcoalKilnMachine.cs | 49 +++ .../Machines/Objects/CheesePressMachine.cs | 75 ++++ .../Machines/Objects/CoopIncubatorMachine.cs | 80 ++++ .../Machines/Objects/CrabPotMachine.cs | 131 +++++++ .../Machines/Objects/CrystalariumMachine.cs | 63 ++++ .../Machines/Objects/FeedHopperMachine.cs | 93 +++++ .../Machines/Objects/FurnaceMachine.cs | 92 +++++ .../Framework/Machines/Objects/KegMachine.cs | 103 ++++++ .../Machines/Objects/LightningRodMachine.cs | 35 ++ .../Framework/Machines/Objects/LoomMachine.cs | 56 +++ .../Machines/Objects/MayonnaiseMachine.cs | 86 +++++ .../Machines/Objects/MushroomBoxMachine.cs | 54 +++ .../Machines/Objects/OilMakerMachine.cs | 68 ++++ .../Machines/Objects/PreservesJarMachine.cs | 74 ++++ .../Machines/Objects/RecyclingMachine.cs | 86 +++++ .../Machines/Objects/SeedMakerMachine.cs | 85 +++++ .../Machines/Objects/SlimeEggPressMachine.cs | 50 +++ .../Machines/Objects/SlimeIncubatorMachine.cs | 90 +++++ .../Framework/Machines/Objects/SodaMachine.cs | 36 ++ .../Objects/StatueOfEndlessFortuneMachine.cs | 36 ++ .../Objects/StatueOfPerfectionMachine.cs | 36 ++ .../Machines/Objects/TapperMachine.cs | 84 +++++ .../Machines/Objects/WormBinMachine.cs | 42 +++ .../TerrainFeatures/FruitTreeMachine.cs | 72 ++++ .../Machines/Tiles/TrashCanMachine.cs | 149 ++++++++ .../Automate/Framework/Models/ModConfig.cs | 37 ++ .../Framework/Models/ModConfigObject.cs | 16 + .../Automate/Framework/Models/ObjectType.cs | 15 + .../Automate/Framework/OverlayMenu.cs | 126 +++++++ Mods/Automate/Automate/Framework/Recipe.cs | 49 +++ .../Framework/Storage/ChestContainer.cs | 146 ++++++++ .../Framework/Storage/ContainerExtensions.cs | 47 +++ .../Automate/Framework/StorageManager.cs | 206 +++++++++++ Mods/Automate/Automate/IAutomatable.cs | 18 + Mods/Automate/Automate/IAutomateAPI.cs | 19 + Mods/Automate/Automate/IAutomationFactory.cs | 43 +++ Mods/Automate/Automate/IConsumable.cs | 34 ++ Mods/Automate/Automate/IContainer.cs | 31 ++ Mods/Automate/Automate/IMachine.cs | 28 ++ Mods/Automate/Automate/IRecipe.cs | 33 ++ Mods/Automate/Automate/IStorage.cs | 62 ++++ Mods/Automate/Automate/ITrackedStack.cs | 30 ++ Mods/Automate/Automate/MachineState.cs | 18 + Mods/Automate/Automate/ModEntry.cs | 285 +++++++++++++++ Mods/Automate/Automate/TrackedItem.cs | 102 ++++++ .../Automate/TrackedItemCollection.cs | 84 +++++ .../screenshots/chests-anywhere-config.png | Bin 0 -> 29371 bytes .../Automate/screenshots/connectors.png | Bin 0 -> 16106 bytes .../Automate/screenshots/crab-pot-factory.png | Bin 0 -> 8351 bytes .../Automate/screenshots/example-overlay.png | Bin 0 -> 40618 bytes .../extensibility-machine-groups.png | Bin 0 -> 5737 bytes .../screenshots/iridium-bar-factory.png | Bin 0 -> 5295 bytes .../screenshots/iridium-cheese-factory.png | Bin 0 -> 6067 bytes .../screenshots/iridium-mead-factory.png | Bin 0 -> 7990 bytes .../screenshots/refined-quartz-factory.png | Bin 0 -> 4957 bytes Mods/Automate/Common/CommonHelper.cs | 345 ++++++++++++++++++ .../Common/DataParsers/CropDataParser.cs | 93 +++++ .../Automate/AutomateIntegration.cs | 44 +++ .../Integrations/Automate/IAutomateApi.cs | 15 + .../Common/Integrations/BaseIntegration.cs | 82 +++++ .../BetterJunimos/BetterJunimosIntegration.cs | 40 ++ .../BetterJunimos/IBetterJunimosApi.cs | 9 + .../BetterSprinklersIntegration.cs | 49 +++ .../BetterSprinklers/IBetterSprinklersApi.cs | 15 + .../Integrations/Cobalt/CobaltIntegration.cs | 48 +++ .../Common/Integrations/Cobalt/ICobaltApi.cs | 19 + .../CustomFarmingReduxIntegration.cs | 49 +++ .../CustomFarmingRedux/ICustomFarmingApi.cs | 20 + .../FarmExpansion/FarmExpansionIntegration.cs | 49 +++ .../FarmExpansion/IFarmExpansionApi.cs | 16 + .../Common/Integrations/IModIntegration.cs | 15 + .../LineSprinklers/ILineSprinklersApi.cs | 15 + .../LineSprinklersIntegration.cs | 49 +++ .../PelicanFiber/PelicanFiberIntegration.cs | 49 +++ .../PrismaticTools/IPrismaticToolsApi.cs | 19 + .../PrismaticToolsIntegration.cs | 55 +++ .../SimpleSprinkler/ISimplerSprinklerApi.cs | 12 + .../SimpleSprinklerIntegration.cs | 41 +++ Mods/Automate/Common/PathUtilities.cs | 86 +++++ Mods/Automate/Common/SpriteInfo.cs | 31 ++ .../Common/StringEnumArrayConverter.cs | 153 ++++++++ Mods/Automate/Common/TileHelper.cs | 126 +++++++ Mods/Automate/Common/UI/BaseOverlay.cs | 214 +++++++++++ Mods/Automate/Common/UI/CommonSprites.cs | 79 ++++ .../Common/Utilities/ConstraintSet.cs | 141 +++++++ .../Common/Utilities/InvariantDictionary.cs | 30 ++ .../Common/Utilities/InvariantHashSet.cs | 32 ++ .../Utilities/ObjectReferenceComparer.cs | 29 ++ Mods/Automate/Properties/AssemblyInfo.cs | 36 ++ .../CategorizeChestsModule.cs | 110 ++++++ .../CategorizeChests/Framework/ChestData.cs | 52 +++ .../Framework/ChestDataManager.cs | 12 + .../Framework/ChestExtension.cs | 86 +++++ .../CategorizeChests/Framework/ChestFinder.cs | 53 +++ .../Framework/DiscoveredItem.cs | 16 + .../Framework/IChestDataManager.cs | 13 + .../Framework/IChestFiller.cs | 13 + .../Framework/IChestFinder.cs | 13 + .../Framework/IItemDataManager.cs | 17 + .../Framework/ItemBlacklist.cs | 97 +++++ .../Framework/ItemDataManager.cs | 162 ++++++++ .../CategorizeChests/Framework/ItemKey.cs | 77 ++++ .../Framework/ItemNotImplementedException.cs | 17 + .../CategorizeChests/Framework/ItemType.cs | 18 + .../Framework/Persistence/ChestAddress.cs | 40 ++ .../Framework/Persistence/ChestEntry.cs | 43 +++ .../Persistence/ChestLocationType.cs | 9 + .../Framework/Persistence/ISaveManager.cs | 8 + .../Persistence/InvalidSaveDataException.cs | 14 + .../Framework/Persistence/SaveData.cs | 12 + .../Framework/Persistence/SaveManager.cs | 46 +++ .../CategorizeChests/Framework/Saver.cs | 81 ++++ .../Interface/ITooltipManager.cs | 11 + .../Interface/InterfaceHost.cs | 216 +++++++++++ .../CategorizeChests/Interface/NineSlice.cs | 77 ++++ .../CategorizeChests/Interface/Sprites.cs | 77 ++++ .../Interface/TextureRegion.cs | 28 ++ .../Interface/TooltipManager.cs | 34 ++ .../CategorizeChests/Interface/WidgetHost.cs | 40 ++ .../Interface/Widgets/Background.cs | 30 ++ .../Interface/Widgets/Button.cs | 19 + .../Interface/Widgets/CategoryMenu.cs | 171 +++++++++ .../Interface/Widgets/ChestOverlay.cs | 127 +++++++ .../Interface/Widgets/ItemToggle.cs | 48 +++ .../Interface/Widgets/ItemTooltip.cs | 26 ++ .../Interface/Widgets/Label.cs | 52 +++ .../Interface/Widgets/LabeledCheckbox.cs | 49 +++ .../Interface/Widgets/SpriteButton.cs | 25 ++ .../Interface/Widgets/Stamp.cs | 25 ++ .../Interface/Widgets/TextButton.cs | 54 +++ .../Interface/Widgets/Widget.cs | 243 ++++++++++++ .../Interface/Widgets/WrapBag.cs | 41 +++ .../CategorizeChests/ItemHelper.cs | 103 ++++++ .../CategorizeChests/Utility.cs | 46 +++ Mods/ConvenientChests/Config.cs | 15 + Mods/ConvenientChests/ConvenientChests.csproj | 210 +++++++++++ Mods/ConvenientChests/ModEntry.cs | 47 +++ Mods/ConvenientChests/Module.cs | 17 + .../Properties/AssemblyInfo.cs | 36 ++ .../StackToNearbyChests/StackLogic.cs | 87 +++++ .../StashToNearbyChestsModule.cs | 59 +++ Mods/Mods.sln | 61 ++++ Mods/ScytheHarvesting/ModConfig.cs | 16 + .../Properties/AssemblyInfo.cs | 36 ++ Mods/ScytheHarvesting/ScytheHarvesting.cs | 252 +++++++++++++ Mods/ScytheHarvesting/ScytheHarvesting.csproj | 162 ++++++++ Mods/SkullCavernElevator/ModConfig.cs | 13 + Mods/SkullCavernElevator/ModEntry.cs | 120 ++++++ .../MyElevatorMenuWithScrollbar.cs | 250 +++++++++++++ .../Properties/AssemblyInfo.cs | 36 ++ .../SkullCavernElevator.csproj | 164 +++++++++ .../SkullCavernElevator/MyElevatorMenu.cs | 109 ++++++ Mods/TimeSpeed/Framework/LocationType.cs | 15 + Mods/TimeSpeed/Framework/ModConfig.cs | 127 +++++++ Mods/TimeSpeed/Framework/ModControlsConfig.cs | 23 ++ Mods/TimeSpeed/Framework/Notifier.cs | 25 ++ .../Framework/TickProgressChangedEventArgs.cs | 33 ++ Mods/TimeSpeed/Framework/TimeHelper.cs | 53 +++ Mods/TimeSpeed/ModEntry.cs | 336 +++++++++++++++++ Mods/TimeSpeed/Properties/AssemblyInfo.cs | 36 ++ Mods/TimeSpeed/TimeSpeed.csproj | 167 +++++++++ PatchStep.txt | 21 ++ SMAPI | 1 + 191 files changed, 13024 insertions(+) create mode 100644 Mods/AutoFish/AutoFish.csproj create mode 100644 Mods/AutoFish/AutoFish/ModConfig.cs create mode 100644 Mods/AutoFish/AutoFish/ModEntry.cs create mode 100644 Mods/AutoFish/Properties/AssemblyInfo.cs create mode 100644 Mods/AutoSpeed/AutoSpeed.csproj create mode 100644 Mods/AutoSpeed/AutoSpeed/AutoSpeed.cs create mode 100644 Mods/AutoSpeed/AutoSpeed/Framework/ModConfig.cs create mode 100644 Mods/AutoSpeed/AutoSpeed/ModConfig.cs create mode 100644 Mods/AutoSpeed/AutoSpeed/ModEntry.cs create mode 100644 Mods/AutoSpeed/AutoSpeed/README.md create mode 100644 Mods/AutoSpeed/AutoSpeed/manifest.json create mode 100644 Mods/AutoSpeed/Properties/AssemblyInfo.cs create mode 100644 Mods/Automate/Automate.csproj create mode 100644 Mods/Automate/Automate/Framework/AutomateAPI.cs create mode 100644 Mods/Automate/Automate/Framework/AutomationFactory.cs create mode 100644 Mods/Automate/Automate/Framework/BaseMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Connector.cs create mode 100644 Mods/Automate/Automate/Framework/Consumable.cs create mode 100644 Mods/Automate/Automate/Framework/GenericObjectMachine.cs create mode 100644 Mods/Automate/Automate/Framework/MachineGroup.cs create mode 100644 Mods/Automate/Automate/Framework/MachineGroupBuilder.cs create mode 100644 Mods/Automate/Automate/Framework/MachineGroupFactory.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Buildings/JunimoHutMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Buildings/MillMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Buildings/ShippingBinMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Objects/AutoGrabberMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Objects/BeeHouseMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Objects/CaskMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Objects/CharcoalKilnMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Objects/CheesePressMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Objects/CoopIncubatorMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Objects/CrabPotMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Objects/CrystalariumMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Objects/FeedHopperMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Objects/FurnaceMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Objects/KegMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Objects/LightningRodMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Objects/LoomMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Objects/MayonnaiseMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Objects/MushroomBoxMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Objects/OilMakerMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Objects/PreservesJarMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Objects/RecyclingMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Objects/SeedMakerMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Objects/SlimeEggPressMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Objects/SlimeIncubatorMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Objects/SodaMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Objects/StatueOfEndlessFortuneMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Objects/StatueOfPerfectionMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Objects/TapperMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Objects/WormBinMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/TerrainFeatures/FruitTreeMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Machines/Tiles/TrashCanMachine.cs create mode 100644 Mods/Automate/Automate/Framework/Models/ModConfig.cs create mode 100644 Mods/Automate/Automate/Framework/Models/ModConfigObject.cs create mode 100644 Mods/Automate/Automate/Framework/Models/ObjectType.cs create mode 100644 Mods/Automate/Automate/Framework/OverlayMenu.cs create mode 100644 Mods/Automate/Automate/Framework/Recipe.cs create mode 100644 Mods/Automate/Automate/Framework/Storage/ChestContainer.cs create mode 100644 Mods/Automate/Automate/Framework/Storage/ContainerExtensions.cs create mode 100644 Mods/Automate/Automate/Framework/StorageManager.cs create mode 100644 Mods/Automate/Automate/IAutomatable.cs create mode 100644 Mods/Automate/Automate/IAutomateAPI.cs create mode 100644 Mods/Automate/Automate/IAutomationFactory.cs create mode 100644 Mods/Automate/Automate/IConsumable.cs create mode 100644 Mods/Automate/Automate/IContainer.cs create mode 100644 Mods/Automate/Automate/IMachine.cs create mode 100644 Mods/Automate/Automate/IRecipe.cs create mode 100644 Mods/Automate/Automate/IStorage.cs create mode 100644 Mods/Automate/Automate/ITrackedStack.cs create mode 100644 Mods/Automate/Automate/MachineState.cs create mode 100644 Mods/Automate/Automate/ModEntry.cs create mode 100644 Mods/Automate/Automate/TrackedItem.cs create mode 100644 Mods/Automate/Automate/TrackedItemCollection.cs create mode 100644 Mods/Automate/Automate/screenshots/chests-anywhere-config.png create mode 100644 Mods/Automate/Automate/screenshots/connectors.png create mode 100644 Mods/Automate/Automate/screenshots/crab-pot-factory.png create mode 100644 Mods/Automate/Automate/screenshots/example-overlay.png create mode 100644 Mods/Automate/Automate/screenshots/extensibility-machine-groups.png create mode 100644 Mods/Automate/Automate/screenshots/iridium-bar-factory.png create mode 100644 Mods/Automate/Automate/screenshots/iridium-cheese-factory.png create mode 100644 Mods/Automate/Automate/screenshots/iridium-mead-factory.png create mode 100644 Mods/Automate/Automate/screenshots/refined-quartz-factory.png create mode 100644 Mods/Automate/Common/CommonHelper.cs create mode 100644 Mods/Automate/Common/DataParsers/CropDataParser.cs create mode 100644 Mods/Automate/Common/Integrations/Automate/AutomateIntegration.cs create mode 100644 Mods/Automate/Common/Integrations/Automate/IAutomateApi.cs create mode 100644 Mods/Automate/Common/Integrations/BaseIntegration.cs create mode 100644 Mods/Automate/Common/Integrations/BetterJunimos/BetterJunimosIntegration.cs create mode 100644 Mods/Automate/Common/Integrations/BetterJunimos/IBetterJunimosApi.cs create mode 100644 Mods/Automate/Common/Integrations/BetterSprinklers/BetterSprinklersIntegration.cs create mode 100644 Mods/Automate/Common/Integrations/BetterSprinklers/IBetterSprinklersApi.cs create mode 100644 Mods/Automate/Common/Integrations/Cobalt/CobaltIntegration.cs create mode 100644 Mods/Automate/Common/Integrations/Cobalt/ICobaltApi.cs create mode 100644 Mods/Automate/Common/Integrations/CustomFarmingRedux/CustomFarmingReduxIntegration.cs create mode 100644 Mods/Automate/Common/Integrations/CustomFarmingRedux/ICustomFarmingApi.cs create mode 100644 Mods/Automate/Common/Integrations/FarmExpansion/FarmExpansionIntegration.cs create mode 100644 Mods/Automate/Common/Integrations/FarmExpansion/IFarmExpansionApi.cs create mode 100644 Mods/Automate/Common/Integrations/IModIntegration.cs create mode 100644 Mods/Automate/Common/Integrations/LineSprinklers/ILineSprinklersApi.cs create mode 100644 Mods/Automate/Common/Integrations/LineSprinklers/LineSprinklersIntegration.cs create mode 100644 Mods/Automate/Common/Integrations/PelicanFiber/PelicanFiberIntegration.cs create mode 100644 Mods/Automate/Common/Integrations/PrismaticTools/IPrismaticToolsApi.cs create mode 100644 Mods/Automate/Common/Integrations/PrismaticTools/PrismaticToolsIntegration.cs create mode 100644 Mods/Automate/Common/Integrations/SimpleSprinkler/ISimplerSprinklerApi.cs create mode 100644 Mods/Automate/Common/Integrations/SimpleSprinkler/SimpleSprinklerIntegration.cs create mode 100644 Mods/Automate/Common/PathUtilities.cs create mode 100644 Mods/Automate/Common/SpriteInfo.cs create mode 100644 Mods/Automate/Common/StringEnumArrayConverter.cs create mode 100644 Mods/Automate/Common/TileHelper.cs create mode 100644 Mods/Automate/Common/UI/BaseOverlay.cs create mode 100644 Mods/Automate/Common/UI/CommonSprites.cs create mode 100644 Mods/Automate/Common/Utilities/ConstraintSet.cs create mode 100644 Mods/Automate/Common/Utilities/InvariantDictionary.cs create mode 100644 Mods/Automate/Common/Utilities/InvariantHashSet.cs create mode 100644 Mods/Automate/Common/Utilities/ObjectReferenceComparer.cs create mode 100644 Mods/Automate/Properties/AssemblyInfo.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/CategorizeChestsModule.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Framework/ChestData.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Framework/ChestDataManager.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Framework/ChestExtension.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Framework/ChestFinder.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Framework/DiscoveredItem.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Framework/IChestDataManager.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Framework/IChestFiller.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Framework/IChestFinder.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Framework/IItemDataManager.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Framework/ItemBlacklist.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Framework/ItemDataManager.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Framework/ItemKey.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Framework/ItemNotImplementedException.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Framework/ItemType.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Framework/Persistence/ChestAddress.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Framework/Persistence/ChestEntry.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Framework/Persistence/ChestLocationType.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Framework/Persistence/ISaveManager.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Framework/Persistence/InvalidSaveDataException.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Framework/Persistence/SaveData.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Framework/Persistence/SaveManager.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Framework/Saver.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Interface/ITooltipManager.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Interface/InterfaceHost.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Interface/NineSlice.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Interface/Sprites.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Interface/TextureRegion.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Interface/TooltipManager.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Interface/WidgetHost.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Interface/Widgets/Background.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Interface/Widgets/Button.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Interface/Widgets/CategoryMenu.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Interface/Widgets/ChestOverlay.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Interface/Widgets/ItemToggle.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Interface/Widgets/ItemTooltip.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Interface/Widgets/Label.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Interface/Widgets/LabeledCheckbox.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Interface/Widgets/SpriteButton.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Interface/Widgets/Stamp.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Interface/Widgets/TextButton.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Interface/Widgets/Widget.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Interface/Widgets/WrapBag.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/ItemHelper.cs create mode 100644 Mods/ConvenientChests/CategorizeChests/Utility.cs create mode 100644 Mods/ConvenientChests/Config.cs create mode 100644 Mods/ConvenientChests/ConvenientChests.csproj create mode 100644 Mods/ConvenientChests/ModEntry.cs create mode 100644 Mods/ConvenientChests/Module.cs create mode 100644 Mods/ConvenientChests/Properties/AssemblyInfo.cs create mode 100644 Mods/ConvenientChests/StackToNearbyChests/StackLogic.cs create mode 100644 Mods/ConvenientChests/StackToNearbyChests/StashToNearbyChestsModule.cs create mode 100644 Mods/Mods.sln create mode 100644 Mods/ScytheHarvesting/ModConfig.cs create mode 100644 Mods/ScytheHarvesting/Properties/AssemblyInfo.cs create mode 100644 Mods/ScytheHarvesting/ScytheHarvesting.cs create mode 100644 Mods/ScytheHarvesting/ScytheHarvesting.csproj create mode 100644 Mods/SkullCavernElevator/ModConfig.cs create mode 100644 Mods/SkullCavernElevator/ModEntry.cs create mode 100644 Mods/SkullCavernElevator/MyElevatorMenuWithScrollbar.cs create mode 100644 Mods/SkullCavernElevator/Properties/AssemblyInfo.cs create mode 100644 Mods/SkullCavernElevator/SkullCavernElevator.csproj create mode 100644 Mods/SkullCavernElevator/SkullCavernElevator/MyElevatorMenu.cs create mode 100644 Mods/TimeSpeed/Framework/LocationType.cs create mode 100644 Mods/TimeSpeed/Framework/ModConfig.cs create mode 100644 Mods/TimeSpeed/Framework/ModControlsConfig.cs create mode 100644 Mods/TimeSpeed/Framework/Notifier.cs create mode 100644 Mods/TimeSpeed/Framework/TickProgressChangedEventArgs.cs create mode 100644 Mods/TimeSpeed/Framework/TimeHelper.cs create mode 100644 Mods/TimeSpeed/ModEntry.cs create mode 100644 Mods/TimeSpeed/Properties/AssemblyInfo.cs create mode 100644 Mods/TimeSpeed/TimeSpeed.csproj create mode 100644 PatchStep.txt create mode 160000 SMAPI diff --git a/Mods/AutoFish/AutoFish.csproj b/Mods/AutoFish/AutoFish.csproj new file mode 100644 index 000000000..bc33fadea --- /dev/null +++ b/Mods/AutoFish/AutoFish.csproj @@ -0,0 +1,162 @@ + + + + + Debug + AnyCPU + {8B08A816-6125-4277-A9EE-CA6AF9E279FC} + Library + Properties + AutoFish + AutoFish + v4.5.2 + 512 + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\assemblies\Mod.dll + + + ..\assemblies\StardewValley.dll + + + False + ..\assemblies\BmFont.dll + + + False + ..\assemblies\Google.Android.Vending.Expansion.Downloader.dll + + + False + ..\assemblies\Google.Android.Vending.Expansion.ZipFile.dll + + + False + ..\assemblies\Google.Android.Vending.Licensing.dll + + + False + ..\assemblies\Java.Interop.dll + + + False + ..\assemblies\Microsoft.AppCenter.dll + + + False + ..\assemblies\Microsoft.AppCenter.Analytics.dll + + + False + ..\assemblies\Microsoft.AppCenter.Analytics.Android.Bindings.dll + + + False + ..\assemblies\Microsoft.AppCenter.Android.Bindings.dll + + + False + ..\assemblies\Microsoft.AppCenter.Crashes.dll + + + False + ..\assemblies\Microsoft.AppCenter.Crashes.Android.Bindings.dll + + + False + ..\assemblies\Mono.Android.dll + + + False + ..\assemblies\Mono.Security.dll + + + False + ..\assemblies\MonoGame.Framework.dll + + + ..\assemblies\mscorlib.dll + + + ..\assemblies\System.dll + + + ..\assemblies\System.Xml + + + ..\assemblies\System.Net.Http + + + ..\assemblies\System.Runtime.Serialization + + + False + ..\assemblies\Xamarin.Android.Arch.Core.Common.dll + + + False + ..\assemblies\Xamarin.Android.Arch.Lifecycle.Common.dll + + + False + ..\assemblies\Xamarin.Android.Arch.Lifecycle.Runtime.dll + + + False + ..\assemblies\Xamarin.Android.Support.Annotations.dll + + + False + ..\assemblies\Xamarin.Android.Support.Compat.dll + + + False + ..\assemblies\Xamarin.Android.Support.Core.UI.dll + + + False + ..\assemblies\Xamarin.Android.Support.Core.Utils.dll + + + False + ..\assemblies\Xamarin.Android.Support.Fragment.dll + + + False + ..\assemblies\Xamarin.Android.Support.Media.Compat.dll + + + False + ..\assemblies\Xamarin.Android.Support.v4.dll + + + False + ..\assemblies\xTile.dll + + + + + + + + + \ No newline at end of file diff --git a/Mods/AutoFish/AutoFish/ModConfig.cs b/Mods/AutoFish/AutoFish/ModConfig.cs new file mode 100644 index 000000000..3604f5cd4 --- /dev/null +++ b/Mods/AutoFish/AutoFish/ModConfig.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AutoFish +{ + class ModConfig + { + public bool maxCastPower { get; set; } = true; + public bool autoHit { get; set; } = true; + public bool fastBite { get; set; } = false; + public bool catchTreasure { get; set; } = true; + } +} diff --git a/Mods/AutoFish/AutoFish/ModEntry.cs b/Mods/AutoFish/AutoFish/ModEntry.cs new file mode 100644 index 000000000..0d33b57e5 --- /dev/null +++ b/Mods/AutoFish/AutoFish/ModEntry.cs @@ -0,0 +1,138 @@ +using SMDroid.Options; +using StardewModdingAPI; +using StardewModdingAPI.Events; +using StardewValley; +using StardewValley.Menus; +using StardewValley.Tools; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AutoFish +{ + public class ModEntry : Mod + { + private ModConfig Config; + private bool catching = false; + + public override void Entry(IModHelper helper) + { + this.Config = this.Helper.ReadConfig(); + helper.Events.GameLoop.UpdateTicked += this.UpdateTick; + } + public override List GetConfigMenuItems() + { + List options = new List(); + ModOptionsCheckbox _optionsCheckboxAutoHit = new ModOptionsCheckbox("自动起钩", 0x8765, delegate (bool value) { + this.Config.autoHit = value; + this.Helper.WriteConfig(this.Config); + }, -1, -1); + _optionsCheckboxAutoHit.isChecked = this.Config.autoHit; + options.Add(_optionsCheckboxAutoHit); + ModOptionsCheckbox _optionsCheckboxMaxCastPower = new ModOptionsCheckbox("最大抛竿", 0x8765, delegate (bool value) { + this.Config.maxCastPower = value; + this.Helper.WriteConfig(this.Config); + }, -1, -1); + _optionsCheckboxMaxCastPower.isChecked = this.Config.maxCastPower; + options.Add(_optionsCheckboxMaxCastPower); + ModOptionsCheckbox _optionsCheckboxFastBite = new ModOptionsCheckbox("快速咬钩", 0x8765, delegate (bool value) { + this.Config.fastBite = value; + this.Helper.WriteConfig(this.Config); + }, -1, -1); + _optionsCheckboxFastBite.isChecked = this.Config.fastBite; + options.Add(_optionsCheckboxFastBite); + ModOptionsCheckbox _optionsCheckboxCatchTreasure = new ModOptionsCheckbox("钓取宝箱", 0x8765, delegate (bool value) { + this.Config.catchTreasure = value; + this.Helper.WriteConfig(this.Config); + }, -1, -1); + _optionsCheckboxCatchTreasure.isChecked = this.Config.catchTreasure; + options.Add(_optionsCheckboxCatchTreasure); + return options; + } + + + private void UpdateTick(object sender, EventArgs e) + { + if (Game1.player == null) + return; + + if (Game1.player.CurrentTool is FishingRod) + { + FishingRod currentTool = Game1.player.CurrentTool as FishingRod; + if (this.Config.fastBite && currentTool.timeUntilFishingBite > 0) + currentTool.timeUntilFishingBite /= 2; // 快速咬钩 + + if (this.Config.autoHit && currentTool.isNibbling && !currentTool.isReeling && !currentTool.hit && !currentTool.pullingOutOfWater && !currentTool.fishCaught) + currentTool.DoFunction(Game1.player.currentLocation, 1, 1, 1, Game1.player); // 自动咬钩 + + if (this.Config.maxCastPower) + currentTool.castingPower = 1; + } + + if (Game1.activeClickableMenu is BobberBar) // 自动小游戏 + { + BobberBar bar = Game1.activeClickableMenu as BobberBar; + float barPos = this.Helper.Reflection.GetField(bar, "bobberBarPos").GetValue(); + float barHeight = this.Helper.Reflection.GetField(bar, "bobberBarHeight").GetValue(); + float fishPos = this.Helper.Reflection.GetField(bar, "bobberPosition").GetValue(); + float treasurePos = this.Helper.Reflection.GetField(bar, "treasurePosition").GetValue(); + float distanceFromCatching = this.Helper.Reflection.GetField(bar, "distanceFromCatching").GetValue(); + + bool treasureCaught = this.Helper.Reflection.GetField(bar, "treasureCaught").GetValue(); + bool hasTreasure = this.Helper.Reflection.GetField(bar, "treasure").GetValue(); + float treasureScale = this.Helper.Reflection.GetField(bar, "treasureScale").GetValue(); + float bobberBarSpeed = this.Helper.Reflection.GetField(bar, "bobberBarSpeed").GetValue(); + float barPosMax = 568 - barHeight; + + float min = barPos + barHeight / 4, + max = barPos + barHeight / 1.5f; + + if (this.Config.catchTreasure && hasTreasure && !treasureCaught && (distanceFromCatching > 0.75 || this.catching)) + { + this.catching = true; + fishPos = treasurePos; + } + if (this.catching && distanceFromCatching < 0.15) + { + this.catching = false; + fishPos = this.Helper.Reflection.GetField(bar, "bobberPosition").GetValue(); + } + + if (fishPos < min) + { + bobberBarSpeed -= 0.35f + (min - fishPos) / 20; + this.Helper.Reflection.GetField(bar, "bobberBarSpeed").SetValue(bobberBarSpeed); + } else if (fishPos > max) + { + bobberBarSpeed += 0.35f + (fishPos - max) / 20; + this.Helper.Reflection.GetField(bar, "bobberBarSpeed").SetValue(bobberBarSpeed); + } else + { + float target = 0.1f; + if (bobberBarSpeed > target) + { + bobberBarSpeed -= 0.1f + (bobberBarSpeed - target) / 25; + if (barPos + bobberBarSpeed > barPosMax) + bobberBarSpeed /= 2; // 减小触底反弹 + if (bobberBarSpeed < target) + bobberBarSpeed = target; + } else + { + bobberBarSpeed += 0.1f + (target - bobberBarSpeed) / 25; + if (barPos + bobberBarSpeed < 0) + bobberBarSpeed /= 2; // 减小触顶反弹 + if (bobberBarSpeed > target) + bobberBarSpeed = target; + } + this.Helper.Reflection.GetField(bar, "bobberBarSpeed").SetValue(bobberBarSpeed); + } + } + else + { + this.catching = false; + } + } + } +} diff --git a/Mods/AutoFish/Properties/AssemblyInfo.cs b/Mods/AutoFish/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..322b9e55b --- /dev/null +++ b/Mods/AutoFish/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// 有关程序集的一般信息由以下 +// 控制。更改这些特性值可修改 +// 与程序集关联的信息。 +[assembly: AssemblyTitle("AutoFish")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("AutoFish")] +[assembly: AssemblyCopyright("Copyright © 2019")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// 将 ComVisible 设置为 false 会使此程序集中的类型 +//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型 +//请将此类型的 ComVisible 特性设置为 true。 +[assembly: ComVisible(false)] + +// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID +[assembly: Guid("8b08a816-6125-4277-a9ee-ca6af9e279fc")] + +// 程序集的版本信息由下列四个值组成: +// +// 主版本 +// 次版本 +// 生成号 +// 修订号 +// +// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 +//通过使用 "*"，如下所示: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Mods/AutoSpeed/AutoSpeed.csproj b/Mods/AutoSpeed/AutoSpeed.csproj new file mode 100644 index 000000000..d29f361ca --- /dev/null +++ b/Mods/AutoSpeed/AutoSpeed.csproj @@ -0,0 +1,175 @@ + + + + + Debug + AnyCPU + {5B089EEE-F22C-4753-B90D-16D4CD3F5D61} + Library + Properties + AutoSpeed + AutoSpeed + v4.6.1 + 512 + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\assemblies\Mod.dll + + + ..\assemblies\StardewValley.dll + + + False + ..\assemblies\BmFont.dll + + + False + ..\assemblies\Google.Android.Vending.Expansion.Downloader.dll + + + False + ..\assemblies\Google.Android.Vending.Expansion.ZipFile.dll + + + False + ..\assemblies\Google.Android.Vending.Licensing.dll + + + False + ..\assemblies\Java.Interop.dll + + + False + ..\assemblies\Microsoft.AppCenter.dll + + + False + ..\assemblies\Microsoft.AppCenter.Analytics.dll + + + False + ..\assemblies\Microsoft.AppCenter.Analytics.Android.Bindings.dll + + + False + ..\assemblies\Microsoft.AppCenter.Android.Bindings.dll + + + False + ..\assemblies\Microsoft.AppCenter.Crashes.dll + + + False + ..\assemblies\Microsoft.AppCenter.Crashes.Android.Bindings.dll + + + False + ..\assemblies\Mono.Android.dll + + + False + ..\assemblies\Mono.Security.dll + + + False + ..\assemblies\MonoGame.Framework.dll + + + ..\assemblies\mscorlib.dll + + + ..\assemblies\System.dll + + + ..\assemblies\System.Xml + + + ..\assemblies\System.Net.Http + + + ..\assemblies\System.Runtime.Serialization + + + False + ..\assemblies\Xamarin.Android.Arch.Core.Common.dll + + + False + ..\assemblies\Xamarin.Android.Arch.Lifecycle.Common.dll + + + False + ..\assemblies\Xamarin.Android.Arch.Lifecycle.Runtime.dll + + + False + ..\assemblies\Xamarin.Android.Support.Annotations.dll + + + False + ..\assemblies\Xamarin.Android.Support.Compat.dll + + + False + ..\assemblies\Xamarin.Android.Support.Core.UI.dll + + + False + ..\assemblies\Xamarin.Android.Support.Core.Utils.dll + + + False + ..\assemblies\Xamarin.Android.Support.Fragment.dll + + + False + ..\assemblies\Xamarin.Android.Support.Media.Compat.dll + + + False + ..\assemblies\Xamarin.Android.Support.v4.dll + + + False + ..\assemblies\xTile.dll + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Mods/AutoSpeed/AutoSpeed/AutoSpeed.cs b/Mods/AutoSpeed/AutoSpeed/AutoSpeed.cs new file mode 100644 index 000000000..55ee33c66 --- /dev/null +++ b/Mods/AutoSpeed/AutoSpeed/AutoSpeed.cs @@ -0,0 +1,58 @@ +using System.Collections.Generic; +using Omegasis.AutoSpeed.Framework; +using SMDroid.Options; +using StardewModdingAPI; +using StardewModdingAPI.Events; +using StardewValley; +using StardewValley.Menus; + +namespace Omegasis.AutoSpeed +{ + /// The mod entry point. + public class AutoSpeed : Mod + { + /********* + ** Fields + *********/ + /// The mod configuration. + private ModConfig Config; + + + /********* + ** Public methods + *********/ + /// The mod entry point, called after the mod is first loaded. + /// Provides simplified APIs for writing mods. + public override void Entry(IModHelper helper) + { + helper.Events.GameLoop.UpdateTicked += this.OnUpdateTicked; + this.Config = helper.ReadConfig(); + } + + public override List GetConfigMenuItems() + { + List options = new List(); + ModOptionsSlider _optionsSliderSpeed = new ModOptionsSlider("移动加速", 0x8765, delegate (int value) { + this.Config.Speed = value; + this.Helper.WriteConfig(this.Config); + }, -1, -1); + _optionsSliderSpeed.sliderMinValue = 0; + _optionsSliderSpeed.sliderMaxValue = 10; + _optionsSliderSpeed.value = this.Config.Speed; + options.Add(_optionsSliderSpeed); + return options; + } + + /********* + ** Private methods + *********/ + /// Raised after the game state is updated (≈60 times per second). + /// The event sender. + /// The event arguments. + private void OnUpdateTicked(object sender, UpdateTickedEventArgs e) + { + if (Context.IsPlayerFree) + Game1.player.addedSpeed = this.Config.Speed; + } + } +} diff --git a/Mods/AutoSpeed/AutoSpeed/Framework/ModConfig.cs b/Mods/AutoSpeed/AutoSpeed/Framework/ModConfig.cs new file mode 100644 index 000000000..2e6dc10fb --- /dev/null +++ b/Mods/AutoSpeed/AutoSpeed/Framework/ModConfig.cs @@ -0,0 +1,9 @@ +namespace Omegasis.AutoSpeed.Framework +{ + /// The mod configuration. + internal class ModConfig + { + /// The added speed. + public int Speed { get; set; } = 5; + } +} diff --git a/Mods/AutoSpeed/AutoSpeed/ModConfig.cs b/Mods/AutoSpeed/AutoSpeed/ModConfig.cs new file mode 100644 index 000000000..b1f5b73b5 --- /dev/null +++ b/Mods/AutoSpeed/AutoSpeed/ModConfig.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AutoSpeed +{ + class ModConfig + { + /// The added speed. + public int Speed { get; set; } = 5; + } +} diff --git a/Mods/AutoSpeed/AutoSpeed/ModEntry.cs b/Mods/AutoSpeed/AutoSpeed/ModEntry.cs new file mode 100644 index 000000000..818ba5ea5 --- /dev/null +++ b/Mods/AutoSpeed/AutoSpeed/ModEntry.cs @@ -0,0 +1,58 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +using StardewModdingAPI; +using StardewModdingAPI.Events; +using StardewValley; +using StardewValley.Menus; +using SMDroid.Options; + +namespace AutoSpeed +{ + /// The mod entry point. + class ModEntry : StardewModdingAPI.Mod + { + /// The mod configuration. + private ModConfig Config; + + /********* + ** Public methods + *********/ + /// The mod entry point, called after the mod is first loaded. + /// Provides simplified APIs for writing mods. + public override void Entry(IModHelper helper) + { + this.Config = helper.ReadConfig(); + helper.Events.GameLoop.UpdateTicked += this.OnUpdateTicked; + } + + public override List GetConfigMenuItems() + { + List options = new List(); + ModOptionsSlider _optionsSliderSpeed = new ModOptionsSlider("移动加速", 0x8765, delegate (int value) { + Config.Speed = value; + Helper.WriteConfig(Config); + }, -1, -1); + _optionsSliderSpeed.sliderMinValue = 0; + _optionsSliderSpeed.sliderMaxValue = 10; + _optionsSliderSpeed.value = Config.Speed; + options.Add(_optionsSliderSpeed); + return options; + } + + /********* + ** Private methods + *********/ + /// Raised after the game state is updated (≈60 times per second). + /// The event sender. + /// The event arguments. + private void OnUpdateTicked(object sender, UpdateTickedEventArgs e) + { + if (Context.IsPlayerFree) + Game1.player.addedSpeed = Config.Speed; + } + } +} \ No newline at end of file diff --git a/Mods/AutoSpeed/AutoSpeed/README.md b/Mods/AutoSpeed/AutoSpeed/README.md new file mode 100644 index 000000000..50f2e1051 --- /dev/null +++ b/Mods/AutoSpeed/AutoSpeed/README.md @@ -0,0 +1,31 @@ +**Auto Speed** is a [Stardew Valley](http://stardewvalley.net/) mod which lets you move faster +without the need to enter commands in the console. + +Compatible with Stardew Valley 1.2+ on Linux, Mac, and Windows. + +## Installation +1. [Install the latest version of SMAPI](https://github.com/Pathoschild/SMAPI/releases). +2. Install [this mod from Nexus mods](http://www.nexusmods.com/stardewvalley/mods/443). +3. Run the game using SMAPI. + +## Usage +Launch the game with the mod installed to generate the config file, then edit the `config.json` to +set the speed you want (higher values are faster). + +## Versions +1.0 +* Initial release. + +1.1: +* Updated to Stardew Valley 1.1 and SMAPI 0.40 1.1-3. + +1.3: +* Updated to Stardew Valley 1.2 and SMAPI 1.12. + +1.4: +* Switched to standard JSON config file. +* Fixed config defaulting to normal speed. +* Internal refactoring. + +1.4.1: +* Enabled update checks in SMAPI 2.0+. diff --git a/Mods/AutoSpeed/AutoSpeed/manifest.json b/Mods/AutoSpeed/AutoSpeed/manifest.json new file mode 100644 index 000000000..b5c3f9e33 --- /dev/null +++ b/Mods/AutoSpeed/AutoSpeed/manifest.json @@ -0,0 +1,10 @@ +{ + "Name": "Auto Speed", + "Author": "Alpha_Omegasis", + "Version": "1.8.0", + "Description": "Got to go fast!", + "UniqueID": "Omegasis.AutoSpeed", + "EntryDll": "AutoSpeed.dll", + "MinimumApiVersion": "2.10.1", + "UpdateKeys": [ "Nexus:443" ] +} diff --git a/Mods/AutoSpeed/Properties/AssemblyInfo.cs b/Mods/AutoSpeed/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..1907a05dd --- /dev/null +++ b/Mods/AutoSpeed/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// 有关程序集的一般信息由以下 +// 控制。更改这些特性值可修改 +// 与程序集关联的信息。 +[assembly: AssemblyTitle("AutoSpeed")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("AutoSpeed")] +[assembly: AssemblyCopyright("Copyright © 2019")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// 将 ComVisible 设置为 false 会使此程序集中的类型 +//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型 +//请将此类型的 ComVisible 特性设置为 true。 +[assembly: ComVisible(false)] + +// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID +[assembly: Guid("5b089eee-f22c-4753-b90d-16d4cd3f5d61")] + +// 程序集的版本信息由下列四个值组成: +// +// 主版本 +// 次版本 +// 生成号 +// 修订号 +// +// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 +//通过使用 "*"，如下所示: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Mods/Automate/Automate.csproj b/Mods/Automate/Automate.csproj new file mode 100644 index 000000000..295083d6f --- /dev/null +++ b/Mods/Automate/Automate.csproj @@ -0,0 +1,277 @@ + + + + + Debug + AnyCPU + {5EF944E3-D54B-4936-B507-A40C17B17B8E} + Library + Properties + Automate + Automate + v4.5.2 + 512 + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + 7.2 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + 7.2 + + + + ..\assemblies\Mod.dll + + + ..\assemblies\StardewValley.dll + + + False + ..\assemblies\BmFont.dll + + + False + ..\assemblies\Google.Android.Vending.Expansion.Downloader.dll + + + False + ..\assemblies\Google.Android.Vending.Expansion.ZipFile.dll + + + False + ..\assemblies\Google.Android.Vending.Licensing.dll + + + False + ..\assemblies\Java.Interop.dll + + + False + ..\assemblies\Microsoft.AppCenter.dll + + + False + ..\assemblies\Microsoft.AppCenter.Analytics.dll + + + False + ..\assemblies\Microsoft.AppCenter.Analytics.Android.Bindings.dll + + + False + ..\assemblies\Microsoft.AppCenter.Android.Bindings.dll + + + False + ..\assemblies\Microsoft.AppCenter.Crashes.dll + + + False + ..\assemblies\Microsoft.AppCenter.Crashes.Android.Bindings.dll + + + False + ..\assemblies\Mono.Android.dll + + + False + ..\assemblies\Mono.Security.dll + + + False + ..\assemblies\MonoGame.Framework.dll + + + ..\assemblies\mscorlib.dll + + + ..\assemblies\System.dll + + + ..\assemblies\System.Xml + + + ..\assemblies\System.Net.Http + + + ..\assemblies\System.Runtime.Serialization + + + False + ..\assemblies\Xamarin.Android.Arch.Core.Common.dll + + + False + ..\assemblies\Xamarin.Android.Arch.Lifecycle.Common.dll + + + False + ..\assemblies\Xamarin.Android.Arch.Lifecycle.Runtime.dll + + + False + ..\assemblies\Xamarin.Android.Support.Annotations.dll + + + False + ..\assemblies\Xamarin.Android.Support.Compat.dll + + + False + ..\assemblies\Xamarin.Android.Support.Core.UI.dll + + + False + ..\assemblies\Xamarin.Android.Support.Core.Utils.dll + + + False + ..\assemblies\Xamarin.Android.Support.Fragment.dll + + + False + ..\assemblies\Xamarin.Android.Support.Media.Compat.dll + + + False + ..\assemblies\Xamarin.Android.Support.v4.dll + + + False + ..\assemblies\xTile.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Mods/Automate/Automate/Framework/AutomateAPI.cs b/Mods/Automate/Automate/Framework/AutomateAPI.cs new file mode 100644 index 000000000..0508d2490 --- /dev/null +++ b/Mods/Automate/Automate/Framework/AutomateAPI.cs @@ -0,0 +1,98 @@ +using System.Collections.Generic; +using System.Linq; +using Microsoft.Xna.Framework; +using Pathoschild.Stardew.Common; +using StardewModdingAPI; +using StardewValley; + +namespace Pathoschild.Stardew.Automate.Framework +{ + /// The API which lets other mods interact with Automate. + public class AutomateAPI : IAutomateAPI + { + /********* + ** Fields + *********/ + /// Encapsulates monitoring and logging. + private readonly IMonitor Monitor; + + /// Constructs machine groups. + private readonly MachineGroupFactory MachineGroupFactory; + + /// The active machine groups recognised by Automate. + private readonly IDictionary ActiveMachineGroups; + + /// The disabled machine groups recognised by Automate (e.g. machines not connected to a chest). + private readonly IDictionary DisabledMachineGroups; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// Encapsulates monitoring and logging. + /// Constructs machine groups. + /// The active machine groups recognised by Automate. + /// The disabled machine groups recognised by Automate (e.g. machines not connected to a chest). + internal AutomateAPI(IMonitor monitor, MachineGroupFactory machineGroupFactory, IDictionary activeMachineGroups, IDictionary disabledMachineGroups) + { + this.Monitor = monitor; + this.MachineGroupFactory = machineGroupFactory; + this.ActiveMachineGroups = activeMachineGroups; + this.DisabledMachineGroups = disabledMachineGroups; + } + + /// Add an automation factory. + /// An automation factory which construct machines, containers, and connectors. + public void AddFactory(IAutomationFactory factory) + { + this.Monitor.Log($"Adding automation factory: {factory.GetType().AssemblyQualifiedName}", LogLevel.Trace); + this.MachineGroupFactory.Add(factory); + } + + /// Get the status of machines in a tile area. This is a specialised API for Data Layers and similar mods. + /// The location for which to display data. + /// The tile area for which to display data. + public IDictionary GetMachineStates(GameLocation location, Rectangle tileArea) + { + IDictionary data = new Dictionary(); + foreach (IMachine machine in this.GetMachineGroups(location).SelectMany(group => group.Machines)) + { + if (machine.TileArea.Intersects(tileArea)) + { + int state = (int)machine.GetState(); + foreach (Vector2 tile in machine.TileArea.GetTiles()) + { + if (tileArea.Contains((int)tile.X, (int)tile.Y)) + data[tile] = state; + } + } + } + + return data; + } + + + /********* + ** Private methods + *********/ + /// Get all machines in a location. + /// The location whose maches to fetch. + private IEnumerable GetMachineGroups(GameLocation location) + { + // active groups + if (this.ActiveMachineGroups.TryGetValue(location, out MachineGroup[] activeGroups)) + { + foreach (MachineGroup machineGroup in activeGroups) + yield return machineGroup; + } + + // disabled groups + if (this.DisabledMachineGroups.TryGetValue(location, out MachineGroup[] disabledGroups)) + { + foreach (MachineGroup machineGroup in disabledGroups) + yield return machineGroup; + } + } + } +} diff --git a/Mods/Automate/Automate/Framework/AutomationFactory.cs b/Mods/Automate/Automate/Framework/AutomationFactory.cs new file mode 100644 index 000000000..613bb4b12 --- /dev/null +++ b/Mods/Automate/Automate/Framework/AutomationFactory.cs @@ -0,0 +1,247 @@ +using System.Collections.Generic; +using System.Linq; +using Microsoft.Xna.Framework; +using Pathoschild.Stardew.Automate.Framework.Machines.Buildings; +using Pathoschild.Stardew.Automate.Framework.Machines.Objects; +using Pathoschild.Stardew.Automate.Framework.Machines.TerrainFeatures; +using Pathoschild.Stardew.Automate.Framework.Machines.Tiles; +using Pathoschild.Stardew.Automate.Framework.Models; +using Pathoschild.Stardew.Automate.Framework.Storage; +using StardewModdingAPI; +using StardewValley; +using StardewValley.Buildings; +using StardewValley.Locations; +using StardewValley.Objects; +using StardewValley.TerrainFeatures; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework +{ + /// Constructs machines, containers, or connectors which can be added to a machine group. + internal class AutomationFactory : IAutomationFactory + { + /********* + ** Fields + *********/ + /// Encapsulates monitoring and logging. + private readonly IMonitor Monitor; + + /// Simplifies access to private game code. + private readonly IReflectionHelper Reflection; + + /// The object IDs through which machines can connect, but which have no other automation properties. + private readonly IDictionary> Connectors; + + /// Whether to treat the shipping bin as a machine that can be automated. + private readonly bool AutomateShippingBin; + + /// The tile area on the farm matching the shipping bin. + private readonly Rectangle ShippingBinArea = new Rectangle(71, 14, 2, 1); + + /// Whether the Better Junimos mod is installed. + private readonly bool HasBetterJunimos; + + /// Whether the Deluxe Auto-Grabber mod is installed. + private readonly bool HasDeluxeAutoGrabber; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The objects through which machines can connect, but which have no other automation properties. + /// Whether to treat the shipping bin as a machine that can be automated. + /// Encapsulates monitoring and logging. + /// Simplifies access to private game code. + /// Whether the Better Junimos mod is installed. + /// Whether the Deluxe Auto-Grabber mod is installed. + public AutomationFactory(ModConfigObject[] connectors, bool automateShippingBin, IMonitor monitor, IReflectionHelper reflection, bool hasBetterJunimos, bool hasDeluxeAutoGrabber) + { + this.Connectors = connectors + .GroupBy(connector => connector.Type) + .ToDictionary(group => group.Key, group => new HashSet(group.Select(p => p.ID))); + this.AutomateShippingBin = automateShippingBin; + this.Monitor = monitor; + this.Reflection = reflection; + this.HasBetterJunimos = hasBetterJunimos; + this.HasDeluxeAutoGrabber = hasDeluxeAutoGrabber; + } + + /// Get a machine, container, or connector instance for a given object. + /// The in-game object. + /// The location to check. + /// The tile position to check. + /// Returns an instance or null. + public IAutomatable GetFor(SObject obj, GameLocation location, in Vector2 tile) + { + // chest container + if (obj is Chest chest) + return new ChestContainer(chest, location, tile); + + // machine + if (obj.ParentSheetIndex == 165) + return new AutoGrabberMachine(obj, location, tile, ignoreSeedOutput: this.HasDeluxeAutoGrabber); + if (obj.name == "Bee House") + return new BeeHouseMachine(obj, location, tile); + if (obj is Cask cask) + return new CaskMachine(cask, location, tile); + if (obj.name == "Charcoal Kiln") + return new CharcoalKilnMachine(obj, location, tile); + if (obj.name == "Cheese Press") + return new CheesePressMachine(obj, location, tile); + if (obj is CrabPot pot) + return new CrabPotMachine(pot, location, tile, this.Monitor, this.Reflection); + if (obj.Name == "Crystalarium") + return new CrystalariumMachine(obj, location, tile, this.Reflection); + if (obj.name == "Feed Hopper") + return new FeedHopperMachine(location, tile); + if (obj.Name == "Furnace") + return new FurnaceMachine(obj, location, tile); + if (obj.name == "Incubator") + return new CoopIncubatorMachine(obj, location, tile); + if (obj.Name == "Keg") + return new KegMachine(obj, location, tile); + if (obj.name == "Lightning Rod") + return new LightningRodMachine(obj, location, tile); + if (obj.name == "Loom") + return new LoomMachine(obj, location, tile); + if (obj.name == "Mayonnaise Machine") + return new MayonnaiseMachine(obj, location, tile); + if (obj.Name == "Mushroom Box") + return new MushroomBoxMachine(obj, location, tile); + if (obj.name == "Oil Maker") + return new OilMakerMachine(obj, location, tile); + if (obj.name == "Preserves Jar") + return new PreservesJarMachine(obj, location, tile); + if (obj.name == "Recycling Machine") + return new RecyclingMachine(obj, location, tile); + if (obj.name == "Seed Maker") + return new SeedMakerMachine(obj, location, tile); + if (obj.name == "Slime Egg-Press") + return new SlimeEggPressMachine(obj, location, tile); + if (obj.name == "Slime Incubator") + return new SlimeIncubatorMachine(obj, location, tile); + if (obj.name == "Soda Machine") + return new SodaMachine(obj, location, tile); + if (obj.name == "Statue Of Endless Fortune") + return new StatueOfEndlessFortuneMachine(obj, location, tile); + if (obj.name == "Statue Of Perfection") + return new StatueOfPerfectionMachine(obj, location, tile); + if (obj.name == "Tapper") + { + if (location.terrainFeatures.TryGetValue(tile, out TerrainFeature terrainFeature) && terrainFeature is Tree tree) + return new TapperMachine(obj, location, tile, tree.treeType.Value); + } + if (obj.name == "Worm Bin") + return new WormBinMachine(obj, location, tile); + + // connector + if (this.IsConnector(obj.bigCraftable.Value ? ObjectType.BigCraftable : ObjectType.Object, this.GetItemID(obj))) + return new Connector(location, tile); + + return null; + } + + /// Get a machine, container, or connector instance for a given terrain feature. + /// The terrain feature. + /// The location to check. + /// The tile position to check. + /// Returns an instance or null. + public IAutomatable GetFor(TerrainFeature feature, GameLocation location, in Vector2 tile) + { + // machine + if (feature is FruitTree fruitTree) + return new FruitTreeMachine(fruitTree, location, tile); + + // connector + if (feature is Flooring floor && this.IsConnector(ObjectType.Floor, floor.whichFloor.Value)) + return new Connector(location, tile); + + return null; + } + + /// Get a machine, container, or connector instance for a given building. + /// The building. + /// The location to check. + /// The tile position to check. + /// Returns an instance or null. + public IAutomatable GetFor(Building building, BuildableGameLocation location, in Vector2 tile) + { + // machine + if (building is JunimoHut hut) + return new JunimoHutMachine(hut, location, ignoreSeedOutput: this.HasBetterJunimos); + if (building is Mill mill) + return new MillMachine(mill, location); + if (this.AutomateShippingBin && building is ShippingBin bin) + return new ShippingBinMachine(bin, location, Game1.getFarm()); + if (building.buildingType.Value == "Silo") + return new FeedHopperMachine(building, location); + return null; + } + + /// Get a machine, container, or connector instance for a given tile position. + /// The location to check. + /// The tile position to check. + /// Returns an instance or null. + /// Shipping bin logic from , garbage can logic from . + public IAutomatable GetForTile(GameLocation location, in Vector2 tile) + { + // shipping bin + if (this.AutomateShippingBin && location is Farm farm && (int)tile.X == this.ShippingBinArea.X && (int)tile.Y == this.ShippingBinArea.Y) + { + return new ShippingBinMachine(farm, this.ShippingBinArea); + } + + // garbage can + if (location is Town town) + { + string action = town.doesTileHaveProperty((int)tile.X, (int)tile.Y, "Action", "Buildings"); + if (!string.IsNullOrWhiteSpace(action) && action.StartsWith("Garbage ") && int.TryParse(action.Split(' ')[1], out int trashCanIndex)) + return new TrashCanMachine(town, tile, trashCanIndex, this.Reflection); + } + + return null; + } + + + /********* + ** Private methods + *********/ + /// Get whether a given object should be treated as a connector. + /// The object type. + /// The object iD. + private bool IsConnector(ObjectType type, int id) + { + return + this.Connectors.Count != 0 + && this.Connectors.TryGetValue(type, out HashSet ids) + && ids.Contains(id); + } + + /// Get the object ID for a given object. + /// The object instance. + private int GetItemID(SObject obj) + { + // get object ID from fence ID + if (obj is Fence fence) + { + if (fence.isGate.Value) + return 325; + switch (fence.whichType.Value) + { + case Fence.wood: + return 322; + case Fence.stone: + return 323; + case Fence.steel: + return 324; + case Fence.gold: + return 298; + } + } + + // else obj ID + return obj.ParentSheetIndex; + } + } +} diff --git a/Mods/Automate/Automate/Framework/BaseMachine.cs b/Mods/Automate/Automate/Framework/BaseMachine.cs new file mode 100644 index 000000000..485b4ade8 --- /dev/null +++ b/Mods/Automate/Automate/Framework/BaseMachine.cs @@ -0,0 +1,90 @@ +using Microsoft.Xna.Framework; +using StardewValley; +using StardewValley.Buildings; + +namespace Pathoschild.Stardew.Automate.Framework +{ + /// The base implementation for a machine. + internal abstract class BaseMachine : IMachine + { + /********* + ** Accessors + *********/ + /// A unique ID for the machine type. + /// This value should be identical for two machines if they have the exact same behavior and input logic. For example, if one machine in a group can't process input due to missing items, Automate will skip any other empty machines of that type in the same group since it assumes they need the same inputs. + public string MachineTypeID { get; protected set; } + + /// The location which contains the machine. + public GameLocation Location { get; } + + /// The tile area covered by the machine. + public Rectangle TileArea { get; } + + + /********* + ** Public methods + *********/ + /// Get the machine's processing state. + public abstract MachineState GetState(); + + /// Get the output item. + public abstract ITrackedStack GetOutput(); + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public abstract bool SetInput(IStorage input); + + + /********* + ** Protected methods + *********/ + /// Construct an instance. + /// The machine's in-game location. + /// The tile area covered by the machine. + protected BaseMachine(GameLocation location, in Rectangle tileArea) + { + this.MachineTypeID = this.GetType().FullName; + this.Location = location; + this.TileArea = tileArea; + } + + /// Get the tile area for a building. + /// The building. + protected static Rectangle GetTileAreaFor(Building building) + { + return new Rectangle(building.tileX.Value, building.tileY.Value, building.tilesWide.Value, building.tilesHigh.Value); + } + + /// Get the tile area for a placed object. + /// The tile position. + protected static Rectangle GetTileAreaFor(in Vector2 tile) + { + return new Rectangle((int)tile.X, (int)tile.Y, 1, 1); + } + } + + /// The base implementation for a machine. + internal abstract class BaseMachine : BaseMachine + { + /********* + ** Fields + *********/ + /// The underlying entity automated by this machine. This is only stored for the machine instance, and can be null if not applicable. + protected TMachine Machine { get; } + + + /********* + ** Protected methods + *********/ + /// Construct an instance. + /// The underlying entity automated by this machine. This is only stored for the machine instance, and can be null if not applicable. + /// The machine's in-game location. + /// The tile area covered by the machine. + protected BaseMachine(TMachine machine, GameLocation location, in Rectangle tileArea) + : base(location, tileArea) + { + this.Machine = machine; + } + } +} diff --git a/Mods/Automate/Automate/Framework/Connector.cs b/Mods/Automate/Automate/Framework/Connector.cs new file mode 100644 index 000000000..d92b51ab9 --- /dev/null +++ b/Mods/Automate/Automate/Framework/Connector.cs @@ -0,0 +1,37 @@ +using Microsoft.Xna.Framework; +using StardewValley; + +namespace Pathoschild.Stardew.Automate.Framework +{ + /// An entity which connects machines and chests in a machine group, but otherwise has no logic of its own. + internal class Connector : IAutomatable + { + /********* + ** Accessors + *********/ + /// The location which contains the machine. + public GameLocation Location { get; } + + /// The tile area covered by the machine. + public Rectangle TileArea { get; } + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The location which contains the machine. + /// The tile area covered by the machine. + public Connector(GameLocation location, Rectangle tileArea) + { + this.Location = location; + this.TileArea = tileArea; + } + + /// Construct an instance. + /// The location which contains the machine. + /// The tile covered by the machine. + public Connector(GameLocation location, Vector2 tile) + : this(location, new Rectangle((int)tile.X, (int)tile.Y, 1, 1)) { } + } +} diff --git a/Mods/Automate/Automate/Framework/Consumable.cs b/Mods/Automate/Automate/Framework/Consumable.cs new file mode 100644 index 000000000..d2135e576 --- /dev/null +++ b/Mods/Automate/Automate/Framework/Consumable.cs @@ -0,0 +1,50 @@ +using StardewValley; + +namespace Pathoschild.Stardew.Automate.Framework +{ + /// An ingredient stack (or stacks) which can be consumed by a machine. + internal class Consumable : IConsumable + { + /********* + ** Accessors + *********/ + /// The items available to consumable. + public ITrackedStack Consumables { get; } + + /// A sample item for comparison. + /// This should not be a reference to the original stack. + public Item Sample => this.Consumables.Sample; + + /// The number of items needed for the recipe. + public int CountNeeded { get; } + + /// Whether the consumables needed for this requirement are ready. + public bool IsMet { get; } + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The matching items available to consume. + /// The number of items needed for the recipe. + public Consumable(ITrackedStack consumables, int countNeeded) + { + this.Consumables = consumables; + this.CountNeeded = countNeeded; + this.IsMet = consumables.Count >= countNeeded; + } + + /// Remove the needed number of this item from the stack. + public void Reduce() + { + this.Consumables.Reduce(this.CountNeeded); + } + + /// Remove the needed number of this item from the stack and return a new stack matching the count. + public Item Take() + { + return this.Consumables.Take(this.CountNeeded); + } + } +} diff --git a/Mods/Automate/Automate/Framework/GenericObjectMachine.cs b/Mods/Automate/Automate/Framework/GenericObjectMachine.cs new file mode 100644 index 000000000..0992709fa --- /dev/null +++ b/Mods/Automate/Automate/Framework/GenericObjectMachine.cs @@ -0,0 +1,63 @@ +using Microsoft.Xna.Framework; +using StardewValley; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework +{ + /// A generic machine instance. + internal abstract class GenericObjectMachine : BaseMachine where TMachine : SObject + { + /********* + ** Public methods + *********/ + /// Get the machine's processing state. + public override MachineState GetState() + { + if (this.Machine.heldObject.Value == null) + return MachineState.Empty; + + return this.Machine.readyForHarvest.Value + ? MachineState.Done + : MachineState.Processing; + } + + /// Get the output item. + public override ITrackedStack GetOutput() + { + return new TrackedItem(this.Machine.heldObject.Value, onEmpty: this.GenericReset); + } + + + /********* + ** Protected methods + *********/ + /// Construct an instance. + /// The underlying machine. + /// The in-game location. + /// The tile covered by the machine. + protected GenericObjectMachine(TMachine machine, GameLocation location, Vector2 tile) + : base(machine, location, BaseMachine.GetTileAreaFor(tile)) { } + + /// Reset the machine so it's ready to accept a new input. + /// The output item that was taken. + protected void GenericReset(Item item) + { + this.Machine.heldObject.Value = null; + this.Machine.readyForHarvest.Value = false; + } + + /// Generic logic to pull items from storage based on the given recipes. + /// The available items. + /// The recipes to match. + protected bool GenericPullRecipe(IStorage storage, IRecipe[] recipes) + { + if (storage.TryGetIngredient(recipes, out IConsumable consumable, out IRecipe recipe)) + { + this.Machine.heldObject.Value = recipe.Output(consumable.Take()); + this.Machine.MinutesUntilReady = recipe.Minutes; + return true; + } + return false; + } + } +} diff --git a/Mods/Automate/Automate/Framework/MachineGroup.cs b/Mods/Automate/Automate/Framework/MachineGroup.cs new file mode 100644 index 000000000..2267974c8 --- /dev/null +++ b/Mods/Automate/Automate/Framework/MachineGroup.cs @@ -0,0 +1,91 @@ +using System.Collections.Generic; +using System.Linq; +using Microsoft.Xna.Framework; +using StardewValley; + +namespace Pathoschild.Stardew.Automate.Framework +{ + /// A collection of machines and storage which work as one unit. + internal class MachineGroup + { + /********* + ** Accessors + *********/ + /// The location containing the group. + public GameLocation Location { get; } + + /// The machines in the group. + public IMachine[] Machines { get; } + + /// The containers in the group. + public IContainer[] Containers { get; } + + /// The storage manager for the group. + public IStorage StorageManager { get; } + + /// The tiles comprising the group. + public Vector2[] Tiles { get; } + + /// Whether the group has the minimum requirements to enable internal automation (i.e., at least one chest and one machine). + public bool HasInternalAutomation => this.Machines.Length > 0 && this.Containers.Length > 0; + + + /********* + ** Public methods + *********/ + /// Create an instance. + /// The location containing the group. + /// The machines in the group. + /// The containers in the group. + /// The tiles comprising the group. + public MachineGroup(GameLocation location, IMachine[] machines, IContainer[] containers, Vector2[] tiles) + { + this.Location = location; + this.Machines = machines; + this.Containers = containers; + this.Tiles = tiles; + this.StorageManager = new StorageManager(containers); + } + + /// Automate the machines inside the group. + public void Automate() + { + // get machines ready for input/output + IList outputReady = new List(); + IList inputReady = new List(); + foreach (IMachine machine in this.Machines) + { + switch (machine.GetState()) + { + case MachineState.Done: + outputReady.Add(machine); + break; + + case MachineState.Empty: + inputReady.Add(machine); + break; + } + } + if (!outputReady.Any() && !inputReady.Any()) + return; + + // process output + foreach (IMachine machine in outputReady) + { + if (this.StorageManager.TryPush(machine.GetOutput()) && machine.GetState() == MachineState.Empty) + inputReady.Add(machine); + } + + // process input + HashSet ignoreMachines = new HashSet(); + foreach (IMachine machine in inputReady) + { + if (ignoreMachines.Contains(machine.MachineTypeID)) + continue; + + if (!machine.SetInput(this.StorageManager)) + ignoreMachines.Add(machine.MachineTypeID); // if the machine can't process available input, no need to ask every instance of its type + } + } + } +} diff --git a/Mods/Automate/Automate/Framework/MachineGroupBuilder.cs b/Mods/Automate/Automate/Framework/MachineGroupBuilder.cs new file mode 100644 index 000000000..6c62c42ef --- /dev/null +++ b/Mods/Automate/Automate/Framework/MachineGroupBuilder.cs @@ -0,0 +1,90 @@ +using System.Collections.Generic; +using System.Linq; +using Microsoft.Xna.Framework; +using Pathoschild.Stardew.Common; +using StardewValley; + +namespace Pathoschild.Stardew.Automate.Framework +{ + /// Handles logic for building a . + internal class MachineGroupBuilder + { + /********* + ** Fields + *********/ + /// The location containing the group. + private readonly GameLocation Location; + + /// The machines in the group. + private readonly HashSet Machines = new HashSet(); + + /// The containers in the group. + private readonly HashSet Containers = new HashSet(); + + /// The tiles comprising the group. + private readonly HashSet Tiles = new HashSet(); + + + /********* + ** Accessors + *********/ + /// The tile areas added to the machine group since the queue was last cleared. + internal IList NewTileAreas { get; } = new List(); + + + /********* + ** Public methods + *********/ + /// Create an instance. + /// The location containing the group. + public MachineGroupBuilder(GameLocation location) + { + this.Location = location; + } + + /// Add a machine to the group. + /// The machine to add. + public void Add(IMachine machine) + { + this.Machines.Add(machine); + this.Add(machine.TileArea); + } + + /// Add a container to the group. + /// The container to add. + public void Add(IContainer container) + { + this.Containers.Add(container); + this.Add(container.TileArea); + } + + /// Add connector tiles to the group. + /// The tile area to add. + public void Add(Rectangle tileArea) + { + foreach (Vector2 tile in tileArea.GetTiles()) + this.Tiles.Add(tile); + this.NewTileAreas.Add(tileArea); + } + + /// Get whether any tiles were added to the builder. + public bool HasTiles() + { + return this.Tiles.Count > 0; + } + + /// Create a group from the saved data. + public MachineGroup Build() + { + return new MachineGroup(this.Location, this.Machines.ToArray(), this.Containers.ToArray(), this.Tiles.ToArray()); + } + + /// Clear the saved data. + public void Reset() + { + this.Machines.Clear(); + this.Containers.Clear(); + this.Tiles.Clear(); + } + } +} diff --git a/Mods/Automate/Automate/Framework/MachineGroupFactory.cs b/Mods/Automate/Automate/Framework/MachineGroupFactory.cs new file mode 100644 index 000000000..f8f8f4931 --- /dev/null +++ b/Mods/Automate/Automate/Framework/MachineGroupFactory.cs @@ -0,0 +1,176 @@ +using System.Collections.Generic; +using System.Linq; +using Microsoft.Xna.Framework; +using Pathoschild.Stardew.Automate.Framework.Storage; +using Pathoschild.Stardew.Common; +using StardewValley; +using StardewValley.Buildings; +using StardewValley.Locations; +using StardewValley.TerrainFeatures; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework +{ + /// Constructs machine groups. + internal class MachineGroupFactory + { + /********* + ** Fields + *********/ + /// The automation factories which construct machines, containers, and connectors. + private readonly IList AutomationFactories = new List(); + + + /********* + ** Public methods + *********/ + /// Add an automation factory. + /// An automation factory which construct machines, containers, and connectors. + public void Add(IAutomationFactory factory) + { + this.AutomationFactories.Add(factory); + } + + /// Get all machine groups in a location. + /// The location to search. + public IEnumerable GetMachineGroups(GameLocation location) + { + MachineGroupBuilder builder = new MachineGroupBuilder(location); + ISet visited = new HashSet(); + foreach (Vector2 tile in location.GetTiles()) + { + this.FloodFillGroup(builder, location, tile, visited); + if (builder.HasTiles()) + { + yield return builder.Build(); + builder.Reset(); + } + } + } + + + /********* + ** Private methods + *********/ + /// Extend the given machine group to include all machines and containers connected to the given tile, if any. + /// The machine group to extend. + /// The location to search. + /// The first tile to check. + /// A lookup of visited tiles. + private void FloodFillGroup(MachineGroupBuilder machineGroup, GameLocation location, in Vector2 origin, ISet visited) + { + // skip if already visited + if (visited.Contains(origin)) + return; + + // flood-fill connected machines & containers + Queue queue = new Queue(); + queue.Enqueue(origin); + while (queue.Any()) + { + // get tile + Vector2 tile = queue.Dequeue(); + if (!visited.Add(tile)) + continue; + + // add machines, containers, or connectors which covers this tile + if (this.TryAddEntity(machineGroup, location, tile)) + { + foreach (Rectangle tileArea in machineGroup.NewTileAreas) + { + // mark visited + foreach (Vector2 cur in tileArea.GetTiles()) + visited.Add(cur); + + // connect entities on surrounding tiles + foreach (Vector2 next in tileArea.GetSurroundingTiles()) + { + if (!visited.Contains(next)) + queue.Enqueue(next); + } + } + machineGroup.NewTileAreas.Clear(); + } + } + } + + /// Add any machine, container, or connector on the given tile to the machine group. + /// The machine group to extend. + /// The location to search. + /// The tile to search. + private bool TryAddEntity(MachineGroupBuilder group, GameLocation location, in Vector2 tile) + { + switch (this.GetEntity(location, tile)) + { + case IMachine machine: + group.Add(machine); + return true; + + case IContainer container: + if (!container.ShouldIgnore()) + { + group.Add(container); + return true; + } + return false; + + case IAutomatable connector: + group.Add(connector.TileArea); + return true; + + default: + return false; + } + } + + /// Get a machine, container, or connector from the given tile, if any. + /// The location to search. + /// The tile to search. + private IAutomatable GetEntity(GameLocation location, Vector2 tile) + { + foreach (IAutomationFactory factory in this.AutomationFactories) + { + // from object + if (location.objects.TryGetValue(tile, out SObject obj)) + { + IAutomatable entity = factory.GetFor(obj, location, tile); + if (entity != null) + return entity; + } + + // from terrain feature + if (location.terrainFeatures.TryGetValue(tile, out TerrainFeature feature)) + { + IAutomatable entity = factory.GetFor(feature, location, tile); + if (entity != null) + return entity; + } + + // building machine + if (location is BuildableGameLocation buildableLocation) + { + foreach (Building building in buildableLocation.buildings) + { + Rectangle tileArea = new Rectangle(building.tileX.Value, building.tileY.Value, building.tilesWide.Value, building.tilesHigh.Value); + if (tileArea.Contains((int)tile.X, (int)tile.Y)) + { + IAutomatable entity = factory.GetFor(building, buildableLocation, tile); + if (entity != null) + return entity; + } + } + } + + // from tile position + { + IAutomatable entity = factory.GetForTile(location, tile); + if (entity != null) + return entity; + } + } + + // none found + return null; + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Buildings/JunimoHutMachine.cs b/Mods/Automate/Automate/Framework/Machines/Buildings/JunimoHutMachine.cs new file mode 100644 index 000000000..9dbc845f2 --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Buildings/JunimoHutMachine.cs @@ -0,0 +1,88 @@ +using System.Collections.Generic; +using System.Linq; +using StardewValley; +using StardewValley.Buildings; +using StardewValley.Objects; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Buildings +{ + /// A Junimo hut machine that accepts input and provides output. + internal class JunimoHutMachine : BaseMachine + { + /********* + ** Fields + *********/ + /// Whether seeds should be ignored when selecting output. + private readonly bool IgnoreSeedOutput; + + /// The Junimo hut's output chest. + private Chest Output => this.Machine.output.Value; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying Junimo hut. + /// The location which contains the machine. + /// Whether seeds should be ignored when selecting output. + public JunimoHutMachine(JunimoHut hut, GameLocation location, bool ignoreSeedOutput) + : base(hut, location, BaseMachine.GetTileAreaFor(hut)) + { + this.IgnoreSeedOutput = ignoreSeedOutput; + } + + /// Get the machine's processing state. + public override MachineState GetState() + { + if (this.Output.items.Any(item => item != null)) + return MachineState.Done; + return MachineState.Processing; + } + + /// Get the machine output. + public override ITrackedStack GetOutput() + { + IList inventory = this.Output.items; + return new TrackedItem(inventory.FirstOrDefault(item => item != null), onEmpty: this.OnOutputTaken); + } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + return false; // no input + } + + + /********* + ** Private methods + *********/ + /// Remove an output item once it's been taken. + /// The removed item. + private void OnOutputTaken(Item item) + { + this.Output.clearNulls(); + this.Output.items.Remove(item); + } + + /// Get the next output item. + private Item GetNextOutput() + { + foreach (Item item in this.Output.items) + { + if (item == null) + continue; + + if (this.IgnoreSeedOutput && (item as SObject)?.Category == SObject.SeedsCategory) + continue; + + return item; + } + + return null; + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Buildings/MillMachine.cs b/Mods/Automate/Automate/Framework/Machines/Buildings/MillMachine.cs new file mode 100644 index 000000000..599367867 --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Buildings/MillMachine.cs @@ -0,0 +1,173 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using StardewValley; +using StardewValley.Buildings; +using StardewValley.Objects; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Buildings +{ + /// A mill machine that accepts input and provides output. + internal class MillMachine : BaseMachine + { + /********* + ** Fields + *********/ + /// The mill's input chest. + private Chest Input => this.Machine.input.Value; + + /// The mill's output chest. + private Chest Output => this.Machine.output.Value; + + /// The maximum input stack size to allow per item ID, if different from . + private readonly IDictionary MaxInputStackSize; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying mill. + /// The location which contains the machine. + public MillMachine(Mill mill, GameLocation location) + : base(mill, location, BaseMachine.GetTileAreaFor(mill)) + { + this.MaxInputStackSize = new Dictionary + { + [284] = new SObject(284, 1).maximumStackSize() / 3 // beet => 3 sugar (reduce stack to avoid overfilling output) + }; + } + + /// Get the machine's processing state. + public override MachineState GetState() + { + if (this.Output.items.Any(item => item != null)) + return MachineState.Done; + return this.InputFull() + ? MachineState.Processing + : MachineState.Empty; // 'empty' insofar as it will accept more input, not necessarily empty + } + + /// Get the output item. + public override ITrackedStack GetOutput() + { + IList inventory = this.Output.items; + return new TrackedItem(inventory.FirstOrDefault(item => item != null), onEmpty: this.OnOutputTaken); + } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + if (this.InputFull()) + return false; + + // fill input with wheat (262) and beets (284) + bool anyPulled = false; + foreach (ITrackedStack stack in input.GetItems().Where(i => i.Sample.ParentSheetIndex == 262 || i.Sample.ParentSheetIndex == 284)) + { + // add item + bool anyAdded = this.TryAddInput(stack); + if (!anyAdded) + continue; + anyPulled = true; + + // stop if full + if (this.InputFull()) + return true; + } + + return anyPulled; + } + + + /********* + ** Private methods + *********/ + /// Try to add an item to the input queue, and adjust its stack size accordingly. + /// The item stack to add. + /// Returns whether any items were taken from the stack. + private bool TryAddInput(ITrackedStack item) + { + // nothing to add + if (item.Count <= 0) + return false; + + // clean up input bin + this.Input.clearNulls(); + + // try adding to input + int originalSize = item.Count; + IList slots = this.Input.items; + int maxStackSize = this.GetMaxInputStackSize(item.Sample); + for (int i = 0; i < Chest.capacity; i++) + { + // done + if (item.Count <= 0) + break; + + // add to existing slot + if (slots.Count > i) + { + Item slot = slots[i]; + if (item.Sample.canStackWith(slot) && slot.Stack < maxStackSize) + { + int maxToAdd = Math.Min(item.Count, maxStackSize - slot.Stack); // the most items we can add to the stack (in theory) + int actualAdded = maxToAdd - slot.addToStack(maxToAdd); // how many items were actually added to the stack + item.Reduce(actualAdded); + } + continue; + } + + // add to new slot + slots.Add(item.Take(Math.Min(item.Count, maxStackSize))); + } + + return item.Count < originalSize; + } + + /// Get whether the mill's input bin is full. + private bool InputFull() + { + var slots = this.Input.items; + + // free slots + if (slots.Count < Chest.capacity) + return false; + + // free space in stacks + foreach (Item slot in slots) + { + if (slot == null || slot.Stack < this.GetMaxInputStackSize(slot)) + return false; + } + return true; + } + + + /********* + ** Private methods + *********/ + /// Remove an output item once it's been taken. + /// The removed item. + private void OnOutputTaken(Item item) + { + this.Output.clearNulls(); + this.Output.items.Remove(item); + } + + /// Get the maximum input stack size to allow for an item. + /// The input item to check. + private int GetMaxInputStackSize(Item item) + { + if (item == null) + return 0; + + return this.MaxInputStackSize.TryGetValue(item.ParentSheetIndex, out int max) + ? max + : item.maximumStackSize(); + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Buildings/ShippingBinMachine.cs b/Mods/Automate/Automate/Framework/Machines/Buildings/ShippingBinMachine.cs new file mode 100644 index 000000000..e31eccd90 --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Buildings/ShippingBinMachine.cs @@ -0,0 +1,70 @@ +using System.Linq; +using Microsoft.Xna.Framework; +using StardewValley; +using StardewValley.Buildings; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Buildings +{ + /// A shipping bin that accepts input and provides output. + internal class ShippingBinMachine : BaseMachine + { + /********* + ** Fields + *********/ + /// The farm to automate. + private readonly Farm Farm; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The farm containing the shipping bin. + /// The tile area covered by the machine. + public ShippingBinMachine(Farm farm, Rectangle tileArea) + : base(farm, tileArea) + { + this.Farm = farm; + } + + /// Construct an instance. + /// The constructed shipping bin. + /// The location which contains the machine. + /// The farm which has the shipping bin data. + public ShippingBinMachine(ShippingBin bin, GameLocation location, Farm farm) + : base(location, BaseMachine.GetTileAreaFor(bin)) + { + this.Farm = farm; + } + + /// Get the machine's processing state. + public override MachineState GetState() + { + return MachineState.Empty; // always accepts items + } + + /// Get the output item. + public override ITrackedStack GetOutput() + { + return null; // no output + } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + ITrackedStack tracker = input.GetItems().Where(p => p.Sample is SObject obj && obj.canBeShipped()).Take(1).FirstOrDefault(); + if (tracker != null) + { + SObject item = (SObject)tracker.Take(tracker.Count); + this.Farm.shippingBin.Add(item); + this.Farm.lastItemShipped = item; + this.Farm.showShipment(item, false); + return true; + } + return false; + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Objects/AutoGrabberMachine.cs b/Mods/Automate/Automate/Framework/Machines/Objects/AutoGrabberMachine.cs new file mode 100644 index 000000000..623d11f62 --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Objects/AutoGrabberMachine.cs @@ -0,0 +1,92 @@ +using Microsoft.Xna.Framework; +using StardewValley; +using StardewValley.Objects; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Objects +{ + /// An auto-grabber that provides output. + /// See the game's default logic in and . + internal class AutoGrabberMachine : GenericObjectMachine + { + /********* + ** Fields + *********/ + /// Whether seeds should be ignored when selecting output. + private readonly bool IgnoreSeedOutput; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying machine. + /// The in-game location. + /// The tile covered by the machine. + /// Whether seeds should be ignored when selecting output. + public AutoGrabberMachine(SObject machine, GameLocation location, Vector2 tile, bool ignoreSeedOutput) + : base(machine, location, tile) + { + this.IgnoreSeedOutput = ignoreSeedOutput; + } + + /// Get the machine's processing state. + public override MachineState GetState() + { + return this.Machine.heldObject.Value is Chest output && this.GetNextOutput() != null + ? MachineState.Done + : MachineState.Processing; + } + + /// Get the output item. + public override ITrackedStack GetOutput() + { + Item next = this.GetNextOutput(); + return new TrackedItem(next, onEmpty: this.OnOutputTaken); + } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + return false; + } + + + /********* + ** Private methods + *********/ + /// Get the output chest. + private Chest GetOutputChest() + { + return (Chest)this.Machine.heldObject.Value; + } + + /// Remove an output item once it's been taken. + /// The removed item. + private void OnOutputTaken(Item item) + { + Chest output = this.GetOutputChest(); + output.clearNulls(); + output.items.Remove(item); + } + + /// Get the next output item. + private Item GetNextOutput() + { + foreach (Item item in this.GetOutputChest().items) + { + if (item == null) + continue; + + if (this.IgnoreSeedOutput && (item as SObject)?.Category == SObject.SeedsCategory) + continue; + + return item; + } + + return null; + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Objects/BeeHouseMachine.cs b/Mods/Automate/Automate/Framework/Machines/Objects/BeeHouseMachine.cs new file mode 100644 index 000000000..0a187d0c2 --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Objects/BeeHouseMachine.cs @@ -0,0 +1,103 @@ +using System; +using System.Collections.Generic; +using Microsoft.Xna.Framework; +using StardewValley; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Objects +{ + /// A bee house that accepts input and provides output. + /// See the game's machine logic in , , and . + internal class BeeHouseMachine : GenericObjectMachine + { + /********* + ** Fields + *********/ + /// The honey types produced by this beehouse indexed by input ID. + private readonly IDictionary HoneyTypes = new Dictionary + { + [376] = SObject.HoneyType.Poppy, + [591] = SObject.HoneyType.Tulip, + [593] = SObject.HoneyType.SummerSpangle, + [595] = SObject.HoneyType.FairyRose, + [597] = SObject.HoneyType.BlueJazz + }; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying machine. + /// The location containing the machine. + /// The tile covered by the machine. + public BeeHouseMachine(SObject machine, GameLocation location, Vector2 tile) + : base(machine, location, tile) { } + + /// Get the machine's processing state. + public override MachineState GetState() + { + return Game1.currentSeason == "winter" + ? MachineState.Disabled + : base.GetState(); + } + + /// Get the output item. + public override ITrackedStack GetOutput() + { + // get raw output + SObject output = this.Machine.heldObject.Value; + if (output == null) + return null; + + // get flower data + SObject.HoneyType type = SObject.HoneyType.Wild; + string prefix = type.ToString(); + int addedPrice = 0; + Crop flower = Utility.findCloseFlower(this.Location, this.Machine.TileLocation); + if (flower != null) + { + string[] flowerData = Game1.objectInformation[flower.indexOfHarvest.Value].Split('/'); + prefix = flowerData[0]; + addedPrice = Convert.ToInt32(flowerData[1]) * 2; + if (!this.HoneyTypes.TryGetValue(flower.indexOfHarvest.Value, out type)) + type = SObject.HoneyType.Wild; + } + + // build object + SObject result = new SObject(output.ParentSheetIndex, output.Stack) + { + name = $"{prefix} Honey", + Price = output.Price + addedPrice + }; + result.honeyType.Value = type; + + // yield + return new TrackedItem(result, onEmpty: this.Reset); + } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + return false; // no input needed + } + + + /********* + ** Private methods + *********/ + /// Reset the machine so it's ready to accept a new input. + /// The output item that was taken. + private void Reset(Item item) + { + SObject machine = this.Machine; + + machine.heldObject.Value = new SObject(Vector2.Zero, 340, null, false, true, false, false); + machine.MinutesUntilReady = 2400 - Game1.timeOfDay + 4320; + machine.readyForHarvest.Value = false; + machine.showNextIndex.Value = false; + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Objects/CaskMachine.cs b/Mods/Automate/Automate/Framework/Machines/Objects/CaskMachine.cs new file mode 100644 index 000000000..654c0f043 --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Objects/CaskMachine.cs @@ -0,0 +1,99 @@ +using System.Collections.Generic; +using Microsoft.Xna.Framework; +using StardewValley; +using StardewValley.Objects; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Objects +{ + /// A cask that accepts input and provides output. + internal class CaskMachine : GenericObjectMachine + { + /********* + ** Fields + *********/ + /// The items which can be aged in a cask with their aging rates. + private readonly IDictionary AgingRates = new Dictionary + { + [424] = 4, // cheese + [426] = 4, // goat cheese + [459] = 2, // mead + [303] = 1.66f, // pale ale + [346] = 2, // beer + [348] = 1 // wine + }; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying machine. + /// The location containing the machine. + /// The tile covered by the machine. + public CaskMachine(Cask machine, GameLocation location, Vector2 tile) + : base(machine, location, tile) { } + + /// Get the machine's processing state. + public override MachineState GetState() + { + SObject heldObject = this.Machine.heldObject.Value; + if (heldObject == null) + return MachineState.Empty; + + return heldObject.Quality >= 4 + ? MachineState.Done + : MachineState.Processing; + } + + /// Get the output item. + public override ITrackedStack GetOutput() + { + Cask cask = this.Machine; + SObject heldObject = this.Machine.heldObject.Value; + return new TrackedItem(heldObject.getOne(), item => + { + cask.heldObject.Value = null; + cask.MinutesUntilReady = 0; + cask.readyForHarvest.Value = false; + cask.agingRate.Value = 0; + cask.daysToMature.Value = 0; + }); + } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + Cask cask = this.Machine; + + if (input.TryGetIngredient(match => (match.Sample as SObject)?.Quality < 4 && this.AgingRates.ContainsKey(match.Sample.ParentSheetIndex), 1, out IConsumable consumable)) + { + SObject ingredient = (SObject)consumable.Take(); + + cask.heldObject.Value = ingredient; + cask.agingRate.Value = this.AgingRates[ingredient.ParentSheetIndex]; + cask.daysToMature.Value = 56; + cask.MinutesUntilReady = 999999; + switch (ingredient.Quality) + { + case SObject.medQuality: + cask.daysToMature.Value = 42; + break; + case SObject.highQuality: + cask.daysToMature.Value = 28; + break; + case SObject.bestQuality: + cask.daysToMature.Value = 0; + cask.MinutesUntilReady = 1; + break; + } + + return true; + } + + return false; + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Objects/CharcoalKilnMachine.cs b/Mods/Automate/Automate/Framework/Machines/Objects/CharcoalKilnMachine.cs new file mode 100644 index 000000000..d091cd89f --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Objects/CharcoalKilnMachine.cs @@ -0,0 +1,49 @@ +using Microsoft.Xna.Framework; +using StardewValley; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Objects +{ + /// A charcoal kiln that accepts input and provides output. + internal class CharcoalKilnMachine : GenericObjectMachine + { + /********* + ** Fields + *********/ + /// The recipes to process. + private readonly IRecipe[] Recipes = + { + // wood => coal + new Recipe( + input: 388, + inputCount: 10, + output: input => new SObject(382, 1), + minutes: 30 + ) + }; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying machine. + /// The location containing the machine. + /// The tile covered by the machine. + public CharcoalKilnMachine(SObject machine, GameLocation location, Vector2 tile) + : base(machine, location, tile) { } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + if (this.GenericPullRecipe(input, this.Recipes)) + { + this.Machine.showNextIndex.Value = true; + return true; + } + return false; + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Objects/CheesePressMachine.cs b/Mods/Automate/Automate/Framework/Machines/Objects/CheesePressMachine.cs new file mode 100644 index 000000000..1a31be930 --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Objects/CheesePressMachine.cs @@ -0,0 +1,75 @@ +using Microsoft.Xna.Framework; +using StardewValley; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Objects +{ + /// A cheese press that accepts input and provides output. + internal class CheesePressMachine : GenericObjectMachine + { + /********* + ** Fields + *********/ + /// The recipes processed by this machine (input => output). + private readonly IRecipe[] Recipes = + { + // goat milk => goat cheese + new Recipe( + input: 436, + inputCount: 1, + output: input => new SObject(Vector2.Zero, 426, null, false, true, false, false), + minutes: 200 + ), + + // large goat milk => gold-quality goat cheese + new Recipe( + input: 438, + inputCount: 1, + output: input => new SObject(Vector2.Zero, 426, null, false, true, false, false) { Quality = SObject.highQuality }, + minutes: 200 + ), + + // milk => cheese + new Recipe( + input: 184, + inputCount: 1, + output: input => new SObject(Vector2.Zero, 424, null, false, true, false, false), + minutes: 200 + ), + + // large milk => gold-quality cheese + new Recipe( + input: 186, + inputCount: 1, + output: input => new SObject(Vector2.Zero, 424, "Cheese (=)", false, true, false, false) { Quality = SObject.highQuality }, + minutes: 200 + ) + }; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying machine. + /// The location containing the machine. + /// The tile covered by the machine. + public CheesePressMachine(SObject machine, GameLocation location, Vector2 tile) + : base(machine, location, tile) { } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + if (input.TryGetIngredient(this.Recipes, out IConsumable consumable, out IRecipe recipe)) + { + this.Machine.heldObject.Value = recipe.Output(consumable.Take()); + this.Machine.MinutesUntilReady = recipe.Minutes; + return true; + } + + return false; + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Objects/CoopIncubatorMachine.cs b/Mods/Automate/Automate/Framework/Machines/Objects/CoopIncubatorMachine.cs new file mode 100644 index 000000000..43b3ed333 --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Objects/CoopIncubatorMachine.cs @@ -0,0 +1,80 @@ +using Microsoft.Xna.Framework; +using StardewValley; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Objects +{ + /// A coop incubator that accepts eggs and spawns chickens. + internal class CoopIncubatorMachine : GenericObjectMachine + { + /********* + ** Fields + *********/ + /// The recipes to process. + private readonly IRecipe[] Recipes; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying machine. + /// The location containing the machine. + /// The tile covered by the machine. + public CoopIncubatorMachine(SObject machine, GameLocation location, Vector2 tile) + : base(machine, location, tile) + { + int minutesUntilReady = Game1.player.professions.Contains(2) ? 9000 : 18000; + this.Recipes = new IRecipe[] + { + // egg => chicken + new Recipe( + input: -5, + inputCount: 1, + output: item => new SObject(item.ParentSheetIndex, 1), + minutes: minutesUntilReady / 2 + ), + + // dinosaur egg => dinosaur + new Recipe( + input: 107, + inputCount: 1, + output: item => new SObject(107, 1), + minutes: minutesUntilReady + ) + }; + } + + /// Get the machine's processing state. + /// The coop incubator never produces an object output so it is never done. + public override MachineState GetState() + { + return this.Machine.heldObject.Value != null + ? MachineState.Processing + : MachineState.Empty; + } + + /// Get the output item. + /// The coop incubator never produces an object output. + public override ITrackedStack GetOutput() + { + return null; + } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + bool started = this.GenericPullRecipe(input, this.Recipes); + if (started) + { + int eggID = this.Machine.heldObject.Value.ParentSheetIndex; + this.Machine.ParentSheetIndex = eggID == 180 || eggID == 182 || eggID == 305 + ? this.Machine.ParentSheetIndex + 2 + : this.Machine.ParentSheetIndex + 1; + } + return started; + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Objects/CrabPotMachine.cs b/Mods/Automate/Automate/Framework/Machines/Objects/CrabPotMachine.cs new file mode 100644 index 000000000..87286cc97 --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Objects/CrabPotMachine.cs @@ -0,0 +1,131 @@ +using System; +using System.Collections.Generic; +using Microsoft.Xna.Framework; +using StardewModdingAPI; +using StardewValley; +using StardewValley.Objects; +using SFarmer = StardewValley.Farmer; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Objects +{ + /// A crab pot that accepts input and provides output. + /// See the game's machine logic in and . + internal class CrabPotMachine : GenericObjectMachine + { + /********* + ** Fields + *********/ + /// Simplifies access to private game code. + private readonly IReflectionHelper Reflection; + + /// Encapsulates monitoring and logging. + private readonly IMonitor Monitor; + + /// The fish IDs for which any crabpot has logged an 'invalid fish data' error. + private static readonly ISet LoggedInvalidDataErrors = new HashSet(); + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying machine. + /// The location containing the machine. + /// Simplifies access to private game code. + /// Encapsulates monitoring and logging. + /// The tile covered by the machine. + public CrabPotMachine(CrabPot machine, GameLocation location, Vector2 tile, IMonitor monitor, IReflectionHelper reflection) + : base(machine, location, tile) + { + this.Monitor = monitor; + this.Reflection = reflection; + } + + /// Get the machine's processing state. + public override MachineState GetState() + { + if (this.Machine.heldObject.Value == null) + { + bool hasBait = this.Machine.bait.Value != null || Game1.player.professions.Contains(11); // no bait needed if luremaster + return hasBait + ? MachineState.Processing + : MachineState.Empty; + } + return this.Machine.readyForHarvest.Value + ? MachineState.Done + : MachineState.Processing; + } + + /// Get the output item. + public override ITrackedStack GetOutput() + { + return new TrackedItem(this.Machine.heldObject.Value, onEmpty: this.Reset); + } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + // get bait + if (input.TryGetIngredient(SObject.baitCategory, 1, out IConsumable bait)) + { + this.Machine.bait.Value = (SObject)bait.Take(); + this.Reflection.GetField(this.Machine, "lidFlapping").SetValue(true); + this.Reflection.GetField(this.Machine, "lidFlapTimer").SetValue(60); + return true; + } + + return false; + } + + + /********* + ** Private methods + *********/ + /// Reset the machine so it's ready to accept a new input. + /// The output item that was taken. + /// XP and achievement logic based on . + private void Reset(Item item) + { + CrabPot pot = this.Machine; + + // add fishing XP + Game1.player.gainExperience(SFarmer.fishingSkill, 5); + + // mark fish caught for achievements and stats + IDictionary fishData = Game1.content.Load>("Data\\Fish"); + if (fishData.TryGetValue(item.ParentSheetIndex, out string fishRow)) + { + int size = 0; + try + { + string[] fields = fishRow.Split('/'); + int lowerSize = fields.Length > 5 ? Convert.ToInt32(fields[5]) : 1; + int upperSize = fields.Length > 5 ? Convert.ToInt32(fields[6]) : 10; + size = Game1.random.Next(lowerSize, upperSize + 1); + } + catch (Exception ex) + { + // The fish length stats don't affect anything, so it's not worth notifying the + // user; just log one trace message per affected fish for troubleshooting. + if (CrabPotMachine.LoggedInvalidDataErrors.Add(item.ParentSheetIndex)) + this.Monitor.Log($"The game's fish data has an invalid entry (#{item.ParentSheetIndex}: {fishData[item.ParentSheetIndex]}). Automated crabpots won't track fish length stats for that fish.\n{ex}", LogLevel.Trace); + } + + Game1.player.caughtFish(item.ParentSheetIndex, size); + } + + // reset pot + pot.readyForHarvest.Value = false; + pot.heldObject.Value = null; + pot.tileIndexToShow = 710; + pot.bait.Value = null; + this.Reflection.GetField(pot, "lidFlapping").SetValue(true); + this.Reflection.GetField(pot, "lidFlapTimer").SetValue(60f); + this.Reflection.GetField(pot, "shake").SetValue(Vector2.Zero); + this.Reflection.GetField(pot, "shakeTimer").SetValue(0f); + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Objects/CrystalariumMachine.cs b/Mods/Automate/Automate/Framework/Machines/Objects/CrystalariumMachine.cs new file mode 100644 index 000000000..00e684326 --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Objects/CrystalariumMachine.cs @@ -0,0 +1,63 @@ +using Microsoft.Xna.Framework; +using StardewModdingAPI; +using StardewValley; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Objects +{ + /// A crystalarium that accepts input and provides output. + internal class CrystalariumMachine : GenericObjectMachine + { + /********* + ** Fields + *********/ + /// Simplifies access to private game code. + private readonly IReflectionHelper Reflection; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying machine. + /// The location containing the machine. + /// Simplifies access to private game code. + /// The tile covered by the machine. + public CrystalariumMachine(SObject machine, GameLocation location, Vector2 tile, IReflectionHelper reflection) + : base(machine, location, tile) + { + this.Reflection = reflection; + } + + /// Get the machine's processing state. + public override MachineState GetState() + { + if (this.Machine.heldObject.Value == null) + return MachineState.Disabled; + + return this.Machine.readyForHarvest.Value + ? MachineState.Done + : MachineState.Processing; + } + + /// Get the output item. + public override ITrackedStack GetOutput() + { + SObject machine = this.Machine; + SObject heldObject = machine.heldObject.Value; + return new TrackedItem(heldObject.getOne(), item => + { + machine.MinutesUntilReady = this.Reflection.GetMethod(machine, "getMinutesForCrystalarium").Invoke(heldObject.ParentSheetIndex); + machine.readyForHarvest.Value = false; + }); + } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + return false; // started manually + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Objects/FeedHopperMachine.cs b/Mods/Automate/Automate/Framework/Machines/Objects/FeedHopperMachine.cs new file mode 100644 index 000000000..5158f55e8 --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Objects/FeedHopperMachine.cs @@ -0,0 +1,93 @@ +using System; +using System.Linq; +using Microsoft.Xna.Framework; +using StardewValley; +using StardewValley.Buildings; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Objects +{ + /// A hay hopper that accepts input and provides output. + internal class FeedHopperMachine : BaseMachine + { + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The location containing the machine. + /// The tile covered by the machine. + public FeedHopperMachine(GameLocation location, Vector2 tile) + : base(location, BaseMachine.GetTileAreaFor(tile)) { } + + /// Construct an instance. + /// The silo to automate. + /// The location containing the machine. + public FeedHopperMachine(Building silo, GameLocation location) + : base(location, BaseMachine.GetTileAreaFor(silo)) { } + + /// Get the machine's processing state. + public override MachineState GetState() + { + Farm farm = Game1.getFarm(); + return this.GetFreeSpace(farm) > 0 + ? MachineState.Empty // 'empty' insofar as it will accept more input, not necessarily empty + : MachineState.Disabled; + } + + /// Get the output item. + public override ITrackedStack GetOutput() + { + return null; + } + + /// Reset the machine so it's ready to accept a new input. + /// Whether the current output was taken. + public void Reset(bool outputTaken) + { + // not applicable + } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + Farm farm = Game1.getFarm(); + + // skip if full + if (this.GetFreeSpace(farm) <= 0) + return false; + + // try to add hay (178) until full + bool anyPulled = false; + foreach (ITrackedStack stack in input.GetItems().Where(p => p.Sample.ParentSheetIndex == 178)) + { + // get free space + int space = this.GetFreeSpace(farm); + if (space <= 0) + return anyPulled; + + // pull hay + int maxToAdd = Math.Min(stack.Count, space); + int added = maxToAdd - farm.tryToAddHay(maxToAdd); + stack.Reduce(added); + if (added > 0) + anyPulled = true; + } + + return anyPulled; + } + + + /********* + ** Private methods + *********/ + /// Get the amount of hay the hopper can still accept before it's full. + /// The farm to check. + /// Derived from . + private int GetFreeSpace(Farm farm) + { + return Utility.numSilos() * 240 - farm.piecesOfHay.Value; + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Objects/FurnaceMachine.cs b/Mods/Automate/Automate/Framework/Machines/Objects/FurnaceMachine.cs new file mode 100644 index 000000000..8caf4d7dc --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Objects/FurnaceMachine.cs @@ -0,0 +1,92 @@ +using Microsoft.Xna.Framework; +using StardewValley; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Objects +{ + /// A furnace that accepts input and provides output. + internal class FurnaceMachine : GenericObjectMachine + { + /********* + ** Fields + *********/ + /// The recipes to process. + /// Derived from . + private readonly IRecipe[] Recipes = + { + // copper => copper bar + new Recipe( + input: SObject.copper, + inputCount: 5, + output: input => new SObject(Vector2.Zero, SObject.copperBar, 1), + minutes: 30 + ), + + // iron => iron bar + new Recipe( + input: SObject.iron, + inputCount: 5, + output: input => new SObject(Vector2.Zero, SObject.ironBar, 1), + minutes: 120 + ), + + // gold => gold bar + new Recipe( + input: SObject.gold, + inputCount: 5, + output: input => new SObject(Vector2.Zero, SObject.goldBar, 1), + minutes: 300 + ), + + // iridium => iridium bar + new Recipe( + input: SObject.iridium, + inputCount: 5, + output: input => new SObject(Vector2.Zero, SObject.iridiumBar, 1), + minutes: 480 + ), + + // quartz => refined quartz + new Recipe( + input: SObject.quartzIndex, + inputCount: 1, + output: input => new SObject(Vector2.Zero, 338, 1), + minutes: 90 + ), + + // refined quartz => refined quartz + new Recipe( + input: 82, + inputCount: 1, + output: input => new SObject(Vector2.Zero, 338, 3), + minutes: 90 + ) + }; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying machine. + /// The location containing the machine. + /// The tile covered by the machine. + public FurnaceMachine(SObject machine, GameLocation location, Vector2 tile) + : base(machine, location, tile) { } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + if (input.TryGetIngredient(SObject.coal, 1, out IConsumable coal) && this.GenericPullRecipe(input, this.Recipes)) + { + coal.Reduce(); + this.Machine.initializeLightSource(this.Machine.TileLocation); + this.Machine.showNextIndex.Value = true; + return true; + } + return false; + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Objects/KegMachine.cs b/Mods/Automate/Automate/Framework/Machines/Objects/KegMachine.cs new file mode 100644 index 000000000..efc8adfcc --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Objects/KegMachine.cs @@ -0,0 +1,103 @@ +using Microsoft.Xna.Framework; +using StardewValley; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Objects +{ + /// A keg that accepts input and provides output. + /// See the game's machine logic in and . + internal class KegMachine : GenericObjectMachine + { + /********* + ** Fields + *********/ + /// The recipes to process. + private readonly IRecipe[] Recipes = + { + // honey => mead + new Recipe( + input: 340, + inputCount: 1, + output: input => new SObject(Vector2.Zero, 459, "Mead", false, true, false, false) { name = "Mead" }, + minutes: 600 + ), + + // coffee bean => coffee + new Recipe( + input: 433, + inputCount: 5, + output: input => new SObject(Vector2.Zero, 395, "Coffee", false, true, false, false) { name = "Coffee" }, + minutes: 120 + ), + + // wheat => beer + new Recipe( + input: 262, + inputCount: 1, + output: input => new SObject(Vector2.Zero, 346, "Beer", false, true, false, false) { name = "Beer" }, + minutes: 1750 + ), + + // hops => pale ale + new Recipe( + input: 304, + inputCount: 1, + output: input => new SObject(Vector2.Zero, 303, "Pale Ale", false, true, false, false) { name = "Pale Ale" }, + minutes: 2250 + ), + + // fruit => wine + new Recipe( + input: SObject.FruitsCategory, + inputCount: 1, + output: input => + { + SObject wine = new SObject(Vector2.Zero, 348, input.Name + " Wine", false, true, false, false) + { + name = input.Name + " Wine", + Price = ((SObject)input).Price * 3 + }; + wine.preserve.Value = SObject.PreserveType.Wine; + wine.preservedParentSheetIndex.Value = input.ParentSheetIndex; + return wine; + }, + minutes: 10000 + ), + new Recipe( + input: SObject.VegetableCategory, + inputCount: 1, + output: input => + { + SObject juice = new SObject(Vector2.Zero, 350, input.Name + " Juice", false, true, false, false) + { + name = input.Name + " Juice", + Price = (int)(((SObject)input).Price * 2.25) + }; + juice.preserve.Value = SObject.PreserveType.Juice; + juice.preservedParentSheetIndex.Value = input.ParentSheetIndex; + return juice; + }, + minutes: 6000 + ) + }; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying machine. + /// The location containing the machine. + /// The tile covered by the machine. + public KegMachine(SObject machine, GameLocation location, Vector2 tile) + : base(machine, location, tile) { } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + return this.GenericPullRecipe(input, this.Recipes); + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Objects/LightningRodMachine.cs b/Mods/Automate/Automate/Framework/Machines/Objects/LightningRodMachine.cs new file mode 100644 index 000000000..3f643ef47 --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Objects/LightningRodMachine.cs @@ -0,0 +1,35 @@ +using Microsoft.Xna.Framework; +using StardewValley; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Objects +{ + /// A lightning rod that accepts input and provides output. + internal class LightningRodMachine : GenericObjectMachine + { + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying machine. + /// The location containing the machine. + /// The tile covered by the machine. + public LightningRodMachine(SObject machine, GameLocation location, Vector2 tile) + : base(machine, location, tile) { } + + /// Get the output item. + public override ITrackedStack GetOutput() + { + SObject heldObject = this.Machine.heldObject.Value; + return new TrackedItem(heldObject.getOne(), onEmpty: this.GenericReset); + } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + return false; // no input + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Objects/LoomMachine.cs b/Mods/Automate/Automate/Framework/Machines/Objects/LoomMachine.cs new file mode 100644 index 000000000..4f6e6d09a --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Objects/LoomMachine.cs @@ -0,0 +1,56 @@ +using Microsoft.Xna.Framework; +using StardewValley; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Objects +{ + /// A loom that accepts input and provides output. + internal class LoomMachine : GenericObjectMachine + { + /********* + ** Fields + *********/ + /// The recipes to process. + private readonly IRecipe[] Recipes = + { + // wool => cloth + new Recipe( + input: 440, + inputCount: 1, + output: item => new SObject(Vector2.Zero, 428, null, false, true, false, false), + minutes: 240 + ) + }; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying machine. + /// The location containing the machine. + /// The tile covered by the machine. + public LoomMachine(SObject machine, GameLocation location, Vector2 tile) + : base(machine, location, tile) { } + + /// Get the output item. + public override ITrackedStack GetOutput() + { + SObject machine = this.Machine; + return new TrackedItem(machine.heldObject.Value, item => + { + machine.heldObject.Value = null; + machine.readyForHarvest.Value = false; + machine.showNextIndex.Value = false; + }); + } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + return this.GenericPullRecipe(input, this.Recipes); + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Objects/MayonnaiseMachine.cs b/Mods/Automate/Automate/Framework/Machines/Objects/MayonnaiseMachine.cs new file mode 100644 index 000000000..703784407 --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Objects/MayonnaiseMachine.cs @@ -0,0 +1,86 @@ +using Microsoft.Xna.Framework; +using StardewValley; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Objects +{ + /// A mayonnaise that accepts input and provides output. + internal class MayonnaiseMachine : GenericObjectMachine + { + /********* + ** Fields + *********/ + /// The recipes to process. + private readonly IRecipe[] Recipes = + { + // void egg => void mayonnaise + new Recipe( + input: 305, + inputCount: 1, + output: input => new SObject(Vector2.Zero, 308, null, false, true, false, false), + minutes: 180 + ), + + // duck egg => duck mayonnaise + new Recipe( + input: 442, + inputCount: 1, + output: input => new SObject(Vector2.Zero, 307, null, false, true, false, false), + minutes: 180 + ), + + // white/brown egg => normal mayonnaise + new Recipe( + input: 176, + inputCount: 1, + output: input => new SObject(Vector2.Zero, 306, null, false, true, false, false), + minutes: 180 + ), + new Recipe( + input: 180, + inputCount: 1, + output: input => new SObject(Vector2.Zero, 306, null, false, true, false, false), + minutes: 180 + ), + + // dinosaur or large white/brown egg => gold-quality mayonnaise + new Recipe( + input: 107, + inputCount: 1, + output: input => new SObject(Vector2.Zero, 306, null, false, true, false, false) { Quality = SObject.highQuality }, + minutes: 180 + ), + new Recipe( + input: 174, + inputCount: 1, + output: input => new SObject(Vector2.Zero, 306, null, false, true, false, false) { Quality = SObject.highQuality }, + minutes: 180 + ), + new Recipe( + input: 182, + inputCount: 1, + output: input => new SObject(Vector2.Zero, 306, null, false, true, false, false) { Quality = SObject.highQuality }, + minutes: 180 + ) + }; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying machine. + /// The location containing the machine. + /// The tile covered by the machine. + public MayonnaiseMachine(SObject machine, GameLocation location, Vector2 tile) + : base(machine, location, tile) { } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + return this.GenericPullRecipe(input, this.Recipes); + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Objects/MushroomBoxMachine.cs b/Mods/Automate/Automate/Framework/Machines/Objects/MushroomBoxMachine.cs new file mode 100644 index 000000000..6f2adb2ff --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Objects/MushroomBoxMachine.cs @@ -0,0 +1,54 @@ +using Microsoft.Xna.Framework; +using StardewValley; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Objects +{ + /// A mushroom box that accepts input and provides output. + internal class MushroomBoxMachine : GenericObjectMachine + { + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying machine. + /// The location containing the machine. + /// The tile covered by the machine. + public MushroomBoxMachine(SObject machine, GameLocation location, Vector2 tile) + : base(machine, location, tile) { } + + /// Get the machine's processing state. + public override MachineState GetState() + { + return this.Machine.heldObject.Value != null && this.Machine.readyForHarvest.Value + ? MachineState.Done + : MachineState.Processing; + } + + /// Get the output item. + public override ITrackedStack GetOutput() + { + return new TrackedItem(this.Machine.heldObject.Value, onEmpty: this.Reset); + } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + return false; // no input needed + } + + + /********* + ** Private methods + *********/ + /// Reset the machine so it's ready to accept a new input. + /// The output item that was taken. + private void Reset(Item item) + { + this.GenericReset(item); + this.Machine.showNextIndex.Value = false; + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Objects/OilMakerMachine.cs b/Mods/Automate/Automate/Framework/Machines/Objects/OilMakerMachine.cs new file mode 100644 index 000000000..3cd95f130 --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Objects/OilMakerMachine.cs @@ -0,0 +1,68 @@ +using Microsoft.Xna.Framework; +using StardewValley; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Objects +{ + /// An oil maker that accepts input and provides output. + internal class OilMakerMachine : GenericObjectMachine + { + /********* + ** Fields + *********/ + /// The recipes to process. + private readonly IRecipe[] Recipes = + { + // truffle => truffle oil + new Recipe( + input: 430, + inputCount: 1, + output: input => new SObject(Vector2.Zero, 432, null, false, true, false, false), + minutes: 360 + ), + + // sunflower seed => oil + new Recipe( + input: 431, + inputCount: 1, + output: input => new SObject(247, 1), + minutes: 3200 + ), + + // corn => oil + new Recipe( + input: 270, + inputCount: 1, + output: input => new SObject(Vector2.Zero, 247, null, false, true, false, false), + minutes: 1000 + ), + + // sunflower => oil + new Recipe( + input: 421, + inputCount: 1, + output: input => new SObject(Vector2.Zero, 247, null, false, true, false, false), + minutes: 60 + ) + }; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying machine. + /// The location containing the machine. + /// The tile covered by the machine. + public OilMakerMachine(SObject machine, GameLocation location, Vector2 tile) + : base(machine, location, tile) { } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + return this.GenericPullRecipe(input, this.Recipes); + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Objects/PreservesJarMachine.cs b/Mods/Automate/Automate/Framework/Machines/Objects/PreservesJarMachine.cs new file mode 100644 index 000000000..cc0b08b3c --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Objects/PreservesJarMachine.cs @@ -0,0 +1,74 @@ +using Microsoft.Xna.Framework; +using StardewValley; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Objects +{ + /// A preserves jar that accepts input and provides output. + /// See the game's machine logic in and . + internal class PreservesJarMachine : GenericObjectMachine + { + /********* + ** Fields + *********/ + /// The recipes to process. + private readonly IRecipe[] Recipes = + { + // fruit => jelly + new Recipe( + input: SObject.FruitsCategory, + inputCount: 1, + output: input => + { + SObject jelly = new SObject(Vector2.Zero, 344, input.Name + " Jelly", false, true, false, false) + { + Price = 50 + ((SObject) input).Price * 2, + name = input.Name + " Jelly" + }; + jelly.preserve.Value = SObject.PreserveType.Jelly; + jelly.preservedParentSheetIndex.Value = input.ParentSheetIndex; + return jelly; + }, + minutes: 4000 + ), + + // vegetable => pickled vegetable + new Recipe( + input: SObject.VegetableCategory, + inputCount: 1, + output: input => + { + SObject item = new SObject(Vector2.Zero, 342, "Pickled " + input.Name, false, true, false, false) + { + Price = 50 + ((SObject) input).Price * 2, + name = "Pickled " + input.Name + }; + item.preserve.Value = SObject.PreserveType.Pickle; + item.preservedParentSheetIndex.Value = input.ParentSheetIndex; + return item; + + }, + minutes: 4000 + ) + }; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying machine. + /// The location containing the machine. + /// The tile covered by the machine. + public PreservesJarMachine(SObject machine, GameLocation location, Vector2 tile) + : base(machine, location, tile) { } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + return this.GenericPullRecipe(input, this.Recipes); + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Objects/RecyclingMachine.cs b/Mods/Automate/Automate/Framework/Machines/Objects/RecyclingMachine.cs new file mode 100644 index 000000000..a436db130 --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Objects/RecyclingMachine.cs @@ -0,0 +1,86 @@ +using System; +using Microsoft.Xna.Framework; +using StardewValley; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Objects +{ + /// A recycling maching that accepts input and provides output. + /// This differs slightly from the game implementation in that it uses a more random RNG, due to a C# limitation which prevents us from accessing machine info from the cached recipe output functions for use in the RNG seed. + internal class RecyclingMachine : GenericObjectMachine + { + /********* + ** Fields + *********/ + /// The RNG to use for randomising output. + private static readonly Random Random = new Random(); + + /// The recipes to process. + private readonly IRecipe[] Recipes = + { + // trash => coal/iron ore/stone + new Recipe( + input: 168, + inputCount: 1, + output: input => new SObject(RecyclingMachine.Random.NextDouble() < 0.3 ? 382 : (RecyclingMachine.Random.NextDouble() < 0.3 ? 380 : 390), RecyclingMachine.Random.Next(1, 4)), + minutes: 60 + ), + + // driftwood => coal/wood + new Recipe( + input: 169, + inputCount: 1, + output: input => new SObject(RecyclingMachine.Random.NextDouble() < 0.25 ? 382 : 388, RecyclingMachine.Random.Next(1, 4)), + minutes: 60 + ), + + // broken glasses or broken CD => refined quartz + new Recipe( + input: 170, + inputCount: 1, + output: input => new SObject(338, 1), + minutes: 60 + ), + new Recipe( + input: 171, + inputCount: 1, + output: input => new SObject(338, 1), + minutes: 60 + ), + + // soggy newspaper => cloth/torch + new Recipe( + input: 172, + inputCount: 1, + output: input => RecyclingMachine.Random.NextDouble() < 0.1 ? new SObject(428, 1) : new Torch(Vector2.Zero, 3), + minutes: 60 + ) + }; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying machine. + /// The location containing the machine. + /// The tile covered by the machine. + public RecyclingMachine(SObject machine, GameLocation location, Vector2 tile) + : base(machine, location, tile) { } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + //Random random = new Random((int)Game1.uniqueIDForThisGame / 2 + (int)Game1.stats.DaysPlayed + Game1.timeOfDay + (int)machine.tileLocation.X * 200 + (int)machine.tileLocation.Y); + + if (this.GenericPullRecipe(input, this.Recipes)) + { + Game1.stats.PiecesOfTrashRecycled += 1; + return true; + } + return false; + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Objects/SeedMakerMachine.cs b/Mods/Automate/Automate/Framework/Machines/Objects/SeedMakerMachine.cs new file mode 100644 index 000000000..093408e47 --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Objects/SeedMakerMachine.cs @@ -0,0 +1,85 @@ +using System; +using System.Collections.Generic; +using Microsoft.Xna.Framework; +using StardewValley; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Objects +{ + /// A seed maker that accepts input and provides output. + internal class SeedMakerMachine : GenericObjectMachine + { + /********* + ** Fields + *********/ + /// A crop ID => seed ID lookup. + private static readonly IDictionary CropSeedIDs = SeedMakerMachine.GetCropSeedIDs(); + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying machine. + /// The location containing the machine. + /// The tile covered by the machine. + public SeedMakerMachine(SObject machine, GameLocation location, Vector2 tile) + : base(machine, location, tile) { } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + SObject machine = this.Machine; + + // crop => seeds + if (input.TryGetIngredient(this.IsValidCrop, 1, out IConsumable crop)) + { + crop.Reduce(); + int seedID = SeedMakerMachine.CropSeedIDs[crop.Sample.ParentSheetIndex]; + + Random random = new Random((int)Game1.stats.DaysPlayed + (int)Game1.uniqueIDForThisGame / 2 + (int)machine.TileLocation.X + (int)machine.TileLocation.Y * 77 + Game1.timeOfDay); + machine.heldObject.Value = new SObject(seedID, random.Next(1, 4)); + if (random.NextDouble() < 0.005) + machine.heldObject.Value = new SObject(499, 1); + else if (random.NextDouble() < 0.02) + machine.heldObject.Value = new SObject(770, random.Next(1, 5)); + machine.MinutesUntilReady = 20; + return true; + } + + return false; + } + + + /********* + ** Public methods + *********/ + /// Get whether a given item is a crop compatible with the seed marker. + /// The item to check. + public bool IsValidCrop(ITrackedStack item) + { + return + item.Sample.ParentSheetIndex != 433 // seed maker doesn't allow coffee beans + && SeedMakerMachine.CropSeedIDs.ContainsKey(item.Sample.ParentSheetIndex); + } + + /// Get a crop ID => seed ID lookup. + public static IDictionary GetCropSeedIDs() + { + IDictionary lookup = new Dictionary(); + + IDictionary cropData = Game1.content.Load>("Data\\Crops"); + foreach (KeyValuePair entry in cropData) + { + int dataCropID = Convert.ToInt32(entry.Value.Split('/')[3]); + int dataSeedID = entry.Key; + if (!lookup.ContainsKey(dataCropID)) // if multiple crops have the same seed, use the earliest one (which is more likely the vanilla seed) + lookup[dataCropID] = dataSeedID; + } + + return lookup; + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Objects/SlimeEggPressMachine.cs b/Mods/Automate/Automate/Framework/Machines/Objects/SlimeEggPressMachine.cs new file mode 100644 index 000000000..2ce84cee3 --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Objects/SlimeEggPressMachine.cs @@ -0,0 +1,50 @@ +using Microsoft.Xna.Framework; +using StardewValley; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Objects +{ + /// A slime egg-press that accepts input and provides output. + internal class SlimeEggPressMachine : GenericObjectMachine + { + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying machine. + /// The location containing the machine. + /// The tile covered by the machine. + public SlimeEggPressMachine(SObject machine, GameLocation location, Vector2 tile) + : base(machine, location, tile) { } + + /// Get the output item. + public override ITrackedStack GetOutput() + { + SObject heldObject = this.Machine.heldObject.Value; + return new TrackedItem(heldObject.getOne(), this.GenericReset); + } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + // slime => slime egg + if (input.TryConsume(766, 100)) + { + int parentSheetIndex = 680; + if (Game1.random.NextDouble() < 0.05) + parentSheetIndex = 439; + else if (Game1.random.NextDouble() < 0.1) + parentSheetIndex = 437; + else if (Game1.random.NextDouble() < 0.25) + parentSheetIndex = 413; + this.Machine.heldObject.Value = new SObject(parentSheetIndex, 1); + this.Machine.MinutesUntilReady = 1200; + return true; + } + + return false; + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Objects/SlimeIncubatorMachine.cs b/Mods/Automate/Automate/Framework/Machines/Objects/SlimeIncubatorMachine.cs new file mode 100644 index 000000000..6b814c436 --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Objects/SlimeIncubatorMachine.cs @@ -0,0 +1,90 @@ +using Microsoft.Xna.Framework; +using StardewValley; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Objects +{ + /// A slime incubator that accepts slime eggs and spawns slime monsters. + internal class SlimeIncubatorMachine : GenericObjectMachine + { + /********* + ** Fields + *********/ + /// The recipes to process. + private readonly IRecipe[] Recipes; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying machine. + /// The location containing the machine. + /// The tile covered by the machine. + public SlimeIncubatorMachine(SObject machine, GameLocation location, Vector2 tile) + : base(machine, location, tile) + { + int minutesUntilReady = Game1.player.professions.Contains(2) ? 2000 : 4000; + this.Recipes = new IRecipe[] { + // blue slime egg => object with parentSheetIndex of blue slime egg + new Recipe( + input: 413, + inputCount: 1, + output: input => new SObject(413,1), + minutes: minutesUntilReady + ), + + // red slime egg => object with parentSheetIndex of red slime egg + new Recipe( + input: 437, + inputCount: 1, + output: input => new SObject(437,1), + minutes: minutesUntilReady + ), + + // purple slime egg => object with parentSheetIndex of purple slime egg + new Recipe( + input: 439, + inputCount: 1, + output: input => new SObject(439,1), + minutes: minutesUntilReady + ), + + // green slime egg => object with parentSheetIndex of green slime egg + new Recipe( + input: 680, + inputCount: 1, + output: input => new SObject(680,1), + minutes: minutesUntilReady + ) + }; + } + + /// Get the machine's processing state. + /// The slime incubator does not produce an output object, so it is never done. + public override MachineState GetState() + { + return this.Machine.heldObject.Value != null + ? MachineState.Processing + : MachineState.Empty; + } + + /// Get the output item. + /// The slime incubator does not produce an output object. + public override ITrackedStack GetOutput() + { + return null; + } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + bool started = this.GenericPullRecipe(input, this.Recipes); + if (started) + this.Machine.ParentSheetIndex = 157; + return started; + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Objects/SodaMachine.cs b/Mods/Automate/Automate/Framework/Machines/Objects/SodaMachine.cs new file mode 100644 index 000000000..054c35169 --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Objects/SodaMachine.cs @@ -0,0 +1,36 @@ +using Microsoft.Xna.Framework; +using StardewValley; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Objects +{ + /// A soda machine that accepts input and provides output. + internal class SodaMachine : GenericObjectMachine + { + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying machine. + /// The location containing the machine. + /// The tile covered by the machine. + public SodaMachine(SObject machine, GameLocation location, Vector2 tile) + : base(machine, location, tile) { } + + /// Get the machine's processing state. + public override MachineState GetState() + { + return this.Machine.heldObject.Value != null + ? MachineState.Done + : MachineState.Processing; + } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + return false; // no input + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Objects/StatueOfEndlessFortuneMachine.cs b/Mods/Automate/Automate/Framework/Machines/Objects/StatueOfEndlessFortuneMachine.cs new file mode 100644 index 000000000..0cbc6e774 --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Objects/StatueOfEndlessFortuneMachine.cs @@ -0,0 +1,36 @@ +using Microsoft.Xna.Framework; +using StardewValley; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Objects +{ + /// A statue of endless fortune that accepts input and provides output. + internal class StatueOfEndlessFortuneMachine : GenericObjectMachine + { + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying machine. + /// The location containing the machine. + /// The tile covered by the machine. + public StatueOfEndlessFortuneMachine(SObject machine, GameLocation location, Vector2 tile) + : base(machine, location, tile) { } + + /// Get the machine's processing state. + public override MachineState GetState() + { + return this.Machine.heldObject.Value != null + ? MachineState.Done + : MachineState.Processing; + } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + return false; // no input + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Objects/StatueOfPerfectionMachine.cs b/Mods/Automate/Automate/Framework/Machines/Objects/StatueOfPerfectionMachine.cs new file mode 100644 index 000000000..8a48511c6 --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Objects/StatueOfPerfectionMachine.cs @@ -0,0 +1,36 @@ +using Microsoft.Xna.Framework; +using StardewValley; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Objects +{ + /// A statue of perfection that accepts input and provides output. + internal class StatueOfPerfectionMachine : GenericObjectMachine + { + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying machine. + /// The location containing the machine. + /// The tile covered by the machine. + public StatueOfPerfectionMachine(SObject machine, GameLocation location, Vector2 tile) + : base(machine, location, tile) { } + + /// Get the machine's processing state. + public override MachineState GetState() + { + return this.Machine.heldObject.Value != null + ? MachineState.Done + : MachineState.Processing; + } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + return false; // no input + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Objects/TapperMachine.cs b/Mods/Automate/Automate/Framework/Machines/Objects/TapperMachine.cs new file mode 100644 index 000000000..dce6ed8de --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Objects/TapperMachine.cs @@ -0,0 +1,84 @@ +using Microsoft.Xna.Framework; +using StardewValley; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Objects +{ + /// A tapper that accepts input and provides output. + internal class TapperMachine : GenericObjectMachine + { + /********* + ** Fields + *********/ + /// The tree type. + private readonly int TreeType; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying machine. + /// The location to search. + /// The tile covered by the machine. + /// The tree type being tapped. + public TapperMachine(SObject machine, GameLocation location, Vector2 tile, int treeType) + : base(machine, location, tile) + { + this.TreeType = treeType; + } + + /// Get the output item. + public override ITrackedStack GetOutput() + { + SObject heldObject = this.Machine.heldObject.Value; + return new TrackedItem(heldObject.getOne(), onEmpty: this.Reset); + } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + return false; // no input + } + + + /********* + ** Private methods + *********/ + /// Reset the machine so it's ready to accept a new input. + /// The output item that was taken. + private void Reset(Item item) + { + SObject tapper = this.Machine; + + switch (this.TreeType) + { + case 1: + tapper.heldObject.Value = new SObject(725, 1); + tapper.MinutesUntilReady = 13000 - Game1.timeOfDay; + break; + case 2: + tapper.heldObject.Value = new SObject(724, 1); + tapper.MinutesUntilReady = 16000 - Game1.timeOfDay; + break; + case 3: + tapper.heldObject.Value = new SObject(726, 1); + tapper.MinutesUntilReady = 10000 - Game1.timeOfDay; + break; + case 7: + tapper.heldObject.Value = new SObject(420, 1); + tapper.MinutesUntilReady = 3000 - Game1.timeOfDay; + if (!Game1.currentSeason.Equals("fall")) + { + tapper.heldObject.Value = new SObject(404, 1); + tapper.MinutesUntilReady = 6000 - Game1.timeOfDay; + } + break; + } + tapper.heldObject.Value = (SObject)tapper.heldObject.Value.getOne(); + tapper.readyForHarvest.Value = false; + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Objects/WormBinMachine.cs b/Mods/Automate/Automate/Framework/Machines/Objects/WormBinMachine.cs new file mode 100644 index 000000000..172156ac6 --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Objects/WormBinMachine.cs @@ -0,0 +1,42 @@ +using Microsoft.Xna.Framework; +using StardewValley; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Objects +{ + /// A tapper that accepts input and provides output. + /// See the game's machine logic in and . + internal class WormBinMachine : GenericObjectMachine + { + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying machine. + /// The location containing the machine. + /// The tile covered by the machine. + public WormBinMachine(SObject machine, GameLocation location, Vector2 tile) + : base(machine, location, tile) { } + + /// Get the output item. + public override ITrackedStack GetOutput() + { + SObject bin = this.Machine; + return new TrackedItem(bin.heldObject.Value, item => + { + bin.heldObject.Value = new SObject(685, Game1.random.Next(2, 6)); + bin.MinutesUntilReady = 2600 - Game1.timeOfDay; + bin.readyForHarvest.Value = false; + bin.showNextIndex.Value = false; + }); + } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + return false; // no input + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/TerrainFeatures/FruitTreeMachine.cs b/Mods/Automate/Automate/Framework/Machines/TerrainFeatures/FruitTreeMachine.cs new file mode 100644 index 000000000..301773c9e --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/TerrainFeatures/FruitTreeMachine.cs @@ -0,0 +1,72 @@ +using Microsoft.Xna.Framework; +using StardewValley; +using StardewValley.TerrainFeatures; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.TerrainFeatures +{ + /// A fruit tree machine that accepts input and provides output. + /// Derived from . + internal class FruitTreeMachine : BaseMachine + { + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying fruit tree. + /// The machine's in-game location. + /// The tree's tile position. + public FruitTreeMachine(FruitTree tree, GameLocation location, Vector2 tile) + : base(tree, location, BaseMachine.GetTileAreaFor(tile)) { } + + /// Get the machine's processing state. + public override MachineState GetState() + { + if (this.Machine.growthStage.Value < FruitTree.treeStage) + return MachineState.Disabled; + + return this.Machine.fruitsOnTree.Value > 0 + ? MachineState.Done + : MachineState.Processing; + } + + /// Get the output item. + public override ITrackedStack GetOutput() + { + FruitTree tree = this.Machine; + + // if struck by lightning => coal + if (tree.struckByLightningCountdown.Value > 0) + return new TrackedItem(new SObject(382, tree.fruitsOnTree.Value), onReduced: this.OnOutputReduced); + + // else => fruit + int quality = SObject.lowQuality; + if (tree.daysUntilMature.Value <= -112) + quality = SObject.medQuality; + if (tree.daysUntilMature.Value <= -224) + quality = SObject.highQuality; + if (tree.daysUntilMature.Value <= -336) + quality = SObject.bestQuality; + return new TrackedItem(new SObject(tree.indexOfFruit.Value, tree.fruitsOnTree.Value, quality: quality), onReduced: this.OnOutputReduced); + } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + return false; // no input + } + + + /********* + ** Private methods + *********/ + /// Reset the machine so it's ready to accept a new input. + /// The output item that was taken. + private void OnOutputReduced(Item item) + { + this.Machine.fruitsOnTree.Value = item.Stack; + } + } +} diff --git a/Mods/Automate/Automate/Framework/Machines/Tiles/TrashCanMachine.cs b/Mods/Automate/Automate/Framework/Machines/Tiles/TrashCanMachine.cs new file mode 100644 index 000000000..0a8397dc3 --- /dev/null +++ b/Mods/Automate/Automate/Framework/Machines/Tiles/TrashCanMachine.cs @@ -0,0 +1,149 @@ +using System; +using System.Collections.Generic; +using Microsoft.Xna.Framework; +using StardewModdingAPI; +using StardewValley; +using StardewValley.Locations; + +namespace Pathoschild.Stardew.Automate.Framework.Machines.Tiles +{ + /// A trash can that accepts input and provides output. + internal class TrashCanMachine : BaseMachine + { + /********* + ** Fields + *********/ + /// The machine's position in its location. + private readonly Vector2 Tile; + + /// The game's list of trash cans the player has already checked. + private readonly IList TrashCansChecked; + + /// The trash can index (or -1 if not a valid trash can). + private readonly int TrashCanIndex = -1; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The town to search. + /// The machine's position in its location. + /// The trash can index. + /// Simplifies access to private game code. + public TrashCanMachine(Town town, Vector2 tile, int trashCanIndex, IReflectionHelper reflection) + : base(town, BaseMachine.GetTileAreaFor(tile)) + { + this.Tile = tile; + this.TrashCansChecked = reflection.GetField>(town, "garbageChecked").GetValue(); + if (trashCanIndex >= 0 && trashCanIndex < this.TrashCansChecked.Count) + this.TrashCanIndex = trashCanIndex; + } + + /// Get the machine's processing state. + public override MachineState GetState() + { + if (this.TrashCanIndex == -1) + return MachineState.Disabled; + if (this.TrashCansChecked[this.TrashCanIndex]) + return MachineState.Processing; + return MachineState.Done; + } + + /// Get the output item. + public override ITrackedStack GetOutput() + { + // get trash + int? itemID = this.GetRandomTrash(this.TrashCanIndex); + if (itemID.HasValue) + return new TrackedItem(new StardewValley.Object(itemID.Value, 1), onEmpty: this.MarkChecked); + + // if nothing is returned, mark trash can checked + this.MarkChecked(null); + return null; + } + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + public override bool SetInput(IStorage input) + { + return false; // no input + } + + + /********* + ** Private methods + *********/ + /// Reset the machine so it starts processing the next item. + /// The output item that was taken. + private void MarkChecked(Item item) + { + this.TrashCansChecked[this.TrashCanIndex] = true; + } + + /// Get a random trash item ID. + /// The trash can index. + /// Duplicated from . + private int? GetRandomTrash(int index) + { + Random random = new Random((int)Game1.uniqueIDForThisGame / 2 + (int)Game1.stats.DaysPlayed + 777 + index); + if (random.NextDouble() < 0.2 + Game1.dailyLuck) + { + int parentSheetIndex = 168; + switch (random.Next(10)) + { + case 0: + parentSheetIndex = 168; + break; + case 1: + parentSheetIndex = 167; + break; + case 2: + parentSheetIndex = 170; + break; + case 3: + parentSheetIndex = 171; + break; + case 4: + parentSheetIndex = 172; + break; + case 5: + parentSheetIndex = 216; + break; + case 6: + parentSheetIndex = Utility.getRandomItemFromSeason(Game1.currentSeason, ((int)this.Tile.X) * 653 + ((int)this.Tile.Y) * 777, false); + break; + case 7: + parentSheetIndex = 403; + break; + case 8: + parentSheetIndex = 309 + random.Next(3); + break; + case 9: + parentSheetIndex = 153; + break; + } + if (index == 3 && random.NextDouble() < 0.2 + Game1.dailyLuck) + { + parentSheetIndex = 535; + if (random.NextDouble() < 0.05) + parentSheetIndex = 749; + } + if (index == 4 && random.NextDouble() < 0.2 + Game1.dailyLuck) + { + parentSheetIndex = 378 + random.Next(3) * 2; + random.Next(1, 5); + } + if (index == 5 && random.NextDouble() < 0.2 + Game1.dailyLuck && Game1.dishOfTheDay != null) + parentSheetIndex = Game1.dishOfTheDay.ParentSheetIndex != 217 ? Game1.dishOfTheDay.ParentSheetIndex : 216; + if (index == 6 && random.NextDouble() < 0.2 + Game1.dailyLuck) + parentSheetIndex = 223; + + return parentSheetIndex; + } + + return null; + } + } +} diff --git a/Mods/Automate/Automate/Framework/Models/ModConfig.cs b/Mods/Automate/Automate/Framework/Models/ModConfig.cs new file mode 100644 index 000000000..1327f11c3 --- /dev/null +++ b/Mods/Automate/Automate/Framework/Models/ModConfig.cs @@ -0,0 +1,37 @@ +using Newtonsoft.Json; +using Pathoschild.Stardew.Common; +using StardewModdingAPI; + +namespace Pathoschild.Stardew.Automate.Framework.Models +{ + /// The raw mod configuration. + internal class ModConfig + { + /********* + ** Accessors + *********/ + /// Whether to treat the shipping bin as a machine that can be automated. + public bool AutomateShippingBin { get; set; } = true; + + /// The number of ticks between each automation process (60 = once per second). + public int AutomationInterval { get; set; } = 60; + + /// The control bindings. + public ModConfigControls Controls { get; set; } = new ModConfigControls(); + + /// The in-game objects through which machines can connect. + public ModConfigObject[] Connectors { get; set; } = new ModConfigObject[0]; + + + /********* + ** Nested models + *********/ + /// A set of control bindings. + internal class ModConfigControls + { + /// The button which toggles the automation overlay. + [JsonConverter(typeof(StringEnumArrayConverter))] + public SButton[] ToggleOverlay { get; set; } = { SButton.U }; + } + } +} diff --git a/Mods/Automate/Automate/Framework/Models/ModConfigObject.cs b/Mods/Automate/Automate/Framework/Models/ModConfigObject.cs new file mode 100644 index 000000000..f61990a6e --- /dev/null +++ b/Mods/Automate/Automate/Framework/Models/ModConfigObject.cs @@ -0,0 +1,16 @@ +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; + +namespace Pathoschild.Stardew.Automate.Framework.Models +{ + /// An object identifier. + internal class ModConfigObject + { + /// The object type. + [JsonConverter(typeof(StringEnumConverter))] + public ObjectType Type { get; set; } + + /// The object ID. + public int ID { get; set; } + } +} diff --git a/Mods/Automate/Automate/Framework/Models/ObjectType.cs b/Mods/Automate/Automate/Framework/Models/ObjectType.cs new file mode 100644 index 000000000..746a2e76b --- /dev/null +++ b/Mods/Automate/Automate/Framework/Models/ObjectType.cs @@ -0,0 +1,15 @@ +namespace Pathoschild.Stardew.Automate.Framework.Models +{ + /// The type of an in-game object for the mod's purposes. + internal enum ObjectType + { + /// A flooring object. + Floor, + + /// A bigcraftable object. + BigCraftable, + + /// A map object. + Object + } +} diff --git a/Mods/Automate/Automate/Framework/OverlayMenu.cs b/Mods/Automate/Automate/Framework/OverlayMenu.cs new file mode 100644 index 000000000..41b04858e --- /dev/null +++ b/Mods/Automate/Automate/Framework/OverlayMenu.cs @@ -0,0 +1,126 @@ +using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; +using System.Linq; +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; +using Pathoschild.Stardew.Common; +using Pathoschild.Stardew.Common.UI; +using StardewModdingAPI; +using StardewModdingAPI.Events; +using StardewValley; + +namespace Pathoschild.Stardew.Automate.Framework +{ + /// The overlay which highlights automatable machines. + internal class OverlayMenu : BaseOverlay + { + /********* + ** Fields + *********/ + /// The padding to apply to tile backgrounds to make the grid visible. + private readonly int TileGap = 1; + + /// A machine group lookup by tile coordinate. + private readonly IDictionary GroupTiles; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The SMAPI events available for mods. + /// An API for checking and changing input state. + /// The machine groups to display. + public OverlayMenu(IModEvents events, IInputHelper inputHelper, IEnumerable machineGroups) + : base(events, inputHelper) + { + // init machine groups + machineGroups = machineGroups.ToArray(); + this.GroupTiles = + ( + from machineGroup in machineGroups + from tile in machineGroup.Tiles + select new { tile, machineGroup } + ) + .ToDictionary(p => p.tile, p => p.machineGroup); + } + + + /********* + ** Protected + *********/ + /// Draw the overlay to the screen. + /// The sprite batch being drawn. + [SuppressMessage("ReSharper", "PossibleLossOfFraction", Justification = "Deliberate discarded for conversion to tile coordinates.")] + protected override void Draw(SpriteBatch spriteBatch) + { + if (!Context.IsPlayerFree) + return; + + // draw each tile + foreach (Vector2 tile in TileHelper.GetVisibleTiles()) + { + // get tile's screen coordinates + float screenX = tile.X * Game1.tileSize - Game1.viewport.X; + float screenY = tile.Y * Game1.tileSize - Game1.viewport.Y; + int tileSize = Game1.tileSize; + + // get machine group + this.GroupTiles.TryGetValue(tile, out MachineGroup group); + bool isGrouped = group != null; + bool isActive = isGrouped && group.HasInternalAutomation; + + // draw background + { + Color color = Color.Black * 0.5f; + if (isActive) + color = Color.Green * 0.2f; + else if (isGrouped) + color = Color.Red * 0.2f; + + spriteBatch.DrawLine(screenX + this.TileGap, screenY + this.TileGap, new Vector2(tileSize - this.TileGap * 2, tileSize - this.TileGap * 2), color); + } + + // draw group edge borders + if (group != null) + this.DrawEdgeBorders(spriteBatch, group, tile, group.HasInternalAutomation ? Color.Green : Color.Red); + } + + // draw cursor + this.DrawCursor(); + } + + + /********* + ** Private methods + *********/ + /// Draw borders for each unconnected edge of a tile. + /// The sprite batch being drawn. + /// The machine group. + /// The group tile. + /// The border color. + private void DrawEdgeBorders(SpriteBatch spriteBatch, MachineGroup group, Vector2 tile, Color color) + { + int borderSize = 3; + float screenX = tile.X * Game1.tileSize - Game1.viewport.X; + float screenY = tile.Y * Game1.tileSize - Game1.viewport.Y; + float tileSize = Game1.tileSize; + + // top + if (!group.Tiles.Contains(new Vector2(tile.X, tile.Y - 1))) + spriteBatch.DrawLine(screenX, screenY, new Vector2(tileSize, borderSize), color); // top + + // bottom + if (!group.Tiles.Contains(new Vector2(tile.X, tile.Y + 1))) + spriteBatch.DrawLine(screenX, screenY + tileSize, new Vector2(tileSize, borderSize), color); // bottom + + // left + if (!group.Tiles.Contains(new Vector2(tile.X - 1, tile.Y))) + spriteBatch.DrawLine(screenX, screenY, new Vector2(borderSize, tileSize), color); // left + + // right + if (!group.Tiles.Contains(new Vector2(tile.X + 1, tile.Y))) + spriteBatch.DrawLine(screenX + tileSize, screenY, new Vector2(borderSize, tileSize), color); // right + } + } +} diff --git a/Mods/Automate/Automate/Framework/Recipe.cs b/Mods/Automate/Automate/Framework/Recipe.cs new file mode 100644 index 000000000..9f2ac69f5 --- /dev/null +++ b/Mods/Automate/Automate/Framework/Recipe.cs @@ -0,0 +1,49 @@ +using System; +using StardewValley; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework +{ + /// Describes a generic recipe based on item input and output. + internal class Recipe : IRecipe + { + /********* + ** Accessors + *********/ + /// The input item or category ID. + public int InputID { get; } + + /// The number of inputs needed. + public int InputCount { get; } + + /// The output to generate (given an input). + public Func Output { get; } + + /// The time needed to prepare an output. + public int Minutes { get; } + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The input item or category ID. + /// The number of inputs needed. + /// The output to generate (given an input). + /// The time needed to prepare an output. + public Recipe(int input, int inputCount, Func output, int minutes) + { + this.InputID = input; + this.InputCount = inputCount; + this.Output = output; + this.Minutes = minutes; + } + + /// Get whether the recipe can accept a given item as input (regardless of stack size). + /// The item to check. + public bool AcceptsInput(ITrackedStack stack) + { + return stack.Sample.ParentSheetIndex == this.InputID || stack.Sample.Category == this.InputID; + } + } +} diff --git a/Mods/Automate/Automate/Framework/Storage/ChestContainer.cs b/Mods/Automate/Automate/Framework/Storage/ChestContainer.cs new file mode 100644 index 000000000..aaa5eda7b --- /dev/null +++ b/Mods/Automate/Automate/Framework/Storage/ChestContainer.cs @@ -0,0 +1,146 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using Microsoft.Xna.Framework; +using StardewValley; +using StardewValley.Objects; + +namespace Pathoschild.Stardew.Automate.Framework.Storage +{ + /// A in-game chest which can provide or store items. + internal class ChestContainer : IContainer + { + /********* + ** Fields + *********/ + /// The underlying chest. + private readonly Chest Chest; + + + /********* + ** Accessors + *********/ + /// The container name (if any). + public string Name => this.Chest.Name; + + /// The location which contains the container. + public GameLocation Location { get; } + + /// The tile area covered by the container. + public Rectangle TileArea { get; } + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying chest. + /// The location which contains the container. + /// The tile area covered by the container. + public ChestContainer(Chest chest, GameLocation location, Vector2 tile) + { + this.Chest = chest; + this.Location = location; + this.TileArea = new Rectangle((int)tile.X, (int)tile.Y, 1, 1); + } + + /// Store an item stack. + /// The item stack to store. + /// If the storage can't hold the entire stack, it should reduce the tracked stack accordingly. + public void Store(ITrackedStack stack) + { + if (stack.Count <= 0) + return; + + IList inventory = this.Chest.items; + + // try stack into existing slot + foreach (Item slot in inventory) + { + if (slot != null && stack.Sample.canStackWith(slot)) + { + int added = stack.Count - slot.addToStack(stack.Count); + stack.Reduce(added); + if (stack.Count <= 0) + return; + } + } + + // try add to empty slot + for (int i = 0; i < Chest.capacity && i < inventory.Count; i++) + { + if (inventory[i] == null) + { + inventory[i] = stack.Take(stack.Count); + return; + } + + } + + // try add new slot + if (inventory.Count < Chest.capacity) + inventory.Add(stack.Take(stack.Count)); + } + + /// Find items in the pipe matching a predicate. + /// Matches items that should be returned. + /// The number of items to find. + /// If the pipe has no matching item, returns null. Otherwise returns a tracked item stack, which may have less items than requested if no more were found. + public ITrackedStack Get(Func predicate, int count) + { + ITrackedStack[] stacks = this.GetImpl(predicate, count).ToArray(); + if (!stacks.Any()) + return null; + return new TrackedItemCollection(stacks); + } + + /// Returns an enumerator that iterates through the collection. + /// An enumerator that can be used to iterate through the collection. + public IEnumerator GetEnumerator() + { + foreach (Item item in this.Chest.items.ToArray()) + { + if (item != null) + yield return this.GetTrackedItem(item); + } + } + + /// Returns an enumerator that iterates through a collection. + /// An object that can be used to iterate through the collection. + IEnumerator IEnumerable.GetEnumerator() + { + return this.GetEnumerator(); + } + + + /********* + ** Private methods + *********/ + /// Find items in the pipe matching a predicate. + /// Matches items that should be returned. + /// The number of items to find. + /// If there aren't enough items in the pipe, it should return those it has. + private IEnumerable GetImpl(Func predicate, int count) + { + int countFound = 0; + foreach (Item item in this.Chest.items) + { + if (item != null && predicate(item)) + { + countFound += item.Stack; + yield return this.GetTrackedItem(item); + if (countFound >= count) + yield break; + } + } + } + + /// Get a tracked item sync'd with the chest inventory. + /// The item to track. + private ITrackedStack GetTrackedItem(Item item) + { + return new TrackedItem(item, onEmpty: i => this.Chest.items.Remove(i)); + } + } +} diff --git a/Mods/Automate/Automate/Framework/Storage/ContainerExtensions.cs b/Mods/Automate/Automate/Framework/Storage/ContainerExtensions.cs new file mode 100644 index 000000000..ce9fe3b67 --- /dev/null +++ b/Mods/Automate/Automate/Framework/Storage/ContainerExtensions.cs @@ -0,0 +1,47 @@ +using System; + +namespace Pathoschild.Stardew.Automate.Framework.Storage +{ + /// Provides extensions for instances. + internal static class ContainerExtensions + { + /********* + ** Public methods + *********/ + /// Get whether the container name contains a given tag. + /// The container instance. + /// The tag to check, excluding the '|' delimiters. + public static bool HasTag(this IContainer container, string tag) + { + return container.Name?.IndexOf($"|{tag}|", StringComparison.InvariantCultureIgnoreCase) >= 0; + } + + /// Get whether this container should be preferred for output when possible. + /// The container instance. + public static bool ShouldIgnore(this IContainer container) + { + return container.HasTag("automate:ignore"); + } + + /// Get whether input is enabled for this container. + /// The container instance. + public static bool AllowsInput(this IContainer container) + { + return !container.ShouldIgnore() && !container.HasTag("automate:noinput"); + } + + /// Get whether output is enabled for this container. + /// The container instance. + public static bool AllowsOutput(this IContainer container) + { + return !container.ShouldIgnore() && !container.HasTag("automate:nooutput"); + } + + /// Get whether this container should be preferred for output when possible. + /// The container instance. + public static bool PreferForOutput(this IContainer container) + { + return container.HasTag("automate:output"); + } + } +} diff --git a/Mods/Automate/Automate/Framework/StorageManager.cs b/Mods/Automate/Automate/Framework/StorageManager.cs new file mode 100644 index 000000000..59fa3250d --- /dev/null +++ b/Mods/Automate/Automate/Framework/StorageManager.cs @@ -0,0 +1,206 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Pathoschild.Stardew.Automate.Framework.Storage; +using StardewValley; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate.Framework +{ + /// Manages access to items in the underlying containers. + internal class StorageManager : IStorage + { + /********* + ** Fields + *********/ + /// The storage containers. + private readonly IContainer[] Containers; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The storage containers. + public StorageManager(IEnumerable containers) + { + this.Containers = containers.ToArray(); + } + + /**** + ** GetItems + ****/ + /// Get all items from the given pipes. + public IEnumerable GetItems() + { + foreach (IContainer container in this.Containers) + { + if (!container.AllowsOutput()) + continue; + + foreach (ITrackedStack item in container) + yield return item; + } + } + + /**** + ** TryGetIngredient + ****/ + /// Get an ingredient needed for a recipe. + /// Returns whether an item should be matched. + /// The number of items to find. + /// The matching consumables. + /// Returns whether the requirement is met. + public bool TryGetIngredient(Func predicate, int count, out IConsumable consumable) + { + int countMissing = count; + ITrackedStack[] consumables = this.GetItems().Where(predicate) + .TakeWhile(chestItem => + { + if (countMissing <= 0) + return false; + + countMissing -= chestItem.Count; + return true; + }) + .ToArray(); + + consumable = new Consumable(new TrackedItemCollection(consumables), count); + return consumable.IsMet; + } + + /// Get an ingredient needed for a recipe. + /// The item or category ID. + /// The number of items to find. + /// The matching consumables. + /// Returns whether the requirement is met. + public bool TryGetIngredient(int id, int count, out IConsumable consumable) + { + return this.TryGetIngredient(item => item.Sample.ParentSheetIndex == id || item.Sample.Category == id, count, out consumable); + } + + /// Get an ingredient needed for a recipe. + /// The items to match. + /// The matching consumables. + /// The matched requisition. + /// Returns whether the requirement is met. + public bool TryGetIngredient(IRecipe[] recipes, out IConsumable consumable, out IRecipe recipe) + { + IDictionary> accumulator = recipes.ToDictionary(req => req, req => new List()); + + foreach (ITrackedStack stack in this.GetItems()) + { + foreach (var entry in accumulator) + { + recipe = entry.Key; + List found = entry.Value; + + if (recipe.AcceptsInput(stack)) + { + found.Add(stack); + if (found.Sum(p => p.Count) >= recipe.InputCount) + { + consumable = new Consumable(new TrackedItemCollection(found), entry.Key.InputCount); + return true; + } + } + } + } + + consumable = null; + recipe = null; + return false; + } + + /**** + ** TryConsume + ****/ + /// Consume an ingredient needed for a recipe. + /// Returns whether an item should be matched. + /// The number of items to find. + /// Returns whether the item was consumed. + public bool TryConsume(Func predicate, int count) + { + if (this.TryGetIngredient(predicate, count, out IConsumable requirement)) + { + requirement.Reduce(); + return true; + } + return false; + } + + /// Consume an ingredient needed for a recipe. + /// The item ID. + /// The number of items to find. + /// Returns whether the item was consumed. + public bool TryConsume(int itemID, int count) + { + return this.TryConsume(item => item.Sample.ParentSheetIndex == itemID, count); + } + + /**** + ** TryPush + ****/ + /// Add the given item stack to the pipes if there's space. + /// The item stack to push. + public bool TryPush(ITrackedStack item) + { + if (item == null || item.Count <= 0) + return false; + + int originalCount = item.Count; + + var preferOutputContainers = this.Containers.Where(p => p.AllowsInput() && p.PreferForOutput()); + var otherContainers = this.Containers.Where(p => p.AllowsInput() && !p.PreferForOutput()); + + // push into 'output' chests + foreach (IContainer container in preferOutputContainers) + { + container.Store(item); + if (item.Count <= 0) + return true; + } + + // push into chests that already have this item + string itemKey = this.GetItemKey(item.Sample); + foreach (IContainer container in otherContainers) + { + if (container.All(p => this.GetItemKey(p.Sample) != itemKey)) + continue; + + container.Store(item); + if (item.Count <= 0) + return true; + } + + // push into first available chest + if (item.Count >= 0) + { + foreach (IContainer container in otherContainers) + { + container.Store(item); + if (item.Count <= 0) + return true; + } + } + + return item.Count < originalCount; + } + + + /********* + ** Private methods + *********/ + /// Get a key which uniquely identifies an item type. + /// The item to identify. + private string GetItemKey(Item item) + { + string key = item.GetType().FullName; + if (item is SObject obj) + key += "_craftable:" + obj.bigCraftable.Value; + key += "_id:" + item.ParentSheetIndex; + + return key; + } + } +} diff --git a/Mods/Automate/Automate/IAutomatable.cs b/Mods/Automate/Automate/IAutomatable.cs new file mode 100644 index 000000000..a0ec02f17 --- /dev/null +++ b/Mods/Automate/Automate/IAutomatable.cs @@ -0,0 +1,18 @@ +using Microsoft.Xna.Framework; +using StardewValley; + +namespace Pathoschild.Stardew.Automate +{ + /// An automatable entity, which can implement a more specific type like or . If it doesn't implement a more specific type, it's treated as a connector with no additional logic. + public interface IAutomatable + { + /********* + ** Accessors + *********/ + /// The location which contains the machine. + GameLocation Location { get; } + + /// The tile area covered by the machine. + Rectangle TileArea { get; } + } +} diff --git a/Mods/Automate/Automate/IAutomateAPI.cs b/Mods/Automate/Automate/IAutomateAPI.cs new file mode 100644 index 000000000..4a63532f2 --- /dev/null +++ b/Mods/Automate/Automate/IAutomateAPI.cs @@ -0,0 +1,19 @@ +using System.Collections.Generic; +using Microsoft.Xna.Framework; +using StardewValley; + +namespace Pathoschild.Stardew.Automate +{ + /// The API which lets other mods interact with Automate. + public interface IAutomateAPI + { + /// Add an automation factory. + /// An automation factory which construct machines, containers, and connectors. + void AddFactory(IAutomationFactory factory); + + /// Get the status of machines in a tile area. This is a specialised API for Data Layers and similar mods. + /// The location for which to display data. + /// The tile area for which to display data. + IDictionary GetMachineStates(GameLocation location, Rectangle tileArea); + } +} diff --git a/Mods/Automate/Automate/IAutomationFactory.cs b/Mods/Automate/Automate/IAutomationFactory.cs new file mode 100644 index 000000000..c1adb0c03 --- /dev/null +++ b/Mods/Automate/Automate/IAutomationFactory.cs @@ -0,0 +1,43 @@ +using Microsoft.Xna.Framework; +using StardewValley; +using StardewValley.Buildings; +using StardewValley.Locations; +using StardewValley.TerrainFeatures; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate +{ + /// Constructs machines, containers, or connectors which can be added to a machine group. + public interface IAutomationFactory + { + /********* + ** Accessors + *********/ + /// Get a machine, container, or connector instance for a given object. + /// The in-game object. + /// The location to check. + /// The tile position to check. + /// Returns an instance or null. + IAutomatable GetFor(SObject obj, GameLocation location, in Vector2 tile); + + /// Get a machine, container, or connector instance for a given terrain feature. + /// The terrain feature. + /// The location to check. + /// The tile position to check. + /// Returns an instance or null. + IAutomatable GetFor(TerrainFeature feature, GameLocation location, in Vector2 tile); + + /// Get a machine, container, or connector instance for a given building. + /// The building. + /// The location to check. + /// The tile position to check. + /// Returns an instance or null. + IAutomatable GetFor(Building building, BuildableGameLocation location, in Vector2 tile); + + /// Get a machine, container, or connector instance for a given tile position. + /// The location to check. + /// The tile position to check. + /// Returns an instance or null. + IAutomatable GetForTile(GameLocation location, in Vector2 tile); + } +} diff --git a/Mods/Automate/Automate/IConsumable.cs b/Mods/Automate/Automate/IConsumable.cs new file mode 100644 index 000000000..260a1edaf --- /dev/null +++ b/Mods/Automate/Automate/IConsumable.cs @@ -0,0 +1,34 @@ +using StardewValley; + +namespace Pathoschild.Stardew.Automate +{ + /// An ingredient stack (or stacks) which can be consumed by a machine. + public interface IConsumable + { + /********* + ** Accessors + *********/ + /// The items available to consumable. + ITrackedStack Consumables { get; } + + /// A sample item for comparison. + /// This should not be a reference to the original stack. + Item Sample { get; } + + /// The number of items needed for the recipe. + int CountNeeded { get; } + + /// Whether the consumables needed for this requirement are ready. + bool IsMet { get; } + + + /********* + ** Public methods + *********/ + /// Remove the needed number of this item from the stack. + void Reduce(); + + /// Remove the needed number of this item from the stack and return a new stack matching the count. + Item Take(); + } +} diff --git a/Mods/Automate/Automate/IContainer.cs b/Mods/Automate/Automate/IContainer.cs new file mode 100644 index 000000000..42197319e --- /dev/null +++ b/Mods/Automate/Automate/IContainer.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using StardewValley; + +namespace Pathoschild.Stardew.Automate +{ + /// Provides and stores items for machines. + public interface IContainer : IAutomatable, IEnumerable + { + /********* + ** Accessors + *********/ + /// The container name (if any). + string Name { get; } + + + /********* + ** Public methods + *********/ + /// Find items in the pipe matching a predicate. + /// Matches items that should be returned. + /// The number of items to find. + /// If the pipe has no matching item, returns null. Otherwise returns a tracked item stack, which may have less items than requested if no more were found. + ITrackedStack Get(Func predicate, int count); + + /// Store an item stack. + /// The item stack to store. + /// If the storage can't hold the entire stack, it should reduce the tracked stack accordingly. + void Store(ITrackedStack stack); + } +} diff --git a/Mods/Automate/Automate/IMachine.cs b/Mods/Automate/Automate/IMachine.cs new file mode 100644 index 000000000..fcc20fbbe --- /dev/null +++ b/Mods/Automate/Automate/IMachine.cs @@ -0,0 +1,28 @@ +namespace Pathoschild.Stardew.Automate +{ + /// A machine that accepts input and provides output. + public interface IMachine : IAutomatable + { + /********* + ** Accessors + *********/ + /// A unique ID for the machine type. + /// This value should be identical for two machines if they have the exact same behavior and input logic. For example, if one machine in a group can't process input due to missing items, Automate will skip any other empty machines of that type in the same group since it assumes they need the same inputs. + string MachineTypeID { get; } + + + /********* + ** Public methods + *********/ + /// Get the machine's processing state. + MachineState GetState(); + + /// Get the output item. + ITrackedStack GetOutput(); + + /// Provide input to the machine. + /// The available items. + /// Returns whether the machine started processing an item. + bool SetInput(IStorage input); + } +} diff --git a/Mods/Automate/Automate/IRecipe.cs b/Mods/Automate/Automate/IRecipe.cs new file mode 100644 index 000000000..806ecbdbf --- /dev/null +++ b/Mods/Automate/Automate/IRecipe.cs @@ -0,0 +1,33 @@ +using System; +using StardewValley; +using Object = StardewValley.Object; + +namespace Pathoschild.Stardew.Automate +{ + /// Describes a generic recipe based on item input and output. + public interface IRecipe + { + /********* + ** Accessors + *********/ + /// The input item or category ID. + int InputID { get; } + + /// The number of inputs needed. + int InputCount { get; } + + /// The output to generate (given an input). + Func Output { get; } + + /// The time needed to prepare an output. + int Minutes { get; } + + + /********* + ** Methods + *********/ + /// Get whether the recipe can accept a given item as input (regardless of stack size). + /// The item to check. + bool AcceptsInput(ITrackedStack stack); + } +} diff --git a/Mods/Automate/Automate/IStorage.cs b/Mods/Automate/Automate/IStorage.cs new file mode 100644 index 000000000..f8df55eb6 --- /dev/null +++ b/Mods/Automate/Automate/IStorage.cs @@ -0,0 +1,62 @@ +using System; +using System.Collections.Generic; +using Pathoschild.Stardew.Automate.Framework; + +namespace Pathoschild.Stardew.Automate +{ + /// Manages access to items in the underlying containers. + public interface IStorage + { + /********* + ** Public methods + *********/ + /// Get all items from the given pipes. + IEnumerable GetItems(); + + /**** + ** TryGetIngredient + ****/ + /// Get an ingredient needed for a recipe. + /// Returns whether an item should be matched. + /// The number of items to find. + /// The matching consumables. + /// Returns whether the requirement is met. + bool TryGetIngredient(Func predicate, int count, out IConsumable consumable); + + /// Get an ingredient needed for a recipe. + /// The item or category ID. + /// The number of items to find. + /// The matching consumables. + /// Returns whether the requirement is met. + bool TryGetIngredient(int id, int count, out IConsumable consumable); + + /// Get an ingredient needed for a recipe. + /// The items to match. + /// The matching consumables. + /// The matched requisition. + /// Returns whether the requirement is met. + bool TryGetIngredient(IRecipe[] recipes, out IConsumable consumable, out IRecipe recipe); + + /**** + ** TryConsume + ****/ + /// Consume an ingredient needed for a recipe. + /// Returns whether an item should be matched. + /// The number of items to find. + /// Returns whether the item was consumed. + bool TryConsume(Func predicate, int count); + + /// Consume an ingredient needed for a recipe. + /// The item ID. + /// The number of items to find. + /// Returns whether the item was consumed. + bool TryConsume(int itemID, int count); + + /**** + ** TryPush + ****/ + /// Add the given item stack to the pipes if there's space. + /// The item stack to push. + bool TryPush(ITrackedStack item); + } +} diff --git a/Mods/Automate/Automate/ITrackedStack.cs b/Mods/Automate/Automate/ITrackedStack.cs new file mode 100644 index 000000000..aaa738417 --- /dev/null +++ b/Mods/Automate/Automate/ITrackedStack.cs @@ -0,0 +1,30 @@ +using StardewValley; + +namespace Pathoschild.Stardew.Automate +{ + /// An item stack in an input pipe which can be reduced or taken. + public interface ITrackedStack + { + /********* + ** Accessors + *********/ + /// A sample item for comparison. + /// This should be equivalent to the underlying item (except in stack size), but *not* a reference to it. + Item Sample { get; } + + /// The number of items in the stack. + int Count { get; } + + + /********* + ** Public methods + *********/ + /// Remove the specified number of this item from the stack. + /// The number to consume. + void Reduce(int count); + + /// Remove the specified number of this item from the stack and return a new stack matching the count. + /// The number to get. + Item Take(int count); + } +} diff --git a/Mods/Automate/Automate/MachineState.cs b/Mods/Automate/Automate/MachineState.cs new file mode 100644 index 000000000..b7275df56 --- /dev/null +++ b/Mods/Automate/Automate/MachineState.cs @@ -0,0 +1,18 @@ +namespace Pathoschild.Stardew.Automate +{ + /// A machine processing state. + public enum MachineState + { + /// The machine is not currently enabled (e.g. out of season or needs to be started manually). + Disabled, + + /// The machine has no input. + Empty, + + /// The machine is processing an input. + Processing, + + /// The machine finished processing an input and has an output item ready. + Done + } +} diff --git a/Mods/Automate/Automate/ModEntry.cs b/Mods/Automate/Automate/ModEntry.cs new file mode 100644 index 000000000..d394c482f --- /dev/null +++ b/Mods/Automate/Automate/ModEntry.cs @@ -0,0 +1,285 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Pathoschild.Stardew.Automate.Framework; +using Pathoschild.Stardew.Automate.Framework.Models; +using Pathoschild.Stardew.Common; +using Pathoschild.Stardew.Common.Utilities; +using StardewModdingAPI; +using StardewModdingAPI.Events; +using StardewValley; + +namespace Pathoschild.Stardew.Automate +{ + /// The mod entry point. + internal class ModEntry : Mod + { + /********* + ** Fields + *********/ + /// The mod configuration. + private ModConfig Config; + + /// Constructs machine groups. + private MachineGroupFactory Factory; + + /// Whether to enable automation for the current save. + private bool EnableAutomation => Context.IsMainPlayer; + + /// The machines to process. + private readonly IDictionary ActiveMachineGroups = new Dictionary(new ObjectReferenceComparer()); + + /// The disabled machine groups (e.g. machines not connected to a chest). + private readonly IDictionary DisabledMachineGroups = new Dictionary(new ObjectReferenceComparer()); + + /// The locations that should be reloaded on the next update tick. + private readonly HashSet ReloadQueue = new HashSet(new ObjectReferenceComparer()); + + /// The number of ticks until the next automation cycle. + private int AutomateCountdown; + + /// The current overlay being displayed, if any. + private OverlayMenu CurrentOverlay; + + + /********* + ** Public methods + *********/ + /// The mod entry point, called after the mod is first loaded. + /// Provides methods for interacting with the mod directory, such as read/writing a config file or custom JSON files. + public override void Entry(IModHelper helper) + { + // toggle mod compatibility + bool hasBetterJunimos = helper.ModRegistry.IsLoaded("hawkfalcon.BetterJunimos"); + bool hasDeluxeAutoGrabber = helper.ModRegistry.IsLoaded("stokastic.DeluxeGrabber"); + + // init + this.Config = helper.ReadConfig(); + this.Factory = new MachineGroupFactory(); + this.Factory.Add(new AutomationFactory(this.Config.Connectors, this.Config.AutomateShippingBin, this.Monitor, helper.Reflection, hasBetterJunimos, hasDeluxeAutoGrabber)); + + // hook events + helper.Events.GameLoop.SaveLoaded += this.OnSaveLoaded; + helper.Events.Player.Warped += this.OnWarped; + helper.Events.World.LocationListChanged += this.World_LocationListChanged; + helper.Events.World.ObjectListChanged += this.World_ObjectListChanged; + helper.Events.GameLoop.UpdateTicked += this.OnUpdateTicked; + helper.Events.Input.ButtonPressed += this.OnButtonPressed; + + if (this.Config.Connectors.Any(p => p.Type == ObjectType.Floor)) + helper.Events.World.TerrainFeatureListChanged += this.World_TerrainFeatureListChanged; + + // log info + this.Monitor.VerboseLog($"Initialised with automation every {this.Config.AutomationInterval} ticks."); + } + + /// Get an API that other mods can access. This is always called after . + public override object GetApi() + { + return new AutomateAPI(this.Monitor, this.Factory, this.ActiveMachineGroups, this.DisabledMachineGroups); + } + + + /********* + ** Private methods + *********/ + /**** + ** Event handlers + ****/ + /// The method invoked when the player loads a save. + /// The event sender. + /// The event arguments. + private void OnSaveLoaded(object sender, SaveLoadedEventArgs e) + { + // disable if secondary player + if (!this.EnableAutomation) + this.Monitor.Log("Disabled automation (only the main player can automate machines in multiplayer mode).", LogLevel.Warn); + + // reset + this.ActiveMachineGroups.Clear(); + this.DisabledMachineGroups.Clear(); + this.AutomateCountdown = this.Config.AutomationInterval; + this.DisableOverlay(); + foreach (GameLocation location in CommonHelper.GetLocations()) + this.ReloadQueue.Add(location); + } + + /// The method invoked when the player warps to a new location. + /// The event sender. + /// The event arguments. + private void OnWarped(object sender, WarpedEventArgs e) + { + if (e.IsLocalPlayer) + this.ResetOverlayIfShown(); + } + + /// The method invoked when a location is added or removed. + /// The event sender. + /// The event arguments. + private void World_LocationListChanged(object sender, LocationListChangedEventArgs e) + { + if (!this.EnableAutomation) + return; + + this.Monitor.VerboseLog("Location list changed, reloading all machines."); + + try + { + this.ActiveMachineGroups.Clear(); + this.DisabledMachineGroups.Clear(); + foreach (GameLocation location in CommonHelper.GetLocations()) + this.ReloadQueue.Add(location); + } + catch (Exception ex) + { + this.HandleError(ex, "updating locations"); + } + } + + /// The method invoked when an object is added or removed to a location. + /// The event sender. + /// The event arguments. + private void World_ObjectListChanged(object sender, ObjectListChangedEventArgs e) + { + if (!this.EnableAutomation) + return; + + this.Monitor.VerboseLog($"Object list changed in {e.Location.Name}, reloading machines in current location."); + this.ReloadQueue.Add(e.Location); + } + + /// The method invoked when a terrain feature is added or removed to a location. + /// The event sender. + /// The event arguments. + private void World_TerrainFeatureListChanged(object sender, TerrainFeatureListChangedEventArgs e) + { + if (!this.EnableAutomation) + return; + + this.Monitor.VerboseLog($"Terrain feature list changed in {e.Location.Name}, reloading machines in current location."); + this.ReloadQueue.Add(e.Location); + } + + /// The method invoked when the in-game clock time changes. + /// The event sender. + /// The event arguments. + private void OnUpdateTicked(object sender, UpdateTickedEventArgs e) + { + if (!Context.IsWorldReady || !this.EnableAutomation) + return; + + try + { + // handle delay + this.AutomateCountdown--; + if (this.AutomateCountdown > 0) + return; + this.AutomateCountdown = this.Config.AutomationInterval; + + // reload machines if needed + if (this.ReloadQueue.Any()) + { + foreach (GameLocation location in this.ReloadQueue) + this.ReloadMachinesIn(location); + this.ReloadQueue.Clear(); + + this.ResetOverlayIfShown(); + } + + // process machines + foreach (MachineGroup group in this.GetActiveMachineGroups()) + group.Automate(); + } + catch (Exception ex) + { + this.HandleError(ex, "processing machines"); + } + } + + /// The method invoked when the player presses a button. + /// The event sender. + /// The event arguments. + private void OnButtonPressed(object sender, ButtonPressedEventArgs e) + { + try + { + // toggle overlay + if (Context.IsPlayerFree && this.Config.Controls.ToggleOverlay.Contains(e.Button)) + { + if (this.CurrentOverlay != null) + this.DisableOverlay(); + else + this.EnableOverlay(); + } + } + catch (Exception ex) + { + this.HandleError(ex, "handling key input"); + } + } + + /**** + ** Methods + ****/ + /// Get the active machine groups in every location. + private IEnumerable GetActiveMachineGroups() + { + foreach (KeyValuePair group in this.ActiveMachineGroups) + { + foreach (MachineGroup machineGroup in group.Value) + yield return machineGroup; + } + } + + /// Reload the machines in a given location. + /// The location whose machines to reload. + private void ReloadMachinesIn(GameLocation location) + { + this.Monitor.VerboseLog($"Reloading machines in {location.Name}..."); + + // get machine groups + MachineGroup[] machineGroups = this.Factory.GetMachineGroups(location).ToArray(); + this.ActiveMachineGroups[location] = machineGroups.Where(p => p.HasInternalAutomation).ToArray(); + this.DisabledMachineGroups[location] = machineGroups.Where(p => !p.HasInternalAutomation).ToArray(); + + // remove unneeded entries + if (!this.ActiveMachineGroups[location].Any()) + this.ActiveMachineGroups.Remove(location); + if (!this.DisabledMachineGroups[location].Any()) + this.DisabledMachineGroups.Remove(location); + } + + /// Log an error and warn the user. + /// The exception to handle. + /// The verb describing where the error occurred (e.g. "looking that up"). + private void HandleError(Exception ex, string verb) + { + this.Monitor.Log($"Something went wrong {verb}:\n{ex}", LogLevel.Error); + CommonHelper.ShowErrorMessage($"Huh. Something went wrong {verb}. The error log has the technical details."); + } + + /// Disable the overlay, if shown. + private void DisableOverlay() + { + this.CurrentOverlay?.Dispose(); + this.CurrentOverlay = null; + } + + /// Enable the overlay. + private void EnableOverlay() + { + if (this.CurrentOverlay == null) + this.CurrentOverlay = new OverlayMenu(this.Helper.Events, this.Helper.Input, this.Factory.GetMachineGroups(Game1.currentLocation)); + } + + /// Reset the overlay if it's being shown. + private void ResetOverlayIfShown() + { + if (this.CurrentOverlay != null) + { + this.DisableOverlay(); + this.EnableOverlay(); + } + } + } +} diff --git a/Mods/Automate/Automate/TrackedItem.cs b/Mods/Automate/Automate/TrackedItem.cs new file mode 100644 index 000000000..b0da39bc8 --- /dev/null +++ b/Mods/Automate/Automate/TrackedItem.cs @@ -0,0 +1,102 @@ +using System; +using StardewValley; + +namespace Pathoschild.Stardew.Automate +{ + /// An item stack which notifies callbacks when it's reduced. + public class TrackedItem : ITrackedStack + { + /********* + ** Fields + *********/ + /// The item stack. + private readonly Item Item; + + /// The callback invoked when the stack size is reduced (including reduced to zero). + protected readonly Action OnReduced; + + /// The callback invoked when the stack is empty. + protected readonly Action OnEmpty; + + /// The last stack size handlers were notified of. + private int LastStackSize; + + + /********* + ** Accessors + *********/ + /// A sample item for comparison. + /// This should be equivalent to the underlying item (except in stack size), but *not* a reference to it. + public Item Sample { get; } + + /// The number of items in the stack. + public int Count => this.Item.Stack; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The item stack. + /// The callback invoked when the stack size is reduced (including reduced to zero). + /// The callback invoked when the stack is empty. + public TrackedItem(Item item, Action onReduced = null, Action onEmpty = null) + { + this.Item = item ?? throw new InvalidOperationException("Can't track a null item stack."); + this.Sample = this.GetNewStack(item); + this.LastStackSize = item.Stack; + this.OnReduced = onReduced; + this.OnEmpty = onEmpty; + } + + /// Remove the specified number of this item from the stack. + /// The number to consume. + public void Reduce(int count) + { + this.Item.Stack -= Math.Max(0, count); + this.Delegate(); + } + + /// Remove the specified number of this item from the stack and return a new stack matching the count. + /// The number to get. + public Item Take(int count) + { + if (count <= 0) + return null; + + this.Reduce(count); + return this.GetNewStack(this.Item, count); + } + + + /********* + ** Private methods + *********/ + /// Notify handlers. + private void Delegate() + { + // skip if not reduced + if (this.Item.Stack >= this.LastStackSize) + return; + this.LastStackSize = this.Item.Stack; + + // notify handlers + this.OnReduced?.Invoke(this.Item); + if (this.Item.Stack <= 0) + this.OnEmpty?.Invoke(this.Item); + } + + /// Create a new stack of the given item. + /// The item stack to clone. + /// The new stack size. + private Item GetNewStack(Item original, int stackSize = 1) + { + if (original == null) + return null; + + Item stack = original.getOne(); + stack.Stack = stackSize; + return stack; + } + } +} diff --git a/Mods/Automate/Automate/TrackedItemCollection.cs b/Mods/Automate/Automate/TrackedItemCollection.cs new file mode 100644 index 000000000..969366c24 --- /dev/null +++ b/Mods/Automate/Automate/TrackedItemCollection.cs @@ -0,0 +1,84 @@ +using System.Collections.Generic; +using System.Linq; +using StardewValley; + +namespace Pathoschild.Stardew.Automate +{ + /// An item stack which wraps an underlying collection of stacks. + public class TrackedItemCollection : ITrackedStack + { + /********* + ** Fields + *********/ + /// The underlying item stacks. + private readonly ITrackedStack[] Stacks; + + + /********* + ** Accessors + *********/ + /// A sample item for comparison. + /// This should be equivalent to the underlying item (except in stack size), but *not* a reference to it. + public Item Sample { get; } + + /// The number of items in the stack. + public int Count => this.Stacks.Sum(p => p.Count); + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The underlying item stacks. + public TrackedItemCollection(IEnumerable stacks) + { + this.Stacks = stacks.ToArray(); + this.Sample = this.Stacks.FirstOrDefault()?.Sample; + } + + /// Remove the specified number of this item from the stack. + /// The number to consume. + public void Reduce(int count) + { + if (count <= 0 || !this.Stacks.Any()) + return; + + // reduce + int left = count; + foreach (ITrackedStack stack in this.Stacks) + { + // skip, stack empty + if (stack.Count <= 0) + continue; + + // take entire stack + if (stack.Count < left) + { + left -= stack.Count; + stack.Reduce(stack.Count); + continue; + } + + // take remaining items + stack.Reduce(left); + break; + } + } + + /// Remove the specified number of this item from the stack and return a new stack matching the count. + /// The number to get. + public Item Take(int count) + { + if (count <= 0 || !this.Stacks.Any()) + return null; + + // reduce + this.Reduce(count); + + // create new stack + Item item = this.Sample.getOne(); + item.Stack = count; + return item; + } + } +} diff --git a/Mods/Automate/Automate/screenshots/chests-anywhere-config.png b/Mods/Automate/Automate/screenshots/chests-anywhere-config.png new file mode 100644 index 0000000000000000000000000000000000000000..1777e755a9fad2289a2b272eeb8c625776a4258c GIT binary patch literal 29371 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 Sq&?_{jG4))BU#4huKpJaIwqU| literal 0 HcmV?d00001 diff --git a/Mods/Automate/Automate/screenshots/connectors.png b/Mods/Automate/Automate/screenshots/connectors.png new file mode 100644 index 0000000000000000000000000000000000000000..846ea60cc87af2fc67198b3ef8b688d08eb7d286 GIT binary patch literal 16106 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 NX)At{w+un~zW})oX+r=2 literal 0 HcmV?d00001 diff --git a/Mods/Automate/Automate/screenshots/crab-pot-factory.png b/Mods/Automate/Automate/screenshots/crab-pot-factory.png new file mode 100644 index 0000000000000000000000000000000000000000..97af06c44fad73765e921e97285f6b46da9feaaa GIT binary patch literal 8351 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 Vp$4(w{|Am3+%&#Xq3s;;{{VU}*i--j literal 0 HcmV?d00001 diff --git a/Mods/Automate/Automate/screenshots/example-overlay.png b/Mods/Automate/Automate/screenshots/example-overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..5768cb4e7c35efbeb0405d8a0b89a4228b01210e GIT binary patch literal 40618 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 literal 0 HcmV?d00001 diff --git a/Mods/Automate/Automate/screenshots/extensibility-machine-groups.png b/Mods/Automate/Automate/screenshots/extensibility-machine-groups.png new file mode 100644 index 0000000000000000000000000000000000000000..63e8ac2b1ede0792046cfb98aeb7b904ea26c125 GIT binary patch literal 5737 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 literal 0 HcmV?d00001 diff --git a/Mods/Automate/Automate/screenshots/iridium-bar-factory.png b/Mods/Automate/Automate/screenshots/iridium-bar-factory.png new file mode 100644 index 0000000000000000000000000000000000000000..eb05b434a8bfd88848aecc088f6a34bc52a0cb97 GIT binary patch literal 5295 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 literal 0 HcmV?d00001 diff --git a/Mods/Automate/Automate/screenshots/iridium-mead-factory.png b/Mods/Automate/Automate/screenshots/iridium-mead-factory.png new file mode 100644 index 0000000000000000000000000000000000000000..44d3bd528d6af28cca760cad0020c9941e6e4005 GIT binary patch literal 7990 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 SwF%sQaTw|u>y}-xkN!U#$O_E> literal 0 HcmV?d00001 diff --git a/Mods/Automate/Common/CommonHelper.cs b/Mods/Automate/Common/CommonHelper.cs new file mode 100644 index 000000000..720736e4d --- /dev/null +++ b/Mods/Automate/Common/CommonHelper.cs @@ -0,0 +1,345 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; +using Pathoschild.Stardew.Common.UI; +using StardewModdingAPI; +using StardewValley; +using StardewValley.Locations; +using StardewValley.Menus; + +namespace Pathoschild.Stardew.Common +{ + /// Provides common utility methods for interacting with the game code shared by my various mods. + internal static class CommonHelper + { + /********* + ** Fields + *********/ + /// A blank pixel which can be colorised and stretched to draw geometric shapes. + private static readonly Lazy LazyPixel = new Lazy(() => + { + Texture2D pixel = new Texture2D(Game1.graphics.GraphicsDevice, 1, 1); + pixel.SetData(new[] { Color.White }); + return pixel; + }); + + + /********* + ** Accessors + *********/ + /// A blank pixel which can be colorised and stretched to draw geometric shapes. + public static Texture2D Pixel => CommonHelper.LazyPixel.Value; + + /// The width of the horizontal and vertical scroll edges (between the origin position and start of content padding). + public static readonly Vector2 ScrollEdgeSize = new Vector2(CommonSprites.Scroll.TopLeft.Width * Game1.pixelZoom, CommonSprites.Scroll.TopLeft.Height * Game1.pixelZoom); + + + /********* + ** Public methods + *********/ + /**** + ** Game + ****/ + /// Get all game locations. + public static IEnumerable GetLocations() + { + return Game1.locations + .Concat( + from location in Game1.locations.OfType() + from building in location.buildings + where building.indoors.Value != null + select building.indoors.Value + ); + } + + /**** + ** Fonts + ****/ + /// Get the dimensions of a space character. + /// The font to measure. + public static float GetSpaceWidth(SpriteFont font) + { + return font.MeasureString("A B").X - font.MeasureString("AB").X; + } + + /**** + ** UI + ****/ + /// Draw a pretty hover box for the given text. + /// The sprite batch being drawn. + /// The text to display. + /// The position at which to draw the text. + /// The maximum width to display. + public static Vector2 DrawHoverBox(SpriteBatch spriteBatch, string label, in Vector2 position, float wrapWidth) + { + const int paddingSize = 27; + const int gutterSize = 20; + + Vector2 labelSize = spriteBatch.DrawTextBlock(Game1.smallFont, label, position + new Vector2(gutterSize), wrapWidth); // draw text to get wrapped text dimensions + IClickableMenu.drawTextureBox(spriteBatch, Game1.menuTexture, new Rectangle(0, 256, 60, 60), (int)position.X, (int)position.Y, (int)labelSize.X + paddingSize + gutterSize, (int)labelSize.Y + paddingSize, Color.White); + spriteBatch.DrawTextBlock(Game1.smallFont, label, position + new Vector2(gutterSize), wrapWidth); // draw again over texture box + + return labelSize + new Vector2(paddingSize); + } + + /// Draw a button background. + /// The sprite batch to which to draw. + /// The top-left pixel coordinate at which to draw the button. + /// The button content's pixel size. + /// The pixel position at which the content begins. + /// The button's outer bounds. + /// The padding between the content and border. + public static void DrawButton(SpriteBatch spriteBatch, in Vector2 position, in Vector2 contentSize, out Vector2 contentPos, out Rectangle bounds, int padding = 0) + { + CommonHelper.DrawContentBox( + spriteBatch: spriteBatch, + texture: CommonSprites.Button.Sheet, + background: CommonSprites.Button.Background, + top: CommonSprites.Button.Top, + right: CommonSprites.Button.Right, + bottom: CommonSprites.Button.Bottom, + left: CommonSprites.Button.Left, + topLeft: CommonSprites.Button.TopLeft, + topRight: CommonSprites.Button.TopRight, + bottomRight: CommonSprites.Button.BottomRight, + bottomLeft: CommonSprites.Button.BottomLeft, + position: position, + contentSize: contentSize, + contentPos: out contentPos, + bounds: out bounds, + padding: padding + ); + } + + /// Draw a scroll background. + /// The sprite batch to which to draw. + /// The top-left pixel coordinate at which to draw the scroll. + /// The scroll content's pixel size. + /// The pixel position at which the content begins. + /// The scroll's outer bounds. + /// The padding between the content and border. + public static void DrawScroll(SpriteBatch spriteBatch, in Vector2 position, in Vector2 contentSize, out Vector2 contentPos, out Rectangle bounds, int padding = 5) + { + CommonHelper.DrawContentBox( + spriteBatch: spriteBatch, + texture: CommonSprites.Scroll.Sheet, + background: in CommonSprites.Scroll.Background, + top: CommonSprites.Scroll.Top, + right: CommonSprites.Scroll.Right, + bottom: CommonSprites.Scroll.Bottom, + left: CommonSprites.Scroll.Left, + topLeft: CommonSprites.Scroll.TopLeft, + topRight: CommonSprites.Scroll.TopRight, + bottomRight: CommonSprites.Scroll.BottomRight, + bottomLeft: CommonSprites.Scroll.BottomLeft, + position: position, + contentSize: contentSize, + contentPos: out contentPos, + bounds: out bounds, + padding: padding + ); + } + + /// Draw a generic content box like a scroll or button. + /// The sprite batch to which to draw. + /// The texture to draw. + /// The source rectangle for the background. + /// The source rectangle for the top border. + /// The source rectangle for the right border. + /// The source rectangle for the bottom border. + /// The source rectangle for the left border. + /// The source rectangle for the top-left corner. + /// The source rectangle for the top-right corner. + /// The source rectangle for the bottom-right corner. + /// The source rectangle for the bottom-left corner. + /// The top-left pixel coordinate at which to draw the button. + /// The button content's pixel size. + /// The pixel position at which the content begins. + /// The box's outer bounds. + /// The padding between the content and border. + public static void DrawContentBox(SpriteBatch spriteBatch, Texture2D texture, in Rectangle background, in Rectangle top, in Rectangle right, in Rectangle bottom, in Rectangle left, in Rectangle topLeft, in Rectangle topRight, in Rectangle bottomRight, in Rectangle bottomLeft, in Vector2 position, in Vector2 contentSize, out Vector2 contentPos, out Rectangle bounds, int padding) + { + int cornerWidth = topLeft.Width * Game1.pixelZoom; + int cornerHeight = topLeft.Height * Game1.pixelZoom; + int innerWidth = (int)(contentSize.X + padding * 2); + int innerHeight = (int)(contentSize.Y + padding * 2); + int outerWidth = innerWidth + cornerWidth * 2; + int outerHeight = innerHeight + cornerHeight * 2; + int x = (int)position.X; + int y = (int)position.Y; + + // draw scroll background + spriteBatch.Draw(texture, new Rectangle(x + cornerWidth, y + cornerHeight, innerWidth, innerHeight), background, Color.White); + + // draw borders + spriteBatch.Draw(texture, new Rectangle(x + cornerWidth, y, innerWidth, cornerHeight), top, Color.White); + spriteBatch.Draw(texture, new Rectangle(x + cornerWidth, y + cornerHeight + innerHeight, innerWidth, cornerHeight), bottom, Color.White); + spriteBatch.Draw(texture, new Rectangle(x, y + cornerHeight, cornerWidth, innerHeight), left, Color.White); + spriteBatch.Draw(texture, new Rectangle(x + cornerWidth + innerWidth, y + cornerHeight, cornerWidth, innerHeight), right, Color.White); + + // draw corners + spriteBatch.Draw(texture, new Rectangle(x, y, cornerWidth, cornerHeight), topLeft, Color.White); + spriteBatch.Draw(texture, new Rectangle(x, y + cornerHeight + innerHeight, cornerWidth, cornerHeight), bottomLeft, Color.White); + spriteBatch.Draw(texture, new Rectangle(x + cornerWidth + innerWidth, y, cornerWidth, cornerHeight), topRight, Color.White); + spriteBatch.Draw(texture, new Rectangle(x + cornerWidth + innerWidth, y + cornerHeight + innerHeight, cornerWidth, cornerHeight), bottomRight, Color.White); + + // set out params + contentPos = new Vector2(x + cornerWidth + padding, y + cornerHeight + padding); + bounds = new Rectangle(x, y, outerWidth, outerHeight); + } + + /// Show an informational message to the player. + /// The message to show. + /// The number of milliseconds during which to keep the message on the screen before it fades (or null for the default time). + public static void ShowInfoMessage(string message, int? duration = null) + { + Game1.addHUDMessage(new HUDMessage(message, 3) { noIcon = true, timeLeft = duration ?? HUDMessage.defaultTime }); + } + + /// Show an error message to the player. + /// The message to show. + public static void ShowErrorMessage(string message) + { + Game1.addHUDMessage(new HUDMessage(message, 3)); + } + + /**** + ** Drawing + ****/ + /// Draw a sprite to the screen. + /// The sprite batch. + /// The X-position at which to start the line. + /// The X-position at which to start the line. + /// The line dimensions. + /// The color to tint the sprite. + public static void DrawLine(this SpriteBatch batch, float x, float y, in Vector2 size, in Color? color = null) + { + batch.Draw(CommonHelper.Pixel, new Rectangle((int)x, (int)y, (int)size.X, (int)size.Y), color ?? Color.White); + } + + /// Draw a block of text to the screen with the specified wrap width. + /// The sprite batch. + /// The sprite font. + /// The block of text to write. + /// The position at which to draw the text. + /// The width at which to wrap the text. + /// The text color. + /// Whether to draw bold text. + /// The font scale. + /// Returns the text dimensions. + public static Vector2 DrawTextBlock(this SpriteBatch batch, SpriteFont font, string text, in Vector2 position, float wrapWidth, in Color? color = null, bool bold = false, float scale = 1) + { + if (text == null) + return new Vector2(0, 0); + + // get word list + List words = new List(); + foreach (string word in text.Split(new[] { ' ' }, StringSplitOptions.RemoveEmptyEntries)) + { + // split on newlines + string wordPart = word; + int newlineIndex; + while ((newlineIndex = wordPart.IndexOf(Environment.NewLine, StringComparison.InvariantCulture)) >= 0) + { + if (newlineIndex == 0) + { + words.Add(Environment.NewLine); + wordPart = wordPart.Substring(Environment.NewLine.Length); + } + else if (newlineIndex > 0) + { + words.Add(wordPart.Substring(0, newlineIndex)); + words.Add(Environment.NewLine); + wordPart = wordPart.Substring(newlineIndex + Environment.NewLine.Length); + } + } + + // add remaining word (after newline split) + if (wordPart.Length > 0) + words.Add(wordPart); + } + + // track draw values + float xOffset = 0; + float yOffset = 0; + float lineHeight = font.MeasureString("ABC").Y * scale; + float spaceWidth = CommonHelper.GetSpaceWidth(font) * scale; + float blockWidth = 0; + float blockHeight = lineHeight; + foreach (string word in words) + { + // check wrap width + float wordWidth = font.MeasureString(word).X * scale; + if (word == Environment.NewLine || ((wordWidth + xOffset) > wrapWidth && (int)xOffset != 0)) + { + xOffset = 0; + yOffset += lineHeight; + blockHeight += lineHeight; + } + if (word == Environment.NewLine) + continue; + + // draw text + Vector2 wordPosition = new Vector2(position.X + xOffset, position.Y + yOffset); + if (bold) + Utility.drawBoldText(batch, word, font, wordPosition, color ?? Color.Black, scale); + else + batch.DrawString(font, word, wordPosition, color ?? Color.Black, 0, Vector2.Zero, scale, SpriteEffects.None, 1); + + // update draw values + if (xOffset + wordWidth > blockWidth) + blockWidth = xOffset + wordWidth; + xOffset += wordWidth + spaceWidth; + } + + // return text position & dimensions + return new Vector2(blockWidth, blockHeight); + } + + /**** + ** Error handling + ****/ + /// Intercept errors thrown by the action. + /// Encapsulates monitoring and logging. + /// The verb describing where the error occurred (e.g. "looking that up"). This is displayed on the screen, so it should be simple and avoid characters that might not be available in the sprite font. + /// The action to invoke. + /// A callback invoked if an error is intercepted. + public static void InterceptErrors(this IMonitor monitor, string verb, Action action, Action onError = null) + { + monitor.InterceptErrors(verb, null, action, onError); + } + + /// Intercept errors thrown by the action. + /// Encapsulates monitoring and logging. + /// The verb describing where the error occurred (e.g. "looking that up"). This is displayed on the screen, so it should be simple and avoid characters that might not be available in the sprite font. + /// A more detailed form of if applicable. This is displayed in the log, so it can be more technical and isn't constrained by the sprite font. + /// The action to invoke. + /// A callback invoked if an error is intercepted. + public static void InterceptErrors(this IMonitor monitor, string verb, string detailedVerb, Action action, Action onError = null) + { + try + { + action(); + } + catch (Exception ex) + { + monitor.InterceptError(ex, verb, detailedVerb); + onError?.Invoke(ex); + } + } + + /// Log an error and warn the user. + /// Encapsulates monitoring and logging. + /// The exception to handle. + /// The verb describing where the error occurred (e.g. "looking that up"). This is displayed on the screen, so it should be simple and avoid characters that might not be available in the sprite font. + /// A more detailed form of if applicable. This is displayed in the log, so it can be more technical and isn't constrained by the sprite font. + public static void InterceptError(this IMonitor monitor, Exception ex, string verb, string detailedVerb = null) + { + detailedVerb = detailedVerb ?? verb; + monitor.Log($"Something went wrong {detailedVerb}:\n{ex}", LogLevel.Error); + CommonHelper.ShowErrorMessage($"Huh. Something went wrong {verb}. The error log has the technical details."); + } + } +} diff --git a/Mods/Automate/Common/DataParsers/CropDataParser.cs b/Mods/Automate/Common/DataParsers/CropDataParser.cs new file mode 100644 index 000000000..a84f42267 --- /dev/null +++ b/Mods/Automate/Common/DataParsers/CropDataParser.cs @@ -0,0 +1,93 @@ +using System; +using System.Linq; +using StardewModdingAPI.Utilities; +using StardewValley; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Common.DataParsers +{ + /// Analyses crop data for a tile. + internal class CropDataParser + { + /********* + ** Accessors + *********/ + /// The crop. + public Crop Crop { get; } + + /// The seasons in which the crop grows. + public string[] Seasons { get; } + + /// The phase index in when the crop can be harvested. + public int HarvestablePhase { get; } + + /// The number of days needed between planting and first harvest. + public int DaysToFirstHarvest { get; } + + /// The number of days needed between harvests, after the first harvest. + public int DaysToSubsequentHarvest { get; } + + /// Whether the crop can be harvested multiple times. + public bool HasMultipleHarvests { get; } + + /// Whether the crop is ready to harvest now. + public bool CanHarvestNow { get; } + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The crop. + public CropDataParser(Crop crop) + { + this.Crop = crop; + if (crop != null) + { + this.Seasons = crop.seasonsToGrowIn.ToArray(); + this.HasMultipleHarvests = crop.regrowAfterHarvest.Value == -1; + this.HarvestablePhase = crop.phaseDays.Count - 1; + this.CanHarvestNow = (crop.currentPhase.Value >= this.HarvestablePhase) && (!crop.fullyGrown.Value || crop.dayOfCurrentPhase.Value <= 0); + this.DaysToFirstHarvest = crop.phaseDays.Take(crop.phaseDays.Count - 1).Sum(); // ignore harvestable phase + this.DaysToSubsequentHarvest = crop.regrowAfterHarvest.Value; + } + } + + /// Get the date when the crop will next be ready to harvest. + public SDate GetNextHarvest() + { + // get crop + Crop crop = this.Crop; + if (crop == null) + throw new InvalidOperationException("Can't get the harvest date because there's no crop."); + + // ready now + if (this.CanHarvestNow) + return SDate.Now(); + + // growing: days until next harvest + if (!crop.fullyGrown.Value) + { + int daysUntilLastPhase = this.DaysToFirstHarvest - this.Crop.dayOfCurrentPhase.Value - crop.phaseDays.Take(crop.currentPhase.Value).Sum(); + return SDate.Now().AddDays(daysUntilLastPhase); + } + + // regrowable crop harvested today + if (crop.dayOfCurrentPhase.Value >= crop.regrowAfterHarvest.Value) + return SDate.Now().AddDays(crop.regrowAfterHarvest.Value); + + // regrowable crop + // dayOfCurrentPhase decreases to 0 when fully grown, where <=0 is harvestable + return SDate.Now().AddDays(crop.dayOfCurrentPhase.Value); + } + + /// Get a sample item acquired by harvesting the crop. + public Item GetSampleDrop() + { + if (this.Crop == null) + throw new InvalidOperationException("Can't get a sample drop because there's no crop."); + + return new SObject(this.Crop.indexOfHarvest.Value, 1); + } + } +} diff --git a/Mods/Automate/Common/Integrations/Automate/AutomateIntegration.cs b/Mods/Automate/Common/Integrations/Automate/AutomateIntegration.cs new file mode 100644 index 000000000..9ee33a2d9 --- /dev/null +++ b/Mods/Automate/Common/Integrations/Automate/AutomateIntegration.cs @@ -0,0 +1,44 @@ +using System.Collections.Generic; +using Microsoft.Xna.Framework; +using StardewModdingAPI; +using StardewValley; + +namespace Pathoschild.Stardew.Common.Integrations.Automate +{ + /// Handles the logic for integrating with the Automate mod. + internal class AutomateIntegration : BaseIntegration + { + /********* + ** Fields + *********/ + /// The mod's public API. + private readonly IAutomateApi ModApi; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// An API for fetching metadata about loaded mods. + /// Encapsulates monitoring and logging. + public AutomateIntegration(IModRegistry modRegistry, IMonitor monitor) + : base("Automate", "Pathoschild.Automate", "1.11.0", modRegistry, monitor) + { + if (!this.IsLoaded) + return; + + // get mod API + this.ModApi = this.GetValidatedApi(); + this.IsLoaded = this.ModApi != null; + } + + /// Get the status of machines in a tile area. This is a specialised API for Data Layers and similar mods. + /// The location for which to display data. + /// The tile area for which to display data. + public IDictionary GetMachineStates(GameLocation location, Rectangle tileArea) + { + this.AssertLoaded(); + return this.ModApi.GetMachineStates(location, tileArea); + } + } +} diff --git a/Mods/Automate/Common/Integrations/Automate/IAutomateApi.cs b/Mods/Automate/Common/Integrations/Automate/IAutomateApi.cs new file mode 100644 index 000000000..158013257 --- /dev/null +++ b/Mods/Automate/Common/Integrations/Automate/IAutomateApi.cs @@ -0,0 +1,15 @@ +using System.Collections.Generic; +using Microsoft.Xna.Framework; +using StardewValley; + +namespace Pathoschild.Stardew.Common.Integrations.Automate +{ + /// The API provided by the Automate mod. + public interface IAutomateApi + { + /// Get the status of machines in a tile area. This is a specialised API for Data Layers and similar mods. + /// The location for which to display data. + /// The tile area for which to display data. + IDictionary GetMachineStates(GameLocation location, Rectangle tileArea); + } +} diff --git a/Mods/Automate/Common/Integrations/BaseIntegration.cs b/Mods/Automate/Common/Integrations/BaseIntegration.cs new file mode 100644 index 000000000..13898dbc6 --- /dev/null +++ b/Mods/Automate/Common/Integrations/BaseIntegration.cs @@ -0,0 +1,82 @@ +using System; +using StardewModdingAPI; + +namespace Pathoschild.Stardew.Common.Integrations +{ + /// The base implementation for a mod integration. + internal abstract class BaseIntegration : IModIntegration + { + /********* + ** Fields + *********/ + /// The mod's unique ID. + protected string ModID { get; } + + /// An API for fetching metadata about loaded mods. + protected IModRegistry ModRegistry { get; } + + /// Encapsulates monitoring and logging. + protected IMonitor Monitor { get; } + + + /********* + ** Accessors + *********/ + /// A human-readable name for the mod. + public string Label { get; } + + /// Whether the mod is available. + public bool IsLoaded { get; protected set; } + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// A human-readable name for the mod. + /// The mod's unique ID. + /// The minimum version of the mod that's supported. + /// An API for fetching metadata about loaded mods. + /// Encapsulates monitoring and logging. + protected BaseIntegration(string label, string modID, string minVersion, IModRegistry modRegistry, IMonitor monitor) + { + // init + this.Label = label; + this.ModID = modID; + this.ModRegistry = modRegistry; + this.Monitor = monitor; + + // validate mod + IManifest manifest = modRegistry.Get(this.ModID)?.Manifest; + if (manifest == null) + return; + if (manifest.Version.IsOlderThan(minVersion)) + { + monitor.Log($"Detected {label} {manifest.Version}, but need {minVersion} or later. Disabled integration with this mod.", LogLevel.Warn); + return; + } + this.IsLoaded = true; + } + + /// Get an API for the mod, and show a message if it can't be loaded. + /// The API type. + protected TInterface GetValidatedApi() where TInterface : class + { + TInterface api = this.ModRegistry.GetApi(this.ModID); + if (api == null) + { + this.Monitor.Log($"Detected {this.Label}, but couldn't fetch its API. Disabled integration with this mod.", LogLevel.Warn); + return null; + } + return api; + } + + /// Assert that the integration is loaded. + /// The integration isn't loaded. + protected void AssertLoaded() + { + if (!this.IsLoaded) + throw new InvalidOperationException($"The {this.Label} integration isn't loaded."); + } + } +} diff --git a/Mods/Automate/Common/Integrations/BetterJunimos/BetterJunimosIntegration.cs b/Mods/Automate/Common/Integrations/BetterJunimos/BetterJunimosIntegration.cs new file mode 100644 index 000000000..6c649fcac --- /dev/null +++ b/Mods/Automate/Common/Integrations/BetterJunimos/BetterJunimosIntegration.cs @@ -0,0 +1,40 @@ +using StardewModdingAPI; + +namespace Pathoschild.Stardew.Common.Integrations.BetterJunimos +{ + /// Handles the logic for integrating with the Better Junimos mod. + internal class BetterJunimosIntegration : BaseIntegration + { + /********* + ** Fields + *********/ + /// The mod's public API. + private readonly IBetterJunimosApi ModApi; + + + /********* + ** Accessors + *********/ + /// The Junimo Hut coverage radius. + public int MaxRadius { get; } + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// An API for fetching metadata about loaded mods. + /// Encapsulates monitoring and logging. + public BetterJunimosIntegration(IModRegistry modRegistry, IMonitor monitor) + : base("Better Junimos", "hawkfalcon.BetterJunimos", "0.5.0", modRegistry, monitor) + { + if (!this.IsLoaded) + return; + + // get mod API + this.ModApi = this.GetValidatedApi(); + this.IsLoaded = this.ModApi != null; + this.MaxRadius = this.ModApi?.GetJunimoHutMaxRadius() ?? 0; + } + } +} diff --git a/Mods/Automate/Common/Integrations/BetterJunimos/IBetterJunimosApi.cs b/Mods/Automate/Common/Integrations/BetterJunimos/IBetterJunimosApi.cs new file mode 100644 index 000000000..6081e89b5 --- /dev/null +++ b/Mods/Automate/Common/Integrations/BetterJunimos/IBetterJunimosApi.cs @@ -0,0 +1,9 @@ +namespace Pathoschild.Stardew.Common.Integrations.BetterJunimos +{ + /// The API provided by the Better Junimos mod. + public interface IBetterJunimosApi + { + /// Get the maximum radius for Junimo Huts. + int GetJunimoHutMaxRadius(); + } +} diff --git a/Mods/Automate/Common/Integrations/BetterSprinklers/BetterSprinklersIntegration.cs b/Mods/Automate/Common/Integrations/BetterSprinklers/BetterSprinklersIntegration.cs new file mode 100644 index 000000000..f7f48248b --- /dev/null +++ b/Mods/Automate/Common/Integrations/BetterSprinklers/BetterSprinklersIntegration.cs @@ -0,0 +1,49 @@ +using System.Collections.Generic; +using Microsoft.Xna.Framework; +using StardewModdingAPI; + +namespace Pathoschild.Stardew.Common.Integrations.BetterSprinklers +{ + /// Handles the logic for integrating with the Better Sprinklers mod. + internal class BetterSprinklersIntegration : BaseIntegration + { + /********* + ** Fields + *********/ + /// The mod's public API. + private readonly IBetterSprinklersApi ModApi; + + + /********* + ** Accessors + *********/ + /// The maximum possible sprinkler radius. + public int MaxRadius { get; } + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// An API for fetching metadata about loaded mods. + /// Encapsulates monitoring and logging. + public BetterSprinklersIntegration(IModRegistry modRegistry, IMonitor monitor) + : base("Better Sprinklers", "Speeder.BetterSprinklers", "2.3.1-unofficial.6-pathoschild", modRegistry, monitor) + { + if (!this.IsLoaded) + return; + + // get mod API + this.ModApi = this.GetValidatedApi(); + this.IsLoaded = this.ModApi != null; + this.MaxRadius = this.ModApi?.GetMaxGridSize() ?? 0; + } + + /// Get the configured Sprinkler tiles relative to (0, 0). + public IDictionary GetSprinklerTiles() + { + this.AssertLoaded(); + return this.ModApi.GetSprinklerCoverage(); + } + } +} diff --git a/Mods/Automate/Common/Integrations/BetterSprinklers/IBetterSprinklersApi.cs b/Mods/Automate/Common/Integrations/BetterSprinklers/IBetterSprinklersApi.cs new file mode 100644 index 000000000..c213f02e8 --- /dev/null +++ b/Mods/Automate/Common/Integrations/BetterSprinklers/IBetterSprinklersApi.cs @@ -0,0 +1,15 @@ +using System.Collections.Generic; +using Microsoft.Xna.Framework; + +namespace Pathoschild.Stardew.Common.Integrations.BetterSprinklers +{ + /// The API provided by the Better Sprinklers mod. + public interface IBetterSprinklersApi + { + /// Get the maximum supported coverage width or height. + int GetMaxGridSize(); + + /// Get the relative tile coverage by supported sprinkler ID. + IDictionary GetSprinklerCoverage(); + } +} diff --git a/Mods/Automate/Common/Integrations/Cobalt/CobaltIntegration.cs b/Mods/Automate/Common/Integrations/Cobalt/CobaltIntegration.cs new file mode 100644 index 000000000..4cb7c36d4 --- /dev/null +++ b/Mods/Automate/Common/Integrations/Cobalt/CobaltIntegration.cs @@ -0,0 +1,48 @@ +using System.Collections.Generic; +using Microsoft.Xna.Framework; +using StardewModdingAPI; + +namespace Pathoschild.Stardew.Common.Integrations.Cobalt +{ + /// Handles the logic for integrating with the Cobalt mod. + internal class CobaltIntegration : BaseIntegration + { + /********* + ** Fields + *********/ + /// The mod's public API. + private readonly ICobaltApi ModApi; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// An API for fetching metadata about loaded mods. + /// Encapsulates monitoring and logging. + public CobaltIntegration(IModRegistry modRegistry, IMonitor monitor) + : base("Cobalt", "spacechase0.Cobalt", "1.1", modRegistry, monitor) + { + if (!this.IsLoaded) + return; + + // get mod API + this.ModApi = this.GetValidatedApi(); + this.IsLoaded = this.ModApi != null; + } + + /// Get the cobalt sprinkler's object ID. + public int GetSprinklerId() + { + this.AssertLoaded(); + return this.ModApi.GetSprinklerId(); + } + + /// Get the configured Sprinkler tiles relative to (0, 0). + public IEnumerable GetSprinklerTiles() + { + this.AssertLoaded(); + return this.ModApi.GetSprinklerCoverage(Vector2.Zero); + } + } +} diff --git a/Mods/Automate/Common/Integrations/Cobalt/ICobaltApi.cs b/Mods/Automate/Common/Integrations/Cobalt/ICobaltApi.cs new file mode 100644 index 000000000..4952043ff --- /dev/null +++ b/Mods/Automate/Common/Integrations/Cobalt/ICobaltApi.cs @@ -0,0 +1,19 @@ +using System.Collections.Generic; +using Microsoft.Xna.Framework; + +namespace Pathoschild.Stardew.Common.Integrations.Cobalt +{ + /// The API provided by the Cobalt mod. + public interface ICobaltApi + { + /********* + ** Public methods + *********/ + /// Get the cobalt sprinkler's object ID. + int GetSprinklerId(); + + /// Get the cobalt sprinkler coverage. + /// The tile position containing the sprinkler. + IEnumerable GetSprinklerCoverage(Vector2 origin); + } +} diff --git a/Mods/Automate/Common/Integrations/CustomFarmingRedux/CustomFarmingReduxIntegration.cs b/Mods/Automate/Common/Integrations/CustomFarmingRedux/CustomFarmingReduxIntegration.cs new file mode 100644 index 000000000..277c95c61 --- /dev/null +++ b/Mods/Automate/Common/Integrations/CustomFarmingRedux/CustomFarmingReduxIntegration.cs @@ -0,0 +1,49 @@ +using System; +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; +using StardewModdingAPI; +using StardewValley; +using SObject = StardewValley.Object; + +namespace Pathoschild.Stardew.Common.Integrations.CustomFarmingRedux +{ + /// Handles the logic for integrating with the Custom Farming Redux mod. + internal class CustomFarmingReduxIntegration : BaseIntegration + { + /********* + ** Fields + *********/ + /// The mod's public API. + private readonly ICustomFarmingApi ModApi; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// An API for fetching metadata about loaded mods. + /// Encapsulates monitoring and logging. + public CustomFarmingReduxIntegration(IModRegistry modRegistry, IMonitor monitor) + : base("Custom Farming Redux", "Platonymous.CustomFarming", "2.8.5", modRegistry, monitor) + { + if (!this.IsLoaded) + return; + + // get mod API + this.ModApi = this.GetValidatedApi(); + this.IsLoaded = this.ModApi != null; + } + + /// Get the sprite info for a custom object, or null if the object isn't custom. + /// The custom object. + public SpriteInfo GetSprite(SObject obj) + { + this.AssertLoaded(); + + Tuple data = this.ModApi.getRealItemAndTexture(obj); + return data != null + ? new SpriteInfo(data.Item2, data.Item3) + : null; + } + } +} diff --git a/Mods/Automate/Common/Integrations/CustomFarmingRedux/ICustomFarmingApi.cs b/Mods/Automate/Common/Integrations/CustomFarmingRedux/ICustomFarmingApi.cs new file mode 100644 index 000000000..14b80ffb8 --- /dev/null +++ b/Mods/Automate/Common/Integrations/CustomFarmingRedux/ICustomFarmingApi.cs @@ -0,0 +1,20 @@ +using System; +using System.Diagnostics.CodeAnalysis; +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; +using StardewValley; + +namespace Pathoschild.Stardew.Common.Integrations.CustomFarmingRedux +{ + /// The API provided by the Custom Farming Redux mod. + [SuppressMessage("ReSharper", "InconsistentNaming", Justification = "The naming convention is defined by the Custom Farming Redux mod.")] + public interface ICustomFarmingApi + { + /********* + ** Public methods + *********/ + /// Get metadata for a custom machine and draw metadata for an object. + /// The item that would be replaced by the custom item. + Tuple getRealItemAndTexture(StardewValley.Object dummy); + } +} diff --git a/Mods/Automate/Common/Integrations/FarmExpansion/FarmExpansionIntegration.cs b/Mods/Automate/Common/Integrations/FarmExpansion/FarmExpansionIntegration.cs new file mode 100644 index 000000000..a41135e59 --- /dev/null +++ b/Mods/Automate/Common/Integrations/FarmExpansion/FarmExpansionIntegration.cs @@ -0,0 +1,49 @@ +using StardewModdingAPI; +using StardewValley; + +namespace Pathoschild.Stardew.Common.Integrations.FarmExpansion +{ + /// Handles the logic for integrating with the Farm Expansion mod. + internal class FarmExpansionIntegration : BaseIntegration + { + /********* + ** Fields + *********/ + /// The mod's public API. + private readonly IFarmExpansionApi ModApi; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// An API for fetching metadata about loaded mods. + /// Encapsulates monitoring and logging. + public FarmExpansionIntegration(IModRegistry modRegistry, IMonitor monitor) + : base("Farm Expansion", "Advize.FarmExpansion", "3.3", modRegistry, monitor) + { + if (!this.IsLoaded) + return; + + // get mod API + this.ModApi = this.GetValidatedApi(); + this.IsLoaded = this.ModApi != null; + } + + /// Add a blueprint to all future carpenter menus for the farm area. + /// The blueprint to add. + public void AddFarmBluePrint(BluePrint blueprint) + { + this.AssertLoaded(); + this.ModApi.AddFarmBluePrint(blueprint); + } + + /// Add a blueprint to all future carpenter menus for the expansion area. + /// The blueprint to add. + public void AddExpansionBluePrint(BluePrint blueprint) + { + this.AssertLoaded(); + this.ModApi.AddExpansionBluePrint(blueprint); + } + } +} diff --git a/Mods/Automate/Common/Integrations/FarmExpansion/IFarmExpansionApi.cs b/Mods/Automate/Common/Integrations/FarmExpansion/IFarmExpansionApi.cs new file mode 100644 index 000000000..2c4d92a11 --- /dev/null +++ b/Mods/Automate/Common/Integrations/FarmExpansion/IFarmExpansionApi.cs @@ -0,0 +1,16 @@ +using StardewValley; + +namespace Pathoschild.Stardew.Common.Integrations.FarmExpansion +{ + /// The API provided by the Farm Expansion mod. + public interface IFarmExpansionApi + { + /// Add a blueprint to all future carpenter menus for the farm area. + /// The blueprint to add. + void AddFarmBluePrint(BluePrint blueprint); + + /// Add a blueprint to all future carpenter menus for the expansion area. + /// The blueprint to add. + void AddExpansionBluePrint(BluePrint blueprint); + } +} diff --git a/Mods/Automate/Common/Integrations/IModIntegration.cs b/Mods/Automate/Common/Integrations/IModIntegration.cs new file mode 100644 index 000000000..17327ed80 --- /dev/null +++ b/Mods/Automate/Common/Integrations/IModIntegration.cs @@ -0,0 +1,15 @@ +namespace Pathoschild.Stardew.Common.Integrations +{ + /// Handles integration with a given mod. + internal interface IModIntegration + { + /********* + ** Accessors + *********/ + /// A human-readable name for the mod. + string Label { get; } + + /// Whether the mod is available. + bool IsLoaded { get; } + } +} diff --git a/Mods/Automate/Common/Integrations/LineSprinklers/ILineSprinklersApi.cs b/Mods/Automate/Common/Integrations/LineSprinklers/ILineSprinklersApi.cs new file mode 100644 index 000000000..a945c8c33 --- /dev/null +++ b/Mods/Automate/Common/Integrations/LineSprinklers/ILineSprinklersApi.cs @@ -0,0 +1,15 @@ +using System.Collections.Generic; +using Microsoft.Xna.Framework; + +namespace Pathoschild.Stardew.Common.Integrations.LineSprinklers +{ + /// The API provided by the Line Sprinklers mod. + public interface ILineSprinklersApi + { + /// Get the maximum supported coverage width or height. + int GetMaxGridSize(); + + /// Get the relative tile coverage by supported sprinkler ID. + IDictionary GetSprinklerCoverage(); + } +} diff --git a/Mods/Automate/Common/Integrations/LineSprinklers/LineSprinklersIntegration.cs b/Mods/Automate/Common/Integrations/LineSprinklers/LineSprinklersIntegration.cs new file mode 100644 index 000000000..d5aa4fce5 --- /dev/null +++ b/Mods/Automate/Common/Integrations/LineSprinklers/LineSprinklersIntegration.cs @@ -0,0 +1,49 @@ +using System.Collections.Generic; +using Microsoft.Xna.Framework; +using StardewModdingAPI; + +namespace Pathoschild.Stardew.Common.Integrations.LineSprinklers +{ + /// Handles the logic for integrating with the Line Sprinklers mod. + internal class LineSprinklersIntegration : BaseIntegration + { + /********* + ** Fields + *********/ + /// The mod's public API. + private readonly ILineSprinklersApi ModApi; + + + /********* + ** Accessors + *********/ + /// The maximum possible sprinkler radius. + public int MaxRadius { get; } + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// An API for fetching metadata about loaded mods. + /// Encapsulates monitoring and logging. + public LineSprinklersIntegration(IModRegistry modRegistry, IMonitor monitor) + : base("Line Sprinklers", "hootless.LineSprinklers", "1.1.0", modRegistry, monitor) + { + if (!this.IsLoaded) + return; + + // get mod API + this.ModApi = this.GetValidatedApi(); + this.IsLoaded = this.ModApi != null; + this.MaxRadius = this.ModApi?.GetMaxGridSize() ?? 0; + } + + /// Get the configured Sprinkler tiles relative to (0, 0). + public IDictionary GetSprinklerTiles() + { + this.AssertLoaded(); + return this.ModApi.GetSprinklerCoverage(); + } + } +} diff --git a/Mods/Automate/Common/Integrations/PelicanFiber/PelicanFiberIntegration.cs b/Mods/Automate/Common/Integrations/PelicanFiber/PelicanFiberIntegration.cs new file mode 100644 index 000000000..f90cfb749 --- /dev/null +++ b/Mods/Automate/Common/Integrations/PelicanFiber/PelicanFiberIntegration.cs @@ -0,0 +1,49 @@ +using StardewModdingAPI; +using StardewValley; + +namespace Pathoschild.Stardew.Common.Integrations.PelicanFiber +{ + /// Handles the logic for integrating with the Pelican Fiber mod. + internal class PelicanFiberIntegration : BaseIntegration + { + /********* + ** Fields + *********/ + /// The full type name of the Pelican Fiber mod's build menu. + private readonly string MenuTypeName = "PelicanFiber.Framework.ConstructionMenu"; + + /// An API for accessing private code. + private readonly IReflectionHelper Reflection; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// An API for fetching metadata about loaded mods. + /// An API for accessing private code. + /// Encapsulates monitoring and logging. + public PelicanFiberIntegration(IModRegistry modRegistry, IReflectionHelper reflection, IMonitor monitor) + : base("Pelican Fiber", "jwdred.PelicanFiber", "3.0.2", modRegistry, monitor) + { + this.Reflection = reflection; + } + + /// Get whether the Pelican Fiber build menu is open. + public bool IsBuildMenuOpen() + { + this.AssertLoaded(); + return Game1.activeClickableMenu?.GetType().FullName == this.MenuTypeName; + } + + /// Get the selected blueprint from the Pelican Fiber build menu, if it's open. + public BluePrint GetBuildMenuBlueprint() + { + this.AssertLoaded(); + if (!this.IsBuildMenuOpen()) + return null; + + return this.Reflection.GetProperty(Game1.activeClickableMenu, "CurrentBlueprint").GetValue(); + } + } +} diff --git a/Mods/Automate/Common/Integrations/PrismaticTools/IPrismaticToolsApi.cs b/Mods/Automate/Common/Integrations/PrismaticTools/IPrismaticToolsApi.cs new file mode 100644 index 000000000..b2a61ed32 --- /dev/null +++ b/Mods/Automate/Common/Integrations/PrismaticTools/IPrismaticToolsApi.cs @@ -0,0 +1,19 @@ +using System.Collections.Generic; +using Microsoft.Xna.Framework; + +namespace Pathoschild.Stardew.Common.Integrations.PrismaticTools +{ + /// The API provided by the Prismatic Tools mod. + public interface IPrismaticToolsApi + { + /// Whether prismatic sprinklers also act as scarecrows. + bool ArePrismaticSprinklersScarecrows { get; } + + /// The prismatic sprinkler object ID. + int SprinklerIndex { get; } + + /// Get the relative tile coverage for a prismatic sprinkler. + /// The sprinkler tile. + IEnumerable GetSprinklerCoverage(Vector2 origin); + } +} diff --git a/Mods/Automate/Common/Integrations/PrismaticTools/PrismaticToolsIntegration.cs b/Mods/Automate/Common/Integrations/PrismaticTools/PrismaticToolsIntegration.cs new file mode 100644 index 000000000..b35e6f359 --- /dev/null +++ b/Mods/Automate/Common/Integrations/PrismaticTools/PrismaticToolsIntegration.cs @@ -0,0 +1,55 @@ +using System.Collections.Generic; +using Microsoft.Xna.Framework; +using StardewModdingAPI; + +namespace Pathoschild.Stardew.Common.Integrations.PrismaticTools +{ + /// Handles the logic for integrating with the Prismatic Tools mod. + internal class PrismaticToolsIntegration : BaseIntegration + { + /********* + ** Fields + *********/ + /// The mod's public API. + private readonly IPrismaticToolsApi ModApi; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// An API for fetching metadata about loaded mods. + /// Encapsulates monitoring and logging. + public PrismaticToolsIntegration(IModRegistry modRegistry, IMonitor monitor) + : base("Prismatic Tools", "stokastic.PrismaticTools", "1.3.0", modRegistry, monitor) + { + if (!this.IsLoaded) + return; + + // get mod API + this.ModApi = this.GetValidatedApi(); + this.IsLoaded = this.ModApi != null; + } + + /// Get whether prismatic sprinklers also act as scarecrows. + public bool ArePrismaticSprinklersScarecrows() + { + this.AssertLoaded(); + return this.ModApi.ArePrismaticSprinklersScarecrows; + } + + /// Get the prismatic sprinkler object ID. + public int GetSprinklerID() + { + this.AssertLoaded(); + return this.ModApi.SprinklerIndex; + } + + /// Get the relative tile coverage for a prismatic sprinkler. + public IEnumerable GetSprinklerCoverage() + { + this.AssertLoaded(); + return this.ModApi.GetSprinklerCoverage(Vector2.Zero); + } + } +} diff --git a/Mods/Automate/Common/Integrations/SimpleSprinkler/ISimplerSprinklerApi.cs b/Mods/Automate/Common/Integrations/SimpleSprinkler/ISimplerSprinklerApi.cs new file mode 100644 index 000000000..68d8e05a7 --- /dev/null +++ b/Mods/Automate/Common/Integrations/SimpleSprinkler/ISimplerSprinklerApi.cs @@ -0,0 +1,12 @@ +using System.Collections.Generic; +using Microsoft.Xna.Framework; + +namespace Pathoschild.Stardew.Common.Integrations.SimpleSprinkler +{ + /// The API provided by the Simple Sprinkler mod. + public interface ISimplerSprinklerApi + { + /// Get the relative tile coverage for supported sprinkler IDs (additive to the game's default coverage). + IDictionary GetNewSprinklerCoverage(); + } +} diff --git a/Mods/Automate/Common/Integrations/SimpleSprinkler/SimpleSprinklerIntegration.cs b/Mods/Automate/Common/Integrations/SimpleSprinkler/SimpleSprinklerIntegration.cs new file mode 100644 index 000000000..ef21dd310 --- /dev/null +++ b/Mods/Automate/Common/Integrations/SimpleSprinkler/SimpleSprinklerIntegration.cs @@ -0,0 +1,41 @@ +using System.Collections.Generic; +using Microsoft.Xna.Framework; +using StardewModdingAPI; + +namespace Pathoschild.Stardew.Common.Integrations.SimpleSprinkler +{ + /// Handles the logic for integrating with the Simple Sprinkler mod. + internal class SimpleSprinklerIntegration : BaseIntegration + { + /********* + ** Fields + *********/ + /// The mod's public API. + private readonly ISimplerSprinklerApi ModApi; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// An API for fetching metadata about loaded mods. + /// Encapsulates monitoring and logging. + public SimpleSprinklerIntegration(IModRegistry modRegistry, IMonitor monitor) + : base("Simple Sprinklers", "tZed.SimpleSprinkler", "1.6.0", modRegistry, monitor) + { + if (!this.IsLoaded) + return; + + // get mod API + this.ModApi = this.GetValidatedApi(); + this.IsLoaded = this.ModApi != null; + } + + /// Get the Sprinkler tiles relative to (0, 0), additive to the game's default sprinkler coverage. + public IDictionary GetNewSprinklerTiles() + { + this.AssertLoaded(); + return this.ModApi.GetNewSprinklerCoverage(); + } + } +} diff --git a/Mods/Automate/Common/PathUtilities.cs b/Mods/Automate/Common/PathUtilities.cs new file mode 100644 index 000000000..40b174f02 --- /dev/null +++ b/Mods/Automate/Common/PathUtilities.cs @@ -0,0 +1,86 @@ +using System; +using System.Diagnostics.Contracts; +using System.IO; +using System.Linq; +using System.Text.RegularExpressions; + +namespace Pathoschild.Stardew.Common +{ + /// Provides utilities for normalising file paths. + /// This class is duplicated from StardewModdingAPI.Toolkit.Utilities. + internal static class PathUtilities + { + /********* + ** Fields + *********/ + /// The possible directory separator characters in a file path. + private static readonly char[] PossiblePathSeparators = new[] { '/', '\\', Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar }.Distinct().ToArray(); + + /// The preferred directory separator chaeacter in an asset key. + private static readonly string PreferredPathSeparator = Path.DirectorySeparatorChar.ToString(); + + + /********* + ** Public methods + *********/ + /// Get the segments from a path (e.g. /usr/bin/boop => usr, bin, and boop). + /// The path to split. + /// The number of segments to match. Any additional segments will be merged into the last returned part. + public static string[] GetSegments(string path, int? limit = null) + { + return limit.HasValue + ? path.Split(PathUtilities.PossiblePathSeparators, limit.Value, StringSplitOptions.RemoveEmptyEntries) + : path.Split(PathUtilities.PossiblePathSeparators, StringSplitOptions.RemoveEmptyEntries); + } + + /// Normalise path separators in a file path. + /// The file path to normalise. + [Pure] + public static string NormalisePathSeparators(string path) + { + string[] parts = PathUtilities.GetSegments(path); + string normalised = string.Join(PathUtilities.PreferredPathSeparator, parts); + if (path.StartsWith(PathUtilities.PreferredPathSeparator)) + normalised = PathUtilities.PreferredPathSeparator + normalised; // keep root slash + return normalised; + } + + /// Get a directory or file path relative to a given source path. + /// The source folder path. + /// The target folder or file path. + [Pure] + public static string GetRelativePath(string sourceDir, string targetPath) + { + // convert to URIs + Uri from = new Uri(sourceDir.TrimEnd(PathUtilities.PossiblePathSeparators) + "/"); + Uri to = new Uri(targetPath.TrimEnd(PathUtilities.PossiblePathSeparators) + "/"); + if (from.Scheme != to.Scheme) + throw new InvalidOperationException($"Can't get path for '{targetPath}' relative to '{sourceDir}'."); + + // get relative path + string relative = PathUtilities.NormalisePathSeparators(Uri.UnescapeDataString(from.MakeRelativeUri(to).ToString())); + if (relative == "") + relative = "./"; + return relative; + } + + /// Get whether a path is relative and doesn't try to climb out of its containing folder (e.g. doesn't contain ../). + /// The path to check. + public static bool IsSafeRelativePath(string path) + { + if (string.IsNullOrWhiteSpace(path)) + return true; + + return + !Path.IsPathRooted(path) + && PathUtilities.GetSegments(path).All(segment => segment.Trim() != ".."); + } + + /// Get whether a string is a valid 'slug', containing only basic characters that are safe in all contexts (e.g. filenames, URLs, etc). + /// The string to check. + public static bool IsSlug(string str) + { + return !Regex.IsMatch(str, "[^a-z0-9_.-]", RegexOptions.IgnoreCase); + } + } +} diff --git a/Mods/Automate/Common/SpriteInfo.cs b/Mods/Automate/Common/SpriteInfo.cs new file mode 100644 index 000000000..b7c3be5e2 --- /dev/null +++ b/Mods/Automate/Common/SpriteInfo.cs @@ -0,0 +1,31 @@ +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; + +namespace Pathoschild.Stardew.Common +{ + /// Represents a single sprite in a spritesheet. + internal class SpriteInfo + { + /********* + ** Accessors + *********/ + /// The spritesheet texture. + public Texture2D Spritesheet { get; } + + /// The area in the spritesheet containing the sprite. + public Rectangle SourceRectangle { get; } + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The spritesheet texture. + /// The area in the spritesheet containing the sprite. + public SpriteInfo(Texture2D spritesheet, Rectangle sourceRectangle) + { + this.Spritesheet = spritesheet; + this.SourceRectangle = sourceRectangle; + } + } +} diff --git a/Mods/Automate/Common/StringEnumArrayConverter.cs b/Mods/Automate/Common/StringEnumArrayConverter.cs new file mode 100644 index 000000000..29e781674 --- /dev/null +++ b/Mods/Automate/Common/StringEnumArrayConverter.cs @@ -0,0 +1,153 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using Newtonsoft.Json; +using Newtonsoft.Json.Converters; +using Newtonsoft.Json.Linq; + +namespace Pathoschild.Stardew.Common +{ + /// A variant of which represents arrays in JSON as a comma-delimited string. + internal class StringEnumArrayConverter : StringEnumConverter + { + /********* + ** Fields + *********/ + /// Whether to return null values for missing data instead of an empty array. + public bool AllowNull { get; set; } + + + /********* + ** Public methods + *********/ + /// Get whether this instance can convert the specified object type. + /// The object type. + public override bool CanConvert(Type type) + { + if (!type.IsArray) + return false; + + Type elementType = this.GetElementType(type); + return elementType != null && base.CanConvert(elementType); + } + + /// Read a JSON representation. + /// The JSON reader from which to read. + /// The value type. + /// The raw value of the object being read. + /// The calling serializer. + public override object ReadJson(JsonReader reader, Type valueType, object rawValue, JsonSerializer serializer) + { + // get element type + Type elementType = this.GetElementType(valueType); + if (elementType == null) + throw new InvalidOperationException("Couldn't extract enum array element type."); // should never happen since we validate in CanConvert + + // parse + switch (reader.TokenType) + { + case JsonToken.Null: + return this.GetNullOrEmptyArray(elementType); + + case JsonToken.StartArray: + { + string[] elements = JArray.Load(reader).Values().ToArray(); + object[] parsed = elements.Select(raw => this.ParseOne(raw, elementType)).ToArray(); + return this.Cast(parsed, elementType); + } + + case JsonToken.String: + { + string value = (string)JToken.Load(reader); + + if (string.IsNullOrWhiteSpace(value)) + return this.GetNullOrEmptyArray(elementType); + + object[] parsed = this.ParseMany(value, elementType).ToArray(); + return this.Cast(parsed, elementType); + } + + default: + return base.ReadJson(reader, valueType, rawValue, serializer); + } + } + + /// Write a JSON representation. + /// The JSON writer to which to write. + /// The value. + /// The calling serializer. + public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) + { + if (value == null) + writer.WriteNull(); + else if (value is IEnumerable list) + { + string[] array = (from object element in list where element != null select element.ToString()).ToArray(); + writer.WriteValue(string.Join(", ", array)); + } + else + base.WriteJson(writer, value, serializer); + } + + + /********* + ** Private methods + *********/ + /// Get the underlying array element type (bypassing if necessary). + /// The array type. + private Type GetElementType(Type type) + { + if (!type.IsArray) + return null; + + type = type.GetElementType(); + if (type == null) + return null; + + type = Nullable.GetUnderlyingType(type) ?? type; + + return type; + } + + /// Parse a string into individual values. + /// The input string. + /// The enum type. + private IEnumerable ParseMany(string input, Type elementType) + { + string[] values = input.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries); + foreach (string value in values) + yield return this.ParseOne(value, elementType); + } + + /// Parse a string into one value. + /// The input string. + /// The enum type. + private object ParseOne(string input, Type elementType) + { + return Enum.Parse(elementType, input, ignoreCase: true); + } + + /// Get null or an empty array, depending on the value of . + /// The enum type. + private Array GetNullOrEmptyArray(Type elementType) + { + return this.AllowNull + ? null + : Array.CreateInstance(elementType, 0); + } + + /// Create an array of elements with the given type. + /// The array elements. + /// The array element type. + private Array Cast(object[] elements, Type elementType) + { + if (elements == null) + return null; + + Array result = Array.CreateInstance(elementType, elements.Length); + Array.Copy(elements, result, result.Length); + return result; + } + } +} diff --git a/Mods/Automate/Common/TileHelper.cs b/Mods/Automate/Common/TileHelper.cs new file mode 100644 index 000000000..c96aeb92c --- /dev/null +++ b/Mods/Automate/Common/TileHelper.cs @@ -0,0 +1,126 @@ +using System.Collections.Generic; +using System.Linq; +using Microsoft.Xna.Framework; +using StardewValley; +using xTile.Layers; + +namespace Pathoschild.Stardew.Common +{ + /// Provides extension methods for working with tiles. + internal static class TileHelper + { + /********* + ** Public methods + *********/ + /**** + ** Location + ****/ + /// Get the tile coordinates in the game location. + /// The game location to search. + public static IEnumerable GetTiles(this GameLocation location) + { + if (location?.Map?.Layers == null) + return Enumerable.Empty(); + + Layer layer = location.Map.Layers[0]; + return TileHelper.GetTiles(0, 0, layer.LayerWidth, layer.LayerHeight); + } + + /**** + ** Rectangle + ****/ + /// Get the tile coordinates in the tile area. + /// The tile area to search. + public static IEnumerable GetTiles(this Rectangle area) + { + return TileHelper.GetTiles(area.X, area.Y, area.Width, area.Height); + } + + /// Expand a rectangle equally in all directions. + /// The rectangle to expand. + /// The number of tiles to add in each direction. + public static Rectangle Expand(this Rectangle area, int distance) + { + return new Rectangle(area.X - distance, area.Y - distance, area.Width + distance * 2, area.Height + distance * 2); + } + + /**** + ** Tiles + ****/ + /// Get the eight tiles surrounding the given tile. + /// The center tile. + public static IEnumerable GetSurroundingTiles(this Vector2 tile) + { + return Utility.getSurroundingTileLocationsArray(tile); + } + + /// Get the tiles surrounding the given tile area. + /// The center tile area. + public static IEnumerable GetSurroundingTiles(this Rectangle area) + { + for (int x = area.X - 1; x <= area.X + area.Width; x++) + { + for (int y = area.Y - 1; y <= area.Y + area.Height; y++) + { + if (!area.Contains(x, y)) + yield return new Vector2(x, y); + } + } + } + + /// Get the four tiles adjacent to the given tile. + /// The center tile. + public static IEnumerable GetAdjacentTiles(this Vector2 tile) + { + return Utility.getAdjacentTileLocationsArray(tile); + } + + /// Get a rectangular grid of tiles. + /// The X coordinate of the top-left tile. + /// The Y coordinate of the top-left tile. + /// The grid width. + /// The grid height. + public static IEnumerable GetTiles(int x, int y, int width, int height) + { + for (int curX = x, maxX = x + width - 1; curX <= maxX; curX++) + { + for (int curY = y, maxY = y + height - 1; curY <= maxY; curY++) + yield return new Vector2(curX, curY); + } + } + + /// Get all tiles which are on-screen. + public static IEnumerable GetVisibleTiles() + { + return TileHelper.GetVisibleArea().GetTiles(); + } + + /// Get the tile area visible on-screen. + public static Rectangle GetVisibleArea() + { + return new Rectangle( + x: Game1.viewport.X / Game1.tileSize, + y: Game1.viewport.Y / Game1.tileSize, + width: (int)(Game1.viewport.Width / (decimal)Game1.tileSize) + 2, // extend off-screen slightly to avoid edges popping in + height: (int)(Game1.viewport.Height / (decimal)Game1.tileSize) + 2 + ); + } + + /**** + ** Cursor + ****/ + /// Get the tile under the player's cursor (not restricted to the player's grab tile range). + public static Vector2 GetTileFromCursor() + { + return TileHelper.GetTileFromScreenPosition(Game1.getMouseX(), Game1.getMouseY()); + } + + /// Get the tile at the pixel coordinate relative to the top-left corner of the screen. + /// The pixel X coordinate. + /// The pixel Y coordinate. + public static Vector2 GetTileFromScreenPosition(float x, float y) + { + return new Vector2((int)((Game1.viewport.X + x) / Game1.tileSize), (int)((Game1.viewport.Y + y) / Game1.tileSize)); + } + } +} diff --git a/Mods/Automate/Common/UI/BaseOverlay.cs b/Mods/Automate/Common/UI/BaseOverlay.cs new file mode 100644 index 000000000..4b515ec50 --- /dev/null +++ b/Mods/Automate/Common/UI/BaseOverlay.cs @@ -0,0 +1,214 @@ +using System; +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; +using Microsoft.Xna.Framework.Input; +using StardewModdingAPI; +using StardewModdingAPI.Events; +using StardewValley; +using Rectangle = xTile.Dimensions.Rectangle; + +namespace Pathoschild.Stardew.Common.UI +{ + /// An interface which supports user interaction and overlays the active menu (if any). + internal abstract class BaseOverlay : IDisposable + { + /********* + ** Fields + *********/ + /// The SMAPI events available for mods. + private readonly IModEvents Events; + + /// An API for checking and changing input state. + protected readonly IInputHelper InputHelper; + + /// The last viewport bounds. + private Rectangle LastViewport; + + /// Indicates whether to keep the overlay active. If null, the overlay is kept until explicitly disposed. + private readonly Func KeepAliveCheck; + + + /********* + ** Public methods + *********/ + /// Release all resources. + public virtual void Dispose() + { + this.Events.Display.Rendered -= this.OnRendered; + this.Events.GameLoop.UpdateTicked -= this.OnUpdateTicked; + this.Events.Input.ButtonPressed -= this.OnButtonPressed; + this.Events.Input.CursorMoved -= this.OnCursorMoved; + this.Events.Input.MouseWheelScrolled -= this.OnMouseWheelScrolled; + } + + + /********* + ** Protected methods + *********/ + /**** + ** Implementation + ****/ + /// Construct an instance. + /// The SMAPI events available for mods. + /// An API for checking and changing input state. + /// Indicates whether to keep the overlay active. If null, the overlay is kept until explicitly disposed. + protected BaseOverlay(IModEvents events, IInputHelper inputHelper, Func keepAlive = null) + { + this.Events = events; + this.InputHelper = inputHelper; + this.KeepAliveCheck = keepAlive; + this.LastViewport = new Rectangle(Game1.viewport.X, Game1.viewport.Y, Game1.viewport.Width, Game1.viewport.Height); + + events.Display.Rendered += this.OnRendered; + events.GameLoop.UpdateTicked += this.OnUpdateTicked; + events.Input.ButtonPressed += this.OnButtonPressed; + events.Input.CursorMoved += this.OnCursorMoved; + events.Input.MouseWheelScrolled += this.OnMouseWheelScrolled; + } + + /// Draw the overlay to the screen. + /// The sprite batch being drawn. + protected virtual void Draw(SpriteBatch batch) { } + + /// The method invoked when the player left-clicks. + /// The X-position of the cursor. + /// The Y-position of the cursor. + /// Whether the event has been handled and shouldn't be propagated further. + protected virtual bool ReceiveLeftClick(int x, int y) + { + return false; + } + + /// The method invoked when the player presses a button. + /// The button that was pressed. + /// Whether the event has been handled and shouldn't be propagated further. + protected virtual bool ReceiveButtonPress(SButton input) + { + return false; + } + + /// The method invoked when the player uses the mouse scroll wheel. + /// The scroll amount. + /// Whether the event has been handled and shouldn't be propagated further. + protected virtual bool ReceiveScrollWheelAction(int amount) + { + return false; + } + + /// The method invoked when the cursor is hovered. + /// The cursor's X position. + /// The cursor's Y position. + /// Whether the event has been handled and shouldn't be propagated further. + protected virtual bool ReceiveCursorHover(int x, int y) + { + return false; + } + + /// The method invoked when the player resizes the game windoww. + /// The previous game window bounds. + /// The new game window bounds. + protected virtual void ReceiveGameWindowResized(Rectangle oldBounds, Rectangle newBounds) { } + + /// Draw the mouse cursor. + /// Derived from . + protected void DrawCursor() + { + if (Game1.options.hardwareCursor) + return; + Game1.spriteBatch.Draw(Game1.mouseCursors, new Vector2(Game1.getMouseX(), Game1.getMouseY()), Game1.getSourceRectForStandardTileSheet(Game1.mouseCursors, Game1.options.SnappyMenus ? 44 : 0, 16, 16), Color.White * Game1.mouseCursorTransparency, 0.0f, Vector2.Zero, Game1.pixelZoom + Game1.dialogueButtonScale / 150f, SpriteEffects.None, 1f); + } + + /**** + ** Event listeners + ****/ + /// The method called when the game finishes drawing components to the screen. + /// The source of the event. + /// The event arguments. + private void OnRendered(object sender, RenderedEventArgs e) + { + this.Draw(Game1.spriteBatch); + } + + /// The method called once per event tick. + /// The source of the event. + /// The event arguments. + private void OnUpdateTicked(object sender, UpdateTickedEventArgs e) + { + // detect end of life + if (this.KeepAliveCheck != null && !this.KeepAliveCheck()) + { + this.Dispose(); + return; + } + + // trigger window resize event + Rectangle newViewport = Game1.viewport; + if (this.LastViewport.Width != newViewport.Width || this.LastViewport.Height != newViewport.Height) + { + newViewport = new Rectangle(newViewport.X, newViewport.Y, newViewport.Width, newViewport.Height); + this.ReceiveGameWindowResized(this.LastViewport, newViewport); + this.LastViewport = newViewport; + } + } + + /// The method invoked when the player presses a key. + /// The source of the event. + /// The event arguments. + private void OnButtonPressed(object sender, ButtonPressedEventArgs e) + { + bool handled = e.Button == SButton.MouseLeft || e.Button.IsUseToolButton() + ? this.ReceiveLeftClick(Game1.getMouseX(), Game1.getMouseY()) + : this.ReceiveButtonPress(e.Button); + + if (handled) + this.InputHelper.Suppress(e.Button); + } + + /// The method invoked when the mouse wheel is scrolled. + /// The source of the event. + /// The event arguments. + private void OnMouseWheelScrolled(object sender, MouseWheelScrolledEventArgs e) + { + bool scrollHandled = this.ReceiveScrollWheelAction(e.Delta); + if (scrollHandled) + { + MouseState cur = Game1.oldMouseState; + Game1.oldMouseState = new MouseState( + x: cur.X, + y: cur.Y, + scrollWheel: e.NewValue, + leftButton: cur.LeftButton, + middleButton: cur.MiddleButton, + rightButton: cur.RightButton, + xButton1: cur.XButton1, + xButton2: cur.XButton2 + ); + } + } + + /// The method invoked when the in-game cursor is moved. + /// The source of the event. + /// The event arguments. + private void OnCursorMoved(object sender, CursorMovedEventArgs e) + { + int x = (int)e.NewPosition.ScreenPixels.X; + int y = (int)e.NewPosition.ScreenPixels.Y; + + bool hoverHandled = this.ReceiveCursorHover(x, y); + if (hoverHandled) + { + MouseState cur = Game1.oldMouseState; + Game1.oldMouseState = new MouseState( + x: x, + y: y, + scrollWheel: cur.ScrollWheelValue, + leftButton: cur.LeftButton, + middleButton: cur.MiddleButton, + rightButton: cur.RightButton, + xButton1: cur.XButton1, + xButton2: cur.XButton2 + ); + } + } + } +} diff --git a/Mods/Automate/Common/UI/CommonSprites.cs b/Mods/Automate/Common/UI/CommonSprites.cs new file mode 100644 index 000000000..3da68991e --- /dev/null +++ b/Mods/Automate/Common/UI/CommonSprites.cs @@ -0,0 +1,79 @@ +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; +using StardewValley; + +namespace Pathoschild.Stardew.Common.UI +{ + /// Simplifies access to the game's sprite sheets. + /// Each sprite is represented by a rectangle, which specifies the coordinates and dimensions of the image in the sprite sheet. + internal static class CommonSprites + { + /// Sprites used to draw a button. + public static class Button + { + /// The sprite sheet containing the icon sprites. + public static Texture2D Sheet => Game1.mouseCursors; + + /// The legend background. + public static readonly Rectangle Background = new Rectangle(297, 364, 1, 1); + + /// The top border. + public static readonly Rectangle Top = new Rectangle(279, 284, 1, 4); + + /// The bottom border. + public static readonly Rectangle Bottom = new Rectangle(279, 296, 1, 4); + + /// The left border. + public static readonly Rectangle Left = new Rectangle(274, 289, 4, 1); + + /// The right border. + public static readonly Rectangle Right = new Rectangle(286, 289, 4, 1); + + /// The top-left corner. + public static readonly Rectangle TopLeft = new Rectangle(274, 284, 4, 4); + + /// The top-right corner. + public static readonly Rectangle TopRight = new Rectangle(286, 284, 4, 4); + + /// The bottom-left corner. + public static readonly Rectangle BottomLeft = new Rectangle(274, 296, 4, 4); + + /// The bottom-right corner. + public static readonly Rectangle BottomRight = new Rectangle(286, 296, 4, 4); + } + + /// Sprites used to draw a scroll. + public static class Scroll + { + /// The sprite sheet containing the icon sprites. + public static Texture2D Sheet => Game1.mouseCursors; + + /// The legend background. + public static readonly Rectangle Background = new Rectangle(334, 321, 1, 1); + + /// The top border. + public static readonly Rectangle Top = new Rectangle(331, 318, 1, 2); + + /// The bottom border. + public static readonly Rectangle Bottom = new Rectangle(327, 334, 1, 2); + + /// The left border. + public static readonly Rectangle Left = new Rectangle(325, 320, 6, 1); + + /// The right border. + public static readonly Rectangle Right = new Rectangle(344, 320, 6, 1); + + /// The top-left corner. + public static readonly Rectangle TopLeft = new Rectangle(325, 318, 6, 2); + + /// The top-right corner. + public static readonly Rectangle TopRight = new Rectangle(344, 318, 6, 2); + + /// The bottom-left corner. + public static readonly Rectangle BottomLeft = new Rectangle(325, 334, 6, 2); + + /// The bottom-right corner. + public static readonly Rectangle BottomRight = new Rectangle(344, 334, 6, 2); + } + } +} diff --git a/Mods/Automate/Common/Utilities/ConstraintSet.cs b/Mods/Automate/Common/Utilities/ConstraintSet.cs new file mode 100644 index 000000000..98cf678ec --- /dev/null +++ b/Mods/Automate/Common/Utilities/ConstraintSet.cs @@ -0,0 +1,141 @@ +using System.Collections.Generic; + +namespace Pathoschild.Stardew.Common.Utilities +{ + /// A logical collection of values defined by restriction and exclusion values which may be infinite. + /// + /// + /// Unlike a typical collection, a constraint set doesn't necessarily track the values it contains. For + /// example, a constraint set of values with one exclusion only stores one number but + /// logically contains elements. + /// + /// + /// + /// A constraint set is defined by two inner sets: contains values which are + /// explicitly not part of the set, and contains values which are explicitly + /// part of the set. Crucially, an empty means an unbounded set (i.e. it + /// contains all possible values). If a value is part of both and + /// , the exclusion takes priority. + /// + /// + internal class ConstraintSet + { + /********* + ** Accessors + *********/ + /// The specific values to contain (or empty to match any value). + public HashSet RestrictToValues { get; } + + /// The specific values to exclude. + public HashSet ExcludeValues { get; } + + /// Whether the constraint set matches a finite set of values. + public bool IsBounded => this.RestrictToValues.Count != 0; + + /// Get whether the constraint set logically matches an infinite set of values. + public bool IsInfinite => !this.IsBounded; + + /// Whether there are any constraints placed on the set of values. + public bool IsConstrained => this.RestrictToValues.Count != 0 || this.ExcludeValues.Count != 0; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + public ConstraintSet() + : this(EqualityComparer.Default) { } + + /// Construct an instance. + /// The equality comparer to use when comparing values in the set, or to use the default implementation for the set type. + public ConstraintSet(IEqualityComparer comparer) + { + this.RestrictToValues = new HashSet(comparer); + this.ExcludeValues = new HashSet(comparer); + } + + /// Bound the constraint set by adding the given value to the set of allowed values. If the constraint set is unbounded, this makes it bounded. + /// The value. + /// Returns true if the value was added; else false if it was already present. + public bool AddBound(T value) + { + return this.RestrictToValues.Add(value); + } + + /// Bound the constraint set by adding the given values to the set of allowed values. If the constraint set is unbounded, this makes it bounded. + /// The values. + /// Returns true if any value was added; else false if all values were already present. + public bool AddBound(IEnumerable values) + { + bool anyAdded = false; + foreach (T value in values) + { + if (this.RestrictToValues.Add(value)) + anyAdded = true; + } + return anyAdded; + } + + /// Add values to exclude. + /// The value to exclude. + /// Returns true if the value was added; else false if it was already present. + public bool Exclude(T value) + { + return this.ExcludeValues.Add(value); + } + + /// Add values to exclude. + /// The values to exclude. + /// Returns true if any value was added; else false if all values were already present. + public bool Exclude(IEnumerable values) + { + bool anyAdded = false; + foreach (T value in values) + { + if (this.ExcludeValues.Add(value)) + anyAdded = true; + } + return anyAdded; + } + + /// Get whether this constraint allows some values that would be allowed by another. + /// The other + public bool Intersects(ConstraintSet other) + { + // If both sets are unbounded, they're guaranteed to intersect since exclude can't be unbounded. + if (this.IsInfinite && other.IsInfinite) + return true; + + // if either set is bounded, they can only intersect in the included subset. + if (this.IsBounded) + { + foreach (T value in this.RestrictToValues) + { + if (this.Allows(value) && other.Allows(value)) + return true; + } + } + if (other.IsBounded) + { + foreach (T value in other.RestrictToValues) + { + if (other.Allows(value) && this.Allows(value)) + return true; + } + } + + // else no intersection + return false; + } + + /// Get whether the constraints allow the given value. + /// The value to match. + public bool Allows(T value) + { + if (this.ExcludeValues.Contains(value)) + return false; + + return this.IsInfinite || this.RestrictToValues.Contains(value); + } + } +} diff --git a/Mods/Automate/Common/Utilities/InvariantDictionary.cs b/Mods/Automate/Common/Utilities/InvariantDictionary.cs new file mode 100644 index 000000000..4bad98e7f --- /dev/null +++ b/Mods/Automate/Common/Utilities/InvariantDictionary.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; + +namespace Pathoschild.Stardew.Common.Utilities +{ + /// An implementation of whose keys are guaranteed to use . + internal class InvariantDictionary : Dictionary + { + /********* + ** Public methods + *********/ + /// Construct an instance. + public InvariantDictionary() + : base(StringComparer.InvariantCultureIgnoreCase) { } + + /// Construct an instance. + /// The values to add. + public InvariantDictionary(IDictionary values) + : base(values, StringComparer.InvariantCultureIgnoreCase) { } + + /// Construct an instance. + /// The values to add. + public InvariantDictionary(IEnumerable> values) + : base(StringComparer.InvariantCultureIgnoreCase) + { + foreach (var entry in values) + this.Add(entry.Key, entry.Value); + } + } +} diff --git a/Mods/Automate/Common/Utilities/InvariantHashSet.cs b/Mods/Automate/Common/Utilities/InvariantHashSet.cs new file mode 100644 index 000000000..6f0530d84 --- /dev/null +++ b/Mods/Automate/Common/Utilities/InvariantHashSet.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; + +namespace Pathoschild.Stardew.Common.Utilities +{ + /// An implementation of for strings which always uses . + internal class InvariantHashSet : HashSet + { + /********* + ** Public methods + *********/ + /// Construct an instance. + public InvariantHashSet() + : base(StringComparer.InvariantCultureIgnoreCase) { } + + /// Construct an instance. + /// The values to add. + public InvariantHashSet(IEnumerable values) + : base(values, StringComparer.InvariantCultureIgnoreCase) { } + + /// Construct an instance. + /// The single value to add. + public InvariantHashSet(string value) + : base(new[] { value }, StringComparer.InvariantCultureIgnoreCase) { } + + /// Get a hashset for boolean true/false. + public static InvariantHashSet Boolean() + { + return new InvariantHashSet(new[] { "true", "false" }); + } + } +} diff --git a/Mods/Automate/Common/Utilities/ObjectReferenceComparer.cs b/Mods/Automate/Common/Utilities/ObjectReferenceComparer.cs new file mode 100644 index 000000000..020ebfadd --- /dev/null +++ b/Mods/Automate/Common/Utilities/ObjectReferenceComparer.cs @@ -0,0 +1,29 @@ +using System.Collections.Generic; +using System.Runtime.CompilerServices; + +namespace Pathoschild.Stardew.Common.Utilities +{ + /// A comparer which considers two references equal if they point to the same instance. + /// The value type. + internal class ObjectReferenceComparer : IEqualityComparer + { + /********* + ** Public methods + *********/ + /// Determines whether the specified objects are equal. + /// true if the specified objects are equal; otherwise, false. + /// The first object to compare. + /// The second object to compare. + public bool Equals(T x, T y) + { + return object.ReferenceEquals(x, y); + } + + /// Get a hash code for the specified object. + /// The value. + public int GetHashCode(T obj) + { + return RuntimeHelpers.GetHashCode(obj); + } + } +} diff --git a/Mods/Automate/Properties/AssemblyInfo.cs b/Mods/Automate/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..989fb8027 --- /dev/null +++ b/Mods/Automate/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// 有关程序集的一般信息由以下 +// 控制。更改这些特性值可修改 +// 与程序集关联的信息。 +[assembly: AssemblyTitle("Automate")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Automate")] +[assembly: AssemblyCopyright("Copyright © 2019")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// 将 ComVisible 设置为 false 会使此程序集中的类型 +//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型 +//请将此类型的 ComVisible 特性设置为 true。 +[assembly: ComVisible(false)] + +// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID +[assembly: Guid("5ef944e3-d54b-4936-b507-a40c17b17b8e")] + +// 程序集的版本信息由下列四个值组成: +// +// 主版本 +// 次版本 +// 生成号 +// 修订号 +// +// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 +//通过使用 "*"，如下所示: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Mods/ConvenientChests/CategorizeChests/CategorizeChestsModule.cs b/Mods/ConvenientChests/CategorizeChests/CategorizeChestsModule.cs new file mode 100644 index 000000000..71881bb33 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/CategorizeChestsModule.cs @@ -0,0 +1,110 @@ +using System; +using System.IO; +using ConvenientChests.CategorizeChests.Framework; +using ConvenientChests.CategorizeChests.Framework.Persistence; +using ConvenientChests.CategorizeChests.Interface; +using ConvenientChests.CategorizeChests.Interface.Widgets; +using StardewModdingAPI; +using StardewModdingAPI.Events; +using StardewValley; +using StardewValley.Menus; +using StardewValley.Objects; + +namespace ConvenientChests.CategorizeChests { + public class CategorizeChestsModule : Module { + internal IItemDataManager ItemDataManager { get; } = new ItemDataManager(); + internal IChestDataManager ChestDataManager { get; } = new ChestDataManager(); + internal ChestFinder ChestFinder { get; } = new ChestFinder(); + + protected string SavePath => Path.Combine("savedata", $"{Constants.SaveFolderName}.json"); + protected string AbsoluteSavePath => Path.Combine(ModEntry.Helper.DirectoryPath, SavePath); + private SaveManager SaveManager { get; set; } + + + private WidgetHost WidgetHost { get; set; } + + internal bool ChestAcceptsItem(Chest chest, Item item) => item != null && ChestAcceptsItem(chest, ItemDataManager.GetItemKey(item)); + internal bool ChestAcceptsItem(Chest chest, ItemKey itemKey) => ChestDataManager.GetChestData(chest).Accepts(itemKey); + + public CategorizeChestsModule(ModEntry modEntry) : base(modEntry) { } + + public override void Activate() { + IsActive = true; + + // Menu Events + this.Events.Display.MenuChanged += OnMenuChanged; + + if (Context.IsMultiplayer && !Context.IsMainPlayer) { + ModEntry.Log("Due to limitations in the network code, CHEST CATEGORIES CAN NOT BE SAVED as farmhand, sorry :(", LogLevel.Warn); + return; + } + + // Save Events + SaveManager = new SaveManager(this); + this.Events.GameLoop.Saving += OnSaving; + OnGameLoaded(); + } + + public override void Deactivate() { + IsActive = false; + + // Menu Events + this.Events.Display.MenuChanged -= OnMenuChanged; + + // Save Events + this.Events.GameLoop.Saving -= OnSaving; + } + + /// Raised before the game begins writes data to the save file (except the initial save creation). + /// The event sender. + /// The event data. + private void OnSaving(object sender, SavingEventArgs e) { + try { + SaveManager.Save(SavePath); + } + catch (Exception ex) { + Monitor.Log($"Error saving chest data to {SavePath}", LogLevel.Error); + Monitor.Log(ex.ToString()); + } + } + + private void OnGameLoaded() { + try { + if (File.Exists(AbsoluteSavePath)) + SaveManager.Load(SavePath); + } + catch (Exception ex) { + Monitor.Log($"Error loading chest data from {SavePath}", LogLevel.Error); + Monitor.Log(ex.ToString()); + } + } + + /// Raised after a game menu is opened, closed, or replaced. + /// The event sender. + /// The event data. + private void OnMenuChanged(object sender, MenuChangedEventArgs e) { + if (e.NewMenu == e.OldMenu) + return; + + if (e.OldMenu is ItemGrabMenu) + ClearMenu(); + + if (e.NewMenu is ItemGrabMenu itemGrabMenu) + CreateMenu(itemGrabMenu); + } + + private void CreateMenu(ItemGrabMenu itemGrabMenu) { + if (!(itemGrabMenu.behaviorOnItemGrab?.Target is Chest chest)) + return; + + WidgetHost = new WidgetHost(this.Events, this.ModEntry.Helper.Input); + var overlay = new ChestOverlay(this, chest, itemGrabMenu, WidgetHost.TooltipManager); + WidgetHost.RootWidget.AddChild(overlay); + } + + private void ClearMenu() { + WidgetHost?.Dispose(); + WidgetHost = null; + } + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Framework/ChestData.cs b/Mods/ConvenientChests/CategorizeChests/Framework/ChestData.cs new file mode 100644 index 000000000..00578b9ab --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Framework/ChestData.cs @@ -0,0 +1,52 @@ +using System.Collections.Generic; +using StardewValley.Objects; + +namespace ConvenientChests.CategorizeChests.Framework +{ + /// + /// The extra data associated with a chest object, such as the list of + /// items it should accept. + /// + class ChestData + { + public Chest Chest { get; } + public HashSet AcceptedItemKinds { get; set; } = new HashSet(); + + public ChestData(Chest chest) => Chest = chest; + + /// + /// Set this chest to accept the specified kind of item. + /// + public void AddAccepted(ItemKey itemKey) + { + if (!AcceptedItemKinds.Contains(itemKey)) + AcceptedItemKinds.Add(itemKey); + } + + /// + /// Set this chest to not accept the specified kind of item. + /// + public void AddRejected(ItemKey itemKey) + { + if (AcceptedItemKinds.Contains(itemKey)) + AcceptedItemKinds.Remove(itemKey); + } + + /// + /// Toggle whether this chest accepts the specified kind of item. + /// + public void Toggle(ItemKey itemKey) + { + if (Accepts(itemKey)) + AddRejected(itemKey); + + else + AddAccepted(itemKey); + } + + /// + /// Return whether this chest accepts the given kind of item. + /// + public bool Accepts(ItemKey itemKey) => AcceptedItemKinds.Contains(itemKey); + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Framework/ChestDataManager.cs b/Mods/ConvenientChests/CategorizeChests/Framework/ChestDataManager.cs new file mode 100644 index 000000000..a3fd06f4f --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Framework/ChestDataManager.cs @@ -0,0 +1,12 @@ +using System.Runtime.CompilerServices; +using StardewValley.Objects; + +namespace ConvenientChests.CategorizeChests.Framework +{ + class ChestDataManager : IChestDataManager + { + private readonly ConditionalWeakTable _table = new ConditionalWeakTable(); + + public ChestData GetChestData(Chest chest) => _table.GetValue(chest, c => new ChestData(c)); + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Framework/ChestExtension.cs b/Mods/ConvenientChests/CategorizeChests/Framework/ChestExtension.cs new file mode 100644 index 000000000..698c40e5b --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Framework/ChestExtension.cs @@ -0,0 +1,86 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using StardewModdingAPI; +using StardewValley; +using StardewValley.Locations; +using StardewValley.Objects; + +namespace ConvenientChests.CategorizeChests.Framework { + internal static class ChestExtension { + public static Chest GetFridge(Farmer player) { + if (Game1.player.IsMainPlayer) + return StardewValley.Utility.getHomeOfFarmer(player).fridge.Value; + + if (!(Game1.currentLocation is FarmHouse f)) + // Can't access other locations + return null; + + if (f.owner != player) + ModEntry.Log($"Could not get fridge for player '{player.Name}' (wrong house)"); + + return f.fridge.Value; + } + + public static Chest GetLocalFridge(Farmer player) { + if (Game1.currentLocation is FarmHouse f) + return f.fridge.Value; + + if (Game1.player.IsMainPlayer) + return StardewValley.Utility.getHomeOfFarmer(player).fridge.Value; + + throw new Exception("Cooking from the outside as farmhand?"); + } + + public static bool ContainsItem(this Chest chest, Item i) => chest.items.Any(i.canStackWith); + + /// + /// Attempt to move as much as possible of the player's inventory into the given chest + /// + /// The chest to put the items in. + /// + /// Items to put in + /// List of Items that were successfully moved into the chest + public static IEnumerable DumpItemsToChest(this Chest chest, IList sourceInventory, IEnumerable items) { + var changedItems = items.Where(item => item != null) + .Where(item => TryMoveItemToChest(chest, sourceInventory, item)) + .ToList(); + + return changedItems; + } + + /// + /// Attempt to move as much as possible of the given item stack into the chest. + /// + /// The chest to put the items in. + /// + /// The items to put in the chest. + /// True if at least some of the stack was moved into the chest. + public static bool TryMoveItemToChest(this Chest chest, IList sourceInventory, Item item) { + var remainder = chest.addItem(item); + + // nothing remains -> remove item + if (remainder == null) { + var index = sourceInventory.IndexOf(item); + sourceInventory[index] = null; + return true; + } + + // nothing changed + if (remainder.Stack == item.Stack) + return false; + + // update stack count + item.Stack = remainder.Stack; + return true; + } + + /// + /// Check whether the given chest has any completely empty slots. + /// + /// Whether at least one slot is empty. + /// The chest to check. + public static bool HasEmptySlots(this Chest chest) + => chest.items.Count < Chest.capacity || chest.items.Any(i => i == null); + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Framework/ChestFinder.cs b/Mods/ConvenientChests/CategorizeChests/Framework/ChestFinder.cs new file mode 100644 index 000000000..bf77a936b --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Framework/ChestFinder.cs @@ -0,0 +1,53 @@ +using System.Linq; +using ConvenientChests.CategorizeChests.Framework.Persistence; +using StardewValley; +using StardewValley.Locations; +using StardewValley.Objects; + +namespace ConvenientChests.CategorizeChests.Framework +{ + class ChestFinder : IChestFinder + { + public Chest GetChestByAddress(ChestAddress address) + { + if (address.LocationType == ChestLocationType.Refrigerator) + { + var house = (FarmHouse) Game1.locations.SingleOrDefault(l => l is FarmHouse f && address.LocationName == (f.uniqueName?.Value ?? f.Name)); + + if (house == null) + throw new InvalidSaveDataException($"Save data contains refrigerator data in {address.LocationName} but location does not exist"); + + if (house.upgradeLevel < 1) + throw new InvalidSaveDataException($"Save data contains refrigerator data in {address.LocationName} but refrigerator does not exist"); + + return house.fridge.Value; + } + + var location = GetLocationFromAddress(address); + if (location.objects.ContainsKey(address.Tile) && location.objects[address.Tile] is Chest chest) + return chest; + + throw new InvalidSaveDataException($"Can't find chest in {location.Name} at {address.Tile}"); + } + + private GameLocation GetLocationFromAddress(ChestAddress address) + { + var location = Game1.locations.FirstOrDefault(l => l.Name == address.LocationName); + + if (location == null) + throw new InvalidSaveDataException($"Can't find location named {address.LocationName}"); + + if (address.LocationType != ChestLocationType.Building) + return location; + + if (!(location is BuildableGameLocation buildableLocation)) + throw new InvalidSaveDataException($"Can't find any buildings in location named {location.Name}"); + + var building = buildableLocation.buildings.SingleOrDefault(b => b.nameOfIndoors == address.BuildingName); + if (building == null) + throw new InvalidSaveDataException($"Save data contains building data in {address.BuildingName} but building does not exist"); + + return building.indoors.Value; + } + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Framework/DiscoveredItem.cs b/Mods/ConvenientChests/CategorizeChests/Framework/DiscoveredItem.cs new file mode 100644 index 000000000..8981db0b6 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Framework/DiscoveredItem.cs @@ -0,0 +1,16 @@ +using StardewValley; + +namespace ConvenientChests.CategorizeChests.Framework +{ + class DiscoveredItem + { + public readonly ItemKey ItemKey; + public readonly Item Item; + + public DiscoveredItem(ItemType type, int index, Item item) + { + ItemKey = new ItemKey(type, index); + Item = item; + } + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Framework/IChestDataManager.cs b/Mods/ConvenientChests/CategorizeChests/Framework/IChestDataManager.cs new file mode 100644 index 000000000..6e4302203 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Framework/IChestDataManager.cs @@ -0,0 +1,13 @@ +using StardewValley.Objects; + +namespace ConvenientChests.CategorizeChests.Framework +{ + /// + /// An interface for retrieving the mod-specific data associated with a + /// given Stardew Valley chest object. + /// + internal interface IChestDataManager + { + ChestData GetChestData(Chest chest); + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Framework/IChestFiller.cs b/Mods/ConvenientChests/CategorizeChests/Framework/IChestFiller.cs new file mode 100644 index 000000000..301947e45 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Framework/IChestFiller.cs @@ -0,0 +1,13 @@ +using StardewValley.Objects; + +namespace ConvenientChests.CategorizeChests.Framework +{ + /// + /// A tool for moving items in bulk from the player's inventory + /// into a given chest according to that chest's settings. + /// + public interface IChestFiller + { + void DumpItemsToChest(Chest chest); + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Framework/IChestFinder.cs b/Mods/ConvenientChests/CategorizeChests/Framework/IChestFinder.cs new file mode 100644 index 000000000..eab1e1a48 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Framework/IChestFinder.cs @@ -0,0 +1,13 @@ +using ConvenientChests.CategorizeChests.Framework.Persistence; +using StardewValley.Objects; + +namespace ConvenientChests.CategorizeChests.Framework +{ + /// + /// A helper for finding the chest object corresponding to a given chest address. + /// + interface IChestFinder + { + Chest GetChestByAddress(ChestAddress address); + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Framework/IItemDataManager.cs b/Mods/ConvenientChests/CategorizeChests/Framework/IItemDataManager.cs new file mode 100644 index 000000000..f60fa1363 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Framework/IItemDataManager.cs @@ -0,0 +1,17 @@ +using System.Collections.Generic; +using System.Linq; +using StardewValley; + +namespace ConvenientChests.CategorizeChests.Framework { + /// + /// A repository of item data that maps item keys to representative items + /// and vice versa. + /// + internal interface IItemDataManager { + Dictionary> Categories { get; } + Dictionary Prototypes { get; } + + Item GetItem(ItemKey itemKey); + ItemKey GetItemKey(Item item); + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Framework/ItemBlacklist.cs b/Mods/ConvenientChests/CategorizeChests/Framework/ItemBlacklist.cs new file mode 100644 index 000000000..dcf12be87 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Framework/ItemBlacklist.cs @@ -0,0 +1,97 @@ +using System.Collections.Generic; + +namespace ConvenientChests.CategorizeChests.Framework +{ + /// + /// Maintains the list of items that should be excluded from the available + /// items to use for categorization, e.g. unobtainable items and bug items. + /// + static class ItemBlacklist + { + /// + /// Check whether a given item key is blacklisted. + /// + /// Whether the key is blacklisted. + /// Item key to check. + public static bool Includes(ItemKey itemKey) => + itemKey.ItemType == ItemType.BigCraftable ||itemKey.ItemType == ItemType.Furniture || BlacklistedItemKeys.Contains(itemKey); + + private static readonly HashSet BlacklistedItemKeys = new HashSet { + // stones + new ItemKey(ItemType.Object, 2), + new ItemKey(ItemType.Object, 4), + new ItemKey(ItemType.Object, 75), + new ItemKey(ItemType.Object, 76), + new ItemKey(ItemType.Object, 77), + new ItemKey(ItemType.Object, 290), + new ItemKey(ItemType.Object, 343), + new ItemKey(ItemType.Object, 450), + new ItemKey(ItemType.Object, 668), + new ItemKey(ItemType.Object, 670), + new ItemKey(ItemType.Object, 751), + new ItemKey(ItemType.Object, 760), + new ItemKey(ItemType.Object, 762), + new ItemKey(ItemType.Object, 764), + new ItemKey(ItemType.Object, 765), + + // weeds + new ItemKey(ItemType.Object, 0), + new ItemKey(ItemType.Object, 313), + new ItemKey(ItemType.Object, 314), + new ItemKey(ItemType.Object, 315), + new ItemKey(ItemType.Object, 316), + new ItemKey(ItemType.Object, 317), + new ItemKey(ItemType.Object, 318), + new ItemKey(ItemType.Object, 319), + new ItemKey(ItemType.Object, 320), + new ItemKey(ItemType.Object, 321), + new ItemKey(ItemType.Object, 452), + new ItemKey(ItemType.Object, 674), + new ItemKey(ItemType.Object, 675), + new ItemKey(ItemType.Object, 676), + new ItemKey(ItemType.Object, 677), + new ItemKey(ItemType.Object, 678), + new ItemKey(ItemType.Object, 679), + new ItemKey(ItemType.Object, 750), + new ItemKey(ItemType.Object, 784), + new ItemKey(ItemType.Object, 785), + new ItemKey(ItemType.Object, 786), + new ItemKey(ItemType.Object, 792), + new ItemKey(ItemType.Object, 793), + new ItemKey(ItemType.Object, 794), + + // twigs + new ItemKey(ItemType.Object, 294), + new ItemKey(ItemType.Object, 295), + + new ItemKey(ItemType.Object, 30), // Lumber + new ItemKey(ItemType.Object, 94), // Spirit Torch + new ItemKey(ItemType.Object, 102), // Lost Book + new ItemKey(ItemType.Object, 449), // Stone Base + new ItemKey(ItemType.Object, 461), // Decorative Pot + new ItemKey(ItemType.Object, 590), // Artifact Spot + new ItemKey(ItemType.Object, 788), // Lost Axe + new ItemKey(ItemType.Object, 789), // Lucky Purple Shorts + new ItemKey(ItemType.Object, 790), // Berry Basket + + new ItemKey(ItemType.Weapon, 25), // Alex's Bat + new ItemKey(ItemType.Weapon, 30), // Sam's Old Guitar + new ItemKey(ItemType.Weapon, 35), // Elliott's Pencil + new ItemKey(ItemType.Weapon, 36), // Maru's Wrench + new ItemKey(ItemType.Weapon, 37), // Harvey's Mallet + new ItemKey(ItemType.Weapon, 38), // Penny's Fryer + new ItemKey(ItemType.Weapon, 39), // Leah's Whittler + new ItemKey(ItemType.Weapon, 40), // Abby's Planchette + new ItemKey(ItemType.Weapon, 41), // Seb's Lost Mace + new ItemKey(ItemType.Weapon, 42), // Haley's Iron + new ItemKey(ItemType.Weapon, 20), // Elf Blade + new ItemKey(ItemType.Weapon, 34), // Galaxy Slingshot + new ItemKey(ItemType.Weapon, 46), // Kudgel + new ItemKey(ItemType.Weapon, 49), // Rapier + new ItemKey(ItemType.Weapon, 19), // Shadow Dagger + new ItemKey(ItemType.Weapon, 48), // Yeti Tooth + + new ItemKey(ItemType.Boots, 515), // Cowboy Boots + }; + } +} diff --git a/Mods/ConvenientChests/CategorizeChests/Framework/ItemDataManager.cs b/Mods/ConvenientChests/CategorizeChests/Framework/ItemDataManager.cs new file mode 100644 index 000000000..0480688ea --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Framework/ItemDataManager.cs @@ -0,0 +1,162 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using StardewModdingAPI; +using StardewValley; +using StardewValley.Objects; +using StardewValley.Tools; +using StardewObject = StardewValley.Object; + +namespace ConvenientChests.CategorizeChests.Framework { + internal class ItemDataManager : IItemDataManager { + /// + /// A mapping of category names to the item keys belonging to that category. + /// + public Dictionary> Categories { get; } + + /// + /// A mapping of item keys to a representative instance of the item they correspond to. + /// + public Dictionary Prototypes { get; } = new Dictionary(); + + public ItemDataManager() { + // Load standard items + foreach (var item in DiscoverItems()) { + var key = CreateItemKey(item); + if (ItemBlacklist.Includes(key)) + continue; + + if (Prototypes.ContainsKey(key)) + continue; + + Prototypes.Add(key, item); + } + + // Create Categories + Categories = Prototypes.Keys + .GroupBy(GetCategoryName) + .ToDictionary( + g => g.Key, + g => (IList) g.ToList() + ); + } + + public ItemKey GetItemKey(Item item) { + if (item == null) + throw new Exception(); + + var key = CreateItemKey(item); + if (Prototypes.ContainsKey(key)) + return key; + + // Add to prototypes + Prototypes.Add(key, item); + + var category = GetCategoryName(key); + ModEntry.Log($"Added prototype for '{item.DisplayName}' ({key}) to category '{category}'", LogLevel.Debug); + + // Add to categories, if not blacklisted + if (ItemBlacklist.Includes(key)) + return key; + + if (!Categories.ContainsKey(category)) + Categories.Add(category, new List()); + + if (!Categories[category].Contains(key)) + Categories[category].Add(key); + + + return key; + } + + protected ItemKey CreateItemKey(Item item) { + switch (item) { + // Tool family overrides + case Axe _: + return ToolFactory.getToolFromDescription(ToolFactory.axe, 0).ToItemKey(); + case Pickaxe _: + return ToolFactory.getToolFromDescription(ToolFactory.pickAxe, 0).ToItemKey(); + case Hoe _: + return ToolFactory.getToolFromDescription(ToolFactory.hoe, 0).ToItemKey(); + case WateringCan _: + return ToolFactory.getToolFromDescription(ToolFactory.wateringCan, 0).ToItemKey(); + case FishingRod _: + return ToolFactory.getToolFromDescription(ToolFactory.fishingRod, 0).ToItemKey(); + + default: + return item.ToItemKey(); + } + } + + public Item GetItem(ItemKey itemKey) => Prototypes.ContainsKey(itemKey) + ? Prototypes[itemKey] + : itemKey.GetOne(); + + /// + /// Generate every item known to man, or at least those we're interested + /// in using for categorization. + /// + /// + /// + /// Substantially based on code from Pathoschild's LookupAnything mod. + /// + /// + /// A collection of all of the item entries. + private IEnumerable DiscoverItems() { + // upgradable tools + yield return ToolFactory.getToolFromDescription(ToolFactory.axe, Tool.stone); + yield return ToolFactory.getToolFromDescription(ToolFactory.hoe, Tool.stone); + yield return ToolFactory.getToolFromDescription(ToolFactory.pickAxe, Tool.stone); + yield return ToolFactory.getToolFromDescription(ToolFactory.wateringCan, Tool.stone); + yield return ToolFactory.getToolFromDescription(ToolFactory.fishingRod, Tool.stone); + + // other tools + yield return new MilkPail(); + yield return new Shears(); + yield return new Pan(); + yield return new MagnifyingGlass(); + yield return new Wand(); + + // equipment + foreach (int id in Game1.content.Load>("Data\\Boots").Keys) + yield return new Boots(id); + + foreach (int id in Game1.content.Load>("Data\\hats").Keys) + yield return new Hat(id); + + for (int id = Ring.ringLowerIndexRange; id <= Ring.ringUpperIndexRange; id++) + yield return new Ring(id); + + // weapons + foreach (var item in ItemHelper.GetWeapons()) + yield return item; + + // objects + foreach (int id in Game1.objectInformation.Keys) { + if (id >= Ring.ringLowerIndexRange && id <= Ring.ringUpperIndexRange) + continue; // handled separated + + yield return new StardewObject(id, 1); + } + } + + + /// + /// Decide what category name the given item key should belong to. + /// + /// The chosen category name. + /// The item key to categorize. + public string GetCategoryName(ItemKey itemKey) { + // move scythe to tools + if (itemKey.ItemType == ItemType.Weapon && itemKey.ObjectIndex == MeleeWeapon.scythe) + return "Tool"; + + if (itemKey.ItemType != ItemType.Object) + return itemKey.ItemType.ToString(); + + + var categoryName = GetItem(itemKey).getCategoryName(); + return string.IsNullOrEmpty(categoryName) ? "Miscellaneous" : categoryName; + } + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Framework/ItemKey.cs b/Mods/ConvenientChests/CategorizeChests/Framework/ItemKey.cs new file mode 100644 index 000000000..717b4a091 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Framework/ItemKey.cs @@ -0,0 +1,77 @@ +using System; +using Microsoft.Xna.Framework; +using StardewValley; +using StardewValley.Objects; +using StardewValley.Tools; +using Object = StardewValley.Object; + +namespace ConvenientChests.CategorizeChests.Framework { + internal struct ItemKey { + public ItemType ItemType { get; } + public int ObjectIndex { get; } + + public ItemKey(ItemType itemType, int parentSheetIndex) { + ItemType = itemType; + ObjectIndex = parentSheetIndex; + } + + public override int GetHashCode() => (int) ItemType * 10000 + ObjectIndex; + + public override string ToString() => $"{ItemType}:{ObjectIndex}"; + + public override bool Equals(object obj) => obj is ItemKey itemKey && + itemKey.ItemType == ItemType && + itemKey.ObjectIndex == ObjectIndex; + + public Item GetOne() { + switch (ItemType) { + case ItemType.Boots: + return new Boots(ObjectIndex); + + case ItemType.Furniture: + return new Furniture(ObjectIndex, Vector2.Zero); + + case ItemType.Hat: + return new Hat(ObjectIndex); + + case ItemType.Fish: + case ItemType.Object: + case ItemType.BigCraftable: + return new Object(ObjectIndex, 1); + + case ItemType.Ring: + return new Ring(ObjectIndex); + + case ItemType.Tool: + return ToolFactory.getToolFromDescription((byte) ObjectIndex, Tool.stone); + + case ItemType.Wallpaper: + return new Wallpaper(ObjectIndex); + + case ItemType.Flooring: + return new Wallpaper(ObjectIndex, true); + + case ItemType.Weapon: + return new MeleeWeapon(ObjectIndex); + + case ItemType.Gate: + return new Fence(Vector2.Zero, ObjectIndex, true); + + default: + throw new ArgumentOutOfRangeException(); + } + } + + public string GetCategory() { + // move scythe to tools + if (ItemType == ItemType.Weapon && ObjectIndex == MeleeWeapon.scythe) + return Game1.content.LoadString("Strings\\StringsFromCSFiles:Tool.cs.14307"); + + if (ItemType != ItemType.Object) + return ItemType.ToString(); + + var categoryName = GetOne().getCategoryName(); + return string.IsNullOrEmpty(categoryName) ? "Miscellaneous" : categoryName; + } + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Framework/ItemNotImplementedException.cs b/Mods/ConvenientChests/CategorizeChests/Framework/ItemNotImplementedException.cs new file mode 100644 index 000000000..ec85664c0 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Framework/ItemNotImplementedException.cs @@ -0,0 +1,17 @@ +using System; +using StardewValley; + +namespace ConvenientChests.CategorizeChests.Framework +{ + /// + /// An exception to be raised when some code attempts to perform an + /// operation on an item that's not recognized by the item repository. + /// + class ItemNotImplementedException : Exception + { + public ItemNotImplementedException(Item item) + : base($"Chest categorization for item named {item.Name} is not implemented") + { + } + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Framework/ItemType.cs b/Mods/ConvenientChests/CategorizeChests/Framework/ItemType.cs new file mode 100644 index 000000000..a07804ef5 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Framework/ItemType.cs @@ -0,0 +1,18 @@ +namespace ConvenientChests.CategorizeChests.Framework +{ + internal enum ItemType + { + BigCraftable, + Boots, + Fish, + Flooring, + Furniture, + Hat, + Object, + Ring, + Tool, + Wallpaper, + Weapon, + Gate + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Framework/Persistence/ChestAddress.cs b/Mods/ConvenientChests/CategorizeChests/Framework/Persistence/ChestAddress.cs new file mode 100644 index 000000000..13703a3f2 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Framework/Persistence/ChestAddress.cs @@ -0,0 +1,40 @@ +using Microsoft.Xna.Framework; + +namespace ConvenientChests.CategorizeChests.Framework.Persistence +{ + /// + /// A key that uniquely identifies a spot in the world where a chest exists. + /// + class ChestAddress + { + public ChestLocationType LocationType { get; set; } + + /// + /// The name of the GameLocation where the chest is. + /// + public string LocationName { get; set; } + + /// + /// The name of the building the chest is in, if the location is a + /// buildable location. + /// + public string BuildingName { get; set; } + + /// + /// The tile the chest is found on. + /// + public Vector2 Tile { get; set; } + + public ChestAddress() + { + } + + public ChestAddress(string locationName, Vector2 tile, ChestLocationType locationType = ChestLocationType.Normal, string buildingName = "") + { + LocationName = locationName; + Tile = tile; + LocationType = locationType; + BuildingName = buildingName; + } + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Framework/Persistence/ChestEntry.cs b/Mods/ConvenientChests/CategorizeChests/Framework/Persistence/ChestEntry.cs new file mode 100644 index 000000000..19a7a28b6 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Framework/Persistence/ChestEntry.cs @@ -0,0 +1,43 @@ +using System.Collections.Generic; +using System.Linq; + +namespace ConvenientChests.CategorizeChests.Framework.Persistence +{ + /// + /// A piece of saved data describing the location of a chest and what items + /// the chest at that location has been assigned to. + /// + class ChestEntry + { + /// + /// The chest's location in the world. + /// + public ChestAddress Address; + + /// + /// The set of item keys that were configured to be accepted + /// by the chest at . + /// + public Dictionary AcceptedItems; + + + public ChestEntry() + { + } + + public ChestEntry(ChestData data, ChestAddress address) + { + Address = address; + AcceptedItems = data.AcceptedItemKinds + .GroupBy(i => i.ItemType) + .ToDictionary( + g => g.Key, + g => string.Join(",", g.Select(i => i.ObjectIndex)) + ); + } + + + public HashSet GetItemSet() => + new HashSet(AcceptedItems.SelectMany(e => e.Value.Split(',').Select(i => new ItemKey(e.Key, int.Parse(i))))); + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Framework/Persistence/ChestLocationType.cs b/Mods/ConvenientChests/CategorizeChests/Framework/Persistence/ChestLocationType.cs new file mode 100644 index 000000000..9c6643618 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Framework/Persistence/ChestLocationType.cs @@ -0,0 +1,9 @@ +namespace ConvenientChests.CategorizeChests.Framework.Persistence +{ + enum ChestLocationType + { + Normal, + Building, + Refrigerator + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Framework/Persistence/ISaveManager.cs b/Mods/ConvenientChests/CategorizeChests/Framework/Persistence/ISaveManager.cs new file mode 100644 index 000000000..1e5b9a8c3 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Framework/Persistence/ISaveManager.cs @@ -0,0 +1,8 @@ +namespace ConvenientChests.CategorizeChests.Framework.Persistence +{ + interface ISaveManager + { + void Save(string relativePath); + void Load(string relativePath); + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Framework/Persistence/InvalidSaveDataException.cs b/Mods/ConvenientChests/CategorizeChests/Framework/Persistence/InvalidSaveDataException.cs new file mode 100644 index 000000000..5dcfbf8b6 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Framework/Persistence/InvalidSaveDataException.cs @@ -0,0 +1,14 @@ +using System; + +namespace ConvenientChests.CategorizeChests.Framework.Persistence +{ + /// + /// An exception to be raised when save data is malformed or fails to + /// correspond to the state of the game world. + /// + class InvalidSaveDataException : Exception + { + public InvalidSaveDataException(string message) : base(message) {} + public InvalidSaveDataException(string message, Exception inner) : base(message, inner) {} + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Framework/Persistence/SaveData.cs b/Mods/ConvenientChests/CategorizeChests/Framework/Persistence/SaveData.cs new file mode 100644 index 000000000..c5772d2cf --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Framework/Persistence/SaveData.cs @@ -0,0 +1,12 @@ +using System.Collections.Generic; + +namespace ConvenientChests.CategorizeChests.Framework.Persistence +{ + class SaveData + { + /// + /// A list of chest addresses and the chest data associated with them. + /// + public IEnumerable ChestEntries; + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Framework/Persistence/SaveManager.cs b/Mods/ConvenientChests/CategorizeChests/Framework/Persistence/SaveManager.cs new file mode 100644 index 000000000..33e9c7ab7 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Framework/Persistence/SaveManager.cs @@ -0,0 +1,46 @@ +using System.Linq; +using StardewModdingAPI; + +namespace ConvenientChests.CategorizeChests.Framework.Persistence { + /// + /// The class responsible for saving and loading the mod state. + /// + class SaveManager : ISaveManager { + private readonly CategorizeChestsModule Module; + + public SaveManager(CategorizeChestsModule module) { + Module = module; + } + + /// + /// Generate save data and write it to the given file path. + /// + /// The path of the save file relative to the mod folder. + public void Save(string relativePath) { + var saver = new Saver(Module.ChestDataManager); + Module.ModEntry.Helper.Data.WriteJsonFile(relativePath, saver.GetSerializableData()); + } + + /// + /// Load save data from the given file path. + /// + /// The path of the save file relative to the mod folder. + public void Load(string relativePath) { + var model = Module.ModEntry.Helper.Data.ReadJsonFile(relativePath) ?? new SaveData(); + + foreach (var entry in model.ChestEntries) { + try { + var chest = Module.ChestFinder.GetChestByAddress(entry.Address); + var chestData = Module.ChestDataManager.GetChestData(chest); + + chestData.AcceptedItemKinds = entry.GetItemSet(); + foreach (var key in chestData.AcceptedItemKinds.Where(k => !Module.ItemDataManager.Prototypes.ContainsKey(k))) + Module.ItemDataManager.Prototypes.Add(key, key.GetOne()); + } + catch (InvalidSaveDataException e) { + Module.Monitor.Log(e.Message, LogLevel.Warn); + } + } + } + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Framework/Saver.cs b/Mods/ConvenientChests/CategorizeChests/Framework/Saver.cs new file mode 100644 index 000000000..e9282f02a --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Framework/Saver.cs @@ -0,0 +1,81 @@ +using System.Collections.Generic; +using System.Linq; +using ConvenientChests.CategorizeChests.Framework.Persistence; +using Microsoft.Xna.Framework; +using StardewModdingAPI; +using StardewValley; +using StardewValley.Locations; +using StardewValley.Objects; + +namespace ConvenientChests.CategorizeChests.Framework +{ + /// + /// The class responsible for producing data to be saved. + /// + class Saver + { + private readonly IChestDataManager ChestDataManager; + + public Saver(IChestDataManager chestDataManager) + { + ChestDataManager = chestDataManager; + } + + /// + /// Build save data for the current game state. + /// + public SaveData GetSerializableData() + { + return new SaveData + { + ChestEntries = BuildChestEntries() + }; + } + + private IEnumerable BuildChestEntries() + { + foreach (var location in Game1.locations) + { + // chests + foreach (var pair in GetLocationChests(location)) + yield return new ChestEntry( + ChestDataManager.GetChestData(pair.Value), + new ChestAddress(location.Name, pair.Key) + ); + + switch (location) + { + // buildings + case BuildableGameLocation buildableLocation: + foreach (var building in buildableLocation.buildings.Where(b => b.indoors.Value != null)) + foreach (var pair in GetLocationChests(building.indoors.Value)) + yield return new ChestEntry( + ChestDataManager.GetChestData(pair.Value), + new ChestAddress(location.Name, pair.Key, ChestLocationType.Building, building.nameOfIndoors) + ); + break; + + // fridges + case FarmHouse farmHouse when farmHouse.upgradeLevel >= 1: + yield return new ChestEntry( + ChestDataManager.GetChestData(farmHouse.fridge.Value), + new ChestAddress {LocationName = farmHouse.uniqueName?.Value ?? farmHouse.Name, LocationType = ChestLocationType.Refrigerator} + ); + break; + } + } + } + + /// + /// Retrieve a collection of the chest objects present in the given + /// location, keyed by their tile location. + /// + private static IDictionary GetLocationChests(GameLocation location) => + location.Objects.Pairs + .Where(pair => pair.Value is Chest c && c.playerChest.Value) + .ToDictionary( + pair => pair.Key, + pair => (Chest) pair.Value + ); + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Interface/ITooltipManager.cs b/Mods/ConvenientChests/CategorizeChests/Interface/ITooltipManager.cs new file mode 100644 index 000000000..ccacd36d8 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Interface/ITooltipManager.cs @@ -0,0 +1,11 @@ +using ConvenientChests.CategorizeChests.Interface.Widgets; +using Microsoft.Xna.Framework.Graphics; + +namespace ConvenientChests.CategorizeChests.Interface +{ + interface ITooltipManager + { + void ShowTooltipThisFrame(Widget tooltip); + void Draw(SpriteBatch batch); + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Interface/InterfaceHost.cs b/Mods/ConvenientChests/CategorizeChests/Interface/InterfaceHost.cs new file mode 100644 index 000000000..6d9608688 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Interface/InterfaceHost.cs @@ -0,0 +1,216 @@ +// This file is substantially taken from the BaseOverlay class included in Pathoschild's ChestsAnywhere mod. + +using System; +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; +using Microsoft.Xna.Framework.Input; +using StardewModdingAPI; +using StardewModdingAPI.Events; +using StardewValley; +using Rectangle = xTile.Dimensions.Rectangle; + +namespace ConvenientChests.CategorizeChests.Interface +{ + /// An interface which supports user interaction and overlays the active menu (if any). + public abstract class InterfaceHost : IDisposable + { + /********* + ** Fields + *********/ + /// The SMAPI events available for mods. + private readonly IModEvents Events; + + /// An API for checking and changing input state. + protected readonly IInputHelper InputHelper; + + /// The last viewport bounds. + private Rectangle LastViewport; + + /// Indicates whether to keep the overlay active. If null, the overlay is kept until explicitly disposed. + private readonly Func KeepAliveCheck; + + + /********* + ** Public methods + *********/ + /// Release all resources. + public virtual void Dispose() + { + this.Events.Display.Rendered -= this.OnRendered; + this.Events.GameLoop.UpdateTicked -= this.OnUpdateTicked; + this.Events.Input.ButtonPressed -= this.OnButtonPressed; + this.Events.Input.CursorMoved -= this.OnCursorMoved; + this.Events.Input.MouseWheelScrolled -= this.OnMouseWheelScrolled; + } + + + /********* + ** Protected methods + *********/ + /**** + ** Implementation + ****/ + /// Construct an instance. + /// The SMAPI events available for mods. + /// An API for checking and changing input state. + /// Indicates whether to keep the overlay active. If null, the overlay is kept until explicitly disposed. + protected InterfaceHost(IModEvents events, IInputHelper inputHelper, Func keepAlive = null) + { + this.Events = events; + this.InputHelper = inputHelper; + this.KeepAliveCheck = keepAlive; + this.LastViewport = new Rectangle(Game1.viewport.X, Game1.viewport.Y, Game1.viewport.Width, Game1.viewport.Height); + + events.Display.Rendered += this.OnRendered; + events.GameLoop.UpdateTicked += this.OnUpdateTicked; + events.Input.ButtonPressed += this.OnButtonPressed; + events.Input.CursorMoved += this.OnCursorMoved; + events.Input.MouseWheelScrolled += this.OnMouseWheelScrolled; + } + + /// Draw the overlay to the screen. + /// The sprite batch being drawn. + protected virtual void Draw(SpriteBatch batch) { } + + /// The method invoked when the player left-clicks. + /// The X-position of the cursor. + /// The Y-position of the cursor. + /// Whether the event has been handled and shouldn't be propagated further. + protected virtual bool ReceiveLeftClick(int x, int y) + { + return false; + } + + /// The method invoked when the player presses a button. + /// The button that was pressed. + /// Whether the event has been handled and shouldn't be propagated further. + protected virtual bool ReceiveButtonPress(SButton input) + { + return false; + } + + /// The method invoked when the player uses the mouse scroll wheel. + /// The scroll amount. + /// Whether the event has been handled and shouldn't be propagated further. + protected virtual bool ReceiveScrollWheelAction(int amount) + { + return false; + } + + /// The method invoked when the cursor is hovered. + /// The cursor's X position. + /// The cursor's Y position. + /// Whether the event has been handled and shouldn't be propagated further. + protected virtual bool ReceiveCursorHover(int x, int y) + { + return false; + } + + /// The method invoked when the player resizes the game windoww. + /// The previous game window bounds. + /// The new game window bounds. + protected virtual void ReceiveGameWindowResized(Rectangle oldBounds, Rectangle newBounds) { } + + /// Draw the mouse cursor. + /// Derived from . + protected void DrawCursor() + { + if (Game1.options.hardwareCursor) + return; + Game1.spriteBatch.Draw(Game1.mouseCursors, new Vector2(Game1.getMouseX(), Game1.getMouseY()), Game1.getSourceRectForStandardTileSheet(Game1.mouseCursors, Game1.options.SnappyMenus ? 44 : 0, 16, 16), Color.White * Game1.mouseCursorTransparency, 0.0f, Vector2.Zero, Game1.pixelZoom + Game1.dialogueButtonScale / 150f, SpriteEffects.None, 1f); + } + + /**** + ** Event listeners + ****/ + /// The method called when the game finishes drawing components to the screen. + /// The source of the event. + /// The event arguments. + private void OnRendered(object sender, RenderedEventArgs e) + { + this.Draw(Game1.spriteBatch); + } + + /// The method called once per event tick. + /// The source of the event. + /// The event arguments. + private void OnUpdateTicked(object sender, UpdateTickedEventArgs e) + { + // detect end of life + if (this.KeepAliveCheck != null && !this.KeepAliveCheck()) + { + this.Dispose(); + return; + } + + // trigger window resize event + Rectangle newViewport = Game1.viewport; + if (this.LastViewport.Width != newViewport.Width || this.LastViewport.Height != newViewport.Height) + { + newViewport = new Rectangle(newViewport.X, newViewport.Y, newViewport.Width, newViewport.Height); + this.ReceiveGameWindowResized(this.LastViewport, newViewport); + this.LastViewport = newViewport; + } + } + + /// The method invoked when the player presses a key. + /// The source of the event. + /// The event arguments. + private void OnButtonPressed(object sender, ButtonPressedEventArgs e) + { + bool handled = e.Button == SButton.MouseLeft || e.Button.IsUseToolButton() + ? this.ReceiveLeftClick(Game1.getMouseX(), Game1.getMouseY()) + : this.ReceiveButtonPress(e.Button); + + if (handled) + this.InputHelper.Suppress(e.Button); + } + + /// The method invoked when the mouse wheel is scrolled. + /// The source of the event. + /// The event arguments. + private void OnMouseWheelScrolled(object sender, MouseWheelScrolledEventArgs e) + { + bool scrollHandled = this.ReceiveScrollWheelAction(e.Delta); + if (scrollHandled) + { + MouseState cur = Game1.oldMouseState; + Game1.oldMouseState = new MouseState( + x: cur.X, + y: cur.Y, + scrollWheel: e.NewValue, + leftButton: cur.LeftButton, + middleButton: cur.MiddleButton, + rightButton: cur.RightButton, + xButton1: cur.XButton1, + xButton2: cur.XButton2 + ); + } + } + + /// The method invoked when the in-game cursor is moved. + /// The source of the event. + /// The event arguments. + private void OnCursorMoved(object sender, CursorMovedEventArgs e) + { + int x = (int)e.NewPosition.ScreenPixels.X; + int y = (int)e.NewPosition.ScreenPixels.Y; + + bool hoverHandled = this.ReceiveCursorHover(x, y); + if (hoverHandled) + { + MouseState cur = Game1.oldMouseState; + Game1.oldMouseState = new MouseState( + x: x, + y: y, + scrollWheel: cur.ScrollWheelValue, + leftButton: cur.LeftButton, + middleButton: cur.MiddleButton, + rightButton: cur.RightButton, + xButton1: cur.XButton1, + xButton2: cur.XButton2 + ); + } + } + } +} diff --git a/Mods/ConvenientChests/CategorizeChests/Interface/NineSlice.cs b/Mods/ConvenientChests/CategorizeChests/Interface/NineSlice.cs new file mode 100644 index 000000000..1a0816a45 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Interface/NineSlice.cs @@ -0,0 +1,77 @@ +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; + +namespace ConvenientChests.CategorizeChests.Interface +{ + class NineSlice + { + public TextureRegion Center; + public TextureRegion Top; + public TextureRegion TopRight; + public TextureRegion Right; + public TextureRegion BottomRight; + public TextureRegion Bottom; + public TextureRegion BottomLeft; + public TextureRegion Left; + public TextureRegion TopLeft; + + public int RightBorderThickness => Right.Width; + public int LeftBorderThickness => Left.Width; + public int TopBorderThickness => Top.Height; + public int BottomBorderThickness => Bottom.Height; + + public void Draw(SpriteBatch batch, Rectangle bounds) + { + // draw background + batch.Draw(Center, + bounds.X + Left.Width, + bounds.Y + Top.Height, + bounds.Width - Left.Width - Right.Width, + bounds.Height - Top.Height - Bottom.Height); + + // draw borders + batch.Draw(Top, + bounds.X + TopLeft.Width, + bounds.Y, + bounds.Width - TopLeft.Width - TopRight.Width, + Top.Height); + batch.Draw(Left, + bounds.X, + bounds.Y + TopLeft.Height, + Left.Width, + bounds.Height - TopLeft.Height - BottomLeft.Height); + batch.Draw(Right, + bounds.X + bounds.Width - Right.Width, + bounds.Y + TopRight.Height, + Right.Width, + bounds.Height - TopRight.Height - BottomRight.Height); + batch.Draw(Bottom, + bounds.X + BottomLeft.Width, + bounds.Y + bounds.Height - Bottom.Height, + bounds.Width - BottomLeft.Width - BottomRight.Width, + Bottom.Height); + + // draw border joints + batch.Draw(TopLeft, + bounds.X, + bounds.Y, + TopLeft.Width, + TopLeft.Height); + batch.Draw(TopRight, + bounds.X + bounds.Width - TopRight.Width, + bounds.Y, + TopRight.Width, + TopRight.Height); + batch.Draw(BottomLeft, + bounds.X, + bounds.Y + bounds.Height - BottomLeft.Height, + BottomLeft.Width, + BottomLeft.Height); + batch.Draw(BottomRight, + bounds.X + bounds.Width - BottomRight.Width, + bounds.Y + bounds.Height - BottomRight.Height, + BottomRight.Width, + BottomRight.Height); + } + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Interface/Sprites.cs b/Mods/ConvenientChests/CategorizeChests/Interface/Sprites.cs new file mode 100644 index 000000000..5b2baa529 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Interface/Sprites.cs @@ -0,0 +1,77 @@ +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; +using StardewValley; + +namespace ConvenientChests.CategorizeChests.Interface +{ + static class Sprites + { + public static readonly NineSlice TabBackground = new NineSlice + { + TopLeft = new TextureRegion(Game1.mouseCursors, new Rectangle(0, 384, 5, 5), zoom: true), + TopRight = new TextureRegion(Game1.mouseCursors, new Rectangle(11, 384, 5, 5), zoom: true), + BottomLeft = new TextureRegion(Game1.mouseCursors, new Rectangle(0, 395, 5, 5), zoom: true), + BottomRight = new TextureRegion(Game1.mouseCursors, new Rectangle(11, 395, 5, 5), zoom: true), + Top = new TextureRegion(Game1.mouseCursors, new Rectangle(4, 384, 1, 3), zoom: true), + Left = new TextureRegion(Game1.mouseCursors, new Rectangle(0, 388, 3, 1), zoom: true), + Right = new TextureRegion(Game1.mouseCursors, new Rectangle(13, 388, 3, 1), zoom: true), + Bottom = new TextureRegion(Game1.mouseCursors, new Rectangle(4, 397, 1, 3), zoom: true), + Center = new TextureRegion(Game1.mouseCursors, new Rectangle(5, 387, 1, 1), zoom: true), + }; + + public static readonly NineSlice MenuBackground = new NineSlice + { + TopLeft = new TextureRegion(Game1.menuTexture, new Rectangle(12, 12, 24, 24)), + TopRight = new TextureRegion(Game1.menuTexture, new Rectangle(220, 12, 24, 24)), + BottomLeft = new TextureRegion(Game1.menuTexture, new Rectangle(12, 220, 24, 24)), + BottomRight = new TextureRegion(Game1.menuTexture, new Rectangle(220, 220, 24, 24)), + Top = new TextureRegion(Game1.menuTexture, new Rectangle(40, 12, 1, 24)), + Left = new TextureRegion(Game1.menuTexture, new Rectangle(12, 36, 24, 1)), + Right = new TextureRegion(Game1.menuTexture, new Rectangle(220, 40, 24, 1)), + Bottom = new TextureRegion(Game1.menuTexture, new Rectangle(36, 220, 1, 24)), + Center = new TextureRegion(Game1.menuTexture, new Rectangle(64, 128, 64, 64)), + }; + + public static readonly NineSlice TooltipBackground = new NineSlice + { + TopLeft = new TextureRegion(Game1.mouseCursors, new Rectangle(293, 360, 4, 4), zoom: true), + Left = new TextureRegion(Game1.mouseCursors, new Rectangle(293, 364, 4, 16), zoom: true), + BottomLeft = new TextureRegion(Game1.mouseCursors, new Rectangle(293, 380, 4, 4), zoom: true), + Bottom = new TextureRegion(Game1.mouseCursors, new Rectangle(297, 380, 16, 4), zoom: true), + BottomRight = new TextureRegion(Game1.mouseCursors, new Rectangle(313, 380, 4, 4), zoom: true), + Right = new TextureRegion(Game1.mouseCursors, new Rectangle(313, 364, 4, 16), zoom: true), + TopRight = new TextureRegion(Game1.mouseCursors, new Rectangle(313, 360, 4, 4), zoom: true), + Top = new TextureRegion(Game1.mouseCursors, new Rectangle(297, 360, 16, 4), zoom: true), + Center = new TextureRegion(Game1.mouseCursors, new Rectangle(297, 364, 16, 16), zoom: true), + }; + + public static readonly NineSlice LeftProtrudingTab = new NineSlice + { + TopLeft = new TextureRegion(Game1.mouseCursors, new Rectangle(656, 64, 5, 5), zoom: true), + TopRight = new TextureRegion(Game1.mouseCursors, new Rectangle(670, 64, 2, 5), zoom: true), + BottomLeft = new TextureRegion(Game1.mouseCursors, new Rectangle(656, 75, 5, 5), zoom: true), + BottomRight = new TextureRegion(Game1.mouseCursors, new Rectangle(670, 75, 2, 5), zoom: true), + Top = new TextureRegion(Game1.mouseCursors, new Rectangle(661, 64, 1, 4), zoom: true), + Left = new TextureRegion(Game1.mouseCursors, new Rectangle(656, 69, 5, 1), zoom: true), + Right = new TextureRegion(Game1.mouseCursors, new Rectangle(670, 68, 2, 1), zoom: true), + Bottom = new TextureRegion(Game1.mouseCursors, new Rectangle(661, 76, 1, 4), zoom: true), + Center = new TextureRegion(Game1.mouseCursors, new Rectangle(661, 68, 1, 1), zoom: true), + }; + + public static readonly TextureRegion LeftArrow = new TextureRegion(Game1.mouseCursors, new Rectangle(8, 268, 44, 40)); + public static readonly TextureRegion RightArrow = new TextureRegion(Game1.mouseCursors, new Rectangle(12, 204, 44, 40)); + public static readonly TextureRegion EmptyCheckbox = new TextureRegion(Game1.mouseCursors, new Rectangle(227, 425, 9, 9), zoom: true); + public static readonly TextureRegion FilledCheckbox = new TextureRegion(Game1.mouseCursors, new Rectangle(236, 425, 9, 9), zoom: true); + public static readonly TextureRegion ExitButton = new TextureRegion(Game1.mouseCursors, new Rectangle(337, 494, 12, 12), zoom: true); + + public static void Draw(this SpriteBatch batch, Texture2D sheet, Rectangle sprite, int x, int y, int width, int height, Color? color = null) + { + batch.Draw(sheet, new Rectangle(x, y, width, height), sprite, color ?? Color.White); + } + + public static void Draw(this SpriteBatch batch, TextureRegion textureRegion, int x, int y, int width, int height, Color? color = null) + { + batch.Draw(textureRegion.Texture, textureRegion.Region, x, y, width, height, color); + } + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Interface/TextureRegion.cs b/Mods/ConvenientChests/CategorizeChests/Interface/TextureRegion.cs new file mode 100644 index 000000000..11805173e --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Interface/TextureRegion.cs @@ -0,0 +1,28 @@ +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; +using StardewValley; + +namespace ConvenientChests.CategorizeChests.Interface +{ + class TextureRegion + { + public readonly Texture2D Texture; + public readonly Rectangle Region; + public readonly bool Zoom; + + public TextureRegion(Texture2D texture, Rectangle region) + : this(texture, region, zoom: false) + { + } + + public TextureRegion(Texture2D texture, Rectangle region, bool zoom) + { + Texture = texture; + Region = region; + Zoom = zoom; + } + + public int Width => Region.Width * (Zoom ? Game1.pixelZoom : 1); + public int Height => Region.Height * (Zoom ? Game1.pixelZoom : 1); + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Interface/TooltipManager.cs b/Mods/ConvenientChests/CategorizeChests/Interface/TooltipManager.cs new file mode 100644 index 000000000..6399fae5c --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Interface/TooltipManager.cs @@ -0,0 +1,34 @@ +using ConvenientChests.CategorizeChests.Interface.Widgets; +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; +using StardewValley; + +namespace ConvenientChests.CategorizeChests.Interface +{ + class TooltipManager : ITooltipManager + { + private Widget Tooltip; + + public void ShowTooltipThisFrame(Widget tooltip) + { + Tooltip = tooltip; + } + + public void Draw(SpriteBatch batch) + { + if (Tooltip != null) + { + var mousePosition = Game1.getMousePosition(); + + Tooltip.Position = new Point( + mousePosition.X + 8 * Game1.pixelZoom, + mousePosition.Y + 8 * Game1.pixelZoom + ); + + Tooltip.Draw(batch); + + Tooltip = null; + } + } + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Interface/WidgetHost.cs b/Mods/ConvenientChests/CategorizeChests/Interface/WidgetHost.cs new file mode 100644 index 000000000..387bf0632 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Interface/WidgetHost.cs @@ -0,0 +1,40 @@ +using ConvenientChests.CategorizeChests.Interface.Widgets; +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; +using StardewModdingAPI; +using StardewModdingAPI.Events; +using StardewValley; + +namespace ConvenientChests.CategorizeChests.Interface +{ + class WidgetHost : InterfaceHost + { + public readonly Widget RootWidget; + public readonly ITooltipManager TooltipManager; + + public WidgetHost(IModEvents events, IInputHelper input) + : base(events, input) + { + RootWidget = new Widget() {Width = Game1.viewport.Width, Height = Game1.viewport.Height}; + TooltipManager = new TooltipManager(); + } + + protected override void Draw(SpriteBatch batch) + { + RootWidget.Draw(batch); + DrawCursor(); + TooltipManager.Draw(batch); + } + + protected override bool ReceiveButtonPress(SButton input) => RootWidget.ReceiveButtonPress(input); + protected override bool ReceiveLeftClick(int x, int y) => RootWidget.ReceiveLeftClick(new Point(x, y)); + protected override bool ReceiveCursorHover(int x, int y) => RootWidget.ReceiveCursorHover(new Point(x, y)); + protected override bool ReceiveScrollWheelAction(int amount) => RootWidget.ReceiveScrollWheelAction(amount); + + + public override void Dispose() { + base.Dispose(); + RootWidget?.Dispose(); + } + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/Background.cs b/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/Background.cs new file mode 100644 index 000000000..0c2d31e77 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/Background.cs @@ -0,0 +1,30 @@ +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; + +namespace ConvenientChests.CategorizeChests.Interface.Widgets +{ + /// + /// A resizable nine-slice background. + /// + class Background : Widget + { + public readonly NineSlice Graphic; + + public Background(NineSlice nineSlice) + { + Graphic = nineSlice; + } + + public Background(NineSlice nineSlice, int width, int height) + { + Graphic = nineSlice; + Width = width; + Height = height; + } + + public override void Draw(SpriteBatch batch) + { + Graphic.Draw(batch, new Rectangle(GlobalPosition.X, GlobalPosition.Y, Width, Height)); + } + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/Button.cs b/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/Button.cs new file mode 100644 index 000000000..8c8c14d50 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/Button.cs @@ -0,0 +1,19 @@ +using System; +using Microsoft.Xna.Framework; + +namespace ConvenientChests.CategorizeChests.Interface.Widgets +{ + /// + /// A simple clickable widget. + /// + public abstract class Button : Widget + { + public event Action OnPress; + + public override bool ReceiveLeftClick(Point point) + { + OnPress?.Invoke(); + return true; + } + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/CategoryMenu.cs b/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/CategoryMenu.cs new file mode 100644 index 000000000..60fb34c1e --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/CategoryMenu.cs @@ -0,0 +1,171 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using ConvenientChests.CategorizeChests.Framework; +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; +using StardewValley; + +namespace ConvenientChests.CategorizeChests.Interface.Widgets { + class CategoryMenu : Widget { + // Styling settings + private const int MaxItemColumns = 12; + private static int Padding => 2 * Game1.pixelZoom; + private static SpriteFont HeaderFont => Game1.dialogueFont; + + // Elements + private Widget Body { get; set; } + private Widget TopRow { get; set; } + private LabeledCheckbox SelectAllButton { get; set; } + private SpriteButton CloseButton { get; set; } + private Background Background { get; set; } + private Label CategoryLabel { get; set; } + private SpriteButton PrevButton { get; set; } + private SpriteButton NextButton { get; set; } + private WrapBag ToggleBag { get; set; } + private IEnumerable ItemToggles => ToggleBag.Children.OfType(); + + private IItemDataManager ItemDataManager { get; } + private ITooltipManager TooltipManager { get; } + private ChestData ChestData { get; } + private int Index { get; set; } + private List Categories { get; } + private string ActiveCategory => Categories[Index]; + + public event Action OnClose; + + public CategoryMenu(ChestData chestData, IItemDataManager itemDataManager, ITooltipManager tooltipManager) { + ItemDataManager = itemDataManager; + TooltipManager = tooltipManager; + ChestData = chestData; + + Categories = itemDataManager.Categories.Keys.ToList(); + Categories.Sort(); + + BuildWidgets(); + + SetCategory(Index); + } + + private void BuildWidgets() { + Background = AddChild(new Background(Sprites.MenuBackground)); + Body = AddChild(new Widget()); + TopRow = Body.AddChild(new Widget()); + ToggleBag = Body.AddChild(new WrapBag(MaxItemColumns * Game1.tileSize)); + + NextButton = TopRow.AddChild(new SpriteButton(Sprites.RightArrow)); + PrevButton = TopRow.AddChild(new SpriteButton(Sprites.LeftArrow)); + NextButton.OnPress += () => CycleCategory(1); + PrevButton.OnPress += () => CycleCategory(-1); + + SelectAllButton = TopRow.AddChild(new LabeledCheckbox("All")); + SelectAllButton.OnChange += OnToggleSelectAll; + + CloseButton = AddChild(new SpriteButton(Sprites.ExitButton)); + CloseButton.OnPress += () => OnClose?.Invoke(); + + CategoryLabel = TopRow.AddChild(new Label("", Color.Black, HeaderFont)); + } + + private void PositionElements() { + Body.Position = new Point(Background.Graphic.LeftBorderThickness, Background.Graphic.RightBorderThickness); + + // Figure out width + Body.Width = ToggleBag.Width; + TopRow.Width = Body.Width; + Width = Body.Width + Background.Graphic.LeftBorderThickness + Background.Graphic.RightBorderThickness + Padding * 2; + + // Build the top row + var longestCat = Categories.OrderByDescending(s => s.Length).First(); + var headerWidth = (int) HeaderFont.MeasureString(longestCat).X; + NextButton.X = TopRow.Width / 2 + headerWidth / 2; + PrevButton.X = TopRow.Width / 2 - PrevButton.Width - headerWidth / 2; + + SelectAllButton.X = Padding; + + CategoryLabel.CenterHorizontally(); + + TopRow.Height = TopRow.Children.Max(c => c.Height); + + foreach (var child in TopRow.Children) + child.Y = TopRow.Height / 2 - child.Height / 2; + + // Figure out height and vertical positioning + ToggleBag.Y = TopRow.Y + TopRow.Height + Padding; + Body.Height = ToggleBag.Y + ToggleBag.Height; + Height = (Body.Height + Background.Graphic.TopBorderThickness + Background.Graphic.BottomBorderThickness + Padding * 2); + + Background.Width = Width; + Background.Height = Height; + + CloseButton.Position = new Point(Width - CloseButton.Width, 0); + } + + private void OnToggleSelectAll(bool on) { + if (on) + SelectAll(); + else + SelectNone(); + } + + private void SelectAll() { + foreach (var toggle in ItemToggles) { + if (!toggle.Active) + toggle.Toggle(); + } + } + + private void SelectNone() { + foreach (var toggle in ItemToggles) { + if (toggle.Active) + toggle.Toggle(); + } + } + + private void CycleCategory(int offset) { + SetCategory(Utility.Mod(Index + offset, Categories.Count)); + } + + private void SetCategory(int index) { + Index = index; + CategoryLabel.Text = ActiveCategory; + + RecreateItemToggles(); + + SelectAllButton.Checked = AreAllSelected(); + + PositionElements(); + } + + private void RecreateItemToggles() { + ToggleBag.RemoveChildren(); + + var itemKeys = ItemDataManager.Categories[ActiveCategory]; + + foreach (var itemKey in itemKeys) { + var item = ItemDataManager.GetItem(itemKey); + var toggle = ToggleBag.AddChild(new ItemToggle(TooltipManager, item, ChestData.Accepts(itemKey))); + toggle.OnToggle += () => ToggleItem(itemKey); + } + } + + private void ToggleItem(ItemKey itemKey) { + ChestData.Toggle(itemKey); + SelectAllButton.Checked = AreAllSelected(); + } + + private bool AreAllSelected() { + return ItemToggles.Count(t => !t.Active) == 0; + } + + public override bool ReceiveLeftClick(Point point) { + PropagateLeftClick(point); + return true; + } + + public override bool ReceiveScrollWheelAction(int amount) { + CycleCategory(amount > 1 ? -1 : 1); + return true; + } + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/ChestOverlay.cs b/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/ChestOverlay.cs new file mode 100644 index 000000000..1223a0fed --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/ChestOverlay.cs @@ -0,0 +1,127 @@ +using System; +using ConvenientChests.StackToNearbyChests; +using Microsoft.Xna.Framework; +using StardewModdingAPI; +using StardewValley; +using StardewValley.Menus; +using StardewValley.Objects; + +namespace ConvenientChests.CategorizeChests.Interface.Widgets { + internal class ChestOverlay : Widget { + private ItemGrabMenu ItemGrabMenu { get; } + private CategorizeChestsModule Module { get; } + private Chest Chest { get; } + private ITooltipManager TooltipManager { get; } + + private readonly InventoryMenu InventoryMenu; + private readonly InventoryMenu.highlightThisItem DefaultChestHighlighter; + private readonly InventoryMenu.highlightThisItem DefaultInventoryHighlighter; + + private TextButton OpenButton { get; set; } + private TextButton StashButton { get; set; } + private CategoryMenu CategoryMenu { get; set; } + + public ChestOverlay(CategorizeChestsModule module, Chest chest, ItemGrabMenu menu, ITooltipManager tooltipManager) { + Module = module; + Chest = chest; + ItemGrabMenu = menu; + InventoryMenu = menu.ItemsToGrabMenu; + TooltipManager = tooltipManager; + + DefaultChestHighlighter = ItemGrabMenu.inventory.highlightMethod; + DefaultInventoryHighlighter = InventoryMenu.highlightMethod; + + AddButtons(); + } + + protected override void OnParent(Widget parent) { + base.OnParent(parent); + + if (parent == null) return; + Width = parent.Width; + Height = parent.Height; + } + + private void AddButtons() { + OpenButton = new TextButton("Categorize", Sprites.LeftProtrudingTab); + OpenButton.OnPress += ToggleMenu; + AddChild(OpenButton); + + StashButton = new TextButton(ChooseStashButtonLabel(), Sprites.LeftProtrudingTab); + StashButton.OnPress += StashItems; + AddChild(StashButton); + + PositionButtons(); + } + + private void PositionButtons() { + StashButton.Width = OpenButton.Width = Math.Max(StashButton.Width, OpenButton.Width); + + OpenButton.Position = new Point( + ItemGrabMenu.xPositionOnScreen + ItemGrabMenu.width / 2 - OpenButton.Width - 112 * Game1.pixelZoom, + ItemGrabMenu.yPositionOnScreen + 22 * Game1.pixelZoom + ); + + StashButton.Position = new Point( + OpenButton.Position.X + OpenButton.Width - StashButton.Width, + OpenButton.Position.Y + OpenButton.Height - 0 + ); + } + + private string ChooseStashButtonLabel() { + return Module.Config.StashKey == SButton.None + ? "Stash" + : $"Stash ({Module.Config.StashKey})"; + } + + private void ToggleMenu() { + if (CategoryMenu == null) + OpenCategoryMenu(); + + else + CloseCategoryMenu(); + } + + private void OpenCategoryMenu() { + var chestData = Module.ChestDataManager.GetChestData(Chest); + CategoryMenu = new CategoryMenu(chestData, Module.ItemDataManager, TooltipManager); + CategoryMenu.Position = new Point( + ItemGrabMenu.xPositionOnScreen + ItemGrabMenu.width / 2 - CategoryMenu.Width / 2 - 6 * Game1.pixelZoom, + ItemGrabMenu.yPositionOnScreen - 10 * Game1.pixelZoom + ); + CategoryMenu.OnClose += CloseCategoryMenu; + AddChild(CategoryMenu); + + SetItemsClickable(false); + } + + private void CloseCategoryMenu() { + RemoveChild(CategoryMenu); + CategoryMenu = null; + + SetItemsClickable(true); + } + + private void StashItems() => StackLogic.StashToChest(Chest, ModEntry.StashNearby.AcceptingFunction); + + public override bool ReceiveLeftClick(Point point) { + var hit = PropagateLeftClick(point); + if (!hit && CategoryMenu != null) + // Are they clicking outside the menu to try to exit it? + CloseCategoryMenu(); + + return hit; + } + + private void SetItemsClickable(bool clickable) { + if (clickable) { + ItemGrabMenu.inventory.highlightMethod = DefaultChestHighlighter; + InventoryMenu.highlightMethod = DefaultInventoryHighlighter; + } + else { + ItemGrabMenu.inventory.highlightMethod = i => false; + InventoryMenu.highlightMethod = i => false; + } + } + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/ItemToggle.cs b/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/ItemToggle.cs new file mode 100644 index 000000000..a492c5bc9 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/ItemToggle.cs @@ -0,0 +1,48 @@ +using System; +using ConvenientChests.CategorizeChests.Framework; +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; +using StardewValley; + +namespace ConvenientChests.CategorizeChests.Interface.Widgets { + /// + /// A toggle button corresponding to a given kind of item, appearing as + /// the icon for that item with an appropriate tooltip. + /// + class ItemToggle : Widget { + public Item Item { get; } + private ITooltipManager TooltipManager { get; } + private Widget Tooltip { get; } + public bool Active; + + public event Action OnToggle; + + public ItemToggle(ITooltipManager tooltipManager, Item item, bool active) { + TooltipManager = tooltipManager; + Item = item; + Active = active; + Tooltip = new ItemTooltip(item.DisplayName); + Width = Game1.tileSize; + Height = Game1.tileSize; + } + + public override void Draw(SpriteBatch batch) { + var alpha = Active ? 1.0f : 0.25f; + + Item.drawInMenu(batch, new Vector2(GlobalPosition.X, GlobalPosition.Y), 1, alpha, 1, false); + + if (GlobalBounds.Contains(Game1.getMousePosition())) + TooltipManager.ShowTooltipThisFrame(Tooltip); + } + + public void Toggle() { + Active = !Active; + OnToggle?.Invoke(); + } + + public override bool ReceiveLeftClick(Point point) { + Toggle(); + return true; + } + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/ItemTooltip.cs b/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/ItemTooltip.cs new file mode 100644 index 000000000..16377bcca --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/ItemTooltip.cs @@ -0,0 +1,26 @@ +using Microsoft.Xna.Framework; + +namespace ConvenientChests.CategorizeChests.Interface.Widgets +{ + /// + /// A tooltip showing information about a particular item. + /// + class ItemTooltip : Widget + { + public ItemTooltip(string name) + { + var background = AddChild(new Background(Sprites.TooltipBackground)); + var label = AddChild(new Label(name, Color.Black)); + + Width = background.Width = label.Width + background.Graphic.LeftBorderThickness + + background.Graphic.RightBorderThickness; + Height = background.Height = label.Height + background.Graphic.TopBorderThickness + + background.Graphic.BottomBorderThickness; + + label.Position = new Point( + background.Width / 2 - label.Width / 2, + background.Height / 2 - label.Height / 2 + ); + } + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/Label.cs b/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/Label.cs new file mode 100644 index 000000000..dbb92f538 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/Label.cs @@ -0,0 +1,52 @@ +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; +using StardewValley; + +namespace ConvenientChests.CategorizeChests.Interface.Widgets +{ + /// + /// A simple text element. + /// + class Label : Widget + { + private string _Text; + public string Text + { + get => _Text; + set + { + _Text = value; + RecalculateDimensions(); + } + } + + public readonly SpriteFont Font; + public readonly Color Color; + + public Label(string text, Color color, SpriteFont font) + { + Font = font; + Color = color; + Text = text; + + RecalculateDimensions(); + } + + public Label(string text, Color color) + : this(text, color, Game1.smallFont) + { + } + + public override void Draw(SpriteBatch batch) + { + batch.DrawString(Font, Text, new Vector2(GlobalPosition.X, GlobalPosition.Y), Color); + } + + private void RecalculateDimensions() + { + var measure = Font.MeasureString(Text); + Width = (int) measure.X; + Height = (int) measure.Y; + } + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/LabeledCheckbox.cs b/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/LabeledCheckbox.cs new file mode 100644 index 000000000..404c84bc5 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/LabeledCheckbox.cs @@ -0,0 +1,49 @@ +using System; +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; + +namespace ConvenientChests.CategorizeChests.Interface.Widgets +{ + /// + /// A checkbox with a label next to it, like so: [x] Foo + /// + class LabeledCheckbox : Widget + { + public event Action OnChange; + public bool Checked { get; set; } = false; + + private readonly Widget CheckedBox; + private readonly Widget UncheckedBox; + private readonly Label Label; + + public LabeledCheckbox(string labelText) + { + CheckedBox = AddChild(new Stamp(Sprites.FilledCheckbox)); + UncheckedBox = AddChild(new Stamp(Sprites.EmptyCheckbox)); + + Label = AddChild(new Label(labelText, Color.Black)); + var padding = (int) Label.Font.MeasureString(" ").X; + + Height = Math.Max(CheckedBox.Height, Label.Height); + CheckedBox.CenterVertically(); + UncheckedBox.CenterVertically(); + Label.CenterVertically(); + Label.X = CheckedBox.X + CheckedBox.Width + padding; + Width = Label.X + Label.Width; + } + + public override bool ReceiveLeftClick(Point point) + { + Checked = !Checked; + OnChange?.Invoke(Checked); + return true; + } + + public override void Draw(SpriteBatch batch) + { + var box = Checked ? CheckedBox : UncheckedBox; + box.Draw(batch); + Label.Draw(batch); + } + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/SpriteButton.cs b/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/SpriteButton.cs new file mode 100644 index 000000000..7a133bbdd --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/SpriteButton.cs @@ -0,0 +1,25 @@ +using Microsoft.Xna.Framework.Graphics; + +namespace ConvenientChests.CategorizeChests.Interface.Widgets +{ + /// + /// A button that uses a single TextureRegion to display itself. + /// + class SpriteButton : Button + { + private readonly TextureRegion TextureRegion; + + public SpriteButton(TextureRegion textureRegion) + { + TextureRegion = textureRegion; + Width = TextureRegion.Width; + Height = TextureRegion.Height; + } + + public override void Draw(SpriteBatch batch) + { + batch.Draw(TextureRegion.Texture, TextureRegion.Region, GlobalPosition.X, GlobalPosition.Y, + TextureRegion.Width, TextureRegion.Height); + } + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/Stamp.cs b/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/Stamp.cs new file mode 100644 index 000000000..59e365c3d --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/Stamp.cs @@ -0,0 +1,25 @@ +using Microsoft.Xna.Framework.Graphics; + +namespace ConvenientChests.CategorizeChests.Interface.Widgets +{ + /// + /// A simple non-interactive sprite. + /// + class Stamp : Widget + { + private readonly TextureRegion TextureRegion; + + public Stamp(TextureRegion textureRegion) + { + TextureRegion = textureRegion; + Width = TextureRegion.Width; + Height = TextureRegion.Height; + } + + public override void Draw(SpriteBatch batch) + { + batch.Draw(TextureRegion.Texture, TextureRegion.Region, GlobalPosition.X, GlobalPosition.Y, + TextureRegion.Width, TextureRegion.Height); + } + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/TextButton.cs b/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/TextButton.cs new file mode 100644 index 000000000..fd3fb6a28 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/TextButton.cs @@ -0,0 +1,54 @@ +using Microsoft.Xna.Framework; + +namespace ConvenientChests.CategorizeChests.Interface.Widgets +{ + /// + /// A button shown as text on a background. + /// + class TextButton : Button + { + private readonly Background Background; + private readonly Label Label; + + private int LeftPadding => Background.Graphic.LeftBorderThickness; + private int RightPadding => Background.Graphic.RightBorderThickness; + private int TopPadding => Background.Graphic.TopBorderThickness; + private int BottomPadding => Background.Graphic.BottomBorderThickness; + + public TextButton(string text, NineSlice backgroundTexture) + { + Label = new Label(text, Color.Black); + Background = new Background(backgroundTexture); + + Width = Background.Width = Label.Width + LeftPadding + RightPadding; + Height = Background.Height = Label.Height + TopPadding + BottomPadding; + + AddChild(Background); + AddChild(Label); + + CenterLabel(); + } + + protected override void OnDimensionsChanged() + { + base.OnDimensionsChanged(); + + if (Background != null) + { + Background.Width = Width; + Background.Height = Height; + } + + if (Label != null) + CenterLabel(); + } + + private void CenterLabel() + { + Label.Position = new Point( + LeftPadding + (Width - RightPadding - LeftPadding) / 2 - Label.Width / 2, + TopPadding + (Height - BottomPadding - TopPadding) / 2 - Label.Height / 2 + ); + } + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/Widget.cs b/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/Widget.cs new file mode 100644 index 000000000..da83bff3f --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/Widget.cs @@ -0,0 +1,243 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; +using StardewModdingAPI; +using StardewValley; + +namespace ConvenientChests.CategorizeChests.Interface.Widgets +{ + /// + /// A positioned, resizable element in the interface + /// that can also contain other elements. + /// + public class Widget : IDisposable + { + Widget _Parent; + public Widget Parent + { + get => _Parent; + set + { + _Parent = value; + OnParent(value); + } + } + + List _Children = new List(); + public IEnumerable Children => _Children; + + public Point Position { get; set; } + + public int X + { + get => Position.X; + set { Position = new Point(value, Position.Y); } + } + + public int Y + { + get => Position.Y; + set { Position = new Point(Position.X, value); } + } + + int _Width; + public int Width + { + get => _Width; + set + { + _Width = value; + OnDimensionsChanged(); + } + } + + int _Height; + public int Height + { + get { return _Height; } + set + { + _Height = value; + OnDimensionsChanged(); + } + } + + public Widget() + { + Position = Point.Zero; + Width = 1; + Height = 1; + } + + protected virtual void OnParent(Widget parent) + { + } + + public virtual void Draw(SpriteBatch batch) + { + DrawChildren(batch); + } + + protected void DrawChildren(SpriteBatch batch) + { + foreach (var child in Children) + { + child.Draw(batch); + } + } + + public Rectangle LocalBounds => new Rectangle(0, 0, Width, Height); + public Rectangle GlobalBounds => new Rectangle(GlobalPosition.X, GlobalPosition.Y, Width, Height); + public Point GlobalPosition => Globalize(Point.Zero); + + public bool Contains(Point point) + { + return point.X >= Position.X && point.X <= Position.X + Width + && point.Y >= Position.Y && point.Y <= Position.Y + Height; + } + + public Point Globalize(Point point) + { + var global = new Point(point.X + Position.X, point.Y + Position.Y); + return Parent != null ? Parent.Globalize(global) : global; + } + + public virtual bool ReceiveButtonPress(SButton input) + { + return PropagateButtonPress(input); + } + + public virtual bool ReceiveLeftClick(Point point) + { + return PropagateLeftClick(point); + } + + public virtual bool ReceiveCursorHover(Point point) + { + return PropagateCursorHover(point); + } + + public virtual bool ReceiveScrollWheelAction(int amount) + { + return PropagateScrollWheelAction(amount); + } + + protected bool PropagateButtonPress(SButton input) + { + foreach (var child in Children) + { + var handled = child.ReceiveButtonPress(input); + if (handled) + return true; + } + + return false; + } + + protected bool PropagateScrollWheelAction(int amount) + { + foreach (var child in Children) + { + var handled = child.ReceiveScrollWheelAction(amount); + if (handled) + return true; + } + + return false; + } + + protected bool PropagateLeftClick(Point point) + { + foreach (var child in Children) + { + var localPoint = new Point(point.X - child.Position.X, point.Y - child.Position.Y); + + if (child.LocalBounds.Contains(localPoint)) + { + var handled = child.ReceiveLeftClick(localPoint); + if (handled) + return true; + } + } + return false; + } + + protected bool PropagateCursorHover(Point point) + { + foreach (var child in Children) + { + var localPoint = new Point(point.X - child.Position.X, point.Y - child.Position.Y); + + if (child.LocalBounds.Contains(localPoint)) + { + var handled = child.ReceiveCursorHover(localPoint); + if (handled) + return true; + } + } + return false; + } + + public T AddChild(T child) where T : Widget + { + child.Parent = this; + _Children.Add(child); + + OnContentsChanged(); + + return child; + } + + public void RemoveChild(Widget child) + { + _Children.Remove(child); + child.Parent = null; + + OnContentsChanged(); + } + + public void RemoveChildren() + { + RemoveChildren(c => true); + } + + public void RemoveChildren(Predicate shouldRemove) + { + foreach (var child in Children.Where(c => shouldRemove(c))) + { + child.Parent = null; + } + + _Children.RemoveAll(shouldRemove); + + OnContentsChanged(); + } + + protected virtual void OnContentsChanged() + { + } + + protected virtual void OnDimensionsChanged() + { + } + + public void CenterHorizontally() + { + var containerWidth = (Parent != null) ? Parent.Width : Game1.viewport.Width; // TODO + X = containerWidth / 2 - Width / 2; + } + + public void CenterVertically() + { + var containerHeight = (Parent != null) ? Parent.Height : Game1.viewport.Height; // TODO + Y = containerHeight / 2 - Height / 2; + } + + public virtual void Dispose() { + foreach (Widget child in Children) + child.Dispose(); + } + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/WrapBag.cs b/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/WrapBag.cs new file mode 100644 index 000000000..a3ecd7d54 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Interface/Widgets/WrapBag.cs @@ -0,0 +1,41 @@ +using System; +using Microsoft.Xna.Framework; + +namespace ConvenientChests.CategorizeChests.Interface.Widgets +{ + /// + /// A container that automatically positions its children in rows, + /// wrapping to a new row as appropriate. + /// + class WrapBag : Widget + { + public WrapBag(int width) + { + Width = width; + } + + protected override void OnContentsChanged() + { + base.OnContentsChanged(); + + var x = 0; + var y = 0; + var lowestBottom = 0; + foreach (var child in Children) + { + if (x + child.Width > Width && x > 0) + { + x = 0; + y = lowestBottom; + } + + child.Position = new Point(x, y); + x += child.Width; + + lowestBottom = Math.Max(lowestBottom, child.Position.Y + child.Height); + } + + Height = lowestBottom; + } + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/ItemHelper.cs b/Mods/ConvenientChests/CategorizeChests/ItemHelper.cs new file mode 100644 index 000000000..031e98d5a --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/ItemHelper.cs @@ -0,0 +1,103 @@ +using System.Collections.Generic; +using System.Linq; +using ConvenientChests.CategorizeChests.Framework; +using Microsoft.Xna.Framework; +using StardewValley; +using StardewValley.Objects; +using StardewValley.Tools; + +namespace ConvenientChests.CategorizeChests { + internal static class ItemHelper { + public static ItemKey ToItemKey(this Item item) => new ItemKey(GetItemType(item), GetItemID(item)); + + public static Item GetCopy(this Item item) { + if (item == null) + return null; + + var copy = item.getOne(); + copy.Stack = item.Stack; + return copy; + } + + public static IEnumerable GetWeapons() { + foreach (var e in Game1.content.Load>("Data\\weapons")) + if (e.Value.Split('/')[8] == "4") + yield return new Slingshot(e.Key); + + else + yield return new MeleeWeapon(e.Key); + } + + public static ItemType GetItemType(Item item) { + switch (item) { + case Boots _: + return ItemType.Boots; + + case Furniture _: + return ItemType.Furniture; + + case Hat _: + return ItemType.Hat; + + case Ring _: + return ItemType.Ring; + + case Wallpaper w: + return w.isFloor.Value + ? ItemType.Flooring + : ItemType.Wallpaper; + + case MeleeWeapon _: + case Slingshot _: + return ItemType.Weapon; + + case Tool _: + return ItemType.Tool; + + case Fence f: + return f.isGate.Value + ? ItemType.Gate + : ItemType.Object; + + case Object _: + switch (item.Category) { + case Object.FishCategory: + return ItemType.Fish; + + case Object.BigCraftableCategory: + return ItemType.BigCraftable; + + default: + return ItemType.Object; + } + } + + return ItemType.Object; + } + + public static int GetItemID(Item item) { + switch (item) { + case Boots a: + return a.indexInTileSheet.Value; + + case Ring a: + return a.indexInTileSheet.Value; + + case Hat a: + return a.which.Value; + + case Tool a: + return a.InitialParentTileIndex; + + case Fence a: + if (a.isGate.Value) + return 0; + + return a.whichType.Value; + + default: + return item.ParentSheetIndex; + } + } + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/CategorizeChests/Utility.cs b/Mods/ConvenientChests/CategorizeChests/Utility.cs new file mode 100644 index 000000000..519cfdfb6 --- /dev/null +++ b/Mods/ConvenientChests/CategorizeChests/Utility.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; + +namespace ConvenientChests.CategorizeChests +{ + static class Utility + { + public static int Mod(int x, int m) + { + return (x % m + m) % m; + } + + public static IEnumerable> Batch(this IEnumerable source, int batchSize) + { + using (var enumerator = source.GetEnumerator()) + while (enumerator.MoveNext()) + yield return YieldBatchElements(enumerator, batchSize - 1); + } + + private static IEnumerable YieldBatchElements( + IEnumerator source, int batchSize) + { + yield return source.Current; + for (int i = 0; i < batchSize && source.MoveNext(); i++) + yield return source.Current; + } + + public static IDictionary> KeyBy(this IEnumerable values, + Func makeKey) + { + var dict = new Dictionary>(); + + foreach (var value in values) + { + var key = makeKey(value); + + if (!dict.ContainsKey(key)) + dict[key] = new List(); + + ((List) dict[key]).Add(value); + } + + return dict; + } + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/Config.cs b/Mods/ConvenientChests/Config.cs new file mode 100644 index 000000000..1b7afaa93 --- /dev/null +++ b/Mods/ConvenientChests/Config.cs @@ -0,0 +1,15 @@ +using StardewModdingAPI; + +namespace ConvenientChests +{ + public class Config + { + public bool CategorizeChests { get; set; } = true; + public bool StashToExistingStacks { get; set; } = true; + + public bool StashToNearbyChests { get; set; } = true; + public int StashRadius { get; set; } = 5; + public SButton StashKey { get; set; } = SButton.Back; + public SButton? StashButton { get; set; } = SButton.RightStick; + } +} diff --git a/Mods/ConvenientChests/ConvenientChests.csproj b/Mods/ConvenientChests/ConvenientChests.csproj new file mode 100644 index 000000000..9b95ab91b --- /dev/null +++ b/Mods/ConvenientChests/ConvenientChests.csproj @@ -0,0 +1,210 @@ + + + + + Debug + AnyCPU + {84A712EC-5F80-43DC-879C-D3604B6F5644} + Library + Properties + ConvenientChests + ConvenientChests + v4.5.2 + 512 + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\assemblies\Mod.dll + + + ..\assemblies\StardewValley.dll + + + False + ..\assemblies\BmFont.dll + + + False + ..\assemblies\Google.Android.Vending.Expansion.Downloader.dll + + + False + ..\assemblies\Google.Android.Vending.Expansion.ZipFile.dll + + + False + ..\assemblies\Google.Android.Vending.Licensing.dll + + + False + ..\assemblies\Java.Interop.dll + + + False + ..\assemblies\Microsoft.AppCenter.dll + + + False + ..\assemblies\Microsoft.AppCenter.Analytics.dll + + + False + ..\assemblies\Microsoft.AppCenter.Analytics.Android.Bindings.dll + + + False + ..\assemblies\Microsoft.AppCenter.Android.Bindings.dll + + + False + ..\assemblies\Microsoft.AppCenter.Crashes.dll + + + False + ..\assemblies\Microsoft.AppCenter.Crashes.Android.Bindings.dll + + + False + ..\assemblies\Mono.Android.dll + + + False + ..\assemblies\Mono.Security.dll + + + False + ..\assemblies\MonoGame.Framework.dll + + + ..\assemblies\mscorlib.dll + + + ..\assemblies\System.dll + + + ..\assemblies\System.Xml + + + ..\assemblies\System.Net.Http + + + ..\assemblies\System.Runtime.Serialization + + + False + ..\assemblies\Xamarin.Android.Arch.Core.Common.dll + + + False + ..\assemblies\Xamarin.Android.Arch.Lifecycle.Common.dll + + + False + ..\assemblies\Xamarin.Android.Arch.Lifecycle.Runtime.dll + + + False + ..\assemblies\Xamarin.Android.Support.Annotations.dll + + + False + ..\assemblies\Xamarin.Android.Support.Compat.dll + + + False + ..\assemblies\Xamarin.Android.Support.Core.UI.dll + + + False + ..\assemblies\Xamarin.Android.Support.Core.Utils.dll + + + False + ..\assemblies\Xamarin.Android.Support.Fragment.dll + + + False + ..\assemblies\Xamarin.Android.Support.Media.Compat.dll + + + False + ..\assemblies\Xamarin.Android.Support.v4.dll + + + False + ..\assemblies\xTile.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Mods/ConvenientChests/ModEntry.cs b/Mods/ConvenientChests/ModEntry.cs new file mode 100644 index 000000000..40ef1a36b --- /dev/null +++ b/Mods/ConvenientChests/ModEntry.cs @@ -0,0 +1,47 @@ +using ConvenientChests.CategorizeChests; +using ConvenientChests.StackToNearbyChests; +using StardewModdingAPI; + +namespace ConvenientChests { + /// The mod entry class loaded by SMAPI. + public class ModEntry : StardewModdingAPI.Mod + { + public static Config Config { get; private set; } + internal static IModHelper StaticHelper { get; private set; } + internal static IMonitor StaticMonitor { get; private set; } + + internal static void Log(string s, LogLevel l = LogLevel.Trace) => StaticMonitor.Log(s, l); + + public static StashToNearbyChestsModule StashNearby; + public static CategorizeChestsModule CategorizeChests; + + /// The mod entry point, called after the mod is first loaded. + /// Provides simplified APIs for writing mods. + public override void Entry(IModHelper helper) { + Config = helper.ReadConfig(); + StaticMonitor = this.Monitor; + StaticHelper = this.Helper; + + helper.Events.GameLoop.SaveLoaded += (sender, e) => this.LoadModules(); + helper.Events.GameLoop.ReturnedToTitle += (sender, e) => this.UnloadModules(); + } + + private void LoadModules() { + StashNearby = new StashToNearbyChestsModule(this); + if (Config.StashToNearbyChests) + StashNearby.Activate(); + + CategorizeChests = new CategorizeChestsModule(this); + if (Config.CategorizeChests) + CategorizeChests.Activate(); + } + + private void UnloadModules() { + StashNearby.Deactivate(); + StashNearby = null; + + CategorizeChests.Deactivate(); + CategorizeChests = null; + } + } +} diff --git a/Mods/ConvenientChests/Module.cs b/Mods/ConvenientChests/Module.cs new file mode 100644 index 000000000..c328c4e0f --- /dev/null +++ b/Mods/ConvenientChests/Module.cs @@ -0,0 +1,17 @@ +using StardewModdingAPI; +using StardewModdingAPI.Events; + +namespace ConvenientChests { + public abstract class Module { + public bool IsActive { get; protected set; } = false; + public ModEntry ModEntry { get; } + public Config Config => ModEntry.Config; + public IMonitor Monitor => ModEntry.Monitor; + public IModEvents Events => ModEntry.Helper.Events; + + public Module(ModEntry modEntry) => ModEntry = modEntry; + + public abstract void Activate(); + public abstract void Deactivate(); + } +} diff --git a/Mods/ConvenientChests/Properties/AssemblyInfo.cs b/Mods/ConvenientChests/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..8d33854f5 --- /dev/null +++ b/Mods/ConvenientChests/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// 有关程序集的一般信息由以下 +// 控制。更改这些特性值可修改 +// 与程序集关联的信息。 +[assembly: AssemblyTitle("ConvenientChests")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("ConvenientChests")] +[assembly: AssemblyCopyright("Copyright © 2019")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// 将 ComVisible 设置为 false 会使此程序集中的类型 +//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型 +//请将此类型的 ComVisible 特性设置为 true。 +[assembly: ComVisible(false)] + +// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID +[assembly: Guid("84a712ec-5f80-43dc-879c-d3604b6f5644")] + +// 程序集的版本信息由下列四个值组成: +// +// 主版本 +// 次版本 +// 生成号 +// 修订号 +// +// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 +//通过使用 "*"，如下所示: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Mods/ConvenientChests/StackToNearbyChests/StackLogic.cs b/Mods/ConvenientChests/StackToNearbyChests/StackLogic.cs new file mode 100644 index 000000000..7a48472c9 --- /dev/null +++ b/Mods/ConvenientChests/StackToNearbyChests/StackLogic.cs @@ -0,0 +1,87 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using ConvenientChests.CategorizeChests.Framework; +using Microsoft.Xna.Framework; +using StardewValley; +using StardewValley.Buildings; +using StardewValley.Locations; +using StardewValley.Objects; +using Object = StardewValley.Object; + +namespace ConvenientChests.StackToNearbyChests { + public static class StackLogic { + public delegate bool AcceptingFunction(Chest c, Item i); + + public static IEnumerable GetNearbyChests(this Farmer farmer, int radius) + => GetNearbyChests(farmer.currentLocation, farmer.getTileLocation(), radius); + + public static void StashToChest(Chest chest, AcceptingFunction f) { + ModEntry.Log("Stash to current chest"); + + var inventory = Game1.player.Items.Where(i => i != null).ToList(); + var toBeMoved = inventory.Where(i => f(chest, i)).ToList(); + + if (toBeMoved.Any() && chest.DumpItemsToChest(Game1.player.Items, toBeMoved).Any()) + Game1.playSound(Game1.soundBank.GetCue("pickUpItem").Name); + } + + public static void StashToNearbyChests(int radius, AcceptingFunction f) { + ModEntry.Log("Stash to nearby chests"); + + var movedAtLeastOne = false; + + foreach (var chest in Game1.player.GetNearbyChests(radius)) { + var moveItems = Game1.player.Items + .Where(i => i != null) + .Where(i => f(chest, i)) + .ToList(); + + if (!moveItems.Any()) + continue; + + var movedItems = chest.DumpItemsToChest(Game1.player.Items, moveItems); + if (movedItems.Any()) + movedAtLeastOne = true; + } + + if (!movedAtLeastOne) + return; + + // List of sounds: https://gist.github.com/gasolinewaltz/46b1473415d412e220a21cb84dd9aad6 + Game1.playSound(Game1.soundBank.GetCue("pickUpItem").Name); + } + + private static IEnumerable GetNearbyChests(GameLocation location, Vector2 point, int radius) { + // chests + foreach (Chest c in GetNearbyObjects(location, point, radius)) + yield return c; + + switch (location) { + // fridge + case FarmHouse farmHouse when farmHouse.upgradeLevel > 0: + if (InRadius(radius, point, farmHouse.getKitchenStandingSpot().X + 1, farmHouse.getKitchenStandingSpot().Y - 2)) + yield return farmHouse.fridge.Value; + break; + + // buildings + case BuildableGameLocation l: + foreach (var building in l.buildings.Where(b => InRadius(radius, point, b.tileX.Value, b.tileY.Value))) + if (building is JunimoHut junimoHut) + yield return junimoHut.output.Value; + + else if (building is Mill mill) + yield return mill.output.Value; + break; + } + } + + private static IEnumerable GetNearbyObjects(GameLocation location, Vector2 point, int radius) where T : Object => + location.Objects.Pairs + .Where(p => p.Value is T && InRadius(radius, point, p.Key)) + .Select(p => (T) p.Value); + + private static bool InRadius(int radius, Vector2 a, Vector2 b) => Math.Abs(a.X - b.X) < radius && Math.Abs(a.Y - b.Y) < radius; + private static bool InRadius(int radius, Vector2 a, int x, int y) => Math.Abs(a.X - x) < radius && Math.Abs(a.Y - y) < radius; + } +} \ No newline at end of file diff --git a/Mods/ConvenientChests/StackToNearbyChests/StashToNearbyChestsModule.cs b/Mods/ConvenientChests/StackToNearbyChests/StashToNearbyChestsModule.cs new file mode 100644 index 000000000..65822e12c --- /dev/null +++ b/Mods/ConvenientChests/StackToNearbyChests/StashToNearbyChestsModule.cs @@ -0,0 +1,59 @@ +using ConvenientChests.CategorizeChests.Framework; +using StardewModdingAPI.Events; +using StardewValley; +using StardewValley.Menus; +using StardewValley.Objects; + +namespace ConvenientChests.StackToNearbyChests { + public class StashToNearbyChestsModule : Module { + public StackLogic.AcceptingFunction AcceptingFunction { get; private set; } + + public StashToNearbyChestsModule(ModEntry modEntry) : base(modEntry) { } + + public override void Activate() { + IsActive = true; + + // Acceptor + AcceptingFunction = CreateAcceptingFunction(); + + // Events + this.Events.Input.ButtonPressed += OnButtonPressed; + } + + private StackLogic.AcceptingFunction CreateAcceptingFunction() { + if (Config.CategorizeChests && Config.StashToExistingStacks) + return (chest, item) => ModEntry.CategorizeChests.ChestAcceptsItem(chest, item) || chest.ContainsItem(item); + + if (Config.CategorizeChests) + return (chest, item) => ModEntry.CategorizeChests.ChestAcceptsItem(chest, item); + + if (Config.StashToExistingStacks) + return (chest, item) => chest.ContainsItem(item); + + return (chest, item) => false; + } + + public override void Deactivate() { + IsActive = false; + + // Events + this.Events.Input.ButtonPressed -= OnButtonPressed; + } + + private void TryStashNearby() { + if (Game1.player.currentLocation == null) + return; + + if (Game1.activeClickableMenu is ItemGrabMenu m && m.behaviorOnItemGrab?.Target is Chest c) + StackLogic.StashToChest(c, AcceptingFunction); + + else + StackLogic.StashToNearbyChests(Config.StashRadius, AcceptingFunction); + } + + private void OnButtonPressed(object sender, ButtonPressedEventArgs e) { + if (e.Button == Config.StashKey || e.Button == Config.StashButton) + TryStashNearby(); + } + } +} \ No newline at end of file diff --git a/Mods/Mods.sln b/Mods/Mods.sln new file mode 100644 index 000000000..400ec87ef --- /dev/null +++ b/Mods/Mods.sln @@ -0,0 +1,61 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.572 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoSpeed", "AutoSpeed\AutoSpeed.csproj", "{5B089EEE-F22C-4753-B90D-16D4CD3F5D61}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Automate", "Automate\Automate.csproj", "{5EF944E3-D54B-4936-B507-A40C17B17B8E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutoFish", "AutoFish\AutoFish.csproj", "{8B08A816-6125-4277-A9EE-CA6AF9E279FC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TimeSpeed", "TimeSpeed\TimeSpeed.csproj", "{09E76025-DB21-4D9F-B8B1-571D779AC5E6}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkullCavernElevator", "SkullCavernElevator\SkullCavernElevator.csproj", "{50C6FB69-D475-4D69-9B1F-D4B36E41B5E5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScytheHarvesting", "ScytheHarvesting\ScytheHarvesting.csproj", "{2EE8D569-519E-453A-8066-E269DACC73A2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConvenientChests", "ConvenientChests\ConvenientChests.csproj", "{84A712EC-5F80-43DC-879C-D3604B6F5644}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5B089EEE-F22C-4753-B90D-16D4CD3F5D61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5B089EEE-F22C-4753-B90D-16D4CD3F5D61}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5B089EEE-F22C-4753-B90D-16D4CD3F5D61}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5B089EEE-F22C-4753-B90D-16D4CD3F5D61}.Release|Any CPU.Build.0 = Release|Any CPU + {5EF944E3-D54B-4936-B507-A40C17B17B8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5EF944E3-D54B-4936-B507-A40C17B17B8E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5EF944E3-D54B-4936-B507-A40C17B17B8E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5EF944E3-D54B-4936-B507-A40C17B17B8E}.Release|Any CPU.Build.0 = Release|Any CPU + {8B08A816-6125-4277-A9EE-CA6AF9E279FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8B08A816-6125-4277-A9EE-CA6AF9E279FC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8B08A816-6125-4277-A9EE-CA6AF9E279FC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8B08A816-6125-4277-A9EE-CA6AF9E279FC}.Release|Any CPU.Build.0 = Release|Any CPU + {09E76025-DB21-4D9F-B8B1-571D779AC5E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {09E76025-DB21-4D9F-B8B1-571D779AC5E6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {09E76025-DB21-4D9F-B8B1-571D779AC5E6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {09E76025-DB21-4D9F-B8B1-571D779AC5E6}.Release|Any CPU.Build.0 = Release|Any CPU + {50C6FB69-D475-4D69-9B1F-D4B36E41B5E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {50C6FB69-D475-4D69-9B1F-D4B36E41B5E5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {50C6FB69-D475-4D69-9B1F-D4B36E41B5E5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {50C6FB69-D475-4D69-9B1F-D4B36E41B5E5}.Release|Any CPU.Build.0 = Release|Any CPU + {2EE8D569-519E-453A-8066-E269DACC73A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2EE8D569-519E-453A-8066-E269DACC73A2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2EE8D569-519E-453A-8066-E269DACC73A2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2EE8D569-519E-453A-8066-E269DACC73A2}.Release|Any CPU.Build.0 = Release|Any CPU + {84A712EC-5F80-43DC-879C-D3604B6F5644}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {84A712EC-5F80-43DC-879C-D3604B6F5644}.Debug|Any CPU.Build.0 = Debug|Any CPU + {84A712EC-5F80-43DC-879C-D3604B6F5644}.Release|Any CPU.ActiveCfg = Release|Any CPU + {84A712EC-5F80-43DC-879C-D3604B6F5644}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {8AC5C977-D29F-4858-A7AC-D3269E944613} + EndGlobalSection +EndGlobal diff --git a/Mods/ScytheHarvesting/ModConfig.cs b/Mods/ScytheHarvesting/ModConfig.cs new file mode 100644 index 000000000..6ce457abc --- /dev/null +++ b/Mods/ScytheHarvesting/ModConfig.cs @@ -0,0 +1,16 @@ +namespace ScytheHarvesting +{ + using System; + using System.Diagnostics; + using System.Runtime.CompilerServices; + + public class ModConfig + { + public bool EnableMod { get; set; } = true; + + public bool EnableFlowers { get; set; } = false; + + public bool EnableSunflowers { get; set; } = true; + } +} + diff --git a/Mods/ScytheHarvesting/Properties/AssemblyInfo.cs b/Mods/ScytheHarvesting/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..d5928eeb9 --- /dev/null +++ b/Mods/ScytheHarvesting/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// 有关程序集的一般信息由以下 +// 控制。更改这些特性值可修改 +// 与程序集关联的信息。 +[assembly: AssemblyTitle("ScytheHarvesting")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("ScytheHarvesting")] +[assembly: AssemblyCopyright("Copyright © 2019")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// 将 ComVisible 设置为 false 会使此程序集中的类型 +//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型 +//请将此类型的 ComVisible 特性设置为 true。 +[assembly: ComVisible(false)] + +// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID +[assembly: Guid("2ee8d569-519e-453a-8066-e269dacc73a2")] + +// 程序集的版本信息由下列四个值组成: +// +// 主版本 +// 次版本 +// 生成号 +// 修订号 +// +// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 +//通过使用 "*"，如下所示: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Mods/ScytheHarvesting/ScytheHarvesting.cs b/Mods/ScytheHarvesting/ScytheHarvesting.cs new file mode 100644 index 000000000..b158112ad --- /dev/null +++ b/Mods/ScytheHarvesting/ScytheHarvesting.cs @@ -0,0 +1,252 @@ +using Microsoft.Xna.Framework; +using SMDroid.Options; +using StardewModdingAPI; +using StardewValley; +using StardewValley.Menus; +using StardewValley.TerrainFeatures; +using StardewValley.Tools; +using System; +using System.Collections.Generic; +using System.Linq; + +namespace ScytheHarvesting +{ + + public class ScytheHarvesting : StardewModdingAPI.Mod + { + public static ModConfig config; + private static int TickCount { get; set; } = 0; + private void CountCurrentHarvestableCrop() + { + IEnumerable> enumerable = Game1.currentLocation.terrainFeatures.Pairs; + if (enumerable != null) + { + IEnumerable enumerable2 = from x in enumerable + select x.Value into x + where x is HoeDirt + select x; + this.CountOfCropsReadyForHarvest = (from x in enumerable2 + select (HoeDirt) x into x + where x.crop != null + where x.readyForHarvest() + select x).Count(); + } + } + + private void CreateSunflowerSeeds(int index, int x, int y, int quantity) + { + Game1.createMultipleObjectDebris(index, x, y, quantity); + } + + public override void Entry(IModHelper helper) + { + config = this.Helper.ReadConfig(); + helper.Events.GameLoop.UpdateTicked += this.Events_TickUpdate; + } + public override List GetConfigMenuItems() + { + List options = new List(); + ModOptionsCheckbox _optionsCheckboxEnabled = new ModOptionsCheckbox("镰刀收割", 0x8765, this.Toogle, -1, -1); + _optionsCheckboxEnabled.isChecked = config.EnableMod; + options.Add(_optionsCheckboxEnabled); + ModOptionsCheckbox _optionsCheckboxEnableFlowers = new ModOptionsCheckbox("收割花朵", 0x8765, delegate (bool value) { + if (config.EnableFlowers != value) + { + config.EnableFlowers = value; + base.Helper.WriteConfig(config); + } + }, -1, -1); + _optionsCheckboxEnableFlowers.isChecked = config.EnableFlowers; + options.Add(_optionsCheckboxEnableFlowers); + return options; + } + + private void Events_TickUpdate(object sender, EventArgs e) + { + TickCount++; + if(TickCount == 10) + { + TickCount = 0; + if ((Context.IsWorldReady && (Game1.currentLocation != null)) && ((Context.IsWorldReady && config.EnableMod) && (Game1.currentLocation.IsFarm || Game1.currentLocation.Name.Equals("Greenhouse")))) + { + this.SetTargetAsXP(); + IEnumerable> enumerable = Game1.currentLocation.terrainFeatures.Pairs; + if (enumerable != null) + { + List list = new List(); + this.FarmHasSunflowers = false; + foreach (KeyValuePair pair in enumerable) + { + if (pair.Value is HoeDirt) + { + list.Add((HoeDirt)pair.Value); + } + } + foreach (HoeDirt dirt in list) + { + if (dirt.crop != null) + { + if (dirt.crop.indexOfHarvest.Value != 0x1a5) + { + if (config.EnableFlowers) + { + dirt.crop.harvestMethod.Value = 1; + } + else if ((((dirt.crop.indexOfHarvest.Value != 0x24f) && (dirt.crop.indexOfHarvest.Value != 0x251)) && ((dirt.crop.indexOfHarvest.Value != 0x253) && (dirt.crop.indexOfHarvest.Value != 0x255))) && (dirt.crop.indexOfHarvest.Value != 0x178)) + { + dirt.crop.harvestMethod.Value = 1; + } + } + else if (config.EnableSunflowers) + { + this.FarmHasSunflowers = true; + dirt.crop.harvestMethod.Value = 1; + } + } + } + } + if (enumerable != null) + { + int num = (from x in from x in enumerable select x.Value + where x is HoeDirt + select (HoeDirt)x into x + where x.crop != null + where x.readyForHarvest() + select x).Count(); + int num2 = Math.Max(0, this.CountOfCropsReadyForHarvest - num); + if ((num2 > 0) && (this.HoveredCrop != 0)) + { + string str = Game1.objectInformation[this.HoveredCrop]; + char[] separator = new char[] { '/' }; + int num3 = Convert.ToInt32(str.Split(separator)[1]); + float num4 = (float)(16.0 * Math.Log((0.018 * num3) + 1.0, 2.71828182845905)); + float num5 = num4 * num2; + if (num5 <= 0f) + { + num5 = 15 * num2; + } + Game1.player.gainExperience(0, (int)Math.Round((double)num5)); + if ((this.HoveredCrop == 0x1a5) && this.FarmHasSunflowers) + { + int num6 = new Random().Next(1, 10); + if ((num6 >= 1) && (num6 <= 3)) + { + this.CreateSunflowerSeeds(0x1af, this.HoveredX, this.HoveredY, 1); + } + else if ((num6 >= 4) && (num6 <= 6)) + { + this.CreateSunflowerSeeds(0x1af, this.HoveredX, this.HoveredY, 2); + } + else if ((num6 >= 7) || (num6 <= 8)) + { + this.CreateSunflowerSeeds(0x1af, this.HoveredX, this.HoveredY, 3); + } + } + } + } + this.CountCurrentHarvestableCrop(); + } + } + } + + private IDictionary GetHarvestMethod() + { + IDictionary dictionary = new Dictionary(); + foreach (KeyValuePair pair in Game1.content.Load>(@"Data\Crops")) + { + char[] separator = new char[] { '/' }; + string[] strArray = pair.Value.Split(separator); + int index = 3; + int key = Convert.ToInt32(strArray[index]); + int num3 = 5; + int num4 = Convert.ToInt32(strArray[num3]); + if (!dictionary.ContainsKey(key)) + { + dictionary.Add(key, num4); + } + } + return dictionary; + } + + private void SetTargetAsXP() + { + Item currentItem = Game1.player.CurrentItem; + if ((currentItem is MeleeWeapon) && currentItem.Name.Equals("Scythe")) + { + IEnumerable> source = Game1.currentLocation.terrainFeatures.Pairs; + Vector2 toolLocation = Game1.player.GetToolLocation(false); + if ((Game1.currentLocation.IsFarm || Game1.currentLocation.Name.Equals("Greenhouse")) && (source != null)) + { + int tx = ((int) toolLocation.X) / 0x40; + int ty = ((int) toolLocation.Y) / 0x40; + TerrainFeature feature = source.FirstOrDefault>(x => ((x.Key.X == tx) && (x.Key.Y == ty))).Value; + if (feature is HoeDirt) + { + HoeDirt dirt = (HoeDirt) feature; + if (dirt.crop != null) + { + if ((dirt.crop.currentPhase.Value >= (dirt.crop.phaseDays.Count() - 1)) && (!dirt.crop.fullyGrown.Value || (dirt.crop.dayOfCurrentPhase.Value <= 0))) + { + this.HoveredCrop = dirt.crop.indexOfHarvest.Value; + this.HoveredX = tx; + this.HoveredY = ty; + } + } + else + { + this.HoveredCrop = 0; + this.HoveredX = 0; + this.HoveredY = 0; + } + } + } + } + } + + private void Toogle(bool enabled) + { + if (config.EnableMod == enabled) + { + return; + } + if (enabled) + { + config.EnableMod = true; + base.Helper.WriteConfig(config); + } + else + { + config.EnableMod = false; + base.Helper.WriteConfig(config); + IDictionary harvestMethod = this.GetHarvestMethod(); + foreach (GameLocation location in Game1.locations) + { + if (location.IsFarm || location.Name.Equals("Greenhouse")) + { + foreach (KeyValuePair pair in location.terrainFeatures.Pairs) + { + HoeDirt dirt; + int num = 0; + if ((((dirt = pair.Value as HoeDirt) != null) && (dirt.crop != null)) && harvestMethod.TryGetValue(dirt.crop.indexOfHarvest.Value, out num)) + { + dirt.crop.harvestMethod.Value = num; + } + } + } + } + } + } + + private int CountOfCropsReadyForHarvest { get; set; } + + private int HoveredCrop { get; set; } + + private int HoveredX { get; set; } + + private int HoveredY { get; set; } + + private bool FarmHasSunflowers { get; set; } + + } +} + diff --git a/Mods/ScytheHarvesting/ScytheHarvesting.csproj b/Mods/ScytheHarvesting/ScytheHarvesting.csproj new file mode 100644 index 000000000..1bde0f62b --- /dev/null +++ b/Mods/ScytheHarvesting/ScytheHarvesting.csproj @@ -0,0 +1,162 @@ + + + + + Debug + AnyCPU + {2EE8D569-519E-453A-8066-E269DACC73A2} + Library + Properties + ScytheHarvesting + ScytheHarvesting + v4.5.2 + 512 + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\assemblies\Mod.dll + + + ..\assemblies\StardewValley.dll + + + False + ..\assemblies\BmFont.dll + + + False + ..\assemblies\Google.Android.Vending.Expansion.Downloader.dll + + + False + ..\assemblies\Google.Android.Vending.Expansion.ZipFile.dll + + + False + ..\assemblies\Google.Android.Vending.Licensing.dll + + + False + ..\assemblies\Java.Interop.dll + + + False + ..\assemblies\Microsoft.AppCenter.dll + + + False + ..\assemblies\Microsoft.AppCenter.Analytics.dll + + + False + ..\assemblies\Microsoft.AppCenter.Analytics.Android.Bindings.dll + + + False + ..\assemblies\Microsoft.AppCenter.Android.Bindings.dll + + + False + ..\assemblies\Microsoft.AppCenter.Crashes.dll + + + False + ..\assemblies\Microsoft.AppCenter.Crashes.Android.Bindings.dll + + + False + ..\assemblies\Mono.Android.dll + + + False + ..\assemblies\Mono.Security.dll + + + False + ..\assemblies\MonoGame.Framework.dll + + + ..\assemblies\mscorlib.dll + + + ..\assemblies\System.dll + + + ..\assemblies\System.Xml + + + ..\assemblies\System.Net.Http + + + ..\assemblies\System.Runtime.Serialization + + + False + ..\assemblies\Xamarin.Android.Arch.Core.Common.dll + + + False + ..\assemblies\Xamarin.Android.Arch.Lifecycle.Common.dll + + + False + ..\assemblies\Xamarin.Android.Arch.Lifecycle.Runtime.dll + + + False + ..\assemblies\Xamarin.Android.Support.Annotations.dll + + + False + ..\assemblies\Xamarin.Android.Support.Compat.dll + + + False + ..\assemblies\Xamarin.Android.Support.Core.UI.dll + + + False + ..\assemblies\Xamarin.Android.Support.Core.Utils.dll + + + False + ..\assemblies\Xamarin.Android.Support.Fragment.dll + + + False + ..\assemblies\Xamarin.Android.Support.Media.Compat.dll + + + False + ..\assemblies\Xamarin.Android.Support.v4.dll + + + False + ..\assemblies\xTile.dll + + + + + + + + + \ No newline at end of file diff --git a/Mods/SkullCavernElevator/ModConfig.cs b/Mods/SkullCavernElevator/ModConfig.cs new file mode 100644 index 000000000..7b56a1e94 --- /dev/null +++ b/Mods/SkullCavernElevator/ModConfig.cs @@ -0,0 +1,13 @@ +namespace SkullCavernElevator +{ + using System; + using System.Runtime.CompilerServices; + + internal class ModConfig + { + public int elevatorStep { get; set; } = 5; + + public double difficulty { get; set; } = 1.0; + } +} + diff --git a/Mods/SkullCavernElevator/ModEntry.cs b/Mods/SkullCavernElevator/ModEntry.cs new file mode 100644 index 000000000..5ab6d2ed8 --- /dev/null +++ b/Mods/SkullCavernElevator/ModEntry.cs @@ -0,0 +1,120 @@ +using Microsoft.Xna.Framework; +using SkullCavernElevator.SkullCavernElevator; +using StardewModdingAPI; +using StardewModdingAPI.Events; +using StardewValley; +using StardewValley.Locations; +using StardewValley.Menus; +using xTile; +using xTile.Tiles; + +namespace SkullCavernElevator +{ + class ModEntry : StardewModdingAPI.Mod + { + // Fields + private IModHelper helper; + private ModConfig config; + + public override void Entry(IModHelper helper) + { + this.helper = helper; + Helper.Events.Player.Warped += MineEvents_MineLevelChanged; + Helper.Events.Display.MenuChanged += MenuChanged; + Helper.Events.GameLoop.SaveLoaded += SetUpSkullCave; + this.config = helper.ReadConfig(); + } + private Vector2 findLadder(MineShaft ms) + { + Map map = ms.map; + for (int i = 0; i < map.GetLayer("Buildings").LayerHeight; i++) + { + for (int j = 0; j < map.GetLayer("Buildings").LayerWidth; j++) + { + if ((map.GetLayer("Buildings").Tiles[j, i] != null) && (map.GetLayer("Buildings").Tiles[j, i].TileIndex == 0x73)) + { + return new Vector2((float)j, (float)(i + 1)); + } + } + } + return this.helper.Reflection.GetField(ms, "tileBeneathLadder", true).GetValue(); + } + private void MenuChanged(object sender, MenuChangedEventArgs e) + { + if (!(e.NewMenu is MineElevatorMenu) || Game1.currentLocation.Name == "Mine" || e.NewMenu is MyElevatorMenu || e.NewMenu is MyElevatorMenuWithScrollbar) + { + return; + } + if (Game1.currentLocation is MineShaft) + { + MineShaft mineShaft = Game1.currentLocation as MineShaft; + if (mineShaft != null && mineShaft.mineLevel <= 120) + { + return; + } + } + if (Game1.player.deepestMineLevel > 120 + 121 * config.elevatorStep) + { + Game1.activeClickableMenu = (new MyElevatorMenuWithScrollbar(config.elevatorStep, config.difficulty)); + } + else + { + Game1.activeClickableMenu = (new MyElevatorMenu(config.elevatorStep, config.difficulty)); + } + } + private void MineEvents_MineLevelChanged(object sender, WarpedEventArgs e) + { + MineShaft shaft; + if (((shaft = e.NewLocation as MineShaft) != null) && e.IsLocalPlayer) + { + base.Monitor.Log("Current lowest minelevel of player " + Game1.player.deepestMineLevel, LogLevel.Debug); + base.Monitor.Log("Value of MineShaft.lowestMineLevel " + MineShaft.lowestLevelReached, LogLevel.Debug); + base.Monitor.Log("Value of current mineShaft level " + shaft.mineLevel, LogLevel.Debug); + if ((Game1.hasLoadedGame && (Game1.mine != null)) && (((((Game1.CurrentMineLevel - 120) % this.config.elevatorStep) == 0) && (Game1.CurrentMineLevel > 120)) && (Game1.currentLocation is MineShaft))) + { + MineShaft currentLocation = Game1.currentLocation as MineShaft; + TileSheet tileSheet = Game1.getLocationFromName("Mine").map.GetTileSheet("untitled tile sheet"); + currentLocation.map.AddTileSheet(new TileSheet("z_path_objects_custom_sheet", currentLocation.map, tileSheet.ImageSource, tileSheet.SheetSize, tileSheet.TileSize)); + currentLocation.map.DisposeTileSheets(Game1.mapDisplayDevice); + currentLocation.map.LoadTileSheets(Game1.mapDisplayDevice); + Vector2 vector1 = this.findLadder(currentLocation); + int tileX = ((int)vector1.X) + 1; + int tileY = ((int)vector1.Y) - 3; + typeof(MineShaft).GetMethods(); + currentLocation.setMapTileIndex(tileX, tileY + 2, 0x70, "Buildings", 1); + currentLocation.setMapTileIndex(tileX, tileY + 1, 0x60, "Front", 1); + currentLocation.setMapTileIndex(tileX, tileY, 80, "Front", 1); + currentLocation.setMapTile(tileX, tileY, 80, "Front", "MineElevator", 1); + currentLocation.setMapTile(tileX, tileY + 1, 0x60, "Front", "MineElevator", 1); + currentLocation.setMapTile(tileX, tileY + 2, 0x70, "Buildings", "MineElevator", 1); + this.helper.Reflection.GetMethod(currentLocation, "prepareElevator", true).Invoke(new object[0]); + Point point = Utility.findTile(currentLocation, 80, "Buildings"); + object[] objArray1 = new object[] { "x ", point.X, " y ", point.Y }; + base.Monitor.Log(string.Concat(objArray1), LogLevel.Debug); + } + } + } + private void SetUpSkullCave(object sender, SaveLoadedEventArgs e) + { + if (Game1.hasLoadedGame && (Game1.CurrentEvent == null)) + { + GameLocation location = Game1.getLocationFromName("SkullCave"); + TileSheet tileSheet = Game1.getLocationFromName("Mine").map.GetTileSheet("untitled tile sheet"); + location.map.AddTileSheet(new TileSheet("z_path_objects_custom_sheet", location.map, tileSheet.ImageSource, tileSheet.SheetSize, tileSheet.TileSize)); + location.map.DisposeTileSheets(Game1.mapDisplayDevice); + location.map.LoadTileSheets(Game1.mapDisplayDevice); + location.setMapTileIndex(4, 3, 0x70, "Buildings", 2); + location.setMapTileIndex(4, 2, 0x60, "Front", 2); + location.setMapTileIndex(4, 1, 80, "Front", 2); + location.setMapTile(4, 3, 0x70, "Buildings", "MineElevator", 2); + location.setMapTile(4, 2, 0x60, "Front", "MineElevator", 2); + location.setMapTile(4, 1, 80, "Front", "MineElevator", 2); + } + } + } + + + + +} + diff --git a/Mods/SkullCavernElevator/MyElevatorMenuWithScrollbar.cs b/Mods/SkullCavernElevator/MyElevatorMenuWithScrollbar.cs new file mode 100644 index 000000000..c8c5f4557 --- /dev/null +++ b/Mods/SkullCavernElevator/MyElevatorMenuWithScrollbar.cs @@ -0,0 +1,250 @@ +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; +using StardewValley; +using StardewValley.Locations; +using StardewValley.Menus; +using System; + +namespace SkullCavernElevator +{ + public class MyElevatorMenuWithScrollbar : MineElevatorMenu + { + // Fields + private const int SCROLLSTEP = 11; + private const int ELEVATORSIZE = 0x79; + public ClickableTextureComponent upArrow; + public ClickableTextureComponent downArrow; + public ClickableTextureComponent scrollBar; + public Rectangle scrollBarRunner; + private int currentItemIndex; + private int elevatorStep; + private int maxElevators; + private bool scrolling; + + // Methods + public MyElevatorMenuWithScrollbar(int elevatorStep, double difficulty) + { + this.elevatorStep = 5; + base.initialize(0, 0, 0, 0, true); + this.elevatorStep = elevatorStep; + this.maxElevators = (int)(((double)((Game1.player.deepestMineLevel - 120) / elevatorStep)) / difficulty); + if (((Game1.gameMode == 3) && (Game1.player != null)) && !Game1.eventUp) + { + Game1.player.Halt(); + base.elevators.Clear(); + int num = 120; + base.width = (num > 50) ? (0x1e4 + (IClickableMenu.borderWidth * 2)) : Math.Min((int)(220 + (IClickableMenu.borderWidth * 2)), (int)((num * 0x2c) + (IClickableMenu.borderWidth * 2))); + base.height = Math.Max((int)(0x40 + (IClickableMenu.borderWidth * 3)), (int)(((((num * 0x2c) / (base.width - IClickableMenu.borderWidth)) * 0x2c) + 0x40) + (IClickableMenu.borderWidth * 3))); + base.xPositionOnScreen = (Game1.viewport.Width / 2) - (base.width / 2); + base.yPositionOnScreen = (Game1.viewport.Height / 2) - (base.height / 2); + Game1.playSound("crystal"); + this.upArrow = new ClickableTextureComponent(new Rectangle((base.xPositionOnScreen + base.width) + 0x10, base.yPositionOnScreen + 0x40, 0x2c, 0x30), Game1.mouseCursors, new Rectangle(0x1a5, 0x1cb, 11, 12), 4f, false); + this.downArrow = new ClickableTextureComponent(new Rectangle((base.xPositionOnScreen + base.width) + 0x10, (base.yPositionOnScreen + base.height) - 0x40, 0x2c, 0x30), Game1.mouseCursors, new Rectangle(0x1a5, 0x1d8, 11, 12), 4f, false); + this.scrollBar = new ClickableTextureComponent(new Rectangle(this.upArrow.bounds.X + 12, (this.upArrow.bounds.Y + this.upArrow.bounds.Height) + 4, 0x18, 40), Game1.mouseCursors, new Rectangle(0x1b3, 0x1cf, 6, 10), 4f, false); + this.scrollBarRunner = new Rectangle(this.scrollBar.bounds.X, (this.upArrow.bounds.Y + this.upArrow.bounds.Height) + 4, this.scrollBar.bounds.Width, ((base.height - 0x80) - this.upArrow.bounds.Height) - 8); + int x = (base.xPositionOnScreen + IClickableMenu.borderWidth) + ((IClickableMenu.spaceToClearSideBorder * 3) / 4); + int y = (base.yPositionOnScreen + IClickableMenu.borderWidth) + (IClickableMenu.borderWidth / 3); + base.elevators.Add(new ClickableComponent(new Rectangle(x, y, 0x2c, 0x2c), "0")); + int num4 = (x + 0x40) - 20; + if (num4 > ((base.xPositionOnScreen + base.width) - IClickableMenu.borderWidth)) + { + num4 = (base.xPositionOnScreen + IClickableMenu.borderWidth) + ((IClickableMenu.spaceToClearSideBorder * 3) / 4); + y += 0x2c; + } + for (int i = 1; i <= num; i++) + { + base.elevators.Add(new ClickableComponent(new Rectangle(num4, y, 0x2c, 0x2c), (i * elevatorStep).ToString())); + num4 += 0x2c; + if (num4 > ((base.xPositionOnScreen + base.width) - IClickableMenu.borderWidth)) + { + num4 = (base.xPositionOnScreen + IClickableMenu.borderWidth) + ((IClickableMenu.spaceToClearSideBorder * 3) / 4); + y += 0x2c; + } + } + base.initializeUpperRightCloseButton(); + } + } + + private void downArrowPressed() + { + this.downArrow.scale = this.downArrow.baseScale; + this.currentItemIndex += 11; + if (this.currentItemIndex > (this.maxElevators - 0x79)) + { + this.currentItemIndex = (this.maxElevators - 0x79) + 1; + } + this.setScrollBarToCurrentIndex(); + } + + public override void draw(SpriteBatch b) + { + b.Draw(Game1.fadeToBlackRect, Game1.graphics.GraphicsDevice.Viewport.Bounds, Color.Black * 0.4f); + Game1.drawDialogueBox(base.xPositionOnScreen, (base.yPositionOnScreen - 0x40) + 8, base.width + 0x15, base.height + 0x40, false, true, null, false, false); + base.upperRightCloseButton.draw(b); + this.upArrow.draw(b); + this.downArrow.draw(b); + IClickableMenu.drawTextureBox(b, Game1.mouseCursors, new Rectangle(0x193, 0x17f, 6, 6), this.scrollBarRunner.X, this.scrollBarRunner.Y, this.scrollBarRunner.Width, this.scrollBarRunner.Height, Color.White, 4f, false); + this.scrollBar.draw(b); + for (int i = 0; i < 0x79; i++) + { + ClickableComponent elevator = base.elevators[i]; + elevator.name = ((i + this.currentItemIndex) * this.elevatorStep).ToString(); + drawElevator(b, elevator); + } + base.drawMouse(b); + } + private static void drawElevator(SpriteBatch b, ClickableComponent elevator) + { + b.Draw(Game1.mouseCursors, new Vector2((float)(elevator.bounds.X - 4), (float)(elevator.bounds.Y + 4)), new Rectangle((elevator.scale > 1.0) ? 0x10b : 0x100, 0x100, 10, 10), Color.Black * 0.5f, 0f, Vector2.Zero, (float)4f, SpriteEffects.None, 0.865f); + b.Draw(Game1.mouseCursors, new Vector2((float)elevator.bounds.X, (float)elevator.bounds.Y), new Rectangle((elevator.scale > 1.0) ? 0x10b : 0x100, 0x100, 10, 10), Color.White, 0f, Vector2.Zero, (float)4f, SpriteEffects.None, 0.868f); + Vector2 position = new Vector2((float)((elevator.bounds.X + 0x10) + (NumberSprite.numberOfDigits(Convert.ToInt32(elevator.name)) * 6)), (float)((elevator.bounds.Y + 0x18) - (NumberSprite.getHeight() / 4))); + NumberSprite.draw(Convert.ToInt32(elevator.name), b, position, (((Game1.CurrentMineLevel == (Convert.ToInt32(elevator.name) + 120)) && Game1.currentLocation == (Game1.mine)) || ((Convert.ToInt32(elevator.name) == 0) && Game1.currentLocation != (Game1.mine))) ? (Color.Gray * 0.75f) : Color.Gold, 0.5f, 0.86f, 1f, 0, 0); + } + public override void leftClickHeld(int x, int y) + { + if (!GameMenu.forcePreventClose) + { + base.leftClickHeld(x, y); + if (this.scrolling) + { + int y2 = scrollBar.bounds.Y; + scrollBar.bounds.Y = Math.Min(base.yPositionOnScreen + base.height - 64 - 12 - scrollBar.bounds.Height, Math.Max(y, base.yPositionOnScreen + upArrow.bounds.Height + 20)); + currentItemIndex = Math.Min(maxElevators - 121 + 1, Math.Max(0, (int)((double)(maxElevators - 121) * (double)((float)(y - scrollBarRunner.Y) / (float)scrollBarRunner.Height)))); + setScrollBarToCurrentIndex(); + int y3 = scrollBar.bounds.Y; + if (y2 != y3) + { + Game1.playSound("shiny4"); + } + } + } + } + public override void performHoverAction(int x, int y) + { + if (!GameMenu.forcePreventClose) + { + this.upArrow.tryHover(x, y, 0.1f); + this.downArrow.tryHover(x, y, 0.1f); + this.scrollBar.tryHover(x, y, 0.1f); + foreach (ClickableComponent local1 in base.elevators) + { + local1.scale = !local1.containsPoint(x, y) ? 1f : 2f; + } + } + } + public override void receiveLeftClick(int x, int y, bool playSound = true) + { + if (downArrow.containsPoint(x, y)) + { + if (currentItemIndex < Math.Max(0, maxElevators - 121)) + { + downArrowPressed(); + Game1.playSound("shwip"); + } + } + else if (upArrow.containsPoint(x, y)) + { + if (currentItemIndex > 0) + { + upArrowPressed(); + Game1.playSound("shwip"); + } + } + else if (scrollBar.containsPoint(x, y)) + { + scrolling = true; + } + else if (!downArrow.containsPoint(x, y) && x > base.xPositionOnScreen + base.width && x < base.xPositionOnScreen + base.width + 128 && y > base.yPositionOnScreen && y < base.yPositionOnScreen + base.height) + { + scrolling = true; + this.leftClickHeld(x, y); + this.releaseLeftClick(x, y); + } + else if (this.isWithinBounds(x, y)) + { + bool flag = false; + foreach (ClickableComponent elevator in base.elevators) + { + if (elevator.containsPoint(x, y)) + { + MineShaft mineShaft = (Game1.currentLocation as MineShaft); + if (((mineShaft != null) ? new int?(mineShaft.mineLevel) : null) == Convert.ToInt32(elevator.name) + 120) + { + return; + } + Game1.playSound("smallSelect"); + if (Convert.ToInt32(elevator.name) == 0) + { + if ((Game1.currentLocation)!=(Game1.mine)) + { + return; + } + Game1.warpFarmer("SkullCave", 3, 4, 2); + Game1.exitActiveMenu(); + Game1.changeMusicTrack("none"); + flag = true; + } + else + { + if ((Game1.currentLocation)==(Game1.mine) && Convert.ToInt32(elevator.name) == Game1.mine.mineLevel) + { + return; + } + Game1.player.ridingMineElevator = true; + Game1.enterMine(Convert.ToInt32(elevator.name) + 120); + Game1.exitActiveMenu(); + flag = true; + } + } + } + if (!flag) + { + this.receiveLeftClick(x, y, true); + } + } + else + { + Game1.exitActiveMenu(); + } + } + public override void receiveScrollWheelAction(int direction) + { + if (!GameMenu.forcePreventClose) + { + base.receiveScrollWheelAction(direction); + if ((direction > 0) && (this.currentItemIndex > 0)) + { + this.upArrowPressed(); + Game1.playSound("shiny4"); + } + else if ((direction < 0) && (this.currentItemIndex < Math.Max(0, this.maxElevators - 0x79))) + { + this.downArrowPressed(); + Game1.playSound("shiny4"); + } + } + } + private void setScrollBarToCurrentIndex() + { + if (base.elevators.Count > 0) + { + this.scrollBar.bounds.Y = (((int)((((double)this.scrollBarRunner.Height) / ((double)Math.Max(1, (this.maxElevators - 0x79) + 1))) * this.currentItemIndex)) + this.upArrow.bounds.Bottom) + 4; + if (this.currentItemIndex == ((this.maxElevators - 0x79) + 1)) + { + this.scrollBar.bounds.Y = (this.downArrow.bounds.Y - this.scrollBar.bounds.Height) - 4; + } + } + } + private void upArrowPressed() + { + this.upArrow.scale = this.upArrow.baseScale; + this.currentItemIndex -= 11; + if (this.currentItemIndex < 0) + { + this.currentItemIndex = 0; + } + this.setScrollBarToCurrentIndex(); + } + } +} + diff --git a/Mods/SkullCavernElevator/Properties/AssemblyInfo.cs b/Mods/SkullCavernElevator/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..9a904a84e --- /dev/null +++ b/Mods/SkullCavernElevator/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// 有关程序集的一般信息由以下 +// 控制。更改这些特性值可修改 +// 与程序集关联的信息。 +[assembly: AssemblyTitle("SkullCavernElevator")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("SkullCavernElevator")] +[assembly: AssemblyCopyright("Copyright © 2019")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// 将 ComVisible 设置为 false 会使此程序集中的类型 +//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型 +//请将此类型的 ComVisible 特性设置为 true。 +[assembly: ComVisible(false)] + +// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID +[assembly: Guid("50c6fb69-d475-4d69-9b1f-d4b36e41b5e5")] + +// 程序集的版本信息由下列四个值组成: +// +// 主版本 +// 次版本 +// 生成号 +// 修订号 +// +// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 +//通过使用 "*"，如下所示: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Mods/SkullCavernElevator/SkullCavernElevator.csproj b/Mods/SkullCavernElevator/SkullCavernElevator.csproj new file mode 100644 index 000000000..9d97f2a4f --- /dev/null +++ b/Mods/SkullCavernElevator/SkullCavernElevator.csproj @@ -0,0 +1,164 @@ + + + + + Debug + AnyCPU + {50C6FB69-D475-4D69-9B1F-D4B36E41B5E5} + Library + Properties + SkullCavernElevator + SkullCavernElevator + v4.5.2 + 512 + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\assemblies\Mod.dll + + + ..\assemblies\StardewValley.dll + + + False + ..\assemblies\BmFont.dll + + + False + ..\assemblies\Google.Android.Vending.Expansion.Downloader.dll + + + False + ..\assemblies\Google.Android.Vending.Expansion.ZipFile.dll + + + False + ..\assemblies\Google.Android.Vending.Licensing.dll + + + False + ..\assemblies\Java.Interop.dll + + + False + ..\assemblies\Microsoft.AppCenter.dll + + + False + ..\assemblies\Microsoft.AppCenter.Analytics.dll + + + False + ..\assemblies\Microsoft.AppCenter.Analytics.Android.Bindings.dll + + + False + ..\assemblies\Microsoft.AppCenter.Android.Bindings.dll + + + False + ..\assemblies\Microsoft.AppCenter.Crashes.dll + + + False + ..\assemblies\Microsoft.AppCenter.Crashes.Android.Bindings.dll + + + False + ..\assemblies\Mono.Android.dll + + + False + ..\assemblies\Mono.Security.dll + + + False + ..\assemblies\MonoGame.Framework.dll + + + ..\assemblies\mscorlib.dll + + + ..\assemblies\System.dll + + + ..\assemblies\System.Xml + + + ..\assemblies\System.Net.Http + + + ..\assemblies\System.Runtime.Serialization + + + False + ..\assemblies\Xamarin.Android.Arch.Core.Common.dll + + + False + ..\assemblies\Xamarin.Android.Arch.Lifecycle.Common.dll + + + False + ..\assemblies\Xamarin.Android.Arch.Lifecycle.Runtime.dll + + + False + ..\assemblies\Xamarin.Android.Support.Annotations.dll + + + False + ..\assemblies\Xamarin.Android.Support.Compat.dll + + + False + ..\assemblies\Xamarin.Android.Support.Core.UI.dll + + + False + ..\assemblies\Xamarin.Android.Support.Core.Utils.dll + + + False + ..\assemblies\Xamarin.Android.Support.Fragment.dll + + + False + ..\assemblies\Xamarin.Android.Support.Media.Compat.dll + + + False + ..\assemblies\Xamarin.Android.Support.v4.dll + + + False + ..\assemblies\xTile.dll + + + + + + + + + + + \ No newline at end of file diff --git a/Mods/SkullCavernElevator/SkullCavernElevator/MyElevatorMenu.cs b/Mods/SkullCavernElevator/SkullCavernElevator/MyElevatorMenu.cs new file mode 100644 index 000000000..5d3019fad --- /dev/null +++ b/Mods/SkullCavernElevator/SkullCavernElevator/MyElevatorMenu.cs @@ -0,0 +1,109 @@ +using Microsoft.Xna.Framework; +using Microsoft.Xna.Framework.Graphics; +using StardewValley; +using StardewValley.Locations; +using StardewValley.Menus; +using System; + +namespace SkullCavernElevator.SkullCavernElevator +{ + public class MyElevatorMenu : MineElevatorMenu + { + // Methods + public MyElevatorMenu(int elevatorStep, double difficulty) + { + base.initialize(0, 0, 0, 0, true); + if (((Game1.gameMode == 3) && (Game1.player != null)) && !Game1.eventUp) + { + Game1.player.Halt(); + base.elevators.Clear(); + int num = (int)(((double)((Game1.player.deepestMineLevel - 120) / elevatorStep)) / difficulty); + base.width = (num > 50) ? (0x1e4 + (IClickableMenu.borderWidth * 2)) : Math.Min((int)(220 + (IClickableMenu.borderWidth * 2)), (int)((num * 0x2c) + (IClickableMenu.borderWidth * 2))); + base.height = Math.Max((int)(0x40 + (IClickableMenu.borderWidth * 3)), (int)(((((num * 0x2c) / (base.width - IClickableMenu.borderWidth)) * 0x2c) + 0x40) + (IClickableMenu.borderWidth * 3))); + base.xPositionOnScreen = (Game1.viewport.Width / 2) - (base.width / 2); + base.yPositionOnScreen = (Game1.viewport.Height / 2) - (base.height / 2); + Game1.playSound("crystal"); + int x = (base.xPositionOnScreen + IClickableMenu.borderWidth) + ((IClickableMenu.spaceToClearSideBorder * 3) / 4); + int y = (base.yPositionOnScreen + IClickableMenu.borderWidth) + (IClickableMenu.borderWidth / 3); + base.elevators.Add(new ClickableComponent(new Rectangle(x, y, 0x2c, 0x2c), "0")); + int num4 = (x + 0x40) - 20; + if (num4 > ((base.xPositionOnScreen + base.width) - IClickableMenu.borderWidth)) + { + num4 = (base.xPositionOnScreen + IClickableMenu.borderWidth) + ((IClickableMenu.spaceToClearSideBorder * 3) / 4); + y += 0x2c; + } + for (int i = 1; i <= num; i++) + { + base.elevators.Add(new ClickableComponent(new Rectangle(num4, y, 0x2c, 0x2c), (i * elevatorStep).ToString())); + num4 = (num4 + 0x40) - 20; + if (num4 > ((base.xPositionOnScreen + base.width) - IClickableMenu.borderWidth)) + { + num4 = (base.xPositionOnScreen + IClickableMenu.borderWidth) + ((IClickableMenu.spaceToClearSideBorder * 3) / 4); + y += 0x2c; + } + } + base.initializeUpperRightCloseButton(); + } + } + public override void draw(SpriteBatch b) + { + base.draw(b); + foreach (ClickableComponent component in base.elevators) + { + Vector2 position = new Vector2((float)((component.bounds.X + 0x10) + (NumberSprite.numberOfDigits(Convert.ToInt32(component.name)) * 6)), (float)((component.bounds.Y + 0x18) - (NumberSprite.getHeight() / 4))); + NumberSprite.draw(Convert.ToInt32(component.name), b, position, (((Game1.CurrentMineLevel == (Convert.ToInt32(component.name) + 120)) && Game1.currentLocation == Game1.mine) || ((Convert.ToInt32(component.name) == 0) && Game1.currentLocation != Game1.mine)) ? (Color.Gray * 0.75f) : Color.Gold, 0.5f, 0.86f, 1f, 0, 0); + } + } + public override void receiveLeftClick(int x, int y, bool playSound = true) + { + if (this.isWithinBounds(x, y)) + { + bool flag = false; + foreach (ClickableComponent elevator in base.elevators) + { + if (elevator.containsPoint(x, y)) + { + MineShaft mineShaft = (Game1.currentLocation as MineShaft); + if (((mineShaft != null) ? new int?(mineShaft.mineLevel) : null) == Convert.ToInt32(elevator.name) + 120) + { + return; + } + Game1.playSound("smallSelect"); + if (Convert.ToInt32(elevator.name) == 0) + { + if (Game1.currentLocation != Game1.mine) + { + return; + } + Game1.warpFarmer("SkullCave", 3, 4, 2); + Game1.exitActiveMenu(); + Game1.changeMusicTrack("none"); + flag = true; + } + else + { + if ((Game1.currentLocation == Game1.mine) && Convert.ToInt32(elevator.name) == Game1.mine.mineLevel) + { + return; + } + Game1.player.ridingMineElevator = true; + Game1.enterMine(Convert.ToInt32(elevator.name) + 120); + Game1.exitActiveMenu(); + flag = true; + } + } + } + if (!flag) + { + base.receiveLeftClick(x, y, true); + } + } + else + { + Game1.exitActiveMenu(); + } + } + } + +} + diff --git a/Mods/TimeSpeed/Framework/LocationType.cs b/Mods/TimeSpeed/Framework/LocationType.cs new file mode 100644 index 000000000..1cf7875b9 --- /dev/null +++ b/Mods/TimeSpeed/Framework/LocationType.cs @@ -0,0 +1,15 @@ +namespace TimeSpeed.Framework +{ + /// Represents a general location type relative to . + internal enum LocationType + { + /// The location is inside a building. + Indoors, + + /// The location is outside. + Outdoors, + + /// The mines or skull cavern. + Mine + } +} diff --git a/Mods/TimeSpeed/Framework/ModConfig.cs b/Mods/TimeSpeed/Framework/ModConfig.cs new file mode 100644 index 000000000..9848f03b2 --- /dev/null +++ b/Mods/TimeSpeed/Framework/ModConfig.cs @@ -0,0 +1,127 @@ +using System; +using System.Collections.Generic; +using System.Runtime.Serialization; +using StardewValley; +using StardewValley.Locations; + +namespace TimeSpeed.Framework +{ + /// The mod configuration model. + internal class ModConfig + { + /********* + ** Accessors + *********/ + /// The default number of seconds per 10-game-minutes, or null to freeze time globally. The game uses 7 seconds by default. + public double? DefaultTickLength { get; set; } = 7.0; + + /// The number of seconds per 10-game-minutes (or null to freeze time) for each location. The key can be a location name, 'Mine', or . + /// Most location names can be found at "\Stardew Valley\Content\Maps" directory. They usually match the file name without its extension. 'Mine' is a special case which includes all mine maps. + /// + /// This will set the Mines and Skull Cavern to 28 seconds per 10-game-minutes, freeze time indoors and use for outdoors: + /// + /// "TickLengthByLocation": { + /// "Mine": 28, + /// "Indoors": null + /// } + /// + /// + /// This will freeze time on your farm and set it to 14 seconds per 10-game-minutes elsewhere. + /// + /// "TickLengthByLocation": { + /// "Indoors": 14, + /// "Outdoors": 14, + /// "Farm":null + /// } + /// + /// + /// This will freeze time in the Saloon. All other locations will default to . + /// + /// "TickLengthByLocation": { + /// "Saloon": null + /// } + /// + /// + public Dictionary TickLengthByLocation { get; set; } = new Dictionary + { + { LocationType.Indoors.ToString(), 14 }, + { LocationType.Outdoors.ToString(), 7 }, + { LocationType.Mine.ToString(), 7 } + }; + + /// Whether to change tick length on festival days. + public bool EnableOnFestivalDays { get; set; } = false; + + /// The time at which to freeze time everywhere (or null to disable this). This should be 24-hour military time (e.g. 800 for 8am, 1600 for 8pm, etc). + public int? FreezeTimeAt { get; set; } = null; + + /// Whether to show a message about the time settings when you enter a location. + public bool LocationNotify { get; set; } = false; + + /// The keyboard bindings used to control the flow of time. See available keys at . Set a key to null to disable it. + public ModControlsConfig Keys { get; set; } = new ModControlsConfig(); + + + /********* + ** Public methods + *********/ + /// Get whether time should be frozen at a given location. + /// The game location. + public bool ShouldFreeze(GameLocation location) + { + return this.GetTickLengthOrFreeze(location) == null; + } + + /// Get whether the time should be frozen at a given time of day. + /// The time of day in 24-hour military format (e.g. 1600 for 8pm). + public bool ShouldFreeze(int time) + { + return this.FreezeTimeAt == time; + } + + /// Get whether time settings should be applied on a given day. + /// The season to check. + /// The day of month to check. + public bool ShouldScale(string season, int dayOfMonth) + { + return this.EnableOnFestivalDays || !Utility.isFestivalDay(dayOfMonth, season); + } + + /// Get the tick interval to apply for a location. + /// The game location. + public int? GetTickInterval(GameLocation location) + { + return (int?)((this.GetTickLengthOrFreeze(location) ?? this.DefaultTickLength) * 1000); + } + + + /********* + ** Private methods + *********/ + /// The method called after the config file is deserialised. + /// The deserialisation context. + [OnDeserialized] + private void OnDeserializedMethod(StreamingContext context) + { + this.TickLengthByLocation = new Dictionary(this.TickLengthByLocation, StringComparer.OrdinalIgnoreCase); + } + + /// Get the tick length to apply for a given location, or null to freeze time. + /// The game location. + private double? GetTickLengthOrFreeze(GameLocation location) + { + // check by location name + if (this.TickLengthByLocation.TryGetValue(location.Name, out double? tickLength)) + return tickLength; + if (location is MineShaft && this.TickLengthByLocation.TryGetValue(LocationType.Mine.ToString(), out tickLength)) + return tickLength; + + // check by location type + if (this.TickLengthByLocation.TryGetValue((location.IsOutdoors ? LocationType.Outdoors : LocationType.Indoors).ToString(), out tickLength)) + return tickLength; + + // default + return this.DefaultTickLength; + } + } +} diff --git a/Mods/TimeSpeed/Framework/ModControlsConfig.cs b/Mods/TimeSpeed/Framework/ModControlsConfig.cs new file mode 100644 index 000000000..99aba12cc --- /dev/null +++ b/Mods/TimeSpeed/Framework/ModControlsConfig.cs @@ -0,0 +1,23 @@ +using StardewModdingAPI; + +namespace TimeSpeed.Framework +{ + /// The keyboard bindings used to control the flow of time. See available keys at . Set a key to null to disable it. + internal class ModControlsConfig + { + /********* + ** Accessors + *********/ + /// Freeze or unfreeze time. Freezing time will stay in effect until you unfreeze it; unfreezing time will stay in effect until you enter a new location with time settings. + public SButton? FreezeTime { get; set; } = SButton.N; + + /// Slow down time by one second per 10-game-minutes. Combine with Control to increase by 100 seconds, Shift to increase by 10 seconds, or Alt to increase by 0.1 seconds. + public SButton? IncreaseTickInterval { get; set; } = SButton.OemPeriod; + + /// Speed up time by one second per 10-game-minutes. Combine with Control to decrease by 100 seconds, Shift to decrease by 10 seconds, or Alt to decrease by 0.1 seconds. + public SButton? DecreaseTickInterval { get; set; } = SButton.OemComma; + + /// Reload all values from the config file and apply them immediately. Time will stay frozen if it was frozen via hotkey. + public SButton? ReloadConfig { get; set; } = SButton.B; + } +} diff --git a/Mods/TimeSpeed/Framework/Notifier.cs b/Mods/TimeSpeed/Framework/Notifier.cs new file mode 100644 index 000000000..af6ff3b96 --- /dev/null +++ b/Mods/TimeSpeed/Framework/Notifier.cs @@ -0,0 +1,25 @@ +using StardewValley; + +namespace TimeSpeed.Framework +{ + /// Displays messages to the user in-game. + internal class Notifier + { + /********* + ** Public methods + *********/ + /// Display a message for one second. + /// The message to display. + public void QuickNotify(string message) + { + Game1.hudMessages.Add(new HUDMessage(message, 2) { timeLeft = 1000 }); + } + + /// Display a message for two seconds. + /// The message to display. + public void ShortNotify(string message) + { + Game1.hudMessages.Add(new HUDMessage(message, 2) { timeLeft = 2000 }); + } + } +} diff --git a/Mods/TimeSpeed/Framework/TickProgressChangedEventArgs.cs b/Mods/TimeSpeed/Framework/TickProgressChangedEventArgs.cs new file mode 100644 index 000000000..1c9062401 --- /dev/null +++ b/Mods/TimeSpeed/Framework/TickProgressChangedEventArgs.cs @@ -0,0 +1,33 @@ +using System; + +namespace TimeSpeed.Framework +{ + /// Contains information about a change to the value. + internal class TickProgressChangedEventArgs : EventArgs + { + /********* + ** Accessors + *********/ + /// The previous progress value. + public double PreviousProgress { get; } + + /// The new progress value. + public double NewProgress { get; } + + /// Whether a new tick occurred since the last check. + public bool TimeChanged => this.NewProgress < this.PreviousProgress; + + + /********* + ** Public methods + *********/ + /// Construct an instance. + /// The previous progress value. + /// The new progress value. + public TickProgressChangedEventArgs(double previousProgess, double newProgress) + { + this.PreviousProgress = previousProgess; + this.NewProgress = newProgress; + } + } +} diff --git a/Mods/TimeSpeed/Framework/TimeHelper.cs b/Mods/TimeSpeed/Framework/TimeHelper.cs new file mode 100644 index 000000000..967658cb3 --- /dev/null +++ b/Mods/TimeSpeed/Framework/TimeHelper.cs @@ -0,0 +1,53 @@ +using System; +using StardewValley; + +namespace TimeSpeed.Framework +{ + /// Provides helper methods for tracking time flow. + internal class TimeHelper + { + /********* + ** Fields + *********/ + /// The previous tick progress. + private double PreviousProgress; + + /// The handlers to notify when the tick progress changes. + private event EventHandler Handlers; + + + /********* + ** Accessors + *********/ + /// The game's default tick interval in milliseconds for the current location. + public int CurrentDefaultTickInterval => 7000 + (Game1.currentLocation?.getExtraMillisecondsPerInGameMinuteForThisLocation() ?? 0); + + /// The percentage of the that's elapsed since the last tick. + public double TickProgress + { + get => (double)Game1.gameTimeInterval / this.CurrentDefaultTickInterval; + set => Game1.gameTimeInterval = (int)(value * this.CurrentDefaultTickInterval); + } + + + /********* + ** Public methods + *********/ + /// Update the time tracking. + public void Update() + { + // ReSharper disable once CompareOfFloatsByEqualityOperator - intended + if (this.PreviousProgress != this.TickProgress) + this.Handlers?.Invoke(null, new TickProgressChangedEventArgs(this.PreviousProgress, this.TickProgress)); + + this.PreviousProgress = this.TickProgress; + } + + /// Register an event handler to notify when the changes. + /// The event handler to notify. + public void WhenTickProgressChanged(EventHandler handler) + { + this.Handlers += handler; + } + } +} diff --git a/Mods/TimeSpeed/ModEntry.cs b/Mods/TimeSpeed/ModEntry.cs new file mode 100644 index 000000000..00435f845 --- /dev/null +++ b/Mods/TimeSpeed/ModEntry.cs @@ -0,0 +1,336 @@ +using System; +using System.Collections.Generic; +using Microsoft.Xna.Framework.Input; +using SMDroid.Options; +using StardewModdingAPI; +using StardewModdingAPI.Events; +using StardewValley; +using StardewValley.Menus; +using TimeSpeed.Framework; + +namespace TimeSpeed +{ + /// The entry class called by SMAPI. + internal class ModEntry : Mod + { + /********* + ** Properties + *********/ + /// Whether time features should be enabled. + private bool ShouldEnable => Context.IsWorldReady && Context.IsMainPlayer; + + /// Displays messages to the user. + private readonly Notifier Notifier = new Notifier(); + + /// Provides helper methods for tracking time flow. + private readonly TimeHelper TimeHelper = new TimeHelper(); + + /// The mod configuration. + private ModConfig Config; + + /// Whether time should be frozen everywhere. + private bool FrozenGlobally; + + /// Whether time should be frozen at the current location. + private bool FrozenAtLocation; + + /// Whether time should be frozen. + private bool Frozen + { + get => this.FrozenGlobally || this.FrozenAtLocation; + set => this.FrozenGlobally = this.FrozenAtLocation = value; + } + + /// Whether the flow of time should be adjusted. + private bool AdjustTime; + + /// Backing field for . + private int _tickInterval; + + /// The number of seconds per 10-game-minutes to apply. + private int TickInterval + { + get => this._tickInterval; + set => this._tickInterval = Math.Max(value, 0); + } + + + /********* + ** Public methods + *********/ + /// The mod entry point, called after the mod is first loaded. + /// Provides simplified APIs for writing mods. + public override void Entry(IModHelper helper) + { + // read config + this.Config = helper.ReadConfig(); + + // add time events + this.TimeHelper.WhenTickProgressChanged(this.OnTickProgressed); + helper.Events.GameLoop.UpdateTicked += this.OnUpdateTicked; + helper.Events.GameLoop.SaveLoaded += this.OnSaveLoaded; + helper.Events.GameLoop.TimeChanged += this.OnTimeChanged; + helper.Events.GameLoop.DayStarted += this.OnDayStarted; + helper.Events.Input.ButtonPressed += this.OnButtonPressed; + helper.Events.Player.Warped += this.OnWarped; + + // add time freeze/unfreeze notification + { + bool wasPaused = false; + helper.Events.Display.RenderingHud += (sender, args) => + { + wasPaused = Game1.paused; + if (this.Frozen) Game1.paused = true; + }; + + helper.Events.Display.RenderedHud += (sender, args) => + { + Game1.paused = wasPaused; + }; + } + } + + + public override List GetConfigMenuItems() + { + List options = new List(); + ModOptionsSlider _optionsSliderSpeed = new ModOptionsSlider("时速倍数", 0x8765, delegate (int value) { + if (value == 0) + { + if (!this.Frozen) + { + this.Config.DefaultTickLength = null; + this.Frozen = true; + } + } + else + { + this.Frozen = false; + if ((int)(7 * this.TickInterval / 1000) != value) + { + this.Config.DefaultTickLength = 7.0 / value; + this.TickInterval = 7000 / value; + } + } + }, -1, -1); + _optionsSliderSpeed.sliderMinValue = 0; + _optionsSliderSpeed.sliderMaxValue = 10; + if (!this.Frozen) + { + _optionsSliderSpeed.value = 7000 / this.TickInterval; + } + else + { + _optionsSliderSpeed.value = 0; + } + options.Add(_optionsSliderSpeed); + return options; + } + + /********* + ** Private methods + *********/ + /**** + ** Event handlers + ****/ + /// Raised after the player loads a save slot and the world is initialised. + /// The event sender. + /// The event arguments. + private void OnSaveLoaded(object sender, SaveLoadedEventArgs e) + { + if (!Context.IsMainPlayer) + this.Monitor.Log("Disabled mod; only works for the main player in multiplayer.", LogLevel.Warn); + } + + /// Raised after the game begins a new day (including when the player loads a save). + /// The event sender. + /// The event arguments. + private void OnDayStarted(object sender, DayStartedEventArgs e) + { + this.UpdateScaleForDay(Game1.currentSeason, Game1.dayOfMonth); + this.UpdateSettingsForLocation(Game1.currentLocation); + } + + /// Raised after the player presses a button on the keyboard, controller, or mouse. + /// The event sender. + /// The event arguments. + private void OnButtonPressed(object sender, ButtonPressedEventArgs e) + { + if (!this.ShouldEnable || !Context.IsPlayerFree) + return; + + SButton key = e.Button; + if (key == this.Config.Keys.FreezeTime) + this.ToogleFreeze(); + else if (key == this.Config.Keys.IncreaseTickInterval || key == this.Config.Keys.DecreaseTickInterval) + this.ChangeTickInterval(increase: key == this.Config.Keys.IncreaseTickInterval); + else if (key == this.Config.Keys.ReloadConfig) + this.ReloadConfig(); + } + + /// Raised after a player warps to a new location. + /// The event sender. + /// The event arguments. + private void OnWarped(object sender, WarpedEventArgs e) + { + if (!this.ShouldEnable || !e.IsLocalPlayer) + return; + + this.UpdateSettingsForLocation(e.NewLocation); + } + + /// Raised after the in-game clock time changes. + /// The event sender. + /// The event arguments. + private void OnTimeChanged(object sender, TimeChangedEventArgs e) + { + if (!this.ShouldEnable) + return; + + this.UpdateFreezeForTime(Game1.timeOfDay); + } + + /// Raised after the game state is updated (≈60 times per second). + /// The event sender. + /// The event arguments. + private void OnUpdateTicked(object sender, UpdateTickedEventArgs e) + { + this.TimeHelper.Update(); + } + + /// Raised after the value changes. + /// The event sender. + /// The event arguments. + private void OnTickProgressed(object sender, TickProgressChangedEventArgs e) + { + if (!this.ShouldEnable) + return; + + if (this.Frozen) + this.TimeHelper.TickProgress = e.TimeChanged ? 0 : e.PreviousProgress; + else + { + if (!this.AdjustTime) + return; + if (this.TickInterval == 0) + this.TickInterval = 1000; + + if (e.TimeChanged) + this.TimeHelper.TickProgress = this.ScaleTickProgress(this.TimeHelper.TickProgress, this.TickInterval); + else + this.TimeHelper.TickProgress = e.PreviousProgress + this.ScaleTickProgress(e.NewProgress - e.PreviousProgress, this.TickInterval); + } + } + + /**** + ** Methods + ****/ + /// Reload from the config file. + private void ReloadConfig() + { + this.Config = this.Helper.ReadConfig(); + this.UpdateScaleForDay(Game1.currentSeason, Game1.dayOfMonth); + this.UpdateSettingsForLocation(Game1.currentLocation); + this.Notifier.ShortNotify("Time feels differently now..."); + } + + /// Increment or decrement the tick interval, taking into account the held modifier key if applicable. + /// Whether to increment the tick interval; else decrement. + private void ChangeTickInterval(bool increase) + { + // get offset to apply + int change = 1000; + { + KeyboardState state = Keyboard.GetState(); + if (state.IsKeyDown(Keys.LeftControl)) + change *= 100; + else if (state.IsKeyDown(Keys.LeftShift)) + change *= 10; + else if (state.IsKeyDown(Keys.LeftAlt)) + change /= 10; + } + + // update tick interval + if (!increase) + { + int minAllowed = Math.Min(this.TickInterval, change); + this.TickInterval = Math.Max(minAllowed, this.TickInterval - change); + } + else + this.TickInterval = this.TickInterval + change; + + // log change + this.Notifier.QuickNotify($"10 minutes feels like {this.TickInterval / 1000} seconds."); + this.Monitor.Log($"Tick length set to {this.TickInterval / 1000d: 0.##} seconds.", LogLevel.Info); + } + + /// Toggle whether time is frozen. + private void ToogleFreeze() + { + if (!this.Frozen) + { + this.FrozenGlobally = true; + this.Notifier.QuickNotify("Hey, you stopped the time!"); + this.Monitor.Log("Time is frozen globally.", LogLevel.Info); + } + else + { + this.Frozen = false; + this.Notifier.QuickNotify("Time feels as usual now..."); + this.Monitor.Log($"Time is temporarily unfrozen at \"{Game1.currentLocation.Name}\".", LogLevel.Info); + } + } + + /// Update the time freeze settings for the given time of day. + /// The time of day in 24-hour military format (e.g. 1600 for 8pm). + private void UpdateFreezeForTime(int time) + { + if (this.Config.ShouldFreeze(time)) + { + this.FrozenGlobally = true; + this.Notifier.ShortNotify("Time suddenly stops..."); + this.Monitor.Log($"Time automatically set to frozen at {Game1.timeOfDay}.", LogLevel.Info); + } + } + + /// Update the time settings for the given location. + /// The game location. + private void UpdateSettingsForLocation(GameLocation location) + { + if (location == null) + return; + + // update time settings + this.FrozenAtLocation = this.FrozenGlobally || this.Config.ShouldFreeze(location); + if (this.Config.GetTickInterval(location) != null) + this.TickInterval = this.Config.GetTickInterval(location) ?? this.TickInterval; + + // notify player + if (this.Config.LocationNotify) + { + if (this.FrozenGlobally) + this.Notifier.ShortNotify("Looks like time stopped everywhere..."); + else if (this.FrozenAtLocation) + this.Notifier.ShortNotify("It feels like time is frozen here..."); + else + this.Notifier.ShortNotify($"10 minutes feels more like {this.TickInterval / 1000} seconds here..."); + } + } + + /// Update the time settings for the given date. + /// The current season. + /// The current day of month. + private void UpdateScaleForDay(string season, int dayOfMonth) + { + this.AdjustTime = this.Config.ShouldScale(season, dayOfMonth); + } + + /// Get the adjusted progress towards the next 10-game-minute tick. + /// The current progress. + /// The new tick interval. + private double ScaleTickProgress(double progress, int newTickInterval) + { + return progress * this.TimeHelper.CurrentDefaultTickInterval / newTickInterval; + } + } +} diff --git a/Mods/TimeSpeed/Properties/AssemblyInfo.cs b/Mods/TimeSpeed/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..7b703229b --- /dev/null +++ b/Mods/TimeSpeed/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// 有关程序集的一般信息由以下 +// 控制。更改这些特性值可修改 +// 与程序集关联的信息。 +[assembly: AssemblyTitle("TimeSpeed")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("TimeSpeed")] +[assembly: AssemblyCopyright("Copyright © 2019")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// 将 ComVisible 设置为 false 会使此程序集中的类型 +//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型 +//请将此类型的 ComVisible 特性设置为 true。 +[assembly: ComVisible(false)] + +// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID +[assembly: Guid("09e76025-db21-4d9f-b8b1-571d779ac5e6")] + +// 程序集的版本信息由下列四个值组成: +// +// 主版本 +// 次版本 +// 生成号 +// 修订号 +// +// 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号 +//通过使用 "*"，如下所示: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Mods/TimeSpeed/TimeSpeed.csproj b/Mods/TimeSpeed/TimeSpeed.csproj new file mode 100644 index 000000000..ab32bf7c1 --- /dev/null +++ b/Mods/TimeSpeed/TimeSpeed.csproj @@ -0,0 +1,167 @@ + + + + + Debug + AnyCPU + {09E76025-DB21-4D9F-B8B1-571D779AC5E6} + Library + Properties + TimeSpeed + TimeSpeed + v4.5.2 + 512 + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\assemblies\Mod.dll + + + ..\assemblies\StardewValley.dll + + + False + ..\assemblies\BmFont.dll + + + False + ..\assemblies\Google.Android.Vending.Expansion.Downloader.dll + + + False + ..\assemblies\Google.Android.Vending.Expansion.ZipFile.dll + + + False + ..\assemblies\Google.Android.Vending.Licensing.dll + + + False + ..\assemblies\Java.Interop.dll + + + False + ..\assemblies\Microsoft.AppCenter.dll + + + False + ..\assemblies\Microsoft.AppCenter.Analytics.dll + + + False + ..\assemblies\Microsoft.AppCenter.Analytics.Android.Bindings.dll + + + False + ..\assemblies\Microsoft.AppCenter.Android.Bindings.dll + + + False + ..\assemblies\Microsoft.AppCenter.Crashes.dll + + + False + ..\assemblies\Microsoft.AppCenter.Crashes.Android.Bindings.dll + + + False + ..\assemblies\Mono.Android.dll + + + False + ..\assemblies\Mono.Security.dll + + + False + ..\assemblies\MonoGame.Framework.dll + + + ..\assemblies\mscorlib.dll + + + ..\assemblies\System.dll + + + ..\assemblies\System.Xml + + + ..\assemblies\System.Net.Http + + + ..\assemblies\System.Runtime.Serialization + + + False + ..\assemblies\Xamarin.Android.Arch.Core.Common.dll + + + False + ..\assemblies\Xamarin.Android.Arch.Lifecycle.Common.dll + + + False + ..\assemblies\Xamarin.Android.Arch.Lifecycle.Runtime.dll + + + False + ..\assemblies\Xamarin.Android.Support.Annotations.dll + + + False + ..\assemblies\Xamarin.Android.Support.Compat.dll + + + False + ..\assemblies\Xamarin.Android.Support.Core.UI.dll + + + False + ..\assemblies\Xamarin.Android.Support.Core.Utils.dll + + + False + ..\assemblies\Xamarin.Android.Support.Fragment.dll + + + False + ..\assemblies\Xamarin.Android.Support.Media.Compat.dll + + + False + ..\assemblies\Xamarin.Android.Support.v4.dll + + + False + ..\assemblies\xTile.dll + + + + + + + + + + + + + + \ No newline at end of file diff --git a/PatchStep.txt b/PatchStep.txt new file mode 100644 index 000000000..13e513ad4 --- /dev/null +++ b/PatchStep.txt @@ -0,0 +1,21 @@ +1. Inject assembly reference, namespace: SMDroid + +2.Modify class StardewValley.Game1, modify constructor methodinsert Instructions at beginning: +newobj System.Void SMDroid.ModEntry::.ctor() +stsfld StardewValley.ModHooks StardewValley.Game1::hooks + +3.Modify class StardewValley.ModHooks, inject method: + public virtual void OnGame1_Update(GameTime time); + public virtual LocalizedContentManager OnGame1_CreateContentManager(IServiceProvider serviceProvider, string rootDirectory) => null; + +4.Modify class StardewValley.Game1, modify method Update(GameTime gameTime), insert Instructions at beginning: +ldsfld StardewValley.ModHooks StardewValley.Game1::hooks +ldarg.1 +callvirt System.Void StardewValley.ModHooks::OnGame1_Update(Microsoft.Xna.Framework.GameTime) + +5.Modify class StardewValley.Game1, modify method CreateContentManager(GameTime gameTime), replace Instructions to: +ldsfld StardewValley.ModHooks StardewValley.Game1::hooks +ldarg.1 +ldarg.2 +callvirt StardewValley.LocalizedContentManager StardewValley.ModHooks::OnGame1_CreateContentManager(System.IServiceProvider,System.String) +ret \ No newline at end of file diff --git a/SMAPI b/SMAPI new file mode 160000 index 000000000..9e521091f --- /dev/null +++ b/SMAPI @@ -0,0 +1 @@ +Subproject commit 9e521091fe4b13a9091bcb30c9f73ef210ace2dd From 589d48a969fe5a5e05f629493891f17f0ff89122 Mon Sep 17 00:00:00 2001 From: yangzhi <@4F!xZpJwly&KbWq> Date: Wed, 10 Apr 2019 01:27:45 +0800 Subject: [PATCH 2/6] SMAPI Android Transportation --- SMAPI | 1 - src/Harmony/Attributes.cs | 325 ++ src/Harmony/CodeInstruction.cs | 62 + src/Harmony/CodeTranspiler.cs | 295 ++ src/Harmony/Extras/DelegateTypeFactory.cs | 43 + src/Harmony/Extras/FastAccess.cs | 123 + src/Harmony/Extras/MethodInvoker.cs | 179 + src/Harmony/GlobalSuppressions.cs | 4 + src/Harmony/HarmonyInstance.cs | 190 + src/Harmony/HarmonyMethod.cs | 141 + src/Harmony/HarmonySharedState.cs | 68 + src/Harmony/ILCopying/ByteBuffer.cs | 104 + src/Harmony/ILCopying/Emitter.cs | 315 ++ src/Harmony/ILCopying/ILInstruction.cs | 148 + src/Harmony/ILCopying/Memory.cs | 204 + src/Harmony/ILCopying/MethodCopier.cs | 730 ++++ src/Harmony/ILCopying/Signature.cs | 271 ++ src/Harmony/MethodPatcher.cs | 419 ++ src/Harmony/Patch.cs | 194 + src/Harmony/PatchFunctions.cs | 99 + src/Harmony/PatchProcessor.cs | 305 ++ src/Harmony/Priority.cs | 15 + src/Harmony/Tools/AccessCache.cs | 96 + src/Harmony/Tools/AccessTools.cs | 398 ++ src/Harmony/Tools/DynamicTools.cs | 226 + src/Harmony/Tools/Extensions.cs | 82 + src/Harmony/Tools/FileLog.cs | 120 + src/Harmony/Tools/PatchTools.cs | 33 + src/Harmony/Tools/SelfPatching.cs | 134 + src/Harmony/Tools/SymbolExtensions.cs | 61 + src/Harmony/Tools/Traverse.cs | 298 ++ src/Harmony/Transpilers.cs | 38 + src/Mod.csproj | 831 ++++ src/Mod.sln | 25 + src/ModEntry.cs | 66 + src/Mono/Cecil/ArrayType.cs | 141 + src/Mono/Cecil/AssemblyDefinition.cs | 194 + src/Mono/Cecil/AssemblyFlags.cs | 24 + src/Mono/Cecil/AssemblyHashAlgorithm.cs | 18 + src/Mono/Cecil/AssemblyLinkedResource.cs | 39 + src/Mono/Cecil/AssemblyNameDefinition.cs | 32 + src/Mono/Cecil/AssemblyNameReference.cs | 266 ++ src/Mono/Cecil/AssemblyReader.cs | 3862 +++++++++++++++++ src/Mono/Cecil/AssemblyWriter.cs | 3310 ++++++++++++++ src/Mono/Cecil/BaseAssemblyResolver.cs | 410 ++ src/Mono/Cecil/CallSite.cs | 106 + src/Mono/Cecil/Cil/Code.cs | 234 + src/Mono/Cecil/Cil/CodeReader.cs | 671 +++ src/Mono/Cecil/Cil/CodeWriter.cs | 659 +++ src/Mono/Cecil/Cil/Document.cs | 123 + src/Mono/Cecil/Cil/ExceptionHandler.cs | 71 + src/Mono/Cecil/Cil/ILProcessor.cs | 260 ++ src/Mono/Cecil/Cil/Instruction.cs | 296 ++ src/Mono/Cecil/Cil/MethodBody.cs | 248 ++ src/Mono/Cecil/Cil/OpCode.cs | 439 ++ src/Mono/Cecil/Cil/OpCodes.cs | 894 ++++ src/Mono/Cecil/Cil/PortablePdb.cs | 590 +++ src/Mono/Cecil/Cil/SequencePoint.cs | 76 + src/Mono/Cecil/Cil/Symbols.cs | 1127 +++++ src/Mono/Cecil/Cil/VariableDefinition.cs | 29 + src/Mono/Cecil/Cil/VariableReference.cs | 42 + src/Mono/Cecil/Consts.cs | 5 + src/Mono/Cecil/CustomAttribute.cs | 205 + src/Mono/Cecil/DefaultAssemblyResolver.cs | 61 + src/Mono/Cecil/EmbeddedResource.cs | 98 + src/Mono/Cecil/EventAttributes.cs | 21 + src/Mono/Cecil/EventDefinition.cs | 155 + src/Mono/Cecil/EventReference.cs | 42 + src/Mono/Cecil/ExportedType.cs | 240 + src/Mono/Cecil/FieldAttributes.cs | 41 + src/Mono/Cecil/FieldDefinition.cs | 267 ++ src/Mono/Cecil/FieldReference.cs | 68 + src/Mono/Cecil/FileAttributes.cs | 17 + src/Mono/Cecil/FunctionPointerType.cs | 111 + src/Mono/Cecil/GenericInstanceMethod.cs | 67 + src/Mono/Cecil/GenericInstanceType.cs | 65 + src/Mono/Cecil/GenericParameter.cs | 268 ++ src/Mono/Cecil/GenericParameterAttributes.cs | 27 + src/Mono/Cecil/IConstantProvider.cs | 44 + src/Mono/Cecil/ICustomAttributeProvider.cs | 42 + src/Mono/Cecil/IGenericInstance.cs | 48 + src/Mono/Cecil/IGenericParameterProvider.cs | 56 + src/Mono/Cecil/IMarshalInfoProvider.cs | 38 + src/Mono/Cecil/IMemberDefinition.cs | 82 + src/Mono/Cecil/IMetadataScope.cs | 23 + src/Mono/Cecil/IMetadataTokenProvider.cs | 17 + src/Mono/Cecil/IMethodSignature.cs | 57 + src/Mono/Cecil/Import.cs | 829 ++++ src/Mono/Cecil/LinkedResource.cs | 42 + src/Mono/Cecil/ManifestResourceAttributes.cs | 21 + src/Mono/Cecil/MarshalInfo.cs | 153 + src/Mono/Cecil/MemberDefinitionCollection.cs | 74 + src/Mono/Cecil/MemberReference.cs | 107 + src/Mono/Cecil/Metadata/BlobHeap.cs | 54 + src/Mono/Cecil/Metadata/Buffers.cs | 505 +++ src/Mono/Cecil/Metadata/CodedIndex.cs | 29 + src/Mono/Cecil/Metadata/ElementType.cs | 55 + src/Mono/Cecil/Metadata/GuidHeap.cs | 36 + src/Mono/Cecil/Metadata/Heap.cs | 24 + src/Mono/Cecil/Metadata/MetadataToken.cs | 94 + src/Mono/Cecil/Metadata/PdbHeap.cs | 34 + src/Mono/Cecil/Metadata/Row.cs | 152 + src/Mono/Cecil/Metadata/StringHeap.cs | 60 + src/Mono/Cecil/Metadata/TableHeap.cs | 104 + src/Mono/Cecil/Metadata/TokenType.cs | 49 + src/Mono/Cecil/Metadata/UserStringHeap.cs | 36 + src/Mono/Cecil/Metadata/Utilities.cs | 652 +++ src/Mono/Cecil/MetadataResolver.cs | 391 ++ src/Mono/Cecil/MetadataSystem.cs | 429 ++ src/Mono/Cecil/MethodAttributes.cs | 48 + src/Mono/Cecil/MethodCallingConvention.cs | 22 + src/Mono/Cecil/MethodDefinition.cs | 545 +++ src/Mono/Cecil/MethodImplAttributes.cs | 36 + src/Mono/Cecil/MethodReference.cs | 202 + src/Mono/Cecil/MethodReturnType.cs | 98 + src/Mono/Cecil/MethodSemanticsAttributes.cs | 25 + src/Mono/Cecil/MethodSpecification.cs | 84 + src/Mono/Cecil/Modifiers.cs | 112 + src/Mono/Cecil/ModuleDefinition.cs | 1373 ++++++ src/Mono/Cecil/ModuleKind.cs | 55 + src/Mono/Cecil/ModuleReference.cs | 49 + src/Mono/Cecil/NativeType.cs | 55 + src/Mono/Cecil/PE/BinaryStreamReader.cs | 54 + src/Mono/Cecil/PE/BinaryStreamWriter.cs | 93 + src/Mono/Cecil/PE/ByteBuffer.cs | 341 ++ .../Cecil/PE/ByteBufferEqualityComparer.cs | 48 + src/Mono/Cecil/PE/DataDirectory.cs | 32 + src/Mono/Cecil/PE/Image.cs | 170 + src/Mono/Cecil/PE/ImageReader.cs | 793 ++++ src/Mono/Cecil/PE/ImageWriter.cs | 855 ++++ src/Mono/Cecil/PE/Section.cs | 24 + src/Mono/Cecil/PE/TextMap.cs | 112 + src/Mono/Cecil/PInvokeAttributes.cs | 44 + src/Mono/Cecil/PInvokeInfo.cs | 120 + src/Mono/Cecil/ParameterAttributes.cs | 27 + src/Mono/Cecil/ParameterDefinition.cs | 146 + .../Cecil/ParameterDefinitionCollection.cs | 62 + src/Mono/Cecil/ParameterReference.cs | 57 + src/Mono/Cecil/PinnedType.cs | 35 + src/Mono/Cecil/PointerType.cs | 43 + src/Mono/Cecil/PropertyAttributes.cs | 23 + src/Mono/Cecil/PropertyDefinition.cs | 244 ++ src/Mono/Cecil/PropertyReference.cs | 45 + src/Mono/Cecil/ReferenceType.cs | 43 + src/Mono/Cecil/Resource.cs | 58 + src/Mono/Cecil/SecurityDeclaration.cs | 179 + src/Mono/Cecil/SentinelType.cs | 35 + src/Mono/Cecil/TargetRuntime.cs | 19 + src/Mono/Cecil/Treatments.cs | 66 + src/Mono/Cecil/TypeAttributes.cs | 63 + src/Mono/Cecil/TypeDefinition.cs | 609 +++ src/Mono/Cecil/TypeDefinitionCollection.cs | 100 + src/Mono/Cecil/TypeParser.cs | 532 +++ src/Mono/Cecil/TypeReference.cs | 352 ++ src/Mono/Cecil/TypeSpecification.cs | 68 + src/Mono/Cecil/TypeSystem.cs | 331 ++ src/Mono/Cecil/VariantType.cs | 35 + src/Mono/Cecil/WindowsRuntimeProjections.cs | 875 ++++ src/Mono/Collections/Generic/Collection.cs | 416 ++ .../Collections/Generic/ReadOnlyCollection.cs | 94 + src/Mono/Disposable.cs | 45 + src/Mono/Empty.cs | 62 + src/Mono/MergeSort.cs | 66 + .../Security/Cryptography/CryptoConvert.cs | 253 ++ .../Security/Cryptography/CryptoService.cs | 158 + src/Mono/Type.cs | 137 + src/Newtonsoft.Json/Bson/BsonBinaryType.cs | 44 + src/Newtonsoft.Json/Bson/BsonBinaryWriter.cs | 328 ++ src/Newtonsoft.Json/Bson/BsonObjectId.cs | 58 + src/Newtonsoft.Json/Bson/BsonReader.cs | 834 ++++ src/Newtonsoft.Json/Bson/BsonToken.cs | 166 + src/Newtonsoft.Json/Bson/BsonType.cs | 51 + src/Newtonsoft.Json/Bson/BsonWriter.cs | 537 +++ src/Newtonsoft.Json/ConstructorHandling.cs | 43 + .../Converters/BinaryConverter.cs | 208 + .../Converters/BsonObjectIdConverter.cs | 91 + .../Converters/CustomCreationConverter.cs | 101 + .../Converters/DataSetConverter.cs | 125 + .../Converters/DataTableConverter.cs | 254 ++ .../Converters/DateTimeConverterBase.cs | 58 + .../Converters/DiscriminatedUnionConverter.cs | 280 ++ .../Converters/EntityKeyMemberConverter.cs | 156 + .../Converters/ExpandoObjectConverter.cs | 165 + .../Converters/IsoDateTimeConverter.cs | 194 + .../Converters/JavaScriptDateTimeConverter.cs | 111 + .../Converters/KeyValuePairConverter.cs | 153 + .../Converters/RegexConverter.cs | 235 + .../Converters/StringEnumConverter.cs | 276 ++ .../Converters/UnixDateTimeConverter.cs | 132 + .../Converters/VersionConverter.cs | 106 + .../Converters/XmlNodeConverter.cs | 2217 ++++++++++ src/Newtonsoft.Json/DateFormatHandling.cs | 43 + src/Newtonsoft.Json/DateParseHandling.cs | 49 + src/Newtonsoft.Json/DateTimeZoneHandling.cs | 56 + src/Newtonsoft.Json/DefaultJsonNameTable.cs | 197 + src/Newtonsoft.Json/DefaultValueHandling.cs | 67 + src/Newtonsoft.Json/Dynamic.snk | Bin 0 -> 596 bytes src/Newtonsoft.Json/FloatFormatHandling.cs | 52 + src/Newtonsoft.Json/FloatParseHandling.cs | 43 + src/Newtonsoft.Json/FormatterAssemblyStyle.cs | 24 + src/Newtonsoft.Json/Formatting.cs | 43 + src/Newtonsoft.Json/IArrayPool.cs | 22 + src/Newtonsoft.Json/IJsonLineInfo.cs | 53 + src/Newtonsoft.Json/JsonArrayAttribute.cs | 73 + .../JsonConstructorAttribute.cs | 37 + src/Newtonsoft.Json/JsonContainerAttribute.cs | 180 + src/Newtonsoft.Json/JsonConvert.cs | 1084 +++++ src/Newtonsoft.Json/JsonConverter.cs | 147 + src/Newtonsoft.Json/JsonConverterAttribute.cs | 77 + .../JsonConverterCollection.cs | 39 + .../JsonDictionaryAttribute.cs | 52 + src/Newtonsoft.Json/JsonException.cs | 92 + .../JsonExtensionDataAttribute.cs | 37 + src/Newtonsoft.Json/JsonIgnoreAttribute.cs | 39 + src/Newtonsoft.Json/JsonNameTable.cs | 17 + src/Newtonsoft.Json/JsonObjectAttribute.cs | 100 + src/Newtonsoft.Json/JsonPosition.cs | 177 + src/Newtonsoft.Json/JsonPropertyAttribute.cs | 223 + src/Newtonsoft.Json/JsonReader.Async.cs | 246 ++ src/Newtonsoft.Json/JsonReader.cs | 1276 ++++++ src/Newtonsoft.Json/JsonReaderException.cs | 148 + src/Newtonsoft.Json/JsonRequiredAttribute.cs | 39 + .../JsonSerializationException.cs | 148 + src/Newtonsoft.Json/JsonSerializer.cs | 1229 ++++++ src/Newtonsoft.Json/JsonSerializerSettings.cs | 455 ++ src/Newtonsoft.Json/JsonTextReader.Async.cs | 1768 ++++++++ src/Newtonsoft.Json/JsonTextReader.cs | 2599 +++++++++++ src/Newtonsoft.Json/JsonTextWriter.Async.cs | 1357 ++++++ src/Newtonsoft.Json/JsonTextWriter.cs | 915 ++++ src/Newtonsoft.Json/JsonToken.cs | 127 + src/Newtonsoft.Json/JsonValidatingReader.cs | 1023 +++++ src/Newtonsoft.Json/JsonWriter.Async.cs | 1797 ++++++++ src/Newtonsoft.Json/JsonWriter.cs | 1781 ++++++++ src/Newtonsoft.Json/JsonWriterException.cs | 114 + src/Newtonsoft.Json/Linq/CommentHandling.cs | 43 + .../Linq/DuplicatePropertyNameHandling.cs | 46 + src/Newtonsoft.Json/Linq/Extensions.cs | 330 ++ src/Newtonsoft.Json/Linq/IJEnumerable.cs | 46 + src/Newtonsoft.Json/Linq/JArray.Async.cs | 103 + src/Newtonsoft.Json/Linq/JArray.cs | 398 ++ .../Linq/JConstructor.Async.cs | 106 + src/Newtonsoft.Json/Linq/JConstructor.cs | 245 ++ src/Newtonsoft.Json/Linq/JContainer.Async.cs | 169 + src/Newtonsoft.Json/Linq/JContainer.cs | 1203 +++++ src/Newtonsoft.Json/Linq/JEnumerable.cs | 140 + src/Newtonsoft.Json/Linq/JObject.Async.cs | 129 + src/Newtonsoft.Json/Linq/JObject.cs | 849 ++++ src/Newtonsoft.Json/Linq/JProperty.Async.cs | 118 + src/Newtonsoft.Json/Linq/JProperty.cs | 385 ++ .../Linq/JPropertyDescriptor.cs | 156 + .../Linq/JPropertyKeyedCollection.cs | 282 ++ src/Newtonsoft.Json/Linq/JRaw.Async.cs | 57 + src/Newtonsoft.Json/Linq/JRaw.cs | 75 + src/Newtonsoft.Json/Linq/JToken.Async.cs | 178 + src/Newtonsoft.Json/Linq/JToken.cs | 2695 ++++++++++++ .../Linq/JTokenEqualityComparer.cs | 64 + src/Newtonsoft.Json/Linq/JTokenReader.cs | 339 ++ src/Newtonsoft.Json/Linq/JTokenType.cs | 123 + .../Linq/JTokenWriter.Async.cs | 53 + src/Newtonsoft.Json/Linq/JTokenWriter.cs | 532 +++ src/Newtonsoft.Json/Linq/JValue.Async.cs | 138 + src/Newtonsoft.Json/Linq/JValue.cs | 1175 +++++ src/Newtonsoft.Json/Linq/JsonLoadSettings.cs | 81 + src/Newtonsoft.Json/Linq/JsonMergeSettings.cs | 103 + .../Linq/JsonPath/ArrayIndexFilter.cs | 44 + .../Linq/JsonPath/ArrayMultipleIndexFilter.cs | 25 + .../Linq/JsonPath/ArraySliceFilter.cs | 87 + .../Linq/JsonPath/FieldFilter.cs | 48 + .../Linq/JsonPath/FieldMultipleFilter.cs | 51 + src/Newtonsoft.Json/Linq/JsonPath/JPath.cs | 903 ++++ .../Linq/JsonPath/PathFilter.cs | 81 + .../Linq/JsonPath/QueryExpression.cs | 306 ++ .../Linq/JsonPath/QueryFilter.cs | 24 + .../Linq/JsonPath/QueryScanFilter.cs | 34 + .../Linq/JsonPath/RootFilter.cs | 18 + .../Linq/JsonPath/ScanFilter.cs | 48 + .../Linq/JsonPath/ScanMultipleFilter.cs | 40 + src/Newtonsoft.Json/Linq/LineInfoHandling.cs | 43 + .../Linq/MergeArrayHandling.cs | 20 + .../Linq/MergeNullValueHandling.cs | 21 + src/Newtonsoft.Json/MemberSerialization.cs | 58 + .../MetadataPropertyHandling.cs | 52 + src/Newtonsoft.Json/MissingMemberHandling.cs | 47 + src/Newtonsoft.Json/Newtonsoft.Json.csproj | 94 + src/Newtonsoft.Json/Newtonsoft.Json.ruleset | 15 + src/Newtonsoft.Json/NullValueHandling.cs | 47 + src/Newtonsoft.Json/ObjectCreationHandling.cs | 48 + .../PreserveReferencesHandling.cs | 62 + src/Newtonsoft.Json/ReferenceLoopHandling.cs | 52 + src/Newtonsoft.Json/Required.cs | 53 + src/Newtonsoft.Json/Schema/Extensions.cs | 137 + src/Newtonsoft.Json/Schema/JsonSchema.cs | 353 ++ .../Schema/JsonSchemaBuilder.cs | 487 +++ .../Schema/JsonSchemaConstants.cs | 80 + .../Schema/JsonSchemaException.cs | 113 + .../Schema/JsonSchemaGenerator.cs | 502 +++ src/Newtonsoft.Json/Schema/JsonSchemaModel.cs | 125 + .../Schema/JsonSchemaModelBuilder.cs | 211 + src/Newtonsoft.Json/Schema/JsonSchemaNode.cs | 85 + .../Schema/JsonSchemaNodeCollection.cs | 39 + .../Schema/JsonSchemaResolver.cs | 79 + src/Newtonsoft.Json/Schema/JsonSchemaType.cs | 87 + .../Schema/JsonSchemaWriter.cs | 258 ++ .../Schema/UndefinedSchemaIdHandling.cs | 56 + .../Schema/ValidationEventArgs.cs | 68 + .../Schema/ValidationEventHandler.cs | 40 + .../Serialization/CachedAttributeGetter.cs | 41 + .../Serialization/CamelCaseNamingStrategy.cs | 87 + .../CamelCasePropertyNamesContractResolver.cs | 94 + .../Serialization/DefaultContractResolver.cs | 1722 ++++++++ .../Serialization/DefaultNamingStrategy.cs | 18 + .../Serialization/DefaultReferenceResolver.cs | 83 + .../DefaultSerializationBinder.cs | 215 + .../Serialization/DiagnosticsTraceWriter.cs | 79 + .../Serialization/DynamicValueProvider.cs | 120 + .../Serialization/ErrorContext.cs | 75 + .../Serialization/ErrorEventArgs.cs | 58 + .../Serialization/ExpressionValueProvider.cs | 121 + .../Serialization/FormatterConverter.cs | 117 + .../Serialization/IAttributeProvider.cs | 51 + .../Serialization/IContractResolver.cs | 46 + .../Serialization/IReferenceResolver.cs | 67 + .../Serialization/ISerializationBinder.cs | 53 + .../Serialization/ITraceWriter.cs | 28 + .../Serialization/IValueProvider.cs | 47 + .../Serialization/JsonArrayContract.cs | 319 ++ .../Serialization/JsonContainerContract.cs | 117 + .../Serialization/JsonContract.cs | 325 ++ .../Serialization/JsonDictionaryContract.cs | 245 ++ .../Serialization/JsonDynamicContract.cs | 116 + .../Serialization/JsonFormatterConverter.cs | 160 + .../JsonISerializableContract.cs | 55 + .../Serialization/JsonLinqContract.cs | 45 + .../Serialization/JsonObjectContract.cs | 193 + .../Serialization/JsonPrimitiveContract.cs | 75 + .../Serialization/JsonProperty.cs | 318 ++ .../Serialization/JsonPropertyCollection.cs | 185 + .../JsonSerializerInternalBase.cs | 159 + .../JsonSerializerInternalReader.cs | 2603 +++++++++++ .../JsonSerializerInternalWriter.cs | 1223 ++++++ .../Serialization/JsonSerializerProxy.cs | 289 ++ .../Serialization/JsonStringContract.cs | 45 + .../Serialization/JsonTypeReflector.cs | 531 +++ .../Serialization/MemoryTraceWriter.cs | 100 + .../Serialization/NamingStrategy.cs | 146 + .../Serialization/ObjectConstructor.cs | 33 + .../Serialization/OnErrorAttribute.cs | 37 + .../ReflectionAttributeProvider.cs | 71 + .../Serialization/ReflectionValueProvider.cs | 90 + .../SerializationBinderAdapter.cs | 59 + .../Serialization/SnakeCaseNamingStrategy.cs | 87 + .../Serialization/TraceJsonReader.cs | 157 + .../Serialization/TraceJsonWriter.cs | 598 +++ src/Newtonsoft.Json/SerializationBinder.cs | 36 + src/Newtonsoft.Json/StringEscapeHandling.cs | 48 + src/Newtonsoft.Json/TraceLevel.cs | 39 + .../TypeNameAssemblyFormatHandling.cs | 43 + src/Newtonsoft.Json/TypeNameHandling.cs | 70 + src/Newtonsoft.Json/Utilities/AsyncUtils.cs | 108 + .../Utilities/Base64Encoder.cs | 217 + .../Utilities/BidirectionalDictionary.cs | 94 + .../Utilities/CollectionUtils.cs | 389 ++ .../Utilities/CollectionWrapper.cs | 320 ++ src/Newtonsoft.Json/Utilities/ConvertUtils.cs | 1569 +++++++ .../Utilities/DateTimeParser.cs | 277 ++ .../Utilities/DateTimeUtils.cs | 825 ++++ .../Utilities/DictionaryWrapper.cs | 698 +++ src/Newtonsoft.Json/Utilities/DynamicProxy.cs | 109 + .../Utilities/DynamicProxyMetaObject.cs | 391 ++ .../DynamicReflectionDelegateFactory.cs | 401 ++ src/Newtonsoft.Json/Utilities/DynamicUtils.cs | 210 + src/Newtonsoft.Json/Utilities/EnumInfo.cs | 43 + src/Newtonsoft.Json/Utilities/EnumUtils.cs | 401 ++ .../ExpressionReflectionDelegateFactory.cs | 383 ++ src/Newtonsoft.Json/Utilities/FSharpUtils.cs | 195 + .../Utilities/ILGeneratorExtensions.cs | 98 + .../Utilities/ImmutableCollectionsUtils.cs | 181 + .../Utilities/JavaScriptUtils.cs | 653 +++ .../Utilities/JsonTokenUtils.cs | 74 + .../LateBoundReflectionDelegateFactory.cs | 110 + src/Newtonsoft.Json/Utilities/LinqBridge.cs | 3071 +++++++++++++ src/Newtonsoft.Json/Utilities/MathUtils.cs | 187 + src/Newtonsoft.Json/Utilities/MethodBinder.cs | 346 ++ src/Newtonsoft.Json/Utilities/MethodCall.cs | 29 + .../Utilities/MiscellaneousUtils.cs | 165 + .../Utilities/ReflectionDelegateFactory.cs | 83 + .../Utilities/ReflectionObject.cs | 156 + .../Utilities/ReflectionUtils.cs | 1092 +++++ src/Newtonsoft.Json/Utilities/StringBuffer.cs | 116 + .../Utilities/StringReference.cs | 111 + src/Newtonsoft.Json/Utilities/StringUtils.cs | 344 ++ .../Utilities/StructMultiKey.cs | 61 + .../Utilities/ThreadSafeStore.cs | 109 + .../Utilities/TypeExtensions.cs | 632 +++ .../Utilities/ValidationUtils.cs | 40 + src/Newtonsoft.Json/WriteState.cs | 72 + src/Options/ModOptionsCheckbox.cs | 34 + src/Options/ModOptionsSlider.cs | 34 + src/Properties/AssemblyInfo.cs | 36 + src/SMAPI.Installer/Enums/ScriptAction.cs | 12 - .../Framework/InstallerPaths.cs | 65 - src/SMAPI.Installer/InteractiveInstaller.cs | 992 ----- src/SMAPI.Installer/Program.cs | 82 - .../Properties/AssemblyInfo.cs | 4 - src/SMAPI.Installer/README.txt | 44 - .../StardewModdingAPI.Installer.csproj | 80 - src/SMAPI.Installer/unix-install.sh | 21 - src/SMAPI.Installer/unix-launcher.sh | 97 - src/SMAPI.Installer/windows-exe-config.xml | 5 - src/SMAPI.Installer/windows-install.bat | 8 - src/SMAPI.Internal/SMAPI.Internal.projitems | 18 - .../StardewModdingAPI.Internal.shproj | 13 - .../Framework/DiagnosticResult.cs | 88 - .../Framework/DiagnosticVerifier.Helper.cs | 173 - .../Framework/DiagnosticVerifier.cs | 248 -- .../Mock/Netcode/NetCollection.cs | 10 - .../Mock/Netcode/NetFieldBase.cs | 16 - .../Mock/Netcode/NetInt.cs | 6 - .../Mock/Netcode/NetList.cs | 9 - .../Mock/Netcode/NetObjectList.cs | 6 - .../Mock/Netcode/NetRef.cs | 6 - .../Mock/StardewValley/Farmer.cs | 13 - .../Mock/StardewValley/Item.cs | 33 - .../Mock/StardewValley/Object.cs | 12 - .../NetFieldAnalyzerTests.cs | 160 - .../ObsoleteFieldAnalyzerTests.cs | 89 - ...SMAPI.ModBuildConfig.Analyzer.Tests.csproj | 19 - .../AnalyzerUtilities.cs | 93 - .../NetFieldAnalyzer.cs | 329 -- .../ObsoleteFieldAnalyzer.cs | 96 - .../Properties/AssemblyInfo.cs | 4 - ...wModdingAPI.ModBuildConfig.Analyzer.csproj | 24 - src/SMAPI.ModBuildConfig/DeployModTask.cs | 185 - .../Framework/ModFileManager.cs | 173 - .../Framework/UserErrorException.cs | 16 - .../Properties/AssemblyInfo.cs | 6 - .../StardewModdingAPI.ModBuildConfig.csproj | 76 - .../assets/nuget-icon.pdn | Bin 7401 -> 0 bytes .../assets/nuget-icon.png | Bin 5054 -> 0 bytes src/SMAPI.ModBuildConfig/build/smapi.targets | 185 - src/SMAPI.ModBuildConfig/package.nuspec | 21 - .../Framework/Commands/ArgumentParser.cs | 158 - .../Framework/Commands/ITrainerCommand.cs | 32 - .../Framework/Commands/Other/DebugCommand.cs | 32 - .../Commands/Other/ShowDataFilesCommand.cs | 25 - .../Commands/Other/ShowGameFilesCommand.cs | 25 - .../Framework/Commands/Player/AddCommand.cs | 146 - .../Commands/Player/ListItemTypesCommand.cs | 52 - .../Commands/Player/ListItemsCommand.cs | 75 - .../Commands/Player/SetColorCommand.cs | 75 - .../Commands/Player/SetHealthCommand.cs | 71 - .../Commands/Player/SetImmunityCommand.cs | 37 - .../Commands/Player/SetMaxHealthCommand.cs | 37 - .../Commands/Player/SetMaxStaminaCommand.cs | 37 - .../Commands/Player/SetMoneyCommand.cs | 71 - .../Commands/Player/SetNameCommand.cs | 51 - .../Commands/Player/SetStaminaCommand.cs | 71 - .../Commands/Player/SetStyleCommand.cs | 91 - .../Framework/Commands/TrainerCommand.cs | 102 - .../Framework/Commands/World/ClearCommand.cs | 262 -- .../Commands/World/DownMineLevelCommand.cs | 27 - .../Commands/World/FreezeTimeCommand.cs | 66 - .../Framework/Commands/World/SetDayCommand.cs | 38 - .../Commands/World/SetMineLevelCommand.cs | 32 - .../Commands/World/SetSeasonCommand.cs | 46 - .../Commands/World/SetTimeCommand.cs | 69 - .../Commands/World/SetYearCommand.cs | 38 - .../Framework/ItemData/ItemType.cs | 36 - .../Framework/ItemData/SearchableItem.cs | 60 - .../Framework/ItemRepository.cs | 193 - src/SMAPI.Mods.ConsoleCommands/ModEntry.cs | 73 - .../Properties/AssemblyInfo.cs | 4 - ...rdewModdingAPI.Mods.ConsoleCommands.csproj | 93 - src/SMAPI.Mods.ConsoleCommands/manifest.json | 9 - src/SMAPI.Mods.SaveBackup/ModEntry.cs | 181 - .../Properties/AssemblyInfo.cs | 4 - .../StardewModdingAPI.Mods.SaveBackup.csproj | 62 - src/SMAPI.Mods.SaveBackup/manifest.json | 9 - src/SMAPI.Tests/Core/ModResolverTests.cs | 539 --- src/SMAPI.Tests/Core/TranslationTests.cs | 356 -- src/SMAPI.Tests/Properties/AssemblyInfo.cs | 4 - src/SMAPI.Tests/Sample.cs | 30 - .../StardewModdingAPI.Tests.csproj | 80 - src/SMAPI.Tests/Toolkit/PathUtilitiesTests.cs | 70 - src/SMAPI.Tests/Utilities/SDateTests.cs | 310 -- .../Utilities/SemanticVersionTests.cs | 337 -- src/SMAPI.Tests/app.config | 15 - src/SMAPI.Web/Controllers/IndexController.cs | 198 - .../Controllers/LogParserController.cs | 180 - .../Controllers/ModsApiController.cs | 310 -- src/SMAPI.Web/Controllers/ModsController.cs | 74 - .../Framework/AllowLargePostsAttribute.cs | 52 - .../BeanstalkEnvPropsConfigProvider.cs | 54 - .../Clients/Chucklefish/ChucklefishClient.cs | 92 - .../Clients/Chucklefish/ChucklefishMod.cs | 18 - .../Clients/Chucklefish/IChucklefishClient.cs | 17 - .../Framework/Clients/GitHub/GitAsset.cs | 20 - .../Framework/Clients/GitHub/GitHubClient.cs | 94 - .../Framework/Clients/GitHub/GitRelease.cs | 33 - .../Framework/Clients/GitHub/IGitHubClient.cs | 18 - .../Clients/ModDrop/IModDropClient.cs | 17 - .../Clients/ModDrop/ModDropClient.cs | 96 - .../Framework/Clients/ModDrop/ModDropMod.cs | 24 - .../ModDrop/ResponseModels/FileDataModel.cs | 21 - .../ModDrop/ResponseModels/ModDataModel.cs | 15 - .../ModDrop/ResponseModels/ModListModel.cs | 11 - .../ModDrop/ResponseModels/ModModel.cs | 12 - .../Framework/Clients/Nexus/INexusClient.cs | 17 - .../Framework/Clients/Nexus/NexusMod.cs | 28 - .../Clients/Nexus/NexusWebScrapeClient.cs | 146 - .../Clients/Pastebin/IPastebinClient.cs | 17 - .../Framework/Clients/Pastebin/PasteInfo.cs | 15 - .../Clients/Pastebin/PastebinClient.cs | 134 - .../Clients/Pastebin/SavePasteResult.cs | 15 - .../ConfigModels/ApiClientsConfig.cs | 81 - .../ModCompatibilityListConfig.cs | 12 - .../ConfigModels/ModUpdateCheckConfig.cs | 22 - .../Framework/ConfigModels/SiteConfig.cs | 24 - .../InternalControllerFeatureProvider.cs | 27 - .../Framework/LogParsing/LogParseException.cs | 15 - .../Framework/LogParsing/LogParser.cs | 325 -- .../Framework/LogParsing/Models/LogLevel.cs | 29 - .../Framework/LogParsing/Models/LogMessage.cs | 30 - .../Framework/LogParsing/Models/LogModInfo.cs | 39 - .../Framework/LogParsing/Models/LogSection.cs | 15 - .../Framework/LogParsing/Models/ParsedLog.cs | 50 - .../ModRepositories/BaseRepository.cs | 51 - .../ModRepositories/ChucklefishRepository.cs | 59 - .../ModRepositories/GitHubRepository.cs | 72 - .../ModRepositories/IModRepository.cs | 24 - .../ModRepositories/ModDropRepository.cs | 59 - .../Framework/ModRepositories/ModInfoModel.cs | 56 - .../ModRepositories/NexusRepository.cs | 59 - .../ConditionalRedirectToHttpsRule.cs | 62 - .../ConditionalRewriteSubdomainRule.cs | 48 - .../RewriteRules/RedirectToUrlRule.cs | 57 - src/SMAPI.Web/Framework/VersionConstraint.cs | 16 - src/SMAPI.Web/Program.cs | 24 - src/SMAPI.Web/Properties/AssemblyInfo.cs | 4 - src/SMAPI.Web/Properties/launchSettings.json | 20 - src/SMAPI.Web/StardewModdingAPI.Web.csproj | 42 - src/SMAPI.Web/Startup.cs | 195 - src/SMAPI.Web/ViewModels/IndexModel.cs | 36 - src/SMAPI.Web/ViewModels/IndexVersionModel.cs | 41 - src/SMAPI.Web/ViewModels/LogParserModel.cs | 91 - .../ViewModels/ModCompatibilityModel.cs | 40 - src/SMAPI.Web/ViewModels/ModLinkModel.cs | 28 - src/SMAPI.Web/ViewModels/ModListModel.cs | 36 - src/SMAPI.Web/ViewModels/ModModel.cs | 123 - src/SMAPI.Web/Views/Index/Index.cshtml | 123 - src/SMAPI.Web/Views/Index/Privacy.cshtml | 43 - src/SMAPI.Web/Views/LogParser/Index.cshtml | 311 -- src/SMAPI.Web/Views/Mods/Index.cshtml | 108 - src/SMAPI.Web/Views/Shared/_Layout.cshtml | 36 - src/SMAPI.Web/Views/_ViewStart.cshtml | 3 - src/SMAPI.Web/appsettings.Development.json | 35 - src/SMAPI.Web/appsettings.json | 60 - src/SMAPI.Web/wwwroot/Content/css/index.css | 112 - .../wwwroot/Content/css/log-parser.css | 318 -- src/SMAPI.Web/wwwroot/Content/css/main.css | 141 - src/SMAPI.Web/wwwroot/Content/css/mods.css | 141 - src/SMAPI.Web/wwwroot/Content/css/privacy.css | 3 - .../Content/images/direct-download-icon.png | Bin 250 -> 0 bytes .../images/external/patreon-header-help.png | Bin 4928 -> 0 bytes .../external/patreon-header-upcoming.png | Bin 5421 -> 0 bytes .../external/patreon-header-what-i-do.png | Bin 4803 -> 0 bytes .../wwwroot/Content/images/nexus-icon.png | Bin 927 -> 0 bytes .../Content/images/pufferchick-cool.png | Bin 1099 -> 0 bytes .../wwwroot/Content/images/pufferchick.png | Bin 831 -> 0 bytes .../wwwroot/Content/images/sidebar-bg.gif | Bin 1104 -> 0 bytes src/SMAPI.Web/wwwroot/Content/js/index.js | 34 - .../wwwroot/Content/js/log-parser.js | 162 - src/SMAPI.Web/wwwroot/Content/js/mods.js | 284 -- .../wwwroot/StardewModdingAPI.metadata.json | 569 --- src/SMAPI.Web/wwwroot/favicon.ico | Bin 15086 -> 0 bytes src/SMAPI.sln | 151 - src/SMAPI.sln.DotSettings | 26 - src/SMAPI/Constants.cs | 27 +- src/SMAPI/Framework/Content/ContentCache.cs | 14 +- src/SMAPI/Framework/ContentCoordinator.cs | 2 +- src/SMAPI/Framework/IModMetadata.cs | 12 +- src/SMAPI/Framework/ModHelpers/ModHelper.cs | 6 +- .../Framework/ModHelpers/MultiplayerHelper.cs | 76 - .../Framework/ModLoading/AssemblyLoader.cs | 2 +- src/SMAPI/Framework/ModLoading/ModMetadata.cs | 20 +- .../ModLoading/PlatformAssemblyMap.cs | 2 +- .../Framework/Networking/SGalaxyNetClient.cs | 52 - .../Framework/Networking/SGalaxyNetServer.cs | 75 - .../Framework/Networking/SLidgrenClient.cs | 50 - .../Framework/Networking/SLidgrenServer.cs | 65 - src/SMAPI/Framework/Reflection/Reflector.cs | 8 +- src/SMAPI/Framework/SCore.cs | 472 +- src/SMAPI/Framework/SGame.cs | 1602 +++---- src/SMAPI/Framework/SMultiplayer.cs | 515 --- .../StateTracking/LocationTracker.cs | 2 +- .../StateTracking/WorldLocationsTracker.cs | 4 +- src/SMAPI/Framework/WatcherCore.cs | 2 +- src/SMAPI/IMod.cs | 5 + src/SMAPI/IModHelper.cs | 4 +- src/SMAPI/IMultiplayerHelper.cs | 33 - .../ConsoleWriting/ColorfulConsoleWriter.cs | 0 .../Internal}/ConsoleWriting/LogLevel.cs | 0 .../ConsoleWriting/MonitorColorScheme.cs | 2 +- .../Internal}/EnvironmentUtility.cs | 0 .../Internal}/Platform.cs | 3 + src/SMAPI/Mod.cs | 7 + src/SMAPI/Patches/LoadForNewGamePatch.cs | 9 +- src/SMAPI/Program.cs | 4 +- src/SMAPI/Properties/AssemblyInfo.cs | 7 - .../Toolkit/CoreInterfaces}/IManifest.cs | 0 .../IManifestContentPackFor.cs | 0 .../CoreInterfaces}/IManifestDependency.cs | 0 .../CoreInterfaces}/ISemanticVersion.cs | 0 .../Framework/ModData/MetadataModel.cs | 0 .../Framework/ModData/ModDataField.cs | 0 .../Framework/ModData/ModDataFieldKey.cs | 0 .../Framework/ModData/ModDataModel.cs | 0 .../Framework/ModData/ModDataRecord.cs | 0 .../ModData/ModDataRecordVersionedFields.cs | 0 .../Toolkit}/Framework/ModData/ModDatabase.cs | 0 .../Toolkit}/Framework/ModData/ModStatus.cs | 0 .../Toolkit}/Framework/ModData/ModWarning.cs | 0 .../Framework/ModScanning/ModFolder.cs | 0 .../Framework/ModScanning/ModScanner.cs | 0 .../Framework/UpdateData/ModRepositoryKey.cs | 0 .../Framework/UpdateData/UpdateKey.cs | 0 .../Toolkit}/ModToolkit.cs | 14 +- .../Toolkit}/SemanticVersion.cs | 0 .../ManifestContentPackForConverter.cs | 0 .../ManifestDependencyArrayConverter.cs | 0 .../Converters/SemanticVersionConverter.cs | 0 .../Converters/SimpleReadOnlyConverter.cs | 0 .../Serialisation/InternalExtensions.cs | 0 .../Toolkit}/Serialisation/JsonHelper.cs | 0 .../Toolkit}/Serialisation/Models/Manifest.cs | 0 .../Models/ManifestContentPackFor.cs | 0 .../Models/ManifestDependency.cs | 0 .../Toolkit}/Serialisation/SParseException.cs | 0 .../Toolkit}/Utilities/FileUtilities.cs | 4 +- .../Toolkit}/Utilities/PathUtilities.cs | 0 .../Properties/AssemblyInfo.cs | 4 - ...ewModdingAPI.Toolkit.CoreInterfaces.csproj | 18 - .../Framework/Clients/WebApi/ModEntryModel.cs | 33 - .../Clients/WebApi/ModEntryVersionModel.cs | 31 - .../WebApi/ModExtendedMetadataModel.cs | 126 - .../Framework/Clients/WebApi/ModSeachModel.cs | 36 - .../Clients/WebApi/ModSearchEntryModel.cs | 34 - .../Framework/Clients/WebApi/WebApiClient.cs | 73 - .../Framework/Clients/Wiki/WikiClient.cs | 243 -- .../Clients/Wiki/WikiCompatibilityInfo.cs | 24 - .../Clients/Wiki/WikiCompatibilityStatus.cs | 27 - .../Framework/Clients/Wiki/WikiModEntry.cs | 60 - .../Framework/Clients/Wiki/WikiModList.cs | 18 - .../Clients/Wiki/WikiSmapi3Status.cs | 18 - .../Properties/AssemblyInfo.cs | 7 - .../StardewModdingAPI.Toolkit.csproj | 27 - 656 files changed, 105264 insertions(+), 16823 deletions(-) delete mode 160000 SMAPI create mode 100644 src/Harmony/Attributes.cs create mode 100644 src/Harmony/CodeInstruction.cs create mode 100644 src/Harmony/CodeTranspiler.cs create mode 100644 src/Harmony/Extras/DelegateTypeFactory.cs create mode 100644 src/Harmony/Extras/FastAccess.cs create mode 100644 src/Harmony/Extras/MethodInvoker.cs create mode 100644 src/Harmony/GlobalSuppressions.cs create mode 100644 src/Harmony/HarmonyInstance.cs create mode 100644 src/Harmony/HarmonyMethod.cs create mode 100644 src/Harmony/HarmonySharedState.cs create mode 100644 src/Harmony/ILCopying/ByteBuffer.cs create mode 100644 src/Harmony/ILCopying/Emitter.cs create mode 100644 src/Harmony/ILCopying/ILInstruction.cs create mode 100644 src/Harmony/ILCopying/Memory.cs create mode 100644 src/Harmony/ILCopying/MethodCopier.cs create mode 100644 src/Harmony/ILCopying/Signature.cs create mode 100644 src/Harmony/MethodPatcher.cs create mode 100644 src/Harmony/Patch.cs create mode 100644 src/Harmony/PatchFunctions.cs create mode 100644 src/Harmony/PatchProcessor.cs create mode 100644 src/Harmony/Priority.cs create mode 100644 src/Harmony/Tools/AccessCache.cs create mode 100644 src/Harmony/Tools/AccessTools.cs create mode 100644 src/Harmony/Tools/DynamicTools.cs create mode 100644 src/Harmony/Tools/Extensions.cs create mode 100644 src/Harmony/Tools/FileLog.cs create mode 100644 src/Harmony/Tools/PatchTools.cs create mode 100644 src/Harmony/Tools/SelfPatching.cs create mode 100644 src/Harmony/Tools/SymbolExtensions.cs create mode 100644 src/Harmony/Tools/Traverse.cs create mode 100644 src/Harmony/Transpilers.cs create mode 100644 src/Mod.csproj create mode 100644 src/Mod.sln create mode 100644 src/ModEntry.cs create mode 100644 src/Mono/Cecil/ArrayType.cs create mode 100644 src/Mono/Cecil/AssemblyDefinition.cs create mode 100644 src/Mono/Cecil/AssemblyFlags.cs create mode 100644 src/Mono/Cecil/AssemblyHashAlgorithm.cs create mode 100644 src/Mono/Cecil/AssemblyLinkedResource.cs create mode 100644 src/Mono/Cecil/AssemblyNameDefinition.cs create mode 100644 src/Mono/Cecil/AssemblyNameReference.cs create mode 100644 src/Mono/Cecil/AssemblyReader.cs create mode 100644 src/Mono/Cecil/AssemblyWriter.cs create mode 100644 src/Mono/Cecil/BaseAssemblyResolver.cs create mode 100644 src/Mono/Cecil/CallSite.cs create mode 100644 src/Mono/Cecil/Cil/Code.cs create mode 100644 src/Mono/Cecil/Cil/CodeReader.cs create mode 100644 src/Mono/Cecil/Cil/CodeWriter.cs create mode 100644 src/Mono/Cecil/Cil/Document.cs create mode 100644 src/Mono/Cecil/Cil/ExceptionHandler.cs create mode 100644 src/Mono/Cecil/Cil/ILProcessor.cs create mode 100644 src/Mono/Cecil/Cil/Instruction.cs create mode 100644 src/Mono/Cecil/Cil/MethodBody.cs create mode 100644 src/Mono/Cecil/Cil/OpCode.cs create mode 100644 src/Mono/Cecil/Cil/OpCodes.cs create mode 100644 src/Mono/Cecil/Cil/PortablePdb.cs create mode 100644 src/Mono/Cecil/Cil/SequencePoint.cs create mode 100644 src/Mono/Cecil/Cil/Symbols.cs create mode 100644 src/Mono/Cecil/Cil/VariableDefinition.cs create mode 100644 src/Mono/Cecil/Cil/VariableReference.cs create mode 100644 src/Mono/Cecil/Consts.cs create mode 100644 src/Mono/Cecil/CustomAttribute.cs create mode 100644 src/Mono/Cecil/DefaultAssemblyResolver.cs create mode 100644 src/Mono/Cecil/EmbeddedResource.cs create mode 100644 src/Mono/Cecil/EventAttributes.cs create mode 100644 src/Mono/Cecil/EventDefinition.cs create mode 100644 src/Mono/Cecil/EventReference.cs create mode 100644 src/Mono/Cecil/ExportedType.cs create mode 100644 src/Mono/Cecil/FieldAttributes.cs create mode 100644 src/Mono/Cecil/FieldDefinition.cs create mode 100644 src/Mono/Cecil/FieldReference.cs create mode 100644 src/Mono/Cecil/FileAttributes.cs create mode 100644 src/Mono/Cecil/FunctionPointerType.cs create mode 100644 src/Mono/Cecil/GenericInstanceMethod.cs create mode 100644 src/Mono/Cecil/GenericInstanceType.cs create mode 100644 src/Mono/Cecil/GenericParameter.cs create mode 100644 src/Mono/Cecil/GenericParameterAttributes.cs create mode 100644 src/Mono/Cecil/IConstantProvider.cs create mode 100644 src/Mono/Cecil/ICustomAttributeProvider.cs create mode 100644 src/Mono/Cecil/IGenericInstance.cs create mode 100644 src/Mono/Cecil/IGenericParameterProvider.cs create mode 100644 src/Mono/Cecil/IMarshalInfoProvider.cs create mode 100644 src/Mono/Cecil/IMemberDefinition.cs create mode 100644 src/Mono/Cecil/IMetadataScope.cs create mode 100644 src/Mono/Cecil/IMetadataTokenProvider.cs create mode 100644 src/Mono/Cecil/IMethodSignature.cs create mode 100644 src/Mono/Cecil/Import.cs create mode 100644 src/Mono/Cecil/LinkedResource.cs create mode 100644 src/Mono/Cecil/ManifestResourceAttributes.cs create mode 100644 src/Mono/Cecil/MarshalInfo.cs create mode 100644 src/Mono/Cecil/MemberDefinitionCollection.cs create mode 100644 src/Mono/Cecil/MemberReference.cs create mode 100644 src/Mono/Cecil/Metadata/BlobHeap.cs create mode 100644 src/Mono/Cecil/Metadata/Buffers.cs create mode 100644 src/Mono/Cecil/Metadata/CodedIndex.cs create mode 100644 src/Mono/Cecil/Metadata/ElementType.cs create mode 100644 src/Mono/Cecil/Metadata/GuidHeap.cs create mode 100644 src/Mono/Cecil/Metadata/Heap.cs create mode 100644 src/Mono/Cecil/Metadata/MetadataToken.cs create mode 100644 src/Mono/Cecil/Metadata/PdbHeap.cs create mode 100644 src/Mono/Cecil/Metadata/Row.cs create mode 100644 src/Mono/Cecil/Metadata/StringHeap.cs create mode 100644 src/Mono/Cecil/Metadata/TableHeap.cs create mode 100644 src/Mono/Cecil/Metadata/TokenType.cs create mode 100644 src/Mono/Cecil/Metadata/UserStringHeap.cs create mode 100644 src/Mono/Cecil/Metadata/Utilities.cs create mode 100644 src/Mono/Cecil/MetadataResolver.cs create mode 100644 src/Mono/Cecil/MetadataSystem.cs create mode 100644 src/Mono/Cecil/MethodAttributes.cs create mode 100644 src/Mono/Cecil/MethodCallingConvention.cs create mode 100644 src/Mono/Cecil/MethodDefinition.cs create mode 100644 src/Mono/Cecil/MethodImplAttributes.cs create mode 100644 src/Mono/Cecil/MethodReference.cs create mode 100644 src/Mono/Cecil/MethodReturnType.cs create mode 100644 src/Mono/Cecil/MethodSemanticsAttributes.cs create mode 100644 src/Mono/Cecil/MethodSpecification.cs create mode 100644 src/Mono/Cecil/Modifiers.cs create mode 100644 src/Mono/Cecil/ModuleDefinition.cs create mode 100644 src/Mono/Cecil/ModuleKind.cs create mode 100644 src/Mono/Cecil/ModuleReference.cs create mode 100644 src/Mono/Cecil/NativeType.cs create mode 100644 src/Mono/Cecil/PE/BinaryStreamReader.cs create mode 100644 src/Mono/Cecil/PE/BinaryStreamWriter.cs create mode 100644 src/Mono/Cecil/PE/ByteBuffer.cs create mode 100644 src/Mono/Cecil/PE/ByteBufferEqualityComparer.cs create mode 100644 src/Mono/Cecil/PE/DataDirectory.cs create mode 100644 src/Mono/Cecil/PE/Image.cs create mode 100644 src/Mono/Cecil/PE/ImageReader.cs create mode 100644 src/Mono/Cecil/PE/ImageWriter.cs create mode 100644 src/Mono/Cecil/PE/Section.cs create mode 100644 src/Mono/Cecil/PE/TextMap.cs create mode 100644 src/Mono/Cecil/PInvokeAttributes.cs create mode 100644 src/Mono/Cecil/PInvokeInfo.cs create mode 100644 src/Mono/Cecil/ParameterAttributes.cs create mode 100644 src/Mono/Cecil/ParameterDefinition.cs create mode 100644 src/Mono/Cecil/ParameterDefinitionCollection.cs create mode 100644 src/Mono/Cecil/ParameterReference.cs create mode 100644 src/Mono/Cecil/PinnedType.cs create mode 100644 src/Mono/Cecil/PointerType.cs create mode 100644 src/Mono/Cecil/PropertyAttributes.cs create mode 100644 src/Mono/Cecil/PropertyDefinition.cs create mode 100644 src/Mono/Cecil/PropertyReference.cs create mode 100644 src/Mono/Cecil/ReferenceType.cs create mode 100644 src/Mono/Cecil/Resource.cs create mode 100644 src/Mono/Cecil/SecurityDeclaration.cs create mode 100644 src/Mono/Cecil/SentinelType.cs create mode 100644 src/Mono/Cecil/TargetRuntime.cs create mode 100644 src/Mono/Cecil/Treatments.cs create mode 100644 src/Mono/Cecil/TypeAttributes.cs create mode 100644 src/Mono/Cecil/TypeDefinition.cs create mode 100644 src/Mono/Cecil/TypeDefinitionCollection.cs create mode 100644 src/Mono/Cecil/TypeParser.cs create mode 100644 src/Mono/Cecil/TypeReference.cs create mode 100644 src/Mono/Cecil/TypeSpecification.cs create mode 100644 src/Mono/Cecil/TypeSystem.cs create mode 100644 src/Mono/Cecil/VariantType.cs create mode 100644 src/Mono/Cecil/WindowsRuntimeProjections.cs create mode 100644 src/Mono/Collections/Generic/Collection.cs create mode 100644 src/Mono/Collections/Generic/ReadOnlyCollection.cs create mode 100644 src/Mono/Disposable.cs create mode 100644 src/Mono/Empty.cs create mode 100644 src/Mono/MergeSort.cs create mode 100644 src/Mono/Security/Cryptography/CryptoConvert.cs create mode 100644 src/Mono/Security/Cryptography/CryptoService.cs create mode 100644 src/Mono/Type.cs create mode 100644 src/Newtonsoft.Json/Bson/BsonBinaryType.cs create mode 100644 src/Newtonsoft.Json/Bson/BsonBinaryWriter.cs create mode 100644 src/Newtonsoft.Json/Bson/BsonObjectId.cs create mode 100644 src/Newtonsoft.Json/Bson/BsonReader.cs create mode 100644 src/Newtonsoft.Json/Bson/BsonToken.cs create mode 100644 src/Newtonsoft.Json/Bson/BsonType.cs create mode 100644 src/Newtonsoft.Json/Bson/BsonWriter.cs create mode 100644 src/Newtonsoft.Json/ConstructorHandling.cs create mode 100644 src/Newtonsoft.Json/Converters/BinaryConverter.cs create mode 100644 src/Newtonsoft.Json/Converters/BsonObjectIdConverter.cs create mode 100644 src/Newtonsoft.Json/Converters/CustomCreationConverter.cs create mode 100644 src/Newtonsoft.Json/Converters/DataSetConverter.cs create mode 100644 src/Newtonsoft.Json/Converters/DataTableConverter.cs create mode 100644 src/Newtonsoft.Json/Converters/DateTimeConverterBase.cs create mode 100644 src/Newtonsoft.Json/Converters/DiscriminatedUnionConverter.cs create mode 100644 src/Newtonsoft.Json/Converters/EntityKeyMemberConverter.cs create mode 100644 src/Newtonsoft.Json/Converters/ExpandoObjectConverter.cs create mode 100644 src/Newtonsoft.Json/Converters/IsoDateTimeConverter.cs create mode 100644 src/Newtonsoft.Json/Converters/JavaScriptDateTimeConverter.cs create mode 100644 src/Newtonsoft.Json/Converters/KeyValuePairConverter.cs create mode 100644 src/Newtonsoft.Json/Converters/RegexConverter.cs create mode 100644 src/Newtonsoft.Json/Converters/StringEnumConverter.cs create mode 100644 src/Newtonsoft.Json/Converters/UnixDateTimeConverter.cs create mode 100644 src/Newtonsoft.Json/Converters/VersionConverter.cs create mode 100644 src/Newtonsoft.Json/Converters/XmlNodeConverter.cs create mode 100644 src/Newtonsoft.Json/DateFormatHandling.cs create mode 100644 src/Newtonsoft.Json/DateParseHandling.cs create mode 100644 src/Newtonsoft.Json/DateTimeZoneHandling.cs create mode 100644 src/Newtonsoft.Json/DefaultJsonNameTable.cs create mode 100644 src/Newtonsoft.Json/DefaultValueHandling.cs create mode 100644 src/Newtonsoft.Json/Dynamic.snk create mode 100644 src/Newtonsoft.Json/FloatFormatHandling.cs create mode 100644 src/Newtonsoft.Json/FloatParseHandling.cs create mode 100644 src/Newtonsoft.Json/FormatterAssemblyStyle.cs create mode 100644 src/Newtonsoft.Json/Formatting.cs create mode 100644 src/Newtonsoft.Json/IArrayPool.cs create mode 100644 src/Newtonsoft.Json/IJsonLineInfo.cs create mode 100644 src/Newtonsoft.Json/JsonArrayAttribute.cs create mode 100644 src/Newtonsoft.Json/JsonConstructorAttribute.cs create mode 100644 src/Newtonsoft.Json/JsonContainerAttribute.cs create mode 100644 src/Newtonsoft.Json/JsonConvert.cs create mode 100644 src/Newtonsoft.Json/JsonConverter.cs create mode 100644 src/Newtonsoft.Json/JsonConverterAttribute.cs create mode 100644 src/Newtonsoft.Json/JsonConverterCollection.cs create mode 100644 src/Newtonsoft.Json/JsonDictionaryAttribute.cs create mode 100644 src/Newtonsoft.Json/JsonException.cs create mode 100644 src/Newtonsoft.Json/JsonExtensionDataAttribute.cs create mode 100644 src/Newtonsoft.Json/JsonIgnoreAttribute.cs create mode 100644 src/Newtonsoft.Json/JsonNameTable.cs create mode 100644 src/Newtonsoft.Json/JsonObjectAttribute.cs create mode 100644 src/Newtonsoft.Json/JsonPosition.cs create mode 100644 src/Newtonsoft.Json/JsonPropertyAttribute.cs create mode 100644 src/Newtonsoft.Json/JsonReader.Async.cs create mode 100644 src/Newtonsoft.Json/JsonReader.cs create mode 100644 src/Newtonsoft.Json/JsonReaderException.cs create mode 100644 src/Newtonsoft.Json/JsonRequiredAttribute.cs create mode 100644 src/Newtonsoft.Json/JsonSerializationException.cs create mode 100644 src/Newtonsoft.Json/JsonSerializer.cs create mode 100644 src/Newtonsoft.Json/JsonSerializerSettings.cs create mode 100644 src/Newtonsoft.Json/JsonTextReader.Async.cs create mode 100644 src/Newtonsoft.Json/JsonTextReader.cs create mode 100644 src/Newtonsoft.Json/JsonTextWriter.Async.cs create mode 100644 src/Newtonsoft.Json/JsonTextWriter.cs create mode 100644 src/Newtonsoft.Json/JsonToken.cs create mode 100644 src/Newtonsoft.Json/JsonValidatingReader.cs create mode 100644 src/Newtonsoft.Json/JsonWriter.Async.cs create mode 100644 src/Newtonsoft.Json/JsonWriter.cs create mode 100644 src/Newtonsoft.Json/JsonWriterException.cs create mode 100644 src/Newtonsoft.Json/Linq/CommentHandling.cs create mode 100644 src/Newtonsoft.Json/Linq/DuplicatePropertyNameHandling.cs create mode 100644 src/Newtonsoft.Json/Linq/Extensions.cs create mode 100644 src/Newtonsoft.Json/Linq/IJEnumerable.cs create mode 100644 src/Newtonsoft.Json/Linq/JArray.Async.cs create mode 100644 src/Newtonsoft.Json/Linq/JArray.cs create mode 100644 src/Newtonsoft.Json/Linq/JConstructor.Async.cs create mode 100644 src/Newtonsoft.Json/Linq/JConstructor.cs create mode 100644 src/Newtonsoft.Json/Linq/JContainer.Async.cs create mode 100644 src/Newtonsoft.Json/Linq/JContainer.cs create mode 100644 src/Newtonsoft.Json/Linq/JEnumerable.cs create mode 100644 src/Newtonsoft.Json/Linq/JObject.Async.cs create mode 100644 src/Newtonsoft.Json/Linq/JObject.cs create mode 100644 src/Newtonsoft.Json/Linq/JProperty.Async.cs create mode 100644 src/Newtonsoft.Json/Linq/JProperty.cs create mode 100644 src/Newtonsoft.Json/Linq/JPropertyDescriptor.cs create mode 100644 src/Newtonsoft.Json/Linq/JPropertyKeyedCollection.cs create mode 100644 src/Newtonsoft.Json/Linq/JRaw.Async.cs create mode 100644 src/Newtonsoft.Json/Linq/JRaw.cs create mode 100644 src/Newtonsoft.Json/Linq/JToken.Async.cs create mode 100644 src/Newtonsoft.Json/Linq/JToken.cs create mode 100644 src/Newtonsoft.Json/Linq/JTokenEqualityComparer.cs create mode 100644 src/Newtonsoft.Json/Linq/JTokenReader.cs create mode 100644 src/Newtonsoft.Json/Linq/JTokenType.cs create mode 100644 src/Newtonsoft.Json/Linq/JTokenWriter.Async.cs create mode 100644 src/Newtonsoft.Json/Linq/JTokenWriter.cs create mode 100644 src/Newtonsoft.Json/Linq/JValue.Async.cs create mode 100644 src/Newtonsoft.Json/Linq/JValue.cs create mode 100644 src/Newtonsoft.Json/Linq/JsonLoadSettings.cs create mode 100644 src/Newtonsoft.Json/Linq/JsonMergeSettings.cs create mode 100644 src/Newtonsoft.Json/Linq/JsonPath/ArrayIndexFilter.cs create mode 100644 src/Newtonsoft.Json/Linq/JsonPath/ArrayMultipleIndexFilter.cs create mode 100644 src/Newtonsoft.Json/Linq/JsonPath/ArraySliceFilter.cs create mode 100644 src/Newtonsoft.Json/Linq/JsonPath/FieldFilter.cs create mode 100644 src/Newtonsoft.Json/Linq/JsonPath/FieldMultipleFilter.cs create mode 100644 src/Newtonsoft.Json/Linq/JsonPath/JPath.cs create mode 100644 src/Newtonsoft.Json/Linq/JsonPath/PathFilter.cs create mode 100644 src/Newtonsoft.Json/Linq/JsonPath/QueryExpression.cs create mode 100644 src/Newtonsoft.Json/Linq/JsonPath/QueryFilter.cs create mode 100644 src/Newtonsoft.Json/Linq/JsonPath/QueryScanFilter.cs create mode 100644 src/Newtonsoft.Json/Linq/JsonPath/RootFilter.cs create mode 100644 src/Newtonsoft.Json/Linq/JsonPath/ScanFilter.cs create mode 100644 src/Newtonsoft.Json/Linq/JsonPath/ScanMultipleFilter.cs create mode 100644 src/Newtonsoft.Json/Linq/LineInfoHandling.cs create mode 100644 src/Newtonsoft.Json/Linq/MergeArrayHandling.cs create mode 100644 src/Newtonsoft.Json/Linq/MergeNullValueHandling.cs create mode 100644 src/Newtonsoft.Json/MemberSerialization.cs create mode 100644 src/Newtonsoft.Json/MetadataPropertyHandling.cs create mode 100644 src/Newtonsoft.Json/MissingMemberHandling.cs create mode 100644 src/Newtonsoft.Json/Newtonsoft.Json.csproj create mode 100644 src/Newtonsoft.Json/Newtonsoft.Json.ruleset create mode 100644 src/Newtonsoft.Json/NullValueHandling.cs create mode 100644 src/Newtonsoft.Json/ObjectCreationHandling.cs create mode 100644 src/Newtonsoft.Json/PreserveReferencesHandling.cs create mode 100644 src/Newtonsoft.Json/ReferenceLoopHandling.cs create mode 100644 src/Newtonsoft.Json/Required.cs create mode 100644 src/Newtonsoft.Json/Schema/Extensions.cs create mode 100644 src/Newtonsoft.Json/Schema/JsonSchema.cs create mode 100644 src/Newtonsoft.Json/Schema/JsonSchemaBuilder.cs create mode 100644 src/Newtonsoft.Json/Schema/JsonSchemaConstants.cs create mode 100644 src/Newtonsoft.Json/Schema/JsonSchemaException.cs create mode 100644 src/Newtonsoft.Json/Schema/JsonSchemaGenerator.cs create mode 100644 src/Newtonsoft.Json/Schema/JsonSchemaModel.cs create mode 100644 src/Newtonsoft.Json/Schema/JsonSchemaModelBuilder.cs create mode 100644 src/Newtonsoft.Json/Schema/JsonSchemaNode.cs create mode 100644 src/Newtonsoft.Json/Schema/JsonSchemaNodeCollection.cs create mode 100644 src/Newtonsoft.Json/Schema/JsonSchemaResolver.cs create mode 100644 src/Newtonsoft.Json/Schema/JsonSchemaType.cs create mode 100644 src/Newtonsoft.Json/Schema/JsonSchemaWriter.cs create mode 100644 src/Newtonsoft.Json/Schema/UndefinedSchemaIdHandling.cs create mode 100644 src/Newtonsoft.Json/Schema/ValidationEventArgs.cs create mode 100644 src/Newtonsoft.Json/Schema/ValidationEventHandler.cs create mode 100644 src/Newtonsoft.Json/Serialization/CachedAttributeGetter.cs create mode 100644 src/Newtonsoft.Json/Serialization/CamelCaseNamingStrategy.cs create mode 100644 src/Newtonsoft.Json/Serialization/CamelCasePropertyNamesContractResolver.cs create mode 100644 src/Newtonsoft.Json/Serialization/DefaultContractResolver.cs create mode 100644 src/Newtonsoft.Json/Serialization/DefaultNamingStrategy.cs create mode 100644 src/Newtonsoft.Json/Serialization/DefaultReferenceResolver.cs create mode 100644 src/Newtonsoft.Json/Serialization/DefaultSerializationBinder.cs create mode 100644 src/Newtonsoft.Json/Serialization/DiagnosticsTraceWriter.cs create mode 100644 src/Newtonsoft.Json/Serialization/DynamicValueProvider.cs create mode 100644 src/Newtonsoft.Json/Serialization/ErrorContext.cs create mode 100644 src/Newtonsoft.Json/Serialization/ErrorEventArgs.cs create mode 100644 src/Newtonsoft.Json/Serialization/ExpressionValueProvider.cs create mode 100644 src/Newtonsoft.Json/Serialization/FormatterConverter.cs create mode 100644 src/Newtonsoft.Json/Serialization/IAttributeProvider.cs create mode 100644 src/Newtonsoft.Json/Serialization/IContractResolver.cs create mode 100644 src/Newtonsoft.Json/Serialization/IReferenceResolver.cs create mode 100644 src/Newtonsoft.Json/Serialization/ISerializationBinder.cs create mode 100644 src/Newtonsoft.Json/Serialization/ITraceWriter.cs create mode 100644 src/Newtonsoft.Json/Serialization/IValueProvider.cs create mode 100644 src/Newtonsoft.Json/Serialization/JsonArrayContract.cs create mode 100644 src/Newtonsoft.Json/Serialization/JsonContainerContract.cs create mode 100644 src/Newtonsoft.Json/Serialization/JsonContract.cs create mode 100644 src/Newtonsoft.Json/Serialization/JsonDictionaryContract.cs create mode 100644 src/Newtonsoft.Json/Serialization/JsonDynamicContract.cs create mode 100644 src/Newtonsoft.Json/Serialization/JsonFormatterConverter.cs create mode 100644 src/Newtonsoft.Json/Serialization/JsonISerializableContract.cs create mode 100644 src/Newtonsoft.Json/Serialization/JsonLinqContract.cs create mode 100644 src/Newtonsoft.Json/Serialization/JsonObjectContract.cs create mode 100644 src/Newtonsoft.Json/Serialization/JsonPrimitiveContract.cs create mode 100644 src/Newtonsoft.Json/Serialization/JsonProperty.cs create mode 100644 src/Newtonsoft.Json/Serialization/JsonPropertyCollection.cs create mode 100644 src/Newtonsoft.Json/Serialization/JsonSerializerInternalBase.cs create mode 100644 src/Newtonsoft.Json/Serialization/JsonSerializerInternalReader.cs create mode 100644 src/Newtonsoft.Json/Serialization/JsonSerializerInternalWriter.cs create mode 100644 src/Newtonsoft.Json/Serialization/JsonSerializerProxy.cs create mode 100644 src/Newtonsoft.Json/Serialization/JsonStringContract.cs create mode 100644 src/Newtonsoft.Json/Serialization/JsonTypeReflector.cs create mode 100644 src/Newtonsoft.Json/Serialization/MemoryTraceWriter.cs create mode 100644 src/Newtonsoft.Json/Serialization/NamingStrategy.cs create mode 100644 src/Newtonsoft.Json/Serialization/ObjectConstructor.cs create mode 100644 src/Newtonsoft.Json/Serialization/OnErrorAttribute.cs create mode 100644 src/Newtonsoft.Json/Serialization/ReflectionAttributeProvider.cs create mode 100644 src/Newtonsoft.Json/Serialization/ReflectionValueProvider.cs create mode 100644 src/Newtonsoft.Json/Serialization/SerializationBinderAdapter.cs create mode 100644 src/Newtonsoft.Json/Serialization/SnakeCaseNamingStrategy.cs create mode 100644 src/Newtonsoft.Json/Serialization/TraceJsonReader.cs create mode 100644 src/Newtonsoft.Json/Serialization/TraceJsonWriter.cs create mode 100644 src/Newtonsoft.Json/SerializationBinder.cs create mode 100644 src/Newtonsoft.Json/StringEscapeHandling.cs create mode 100644 src/Newtonsoft.Json/TraceLevel.cs create mode 100644 src/Newtonsoft.Json/TypeNameAssemblyFormatHandling.cs create mode 100644 src/Newtonsoft.Json/TypeNameHandling.cs create mode 100644 src/Newtonsoft.Json/Utilities/AsyncUtils.cs create mode 100644 src/Newtonsoft.Json/Utilities/Base64Encoder.cs create mode 100644 src/Newtonsoft.Json/Utilities/BidirectionalDictionary.cs create mode 100644 src/Newtonsoft.Json/Utilities/CollectionUtils.cs create mode 100644 src/Newtonsoft.Json/Utilities/CollectionWrapper.cs create mode 100644 src/Newtonsoft.Json/Utilities/ConvertUtils.cs create mode 100644 src/Newtonsoft.Json/Utilities/DateTimeParser.cs create mode 100644 src/Newtonsoft.Json/Utilities/DateTimeUtils.cs create mode 100644 src/Newtonsoft.Json/Utilities/DictionaryWrapper.cs create mode 100644 src/Newtonsoft.Json/Utilities/DynamicProxy.cs create mode 100644 src/Newtonsoft.Json/Utilities/DynamicProxyMetaObject.cs create mode 100644 src/Newtonsoft.Json/Utilities/DynamicReflectionDelegateFactory.cs create mode 100644 src/Newtonsoft.Json/Utilities/DynamicUtils.cs create mode 100644 src/Newtonsoft.Json/Utilities/EnumInfo.cs create mode 100644 src/Newtonsoft.Json/Utilities/EnumUtils.cs create mode 100644 src/Newtonsoft.Json/Utilities/ExpressionReflectionDelegateFactory.cs create mode 100644 src/Newtonsoft.Json/Utilities/FSharpUtils.cs create mode 100644 src/Newtonsoft.Json/Utilities/ILGeneratorExtensions.cs create mode 100644 src/Newtonsoft.Json/Utilities/ImmutableCollectionsUtils.cs create mode 100644 src/Newtonsoft.Json/Utilities/JavaScriptUtils.cs create mode 100644 src/Newtonsoft.Json/Utilities/JsonTokenUtils.cs create mode 100644 src/Newtonsoft.Json/Utilities/LateBoundReflectionDelegateFactory.cs create mode 100644 src/Newtonsoft.Json/Utilities/LinqBridge.cs create mode 100644 src/Newtonsoft.Json/Utilities/MathUtils.cs create mode 100644 src/Newtonsoft.Json/Utilities/MethodBinder.cs create mode 100644 src/Newtonsoft.Json/Utilities/MethodCall.cs create mode 100644 src/Newtonsoft.Json/Utilities/MiscellaneousUtils.cs create mode 100644 src/Newtonsoft.Json/Utilities/ReflectionDelegateFactory.cs create mode 100644 src/Newtonsoft.Json/Utilities/ReflectionObject.cs create mode 100644 src/Newtonsoft.Json/Utilities/ReflectionUtils.cs create mode 100644 src/Newtonsoft.Json/Utilities/StringBuffer.cs create mode 100644 src/Newtonsoft.Json/Utilities/StringReference.cs create mode 100644 src/Newtonsoft.Json/Utilities/StringUtils.cs create mode 100644 src/Newtonsoft.Json/Utilities/StructMultiKey.cs create mode 100644 src/Newtonsoft.Json/Utilities/ThreadSafeStore.cs create mode 100644 src/Newtonsoft.Json/Utilities/TypeExtensions.cs create mode 100644 src/Newtonsoft.Json/Utilities/ValidationUtils.cs create mode 100644 src/Newtonsoft.Json/WriteState.cs create mode 100644 src/Options/ModOptionsCheckbox.cs create mode 100644 src/Options/ModOptionsSlider.cs create mode 100644 src/Properties/AssemblyInfo.cs delete mode 100644 src/SMAPI.Installer/Enums/ScriptAction.cs delete mode 100644 src/SMAPI.Installer/Framework/InstallerPaths.cs delete mode 100644 src/SMAPI.Installer/InteractiveInstaller.cs delete mode 100644 src/SMAPI.Installer/Program.cs delete mode 100644 src/SMAPI.Installer/Properties/AssemblyInfo.cs delete mode 100644 src/SMAPI.Installer/README.txt delete mode 100644 src/SMAPI.Installer/StardewModdingAPI.Installer.csproj delete mode 100644 src/SMAPI.Installer/unix-install.sh delete mode 100644 src/SMAPI.Installer/unix-launcher.sh delete mode 100644 src/SMAPI.Installer/windows-exe-config.xml delete mode 100644 src/SMAPI.Installer/windows-install.bat delete mode 100644 src/SMAPI.Internal/SMAPI.Internal.projitems delete mode 100644 src/SMAPI.Internal/StardewModdingAPI.Internal.shproj delete mode 100644 src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticResult.cs delete mode 100644 src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticVerifier.Helper.cs delete mode 100644 src/SMAPI.ModBuildConfig.Analyzer.Tests/Framework/DiagnosticVerifier.cs delete mode 100644 src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/Netcode/NetCollection.cs delete mode 100644 src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/Netcode/NetFieldBase.cs delete mode 100644 src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/Netcode/NetInt.cs delete mode 100644 src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/Netcode/NetList.cs delete mode 100644 src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/Netcode/NetObjectList.cs delete mode 100644 src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/Netcode/NetRef.cs delete mode 100644 src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/StardewValley/Farmer.cs delete mode 100644 src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/StardewValley/Item.cs delete mode 100644 src/SMAPI.ModBuildConfig.Analyzer.Tests/Mock/StardewValley/Object.cs delete mode 100644 src/SMAPI.ModBuildConfig.Analyzer.Tests/NetFieldAnalyzerTests.cs delete mode 100644 src/SMAPI.ModBuildConfig.Analyzer.Tests/ObsoleteFieldAnalyzerTests.cs delete mode 100644 src/SMAPI.ModBuildConfig.Analyzer.Tests/SMAPI.ModBuildConfig.Analyzer.Tests.csproj delete mode 100644 src/SMAPI.ModBuildConfig.Analyzer/AnalyzerUtilities.cs delete mode 100644 src/SMAPI.ModBuildConfig.Analyzer/NetFieldAnalyzer.cs delete mode 100644 src/SMAPI.ModBuildConfig.Analyzer/ObsoleteFieldAnalyzer.cs delete mode 100644 src/SMAPI.ModBuildConfig.Analyzer/Properties/AssemblyInfo.cs delete mode 100644 src/SMAPI.ModBuildConfig.Analyzer/StardewModdingAPI.ModBuildConfig.Analyzer.csproj delete mode 100644 src/SMAPI.ModBuildConfig/DeployModTask.cs delete mode 100644 src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs delete mode 100644 src/SMAPI.ModBuildConfig/Framework/UserErrorException.cs delete mode 100644 src/SMAPI.ModBuildConfig/Properties/AssemblyInfo.cs delete mode 100644 src/SMAPI.ModBuildConfig/StardewModdingAPI.ModBuildConfig.csproj delete mode 100644 src/SMAPI.ModBuildConfig/assets/nuget-icon.pdn delete mode 100644 src/SMAPI.ModBuildConfig/assets/nuget-icon.png delete mode 100644 src/SMAPI.ModBuildConfig/build/smapi.targets delete mode 100644 src/SMAPI.ModBuildConfig/package.nuspec delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ArgumentParser.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/ITrainerCommand.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/DebugCommand.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowDataFilesCommand.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Other/ShowGameFilesCommand.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/AddCommand.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemTypesCommand.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/ListItemsCommand.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetColorCommand.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetHealthCommand.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetImmunityCommand.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxHealthCommand.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMaxStaminaCommand.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetMoneyCommand.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetNameCommand.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStaminaCommand.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/Player/SetStyleCommand.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/TrainerCommand.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/ClearCommand.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/DownMineLevelCommand.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/FreezeTimeCommand.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetDayCommand.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetMineLevelCommand.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetSeasonCommand.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetTimeCommand.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/Commands/World/SetYearCommand.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/ItemData/ItemType.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/ItemData/SearchableItem.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Framework/ItemRepository.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/ModEntry.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/Properties/AssemblyInfo.cs delete mode 100644 src/SMAPI.Mods.ConsoleCommands/StardewModdingAPI.Mods.ConsoleCommands.csproj delete mode 100644 src/SMAPI.Mods.ConsoleCommands/manifest.json delete mode 100644 src/SMAPI.Mods.SaveBackup/ModEntry.cs delete mode 100644 src/SMAPI.Mods.SaveBackup/Properties/AssemblyInfo.cs delete mode 100644 src/SMAPI.Mods.SaveBackup/StardewModdingAPI.Mods.SaveBackup.csproj delete mode 100644 src/SMAPI.Mods.SaveBackup/manifest.json delete mode 100644 src/SMAPI.Tests/Core/ModResolverTests.cs delete mode 100644 src/SMAPI.Tests/Core/TranslationTests.cs delete mode 100644 src/SMAPI.Tests/Properties/AssemblyInfo.cs delete mode 100644 src/SMAPI.Tests/Sample.cs delete mode 100644 src/SMAPI.Tests/StardewModdingAPI.Tests.csproj delete mode 100644 src/SMAPI.Tests/Toolkit/PathUtilitiesTests.cs delete mode 100644 src/SMAPI.Tests/Utilities/SDateTests.cs delete mode 100644 src/SMAPI.Tests/Utilities/SemanticVersionTests.cs delete mode 100644 src/SMAPI.Tests/app.config delete mode 100644 src/SMAPI.Web/Controllers/IndexController.cs delete mode 100644 src/SMAPI.Web/Controllers/LogParserController.cs delete mode 100644 src/SMAPI.Web/Controllers/ModsApiController.cs delete mode 100644 src/SMAPI.Web/Controllers/ModsController.cs delete mode 100644 src/SMAPI.Web/Framework/AllowLargePostsAttribute.cs delete mode 100644 src/SMAPI.Web/Framework/BeanstalkEnvPropsConfigProvider.cs delete mode 100644 src/SMAPI.Web/Framework/Clients/Chucklefish/ChucklefishClient.cs delete mode 100644 src/SMAPI.Web/Framework/Clients/Chucklefish/ChucklefishMod.cs delete mode 100644 src/SMAPI.Web/Framework/Clients/Chucklefish/IChucklefishClient.cs delete mode 100644 src/SMAPI.Web/Framework/Clients/GitHub/GitAsset.cs delete mode 100644 src/SMAPI.Web/Framework/Clients/GitHub/GitHubClient.cs delete mode 100644 src/SMAPI.Web/Framework/Clients/GitHub/GitRelease.cs delete mode 100644 src/SMAPI.Web/Framework/Clients/GitHub/IGitHubClient.cs delete mode 100644 src/SMAPI.Web/Framework/Clients/ModDrop/IModDropClient.cs delete mode 100644 src/SMAPI.Web/Framework/Clients/ModDrop/ModDropClient.cs delete mode 100644 src/SMAPI.Web/Framework/Clients/ModDrop/ModDropMod.cs delete mode 100644 src/SMAPI.Web/Framework/Clients/ModDrop/ResponseModels/FileDataModel.cs delete mode 100644 src/SMAPI.Web/Framework/Clients/ModDrop/ResponseModels/ModDataModel.cs delete mode 100644 src/SMAPI.Web/Framework/Clients/ModDrop/ResponseModels/ModListModel.cs delete mode 100644 src/SMAPI.Web/Framework/Clients/ModDrop/ResponseModels/ModModel.cs delete mode 100644 src/SMAPI.Web/Framework/Clients/Nexus/INexusClient.cs delete mode 100644 src/SMAPI.Web/Framework/Clients/Nexus/NexusMod.cs delete mode 100644 src/SMAPI.Web/Framework/Clients/Nexus/NexusWebScrapeClient.cs delete mode 100644 src/SMAPI.Web/Framework/Clients/Pastebin/IPastebinClient.cs delete mode 100644 src/SMAPI.Web/Framework/Clients/Pastebin/PasteInfo.cs delete mode 100644 src/SMAPI.Web/Framework/Clients/Pastebin/PastebinClient.cs delete mode 100644 src/SMAPI.Web/Framework/Clients/Pastebin/SavePasteResult.cs delete mode 100644 src/SMAPI.Web/Framework/ConfigModels/ApiClientsConfig.cs delete mode 100644 src/SMAPI.Web/Framework/ConfigModels/ModCompatibilityListConfig.cs delete mode 100644 src/SMAPI.Web/Framework/ConfigModels/ModUpdateCheckConfig.cs delete mode 100644 src/SMAPI.Web/Framework/ConfigModels/SiteConfig.cs delete mode 100644 src/SMAPI.Web/Framework/InternalControllerFeatureProvider.cs delete mode 100644 src/SMAPI.Web/Framework/LogParsing/LogParseException.cs delete mode 100644 src/SMAPI.Web/Framework/LogParsing/LogParser.cs delete mode 100644 src/SMAPI.Web/Framework/LogParsing/Models/LogLevel.cs delete mode 100644 src/SMAPI.Web/Framework/LogParsing/Models/LogMessage.cs delete mode 100644 src/SMAPI.Web/Framework/LogParsing/Models/LogModInfo.cs delete mode 100644 src/SMAPI.Web/Framework/LogParsing/Models/LogSection.cs delete mode 100644 src/SMAPI.Web/Framework/LogParsing/Models/ParsedLog.cs delete mode 100644 src/SMAPI.Web/Framework/ModRepositories/BaseRepository.cs delete mode 100644 src/SMAPI.Web/Framework/ModRepositories/ChucklefishRepository.cs delete mode 100644 src/SMAPI.Web/Framework/ModRepositories/GitHubRepository.cs delete mode 100644 src/SMAPI.Web/Framework/ModRepositories/IModRepository.cs delete mode 100644 src/SMAPI.Web/Framework/ModRepositories/ModDropRepository.cs delete mode 100644 src/SMAPI.Web/Framework/ModRepositories/ModInfoModel.cs delete mode 100644 src/SMAPI.Web/Framework/ModRepositories/NexusRepository.cs delete mode 100644 src/SMAPI.Web/Framework/RewriteRules/ConditionalRedirectToHttpsRule.cs delete mode 100644 src/SMAPI.Web/Framework/RewriteRules/ConditionalRewriteSubdomainRule.cs delete mode 100644 src/SMAPI.Web/Framework/RewriteRules/RedirectToUrlRule.cs delete mode 100644 src/SMAPI.Web/Framework/VersionConstraint.cs delete mode 100644 src/SMAPI.Web/Program.cs delete mode 100644 src/SMAPI.Web/Properties/AssemblyInfo.cs delete mode 100644 src/SMAPI.Web/Properties/launchSettings.json delete mode 100644 src/SMAPI.Web/StardewModdingAPI.Web.csproj delete mode 100644 src/SMAPI.Web/Startup.cs delete mode 100644 src/SMAPI.Web/ViewModels/IndexModel.cs delete mode 100644 src/SMAPI.Web/ViewModels/IndexVersionModel.cs delete mode 100644 src/SMAPI.Web/ViewModels/LogParserModel.cs delete mode 100644 src/SMAPI.Web/ViewModels/ModCompatibilityModel.cs delete mode 100644 src/SMAPI.Web/ViewModels/ModLinkModel.cs delete mode 100644 src/SMAPI.Web/ViewModels/ModListModel.cs delete mode 100644 src/SMAPI.Web/ViewModels/ModModel.cs delete mode 100644 src/SMAPI.Web/Views/Index/Index.cshtml delete mode 100644 src/SMAPI.Web/Views/Index/Privacy.cshtml delete mode 100644 src/SMAPI.Web/Views/LogParser/Index.cshtml delete mode 100644 src/SMAPI.Web/Views/Mods/Index.cshtml delete mode 100644 src/SMAPI.Web/Views/Shared/_Layout.cshtml delete mode 100644 src/SMAPI.Web/Views/_ViewStart.cshtml delete mode 100644 src/SMAPI.Web/appsettings.Development.json delete mode 100644 src/SMAPI.Web/appsettings.json delete mode 100644 src/SMAPI.Web/wwwroot/Content/css/index.css delete mode 100644 src/SMAPI.Web/wwwroot/Content/css/log-parser.css delete mode 100644 src/SMAPI.Web/wwwroot/Content/css/main.css delete mode 100644 src/SMAPI.Web/wwwroot/Content/css/mods.css delete mode 100644 src/SMAPI.Web/wwwroot/Content/css/privacy.css delete mode 100644 src/SMAPI.Web/wwwroot/Content/images/direct-download-icon.png delete mode 100644 src/SMAPI.Web/wwwroot/Content/images/external/patreon-header-help.png delete mode 100644 src/SMAPI.Web/wwwroot/Content/images/external/patreon-header-upcoming.png delete mode 100644 src/SMAPI.Web/wwwroot/Content/images/external/patreon-header-what-i-do.png delete mode 100644 src/SMAPI.Web/wwwroot/Content/images/nexus-icon.png delete mode 100644 src/SMAPI.Web/wwwroot/Content/images/pufferchick-cool.png delete mode 100644 src/SMAPI.Web/wwwroot/Content/images/pufferchick.png delete mode 100644 src/SMAPI.Web/wwwroot/Content/images/sidebar-bg.gif delete mode 100644 src/SMAPI.Web/wwwroot/Content/js/index.js delete mode 100644 src/SMAPI.Web/wwwroot/Content/js/log-parser.js delete mode 100644 src/SMAPI.Web/wwwroot/Content/js/mods.js delete mode 100644 src/SMAPI.Web/wwwroot/StardewModdingAPI.metadata.json delete mode 100644 src/SMAPI.Web/wwwroot/favicon.ico delete mode 100644 src/SMAPI.sln delete mode 100644 src/SMAPI.sln.DotSettings delete mode 100644 src/SMAPI/Framework/ModHelpers/MultiplayerHelper.cs delete mode 100644 src/SMAPI/Framework/Networking/SGalaxyNetClient.cs delete mode 100644 src/SMAPI/Framework/Networking/SGalaxyNetServer.cs delete mode 100644 src/SMAPI/Framework/Networking/SLidgrenClient.cs delete mode 100644 src/SMAPI/Framework/Networking/SLidgrenServer.cs delete mode 100644 src/SMAPI/Framework/SMultiplayer.cs delete mode 100644 src/SMAPI/IMultiplayerHelper.cs rename src/{SMAPI.Internal => SMAPI/Internal}/ConsoleWriting/ColorfulConsoleWriter.cs (100%) rename src/{SMAPI.Internal => SMAPI/Internal}/ConsoleWriting/LogLevel.cs (100%) rename src/{SMAPI.Internal => SMAPI/Internal}/ConsoleWriting/MonitorColorScheme.cs (92%) rename src/{SMAPI.Internal => SMAPI/Internal}/EnvironmentUtility.cs (100%) rename src/{SMAPI.Internal => SMAPI/Internal}/Platform.cs (81%) delete mode 100644 src/SMAPI/Properties/AssemblyInfo.cs rename src/{StardewModdingAPI.Toolkit.CoreInterfaces => SMAPI/Toolkit/CoreInterfaces}/IManifest.cs (100%) rename src/{StardewModdingAPI.Toolkit.CoreInterfaces => SMAPI/Toolkit/CoreInterfaces}/IManifestContentPackFor.cs (100%) rename src/{StardewModdingAPI.Toolkit.CoreInterfaces => SMAPI/Toolkit/CoreInterfaces}/IManifestDependency.cs (100%) rename src/{StardewModdingAPI.Toolkit.CoreInterfaces => SMAPI/Toolkit/CoreInterfaces}/ISemanticVersion.cs (100%) rename src/{StardewModdingAPI.Toolkit => SMAPI/Toolkit}/Framework/ModData/MetadataModel.cs (100%) rename src/{StardewModdingAPI.Toolkit => SMAPI/Toolkit}/Framework/ModData/ModDataField.cs (100%) rename src/{StardewModdingAPI.Toolkit => SMAPI/Toolkit}/Framework/ModData/ModDataFieldKey.cs (100%) rename src/{StardewModdingAPI.Toolkit => SMAPI/Toolkit}/Framework/ModData/ModDataModel.cs (100%) rename src/{StardewModdingAPI.Toolkit => SMAPI/Toolkit}/Framework/ModData/ModDataRecord.cs (100%) rename src/{StardewModdingAPI.Toolkit => SMAPI/Toolkit}/Framework/ModData/ModDataRecordVersionedFields.cs (100%) rename src/{StardewModdingAPI.Toolkit => SMAPI/Toolkit}/Framework/ModData/ModDatabase.cs (100%) rename src/{StardewModdingAPI.Toolkit => SMAPI/Toolkit}/Framework/ModData/ModStatus.cs (100%) rename src/{StardewModdingAPI.Toolkit => SMAPI/Toolkit}/Framework/ModData/ModWarning.cs (100%) rename src/{StardewModdingAPI.Toolkit => SMAPI/Toolkit}/Framework/ModScanning/ModFolder.cs (100%) rename src/{StardewModdingAPI.Toolkit => SMAPI/Toolkit}/Framework/ModScanning/ModScanner.cs (100%) rename src/{StardewModdingAPI.Toolkit => SMAPI/Toolkit}/Framework/UpdateData/ModRepositoryKey.cs (100%) rename src/{StardewModdingAPI.Toolkit => SMAPI/Toolkit}/Framework/UpdateData/UpdateKey.cs (100%) rename src/{StardewModdingAPI.Toolkit => SMAPI/Toolkit}/ModToolkit.cs (90%) rename src/{StardewModdingAPI.Toolkit => SMAPI/Toolkit}/SemanticVersion.cs (100%) rename src/{StardewModdingAPI.Toolkit => SMAPI/Toolkit}/Serialisation/Converters/ManifestContentPackForConverter.cs (100%) rename src/{StardewModdingAPI.Toolkit => SMAPI/Toolkit}/Serialisation/Converters/ManifestDependencyArrayConverter.cs (100%) rename src/{StardewModdingAPI.Toolkit => SMAPI/Toolkit}/Serialisation/Converters/SemanticVersionConverter.cs (100%) rename src/{StardewModdingAPI.Toolkit => SMAPI/Toolkit}/Serialisation/Converters/SimpleReadOnlyConverter.cs (100%) rename src/{StardewModdingAPI.Toolkit => SMAPI/Toolkit}/Serialisation/InternalExtensions.cs (100%) rename src/{StardewModdingAPI.Toolkit => SMAPI/Toolkit}/Serialisation/JsonHelper.cs (100%) rename src/{StardewModdingAPI.Toolkit => SMAPI/Toolkit}/Serialisation/Models/Manifest.cs (100%) rename src/{StardewModdingAPI.Toolkit => SMAPI/Toolkit}/Serialisation/Models/ManifestContentPackFor.cs (100%) rename src/{StardewModdingAPI.Toolkit => SMAPI/Toolkit}/Serialisation/Models/ManifestDependency.cs (100%) rename src/{StardewModdingAPI.Toolkit => SMAPI/Toolkit}/Serialisation/SParseException.cs (100%) rename src/{StardewModdingAPI.Toolkit => SMAPI/Toolkit}/Utilities/FileUtilities.cs (90%) rename src/{StardewModdingAPI.Toolkit => SMAPI/Toolkit}/Utilities/PathUtilities.cs (100%) delete mode 100644 src/StardewModdingAPI.Toolkit.CoreInterfaces/Properties/AssemblyInfo.cs delete mode 100644 src/StardewModdingAPI.Toolkit.CoreInterfaces/StardewModdingAPI.Toolkit.CoreInterfaces.csproj delete mode 100644 src/StardewModdingAPI.Toolkit/Framework/Clients/WebApi/ModEntryModel.cs delete mode 100644 src/StardewModdingAPI.Toolkit/Framework/Clients/WebApi/ModEntryVersionModel.cs delete mode 100644 src/StardewModdingAPI.Toolkit/Framework/Clients/WebApi/ModExtendedMetadataModel.cs delete mode 100644 src/StardewModdingAPI.Toolkit/Framework/Clients/WebApi/ModSeachModel.cs delete mode 100644 src/StardewModdingAPI.Toolkit/Framework/Clients/WebApi/ModSearchEntryModel.cs delete mode 100644 src/StardewModdingAPI.Toolkit/Framework/Clients/WebApi/WebApiClient.cs delete mode 100644 src/StardewModdingAPI.Toolkit/Framework/Clients/Wiki/WikiClient.cs delete mode 100644 src/StardewModdingAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityInfo.cs delete mode 100644 src/StardewModdingAPI.Toolkit/Framework/Clients/Wiki/WikiCompatibilityStatus.cs delete mode 100644 src/StardewModdingAPI.Toolkit/Framework/Clients/Wiki/WikiModEntry.cs delete mode 100644 src/StardewModdingAPI.Toolkit/Framework/Clients/Wiki/WikiModList.cs delete mode 100644 src/StardewModdingAPI.Toolkit/Framework/Clients/Wiki/WikiSmapi3Status.cs delete mode 100644 src/StardewModdingAPI.Toolkit/Properties/AssemblyInfo.cs delete mode 100644 src/StardewModdingAPI.Toolkit/StardewModdingAPI.Toolkit.csproj diff --git a/SMAPI b/SMAPI deleted file mode 160000 index 9e521091f..000000000 --- a/SMAPI +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9e521091fe4b13a9091bcb30c9f73ef210ace2dd diff --git a/src/Harmony/Attributes.cs b/src/Harmony/Attributes.cs new file mode 100644 index 000000000..14e4f5131 --- /dev/null +++ b/src/Harmony/Attributes.cs @@ -0,0 +1,325 @@ +using System; +using System.Collections.Generic; + +namespace Harmony +{ + public enum MethodType + { + Normal, + Getter, + Setter, + Constructor, + StaticConstructor + } + + [Obsolete("This enum will be removed in the next major version. To define special methods, use MethodType")] + public enum PropertyMethod + { + Getter, + Setter + } + + public enum ArgumentType + { + Normal, + Ref, + Out, + Pointer + } + + public enum HarmonyPatchType + { + All, + Prefix, + Postfix, + Transpiler + } + + public class HarmonyAttribute : Attribute + { + public HarmonyMethod info = new HarmonyMethod(); + } + + [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true)] + public class HarmonyPatch : HarmonyAttribute + { + // no argument (for use with TargetMethod) + + public HarmonyPatch() + { + } + + // starting with 'Type' + + public HarmonyPatch(Type declaringType) + { + info.declaringType = declaringType; + } + + public HarmonyPatch(Type declaringType, Type[] argumentTypes) + { + info.declaringType = declaringType; + info.argumentTypes = argumentTypes; + } + + public HarmonyPatch(Type declaringType, string methodName) + { + info.declaringType = declaringType; + info.methodName = methodName; + } + + public HarmonyPatch(Type declaringType, string methodName, params Type[] argumentTypes) + { + info.declaringType = declaringType; + info.methodName = methodName; + info.argumentTypes = argumentTypes; + } + + public HarmonyPatch(Type declaringType, string methodName, Type[] argumentTypes, ArgumentType[] argumentVariations) + { + info.declaringType = declaringType; + info.methodName = methodName; + ParseSpecialArguments(argumentTypes, argumentVariations); + } + + public HarmonyPatch(Type declaringType, MethodType methodType) + { + info.declaringType = declaringType; + info.methodType = methodType; + } + + public HarmonyPatch(Type declaringType, MethodType methodType, params Type[] argumentTypes) + { + info.declaringType = declaringType; + info.methodType = methodType; + info.argumentTypes = argumentTypes; + } + + public HarmonyPatch(Type declaringType, MethodType methodType, Type[] argumentTypes, ArgumentType[] argumentVariations) + { + info.declaringType = declaringType; + info.methodType = methodType; + ParseSpecialArguments(argumentTypes, argumentVariations); + } + + public HarmonyPatch(Type declaringType, string propertyName, MethodType methodType) + { + info.declaringType = declaringType; + info.methodName = propertyName; + info.methodType = methodType; + } + + // starting with 'string' + + public HarmonyPatch(string methodName) + { + info.methodName = methodName; + } + + public HarmonyPatch(string methodName, params Type[] argumentTypes) + { + info.methodName = methodName; + info.argumentTypes = argumentTypes; + } + + public HarmonyPatch(string methodName, Type[] argumentTypes, ArgumentType[] argumentVariations) + { + info.methodName = methodName; + ParseSpecialArguments(argumentTypes, argumentVariations); + } + + public HarmonyPatch(string propertyName, MethodType methodType) + { + info.methodName = propertyName; + info.methodType = methodType; + } + + // starting with 'MethodType' + + public HarmonyPatch(MethodType methodType) + { + info.methodType = methodType; + } + + public HarmonyPatch(MethodType methodType, params Type[] argumentTypes) + { + info.methodType = methodType; + info.argumentTypes = argumentTypes; + } + + public HarmonyPatch(MethodType methodType, Type[] argumentTypes, ArgumentType[] argumentVariations) + { + info.methodType = methodType; + ParseSpecialArguments(argumentTypes, argumentVariations); + } + + // starting with 'Type[]' + + public HarmonyPatch(Type[] argumentTypes) + { + info.argumentTypes = argumentTypes; + } + + public HarmonyPatch(Type[] argumentTypes, ArgumentType[] argumentVariations) + { + ParseSpecialArguments(argumentTypes, argumentVariations); + } + + // Obsolete attributes + + [Obsolete("This attribute will be removed in the next major version. Use HarmonyPatch together with MethodType.Getter or MethodType.Setter instead")] + public HarmonyPatch(string propertyName, PropertyMethod type) + { + info.methodName = propertyName; + info.methodType = type == PropertyMethod.Getter ? MethodType.Getter : MethodType.Setter; + } + + // + + private void ParseSpecialArguments(Type[] argumentTypes, ArgumentType[] argumentVariations) + { + if (argumentVariations == null || argumentVariations.Length == 0) + { + info.argumentTypes = argumentTypes; + return; + } + + if (argumentTypes.Length < argumentVariations.Length) + throw new ArgumentException("argumentVariations contains more elements than argumentTypes", nameof(argumentVariations)); + + var types = new List(); + for (var i = 0; i < argumentTypes.Length; i++) + { + var type = argumentTypes[i]; + switch (argumentVariations[i]) + { + case ArgumentType.Ref: + case ArgumentType.Out: + type = type.MakeByRefType(); + break; + case ArgumentType.Pointer: + type = type.MakePointerType(); + break; + } + types.Add(type); + } + info.argumentTypes = types.ToArray(); + } + } + + [AttributeUsage(AttributeTargets.Class)] + public class HarmonyPatchAll : HarmonyAttribute + { + public HarmonyPatchAll() + { + } + } + + [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)] + public class HarmonyPriority : HarmonyAttribute + { + public HarmonyPriority(int prioritiy) + { + info.prioritiy = prioritiy; + } + } + + [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)] + public class HarmonyBefore : HarmonyAttribute + { + public HarmonyBefore(params string[] before) + { + info.before = before; + } + } + + [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)] + public class HarmonyAfter : HarmonyAttribute + { + public HarmonyAfter(params string[] after) + { + info.after = after; + } + } + + // If you don't want to use the special method names you can annotate + // using the following attributes: + + [AttributeUsage(AttributeTargets.Method)] + public class HarmonyPrepare : Attribute + { + } + + [AttributeUsage(AttributeTargets.Method)] + public class HarmonyCleanup : Attribute + { + } + + [AttributeUsage(AttributeTargets.Method)] + public class HarmonyTargetMethod : Attribute + { + } + + [AttributeUsage(AttributeTargets.Method)] + public class HarmonyTargetMethods : Attribute + { + } + + [AttributeUsage(AttributeTargets.Method)] + public class HarmonyPrefix : Attribute + { + } + + [AttributeUsage(AttributeTargets.Method)] + public class HarmonyPostfix : Attribute + { + } + + [AttributeUsage(AttributeTargets.Method)] + public class HarmonyTranspiler : Attribute + { + } + + [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method | AttributeTargets.Class, AllowMultiple = true)] + public class HarmonyArgument : Attribute + { + public string OriginalName { get; private set; } + public int Index { get; private set; } + public string NewName { get; private set; } + + public HarmonyArgument(string originalName) : this(originalName, null) + { + } + + public HarmonyArgument(int index) : this(index, null) + { + } + + public HarmonyArgument(string originalName, string newName) + { + OriginalName = originalName; + Index = -1; + NewName = newName; + } + + public HarmonyArgument(int index, string name) + { + OriginalName = null; + Index = index; + NewName = name; + } + } + + // This attribute is for Harmony patching itself to the latest + // + [AttributeUsage(AttributeTargets.Method | AttributeTargets.Constructor)] + internal class UpgradeToLatestVersion : Attribute + { + public int version; + + public UpgradeToLatestVersion(int version) + { + this.version = version; + } + } +} \ No newline at end of file diff --git a/src/Harmony/CodeInstruction.cs b/src/Harmony/CodeInstruction.cs new file mode 100644 index 000000000..a6d897262 --- /dev/null +++ b/src/Harmony/CodeInstruction.cs @@ -0,0 +1,62 @@ +using Harmony.ILCopying; +using System.Collections.Generic; +using System.Linq; +using System.Reflection.Emit; + +namespace Harmony +{ + public class CodeInstruction + { + public OpCode opcode; + public object operand; + public List