summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2021-01-18 18:19:46 -0500
committerJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2021-01-18 18:19:46 -0500
commit47df90f67cab0f1903f0214fed4795c8bd181fe0 (patch)
tree8f31aadea5f8c0b3696a6788292b3cb1f26515d9 /src
parentbc71f994ece3943f02f91cdefbbe126cbef5a541 (diff)
downloadSMAPI-47df90f67cab0f1903f0214fed4795c8bd181fe0.tar.gz
SMAPI-47df90f67cab0f1903f0214fed4795c8bd181fe0.tar.bz2
SMAPI-47df90f67cab0f1903f0214fed4795c8bd181fe0.zip
merge sections in asset propagator
Diffstat (limited to 'src')
-rw-r--r--src/SMAPI/Metadata/CoreAssetPropagator.cs92
1 files changed, 46 insertions, 46 deletions
diff --git a/src/SMAPI/Metadata/CoreAssetPropagator.cs b/src/SMAPI/Metadata/CoreAssetPropagator.cs
index bd1cc50e..72130e05 100644
--- a/src/SMAPI/Metadata/CoreAssetPropagator.cs
+++ b/src/SMAPI/Metadata/CoreAssetPropagator.cs
@@ -374,52 +374,6 @@ namespace StardewModdingAPI.Metadata
return this.ReloadSuspensionBridges(content, key);
/****
- ** Content\TileSheets
- ****/
- case "tilesheets\\chairtiles": // Game1.LoadContent
- MapSeat.mapChairTexture = content.Load<Texture2D>(key);
- return true;
-
- case "tilesheets\\critters": // Critter constructor
- return this.ReloadCritterTextures(content, key) > 0;
-
- case "tilesheets\\crops": // Game1.LoadContent
- Game1.cropSpriteSheet = content.Load<Texture2D>(key);
- return true;
-
- case "tilesheets\\debris": // Game1.LoadContent
- Game1.debrisSpriteSheet = content.Load<Texture2D>(key);
- return true;
-
- case "tilesheets\\emotes": // Game1.LoadContent
- Game1.emoteSpriteSheet = content.Load<Texture2D>(key);
- return true;
-
- case "tilesheets\\furniture": // Game1.LoadContent
- Furniture.furnitureTexture = content.Load<Texture2D>(key);
- return true;
-
- case "tilesheets\\furniturefront": // Game1.LoadContent
- Furniture.furnitureFrontTexture = content.Load<Texture2D>(key);
- return true;
-
- case "tilesheets\\projectiles": // Game1.LoadContent
- Projectile.projectileSheet = content.Load<Texture2D>(key);
- return true;
-
- case "tilesheets\\rain": // Game1.LoadContent
- Game1.rainTexture = content.Load<Texture2D>(key);
- return true;
-
- case "tilesheets\\tools": // Game1.ResetToolSpriteSheet
- Game1.ResetToolSpriteSheet();
- return true;
-
- case "tilesheets\\weapons": // Game1.LoadContent
- Tool.weaponsTexture = content.Load<Texture2D>(key);
- return true;
-
- /****
** Content\Maps
****/
case "maps\\menutiles": // Game1.LoadContent
@@ -469,14 +423,57 @@ namespace StardewModdingAPI.Metadata
Bush.texture = new Lazy<Texture2D>(() => content.Load<Texture2D>(key));
return true;
+ case "tilesheets\\chairtiles": // Game1.LoadContent
+ MapSeat.mapChairTexture = content.Load<Texture2D>(key);
+ return true;
+
case "tilesheets\\craftables": // Game1.LoadContent
Game1.bigCraftableSpriteSheet = content.Load<Texture2D>(key);
return true;
+ case "tilesheets\\critters": // Critter constructor
+ return this.ReloadCritterTextures(content, key) > 0;
+
+ case "tilesheets\\crops": // Game1.LoadContent
+ Game1.cropSpriteSheet = content.Load<Texture2D>(key);
+ return true;
+
+ case "tilesheets\\debris": // Game1.LoadContent
+ Game1.debrisSpriteSheet = content.Load<Texture2D>(key);
+ return true;
+
+ case "tilesheets\\emotes": // Game1.LoadContent
+ Game1.emoteSpriteSheet = content.Load<Texture2D>(key);
+ return true;
+
case "tilesheets\\fruittrees": // FruitTree
FruitTree.texture = content.Load<Texture2D>(key);
return true;
+ case "tilesheets\\furniture": // Game1.LoadContent
+ Furniture.furnitureTexture = content.Load<Texture2D>(key);
+ return true;
+
+ case "tilesheets\\furniturefront": // Game1.LoadContent
+ Furniture.furnitureFrontTexture = content.Load<Texture2D>(key);
+ return true;
+
+ case "tilesheets\\projectiles": // Game1.LoadContent
+ Projectile.projectileSheet = content.Load<Texture2D>(key);
+ return true;
+
+ case "tilesheets\\rain": // Game1.LoadContent
+ Game1.rainTexture = content.Load<Texture2D>(key);
+ return true;
+
+ case "tilesheets\\tools": // Game1.ResetToolSpriteSheet
+ Game1.ResetToolSpriteSheet();
+ return true;
+
+ case "tilesheets\\weapons": // Game1.LoadContent
+ Tool.weaponsTexture = content.Load<Texture2D>(key);
+ return true;
+
/****
** Content\TerrainFeatures
****/
@@ -528,6 +525,9 @@ namespace StardewModdingAPI.Metadata
return this.ReloadTreeTextures(content, key, Tree.pineTree);
}
+ /****
+ ** Dynamic assets
+ ****/
// dynamic textures
if (this.KeyStartsWith(key, "animals\\cat"))
return this.ReloadPetOrHorseSprites<Cat>(content, key);