Support mahogany trees

Author: LeonBlade

TreeTransplant/TreeTransplant.cs

@@ -142,9 +142,10 @@ private void loadTreeTexture()
 		{
 			// the list of seasons
 			var seasons = new[] { "spring", "summer", "fall", "winter" };
+			var trees = new[] { Tree.bushyTree, Tree.leafyTree, Tree.pineTree, Tree.mahoganyTree };
 
 			// create a render target to prepare the tree texture to
-			var texture = new RenderTarget2D(Game1.graphics.GraphicsDevice, 144, 96 * seasons.Length);
+			var texture = new RenderTarget2D(Game1.graphics.GraphicsDevice, 48 * trees.Length, 96 * seasons.Length);
 
 			// set the render target and clear the buffer
 			Game1.graphics.GraphicsDevice.SetRenderTarget(texture);
@@ -156,20 +157,20 @@ private void loadTreeTexture()
 			// Get source rectangle for tree tops.
 			var treeTopSourceRect = new Tree().treeTopSourceRect;
 
-			for (int s = 0; s < seasons.Length; s++)
+			for (var s = 0; s < seasons.Length; s++)
 			{
 				// loop through the three trees in the game
-				for (int i = 0; i < 3; i++)
+				for (var i = 0; i < trees.Length; i++)
 				{
 					// get the current season
-					string season = seasons[s];
+					var season = seasons[s];
 
 					// spring and summer share the same texture for the pine tree
-					if (i == 2 && season.Equals("summer"))
+					if (trees[i] == Tree.pineTree && season.Equals("summer"))
 						season = "spring";
 
 					// load the texture into memory
-					string treeString = $"TerrainFeatures\\tree{i + 1}_{season}";
+					var treeString = $"TerrainFeatures\\tree{trees[i]}_{season}";
 
 					// get the current tree's texture
 					var currentTreeTexture = Game1.content.Load<Texture2D>(treeString);

TreeTransplant/Trees/TreeWrapper.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using StardewValley;
@@ -8,25 +9,23 @@ namespace TreeTransplant
 {
 	public class TreeWrapper : ITree
 	{
-		private Tree tree;
+		private readonly Tree tree;
+		private readonly int[] basicTrees = new[] { Tree.bushyTree, Tree.leafyTree, Tree.pineTree, Tree.mahoganyTree };
 
 		public TreeWrapper(Tree t)
 		{
 			tree = t;
 		}
 
-		public TerrainFeature getTerrainFeature()
-		{
-			return tree;
-		}
+		public TerrainFeature getTerrainFeature() => tree;
 
 		public Texture2D texture
 		{
 			get
 			{
 				if (isAdult() && !tree.stump.Value)
 				{
-					if (tree.treeType.Value == Tree.bushyTree || tree.treeType.Value == Tree.leafyTree || tree.treeType.Value == Tree.pineTree)
+					if (basicTrees.Contains(tree.treeType.Value))
 						return TreeTransplant.treeTexture;
 					else if (tree.treeType.Value == Tree.mushroomTree || tree.treeType.Value == Tree.palmTree)
 						return TreeTransplant.specialTreeTexture;
@@ -37,14 +36,11 @@ public Texture2D texture
 
 		public bool flipped
 		{
-			get { return tree.flipped.Value; }
-			set { tree.flipped.Set(value); }
+			get => tree.flipped.Value;
+			set => tree.flipped.Set(value);
 		}
 
-		public int treeType
-		{
-			get { return tree.treeType.Value; }
-		}
+		public int treeType => tree.treeType.Value;
 
 		public Rectangle treeTopSourceRect
 		{
@@ -75,37 +71,21 @@ public Rectangle treeTopSourceRect
 					return rect;
 				}
 
-				bool basicTree = (tree.treeType.Value >= 1 && tree.treeType.Value <= 3);
-				int xOffset = tree.treeType.Value - (basicTree ? 1 : 6);
-				int yOffset = basicTree ? Utility.getSeasonNumber(Game1.currentSeason) : 0;
+				// tree index refers to column in the generated texture, mahogany is hard coded as 4
+				var treeIndex = tree.treeType.Value == Tree.mahoganyTree ? 4 : tree.treeType.Value;
+				var basicTree = treeIndex >= 1 && treeIndex <= 4;
+				// non-basic trees are palm and mushroom which are 6 and 7 so we subtract 6 to get 0 and 1
+				var xOffset = treeIndex - (basicTree ? 1 : 6);
+				var yOffset = basicTree ? Utility.getSeasonNumber(Game1.currentSeason) : 0;
 
 				return new Rectangle(48 * xOffset, yOffset * 96, 48, 96);
 			}
 		}
 
-		public Rectangle stumpSourceRect
-		{
-			get { return Tree.stumpSourceRect; }
-		}
-
-		public Rectangle getBoundingBox(Vector2 tileLocation)
-		{
-			return tree.getBoundingBox(tileLocation);
-		}
-
-		public bool stump
-		{
-			get { return tree.stump.Value; }
-		}
-
-		public bool isAdult()
-		{
-			return tree.growthStage.Value > 4;
-		}
-
-		public bool isStumpSeparate()
-		{
-			return isAdult();
-		}
+		public Rectangle stumpSourceRect => Tree.stumpSourceRect;
+		public Rectangle getBoundingBox(Vector2 tileLocation) => tree.getBoundingBox(tileLocation);
+		public bool stump => tree.stump.Value;
+		public bool isAdult() => tree.growthStage.Value > 4;
+		public bool isStumpSeparate() => isAdult();
 	}
 }