summaryrefslogtreecommitdiff
path: root/src/SMAPI
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2019-11-24 13:49:30 -0500
committerJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2019-11-24 13:49:30 -0500
commita3f21685049cabf2d824c8060dc0b1de47e9449e (patch)
treead9add30e9da2a50e0ea0245f1546b7378f0d282 /src/SMAPI
parent6521df7b131924835eb797251c1e956fae0d6e13 (diff)
parent277bf082675b98b95bf6184fe3c7a45b969c7ac2 (diff)
downloadSMAPI-a3f21685049cabf2d824c8060dc0b1de47e9449e.tar.gz
SMAPI-a3f21685049cabf2d824c8060dc0b1de47e9449e.tar.bz2
SMAPI-a3f21685049cabf2d824c8060dc0b1de47e9449e.zip
Merge branch 'develop' into stable
Diffstat (limited to 'src/SMAPI')
-rw-r--r--src/SMAPI/Constants.cs64
-rw-r--r--src/SMAPI/Context.cs5
-rw-r--r--src/SMAPI/Enums/LoadStage.cs10
-rw-r--r--src/SMAPI/Events/ContentEvents.cs45
-rw-r--r--src/SMAPI/Events/ControlEvents.cs123
-rw-r--r--src/SMAPI/Events/EventArgsClickableMenuChanged.cs33
-rw-r--r--src/SMAPI/Events/EventArgsClickableMenuClosed.cs28
-rw-r--r--src/SMAPI/Events/EventArgsControllerButtonPressed.cs34
-rw-r--r--src/SMAPI/Events/EventArgsControllerButtonReleased.cs34
-rw-r--r--src/SMAPI/Events/EventArgsControllerTriggerPressed.cs39
-rw-r--r--src/SMAPI/Events/EventArgsControllerTriggerReleased.cs39
-rw-r--r--src/SMAPI/Events/EventArgsInput.cs64
-rw-r--r--src/SMAPI/Events/EventArgsIntChanged.cs32
-rw-r--r--src/SMAPI/Events/EventArgsInventoryChanged.cs43
-rw-r--r--src/SMAPI/Events/EventArgsKeyPressed.cs28
-rw-r--r--src/SMAPI/Events/EventArgsKeyboardStateChanged.cs33
-rw-r--r--src/SMAPI/Events/EventArgsLevelUp.cs55
-rw-r--r--src/SMAPI/Events/EventArgsLocationBuildingsChanged.cs41
-rw-r--r--src/SMAPI/Events/EventArgsLocationObjectsChanged.cs42
-rw-r--r--src/SMAPI/Events/EventArgsLocationsChanged.cs35
-rw-r--r--src/SMAPI/Events/EventArgsMineLevelChanged.cs32
-rw-r--r--src/SMAPI/Events/EventArgsMouseStateChanged.cs44
-rw-r--r--src/SMAPI/Events/EventArgsPlayerWarped.cs34
-rw-r--r--src/SMAPI/Events/EventArgsValueChanged.cs33
-rw-r--r--src/SMAPI/Events/GameEvents.cs122
-rw-r--r--src/SMAPI/Events/GraphicsEvents.cs120
-rw-r--r--src/SMAPI/Events/IGameLoopEvents.cs6
-rw-r--r--src/SMAPI/Events/IModEvents.cs4
-rw-r--r--src/SMAPI/Events/ISpecialisedEvents.cs4
-rw-r--r--src/SMAPI/Events/InputEvents.cs56
-rw-r--r--src/SMAPI/Events/LoadStageChangedEventArgs.cs2
-rw-r--r--src/SMAPI/Events/LocationEvents.cs67
-rw-r--r--src/SMAPI/Events/MenuEvents.cs56
-rw-r--r--src/SMAPI/Events/MineEvents.cs45
-rw-r--r--src/SMAPI/Events/MultiplayerEvents.cs78
-rw-r--r--src/SMAPI/Events/PlayerEvents.cs68
-rw-r--r--src/SMAPI/Events/SaveEvents.cs100
-rw-r--r--src/SMAPI/Events/SpecialisedEvents.cs45
-rw-r--r--src/SMAPI/Events/TimeEvents.cs56
-rw-r--r--src/SMAPI/Events/UnvalidatedUpdateTickedEventArgs.cs2
-rw-r--r--src/SMAPI/Events/UnvalidatedUpdateTickingEventArgs.cs2
-rw-r--r--src/SMAPI/Framework/CommandManager.cs14
-rw-r--r--src/SMAPI/Framework/Content/AssetData.cs10
-rw-r--r--src/SMAPI/Framework/Content/AssetDataForDictionary.cs43
-rw-r--r--src/SMAPI/Framework/Content/AssetDataForImage.cs10
-rw-r--r--src/SMAPI/Framework/Content/AssetDataForObject.cs20
-rw-r--r--src/SMAPI/Framework/Content/AssetInfo.cs22
-rw-r--r--src/SMAPI/Framework/Content/ContentCache.cs30
-rw-r--r--src/SMAPI/Framework/ContentCoordinator.cs65
-rw-r--r--src/SMAPI/Framework/ContentManagers/BaseContentManager.cs168
-rw-r--r--src/SMAPI/Framework/ContentManagers/GameContentManager.cs178
-rw-r--r--src/SMAPI/Framework/ContentManagers/IContentManager.cs36
-rw-r--r--src/SMAPI/Framework/ContentManagers/ModContentManager.cs330
-rw-r--r--src/SMAPI/Framework/ContentPack.cs44
-rw-r--r--src/SMAPI/Framework/CursorPosition.cs8
-rw-r--r--src/SMAPI/Framework/DeprecationManager.cs29
-rw-r--r--src/SMAPI/Framework/Events/EventManager.cs278
-rw-r--r--src/SMAPI/Framework/Events/ManagedEvent.cs105
-rw-r--r--src/SMAPI/Framework/Events/ManagedEventBase.cs93
-rw-r--r--src/SMAPI/Framework/Events/ModEvents.cs6
-rw-r--r--src/SMAPI/Framework/Events/ModGameLoopEvents.cs2
-rw-r--r--src/SMAPI/Framework/Events/ModSpecialisedEvents.cs6
-rw-r--r--src/SMAPI/Framework/GameVersion.cs5
-rw-r--r--src/SMAPI/Framework/IModMetadata.cs20
-rw-r--r--src/SMAPI/Framework/Input/SInputState.cs17
-rw-r--r--src/SMAPI/Framework/InternalExtensions.cs2
-rw-r--r--src/SMAPI/Framework/ModHelpers/ContentHelper.cs229
-rw-r--r--src/SMAPI/Framework/ModHelpers/ContentPackHelper.cs4
-rw-r--r--src/SMAPI/Framework/ModHelpers/DataHelper.cs12
-rw-r--r--src/SMAPI/Framework/ModHelpers/ModHelper.cs75
-rw-r--r--src/SMAPI/Framework/ModHelpers/ModRegistryHelper.cs24
-rw-r--r--src/SMAPI/Framework/ModHelpers/ReflectionHelper.cs2
-rw-r--r--src/SMAPI/Framework/ModHelpers/TranslationHelper.cs87
-rw-r--r--src/SMAPI/Framework/ModLoading/AssemblyLoader.cs32
-rw-r--r--src/SMAPI/Framework/ModLoading/Finders/ReferenceToMemberWithUnexpectedTypeFinder.cs5
-rw-r--r--src/SMAPI/Framework/ModLoading/Finders/TypeFinder.cs2
-rw-r--r--src/SMAPI/Framework/ModLoading/IncompatibleInstructionException.cs23
-rw-r--r--src/SMAPI/Framework/ModLoading/InstructionHandleResult.cs4
-rw-r--r--src/SMAPI/Framework/ModLoading/ModDependencyStatus.cs4
-rw-r--r--src/SMAPI/Framework/ModLoading/ModMetadata.cs37
-rw-r--r--src/SMAPI/Framework/ModLoading/ModResolver.cs29
-rw-r--r--src/SMAPI/Framework/ModLoading/PlatformAssemblyMap.cs2
-rw-r--r--src/SMAPI/Framework/ModLoading/TypeReferenceComparer.cs2
-rw-r--r--src/SMAPI/Framework/ModRegistry.cs6
-rw-r--r--src/SMAPI/Framework/Models/SConfig.cs71
-rw-r--r--src/SMAPI/Framework/Monitor.cs39
-rw-r--r--src/SMAPI/Framework/Networking/MessageType.cs2
-rw-r--r--src/SMAPI/Framework/Networking/SGalaxyNetServer.cs2
-rw-r--r--src/SMAPI/Framework/Networking/SLidgrenServer.cs6
-rw-r--r--src/SMAPI/Framework/Reflection/Reflector.cs2
-rw-r--r--src/SMAPI/Framework/SCore.cs400
-rw-r--r--src/SMAPI/Framework/SGame.cs1198
-rw-r--r--src/SMAPI/Framework/SGameConstructorHack.cs12
-rw-r--r--src/SMAPI/Framework/SMultiplayer.cs60
-rw-r--r--src/SMAPI/Framework/Serialization/ColorConverter.cs (renamed from src/SMAPI/Framework/Serialisation/ColorConverter.cs)8
-rw-r--r--src/SMAPI/Framework/Serialization/PointConverter.cs (renamed from src/SMAPI/Framework/Serialisation/PointConverter.cs)8
-rw-r--r--src/SMAPI/Framework/Serialization/RectangleConverter.cs (renamed from src/SMAPI/Framework/Serialisation/RectangleConverter.cs)8
-rw-r--r--src/SMAPI/Framework/SnapshotDiff.cs43
-rw-r--r--src/SMAPI/Framework/SnapshotListDiff.cs58
-rw-r--r--src/SMAPI/Framework/StateTracking/FieldWatchers/ComparableListWatcher.cs2
-rw-r--r--src/SMAPI/Framework/StateTracking/FieldWatchers/ImmutableCollectionWatcher.cs37
-rw-r--r--src/SMAPI/Framework/StateTracking/FieldWatchers/WatcherFactory.cs35
-rw-r--r--src/SMAPI/Framework/StateTracking/LocationTracker.cs5
-rw-r--r--src/SMAPI/Framework/StateTracking/PlayerTracker.cs35
-rw-r--r--src/SMAPI/Framework/StateTracking/Snapshots/LocationSnapshot.cs59
-rw-r--r--src/SMAPI/Framework/StateTracking/Snapshots/PlayerSnapshot.cs53
-rw-r--r--src/SMAPI/Framework/StateTracking/Snapshots/WatcherSnapshot.cs66
-rw-r--r--src/SMAPI/Framework/StateTracking/Snapshots/WorldLocationsSnapshot.cs52
-rw-r--r--src/SMAPI/Framework/StateTracking/WorldLocationsTracker.cs7
-rw-r--r--src/SMAPI/Framework/Translator.cs128
-rw-r--r--src/SMAPI/GamePlatform.cs5
-rw-r--r--src/SMAPI/IAssetDataForDictionary.cs27
-rw-r--r--src/SMAPI/IAssetInfo.cs6
-rw-r--r--src/SMAPI/IContentHelper.cs4
-rw-r--r--src/SMAPI/IContentPack.cs9
-rw-r--r--src/SMAPI/IContentPackHelper.cs2
-rw-r--r--src/SMAPI/IDataHelper.cs2
-rw-r--r--src/SMAPI/IModHelper.cs38
-rw-r--r--src/SMAPI/IMonitor.cs7
-rw-r--r--src/SMAPI/Metadata/CoreAssetPropagator.cs573
-rw-r--r--src/SMAPI/Metadata/InstructionMetadata.cs13
-rw-r--r--src/SMAPI/Mod.cs2
-rw-r--r--src/SMAPI/Patches/DialogueErrorPatch.cs9
-rw-r--r--src/SMAPI/Patches/EventErrorPatch.cs7
-rw-r--r--src/SMAPI/Patches/LoadContextPatch.cs62
-rw-r--r--src/SMAPI/Patches/LoadErrorPatch.cs120
-rw-r--r--src/SMAPI/Patches/ObjectErrorPatch.cs9
-rw-r--r--src/SMAPI/Program.cs63
-rw-r--r--src/SMAPI/Properties/AssemblyInfo.cs7
-rw-r--r--