From d0a81165e4d23f2f76243342ed00ef83b3fa96fb Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sat, 5 Jan 2019 01:44:20 -0500
Subject: [PATCH 1/8] remove unused code

---
 .../Framework/Menus/MusicManagerMenu.cs       | 154 +++++++-----------
 .../Framework/Music/MusicHexProcessor.cs      |  44 -----
 .../Framework/Music/MusicManager.cs           |  33 ----
 .../Framework/Music/MusicPack.cs              |  17 --
 .../Framework/Music/MusicPackMetaData.cs      |   5 +-
 .../Framework/Music/Song.cs                   |  77 +--------
 .../Framework/Music/SongListNode.cs           |   5 -
 .../Framework/Music/SongSpecifics.cs          |  59 +------
 .../Framework/Music/WavMusicPack.cs           | 102 +-----------
 .../Framework/Music/XACTMusicPack.cs          |  68 +-------
 .../StardewSymphony.cs                        |   4 -
 11 files changed, 75 insertions(+), 493 deletions(-)

diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Menus/MusicManagerMenu.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Menus/MusicManagerMenu.cs
index c618f97e..e21498e1 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Menus/MusicManagerMenu.cs
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Menus/MusicManagerMenu.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
+using Microsoft.Xna.Framework.Input;
 using StardewValley;
 using StardewValley.Locations;
 using StardustCore.Animations;
@@ -77,17 +78,14 @@ namespace StardewSymphonyRemastered.Framework.Menus
 
         public bool searchBoxSelected;
 
-        /// <summary>Construct an instance.</summary>
-        public MusicManagerMenu() { }
-
         /// <summary>Construct an instance.</summary>
         public MusicManagerMenu(float width, float height)
         {
             this.width = (int)width;
             this.height = (int)height;
             this.texturedStrings = new List<StardustCore.UIUtilities.SpriteFonts.Components.TexturedString>();
-            this.musicAlbumButtons = new List<StardustCore.UIUtilities.MenuComponents.Button>();
-            //thismusicAlbumButtons.Add(new Button("myButton", new Rectangle(100, 100, 64, 64), StardewSymphony.textureManager.getTexture("MusicNote").Copy(StardewSymphony.ModHelper), "mynote", new Rectangle(0, 0, 16, 16), 4f, new StardustCore.Animations.Animation(new Rectangle(0, 0, 16, 16)), Color.White, Color.White,new ButtonFunctionality(new DelegatePairing(hello,null),null,null),false)); //A button that does nothing on the left click.  
+            this.musicAlbumButtons = new List<Button>();
+            //thismusicAlbumButtons.Add(new Button("myButton", new Rectangle(100, 100, 64, 64), StardewSymphony.textureManager.getTexture("MusicNote").Copy(StardewSymphony.ModHelper), "mynote", new Rectangle(0, 0, 16, 16), 4f, new Animation(new Rectangle(0, 0, 16, 16)), Color.White, Color.White,new ButtonFunctionality(new DelegatePairing(hello,null),null,null),false)); //A button that does nothing on the left click.  
 
             this.fancyButtons = new List<Button>();
 
@@ -115,7 +113,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                 else
                 {
                     float scale = 1.00f / (v.Value.musicPackInformation.getTexture().getTexture().Width / 64f);
-                    this.musicAlbumButtons.Add(new Button(v.Key, new Rectangle(100 + (numOfButtons * 100), 125 + (rows * 100), 64, 64), v.Value.musicPackInformation.getTexture(), "", new Rectangle(0, 0, v.Value.musicPackInformation.getTexture().getTexture().Width, v.Value.musicPackInformation.getTexture().getTexture().Height), scale, new StardustCore.Animations.Animation(new Rectangle(0, 0, 16, 16)), StardustCore.IlluminateFramework.LightColorsList.Black, StardustCore.IlluminateFramework.LightColorsList.Black, new ButtonFunctionality(new DelegatePairing(null, new List<object>
+                    this.musicAlbumButtons.Add(new Button(v.Key, new Rectangle(100 + (numOfButtons * 100), 125 + (rows * 100), 64, 64), v.Value.musicPackInformation.getTexture(), "", new Rectangle(0, 0, v.Value.musicPackInformation.getTexture().getTexture().Width, v.Value.musicPackInformation.getTexture().getTexture().Height), scale, new Animation(new Rectangle(0, 0, 16, 16)), StardustCore.IlluminateFramework.LightColorsList.Black, StardustCore.IlluminateFramework.LightColorsList.Black, new ButtonFunctionality(new DelegatePairing(null, new List<object>
                     {
                         v
                     }
@@ -176,8 +174,8 @@ namespace StardewSymphonyRemastered.Framework.Menus
             {
                 if (this.framesSinceLastUpdate == updateNumber)
                 {
-                    var state = Microsoft.Xna.Framework.Input.Keyboard.GetState();
-                    if (state.IsKeyDown(Microsoft.Xna.Framework.Input.Keys.Left) || state.IsKeyDown(Microsoft.Xna.Framework.Input.Keys.A))
+                    var state = Keyboard.GetState();
+                    if (state.IsKeyDown(Keys.Left) || state.IsKeyDown(Keys.A))
                     {
                         this.currentAlbumIndex--;
                         if (this.currentAlbumIndex < 0) this.currentAlbumIndex = this.musicAlbumButtons.Count - 1;
@@ -186,7 +184,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                         Game1.playSound("shwip");
                     }
 
-                    if (state.IsKeyDown(Microsoft.Xna.Framework.Input.Keys.Right) || state.IsKeyDown(Microsoft.Xna.Framework.Input.Keys.D))
+                    if (state.IsKeyDown(Keys.Right) || state.IsKeyDown(Keys.D))
                     {
                         this.currentAlbumIndex++;
                         if (this.currentAlbumIndex == this.musicAlbumButtons.Count) this.currentAlbumIndex = 0;
@@ -205,8 +203,8 @@ namespace StardewSymphonyRemastered.Framework.Menus
             {
                 if (this.framesSinceLastUpdate == updateNumber)
                 {
-                    var state = Microsoft.Xna.Framework.Input.Keyboard.GetState();
-                    if (state.IsKeyDown(Microsoft.Xna.Framework.Input.Keys.Left) || state.IsKeyDown(Microsoft.Xna.Framework.Input.Keys.A))
+                    var state = Keyboard.GetState();
+                    if (state.IsKeyDown(Keys.Left) || state.IsKeyDown(Keys.A))
                     {
                         if (this.currentSongPageIndex > 0)
                             this.currentSongPageIndex--;
@@ -215,7 +213,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                         Game1.playSound("shwip");
                     }
 
-                    if (state.IsKeyDown(Microsoft.Xna.Framework.Input.Keys.Right) || state.IsKeyDown(Microsoft.Xna.Framework.Input.Keys.D))
+                    if (state.IsKeyDown(Keys.Right) || state.IsKeyDown(Keys.D))
                     {
                         this.currentSongPageIndex++;
                         this.updateFancyButtons();
@@ -231,8 +229,8 @@ namespace StardewSymphonyRemastered.Framework.Menus
             {
                 if (this.framesSinceLastUpdate == updateNumber)
                 {
-                    var state = Microsoft.Xna.Framework.Input.Keyboard.GetState();
-                    if (state.IsKeyDown(Microsoft.Xna.Framework.Input.Keys.Left) || state.IsKeyDown(Microsoft.Xna.Framework.Input.Keys.A))
+                    var state = Keyboard.GetState();
+                    if (state.IsKeyDown(Keys.Left) || state.IsKeyDown(Keys.A))
                     {
                         if (this.locationPageIndex > 0)
                             this.locationPageIndex--;
@@ -241,7 +239,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                         Game1.playSound("shwip");
                     }
 
-                    if (state.IsKeyDown(Microsoft.Xna.Framework.Input.Keys.Right) || state.IsKeyDown(Microsoft.Xna.Framework.Input.Keys.D))
+                    if (state.IsKeyDown(Keys.Right) || state.IsKeyDown(Keys.D))
                     {
                         this.locationPageIndex++;
                         this.updateFancyButtons();
@@ -257,8 +255,8 @@ namespace StardewSymphonyRemastered.Framework.Menus
             {
                 if (this.framesSinceLastUpdate == updateNumber)
                 {
-                    var state = Microsoft.Xna.Framework.Input.Keyboard.GetState();
-                    if (state.IsKeyDown(Microsoft.Xna.Framework.Input.Keys.Left) || state.IsKeyDown(Microsoft.Xna.Framework.Input.Keys.A))
+                    var state = Keyboard.GetState();
+                    if (state.IsKeyDown(Keys.Left) || state.IsKeyDown(Keys.A))
                     {
                         if (this.festivalPageIndex > 0)
                             this.festivalPageIndex--;
@@ -267,7 +265,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                         Game1.playSound("shwip");
                     }
 
-                    if (state.IsKeyDown(Microsoft.Xna.Framework.Input.Keys.Right) || state.IsKeyDown(Microsoft.Xna.Framework.Input.Keys.D))
+                    if (state.IsKeyDown(Keys.Right) || state.IsKeyDown(Keys.D))
                     {
                         this.festivalPageIndex++;
                         this.updateFancyButtons();
@@ -283,8 +281,8 @@ namespace StardewSymphonyRemastered.Framework.Menus
             {
                 if (this.framesSinceLastUpdate == updateNumber)
                 {
-                    var state = Microsoft.Xna.Framework.Input.Keyboard.GetState();
-                    if (state.IsKeyDown(Microsoft.Xna.Framework.Input.Keys.Left) || state.IsKeyDown(Microsoft.Xna.Framework.Input.Keys.A))
+                    var state = Keyboard.GetState();
+                    if (state.IsKeyDown(Keys.Left) || state.IsKeyDown(Keys.A))
                     {
                         if (this.eventPageIndex > 0)
                             this.eventPageIndex--;
@@ -293,7 +291,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                         Game1.playSound("shwip");
                     }
 
-                    if (state.IsKeyDown(Microsoft.Xna.Framework.Input.Keys.Right) || state.IsKeyDown(Microsoft.Xna.Framework.Input.Keys.D))
+                    if (state.IsKeyDown(Keys.Right) || state.IsKeyDown(Keys.D))
                     {
                         this.eventPageIndex++;
                         this.updateFancyButtons();
@@ -309,8 +307,8 @@ namespace StardewSymphonyRemastered.Framework.Menus
             {
                 if (this.framesSinceLastUpdate == updateNumber)
                 {
-                    var state = Microsoft.Xna.Framework.Input.Keyboard.GetState();
-                    if (state.IsKeyDown(Microsoft.Xna.Framework.Input.Keys.Left) || state.IsKeyDown(Microsoft.Xna.Framework.Input.Keys.A))
+                    var state = Keyboard.GetState();
+                    if (state.IsKeyDown(Keys.Left) || state.IsKeyDown(Keys.A))
                     {
                         if (this.menuPageIndex > 0)
                             this.menuPageIndex--;
@@ -319,7 +317,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                         Game1.playSound("shwip");
                     }
 
-                    if (state.IsKeyDown(Microsoft.Xna.Framework.Input.Keys.Right) || state.IsKeyDown(Microsoft.Xna.Framework.Input.Keys.D))
+                    if (state.IsKeyDown(Keys.Right) || state.IsKeyDown(Keys.D))
                     {
                         this.menuPageIndex++;
                         this.updateFancyButtons();
@@ -334,7 +332,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
 
 
         /// <summary>Update the position of the album artwork when displaying it using the fancy buttons menu.</summary>
-        public virtual void updateFancyButtons()
+        public void updateFancyButtons()
         {
             //Album selection mode.
             if (this.drawMode == DrawMode.AlbumFancySelection)
@@ -378,7 +376,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                             }
                         }
                     }
-                    this.fancyButtons.Add(new Button("Outline", new Rectangle((int)placement.X + offsetX - 16, (int)placement.Y - 16, 64, 64), StardewSymphony.textureManager.getTexture("OutlineBox"), "", new Rectangle(0, 0, 16, 16), 6f, new StardustCore.Animations.Animation(new Rectangle(0, 0, 16, 16)), Color.White, Color.White, new ButtonFunctionality(null, null, new DelegatePairing(null, new List<object>())), false));
+                    this.fancyButtons.Add(new Button("Outline", new Rectangle((int)placement.X + offsetX - 16, (int)placement.Y - 16, 64, 64), StardewSymphony.textureManager.getTexture("OutlineBox"), "", new Rectangle(0, 0, 16, 16), 6f, new Animation(new Rectangle(0, 0, 16, 16)), Color.White, Color.White, new ButtonFunctionality(null, null, new DelegatePairing(null, new List<object>())), false));
                     int count = 0;
                     foreach (var v in this.fancyButtons)
                     {
@@ -389,7 +387,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                             //v.hoverText = (string)pair.Key;
                             //Do something like current album name =
                             this.texturedStrings.Clear();
-                            this.texturedStrings.Add(SpriteFonts.vanillaFont.ParseString("Current Album Name:" + (string)pair.Key, new Microsoft.Xna.Framework.Vector2(v.bounds.X / 2, v.bounds.Y + 128), v.textColor));
+                            this.texturedStrings.Add(SpriteFonts.vanillaFont.ParseString("Current Album Name:" + pair.Key, new Vector2(v.bounds.X / 2, v.bounds.Y + 128), v.textColor));
                             v.hoverText = "";
                         }
                         count++;
@@ -410,7 +408,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                 {
                     //Allow 8 songs to be displayed per page.
                     Texture2DExtended texture = StardewSymphony.textureManager.getTexture("MusicNote");
-                    float scale = 1.00f / ((float)texture.getTexture().Width / 64f);
+                    float scale = 1.00f / (texture.getTexture().Width / 64f);
                     Song s = musicPackSongList.ElementAt(i);
                     Rectangle srcRect = new Rectangle(0, 0, texture.getTexture().Width, texture.getTexture().Height);
                     this.fancyButtons.Add(new Button(s.name, new Rectangle((int)placement2.X + 25, (int)placement2.Y + ((i % 6) * 100) + 100, 64, 64), texture, s.name, srcRect, scale, new Animation(srcRect), Color.White, Color.White, new ButtonFunctionality(null, null, null)));
@@ -428,7 +426,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                 {
                     //Allow 8 songs to be displayed per page.
                     Texture2DExtended texture = StardewSymphony.textureManager.getTexture("GreenBallon");
-                    float scale = 1.00f / ((float)texture.getTexture().Height / 64f);
+                    float scale = 1.00f / (texture.getTexture().Height / 64f);
                     Rectangle srcRect = new Rectangle(0, 0, texture.getTexture().Width, texture.getTexture().Height);
                     this.fancyButtons.Add(new Button(SongSpecifics.festivals.ElementAt(i), new Rectangle((int)placement2.X + 50, (int)placement2.Y + ((i % 6) * 100) + 100, 64, 64), texture, SongSpecifics.festivals.ElementAt(i), srcRect, scale, new Animation(srcRect), Color.White, Color.White, new ButtonFunctionality(null, null, null)));
                 }
@@ -446,7 +444,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
 
                     //Allow 8 songs to be displayed per page.
                     Texture2DExtended texture = StardewSymphony.textureManager.getTexture("MenuIcon");
-                    float scale = 1.00f / ((float)texture.getTexture().Width / 64f);
+                    float scale = 1.00f / (texture.getTexture().Width / 64f);
                     Rectangle srcRect = new Rectangle(0, 0, texture.getTexture().Width, texture.getTexture().Height);
                     this.fancyButtons.Add(new Button(SongSpecifics.menus.ElementAt(i), new Rectangle((int)placement2.X + 50, (int)placement2.Y + ((i % 6) * 100) + 100, 64, 64), texture, SongSpecifics.menus.ElementAt(i), srcRect, scale, new Animation(srcRect), Color.White, Color.White, new ButtonFunctionality(null, null, null)));
                 }
@@ -464,7 +462,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
 
                     //Allow 8 songs to be displayed per page.
                     Texture2DExtended texture = StardewSymphony.textureManager.getTexture("StarIcon");
-                    float scale = 1.00f / ((float)texture.getTexture().Width / 64f);
+                    float scale = 1.00f / (texture.getTexture().Width / 64f);
                     Rectangle srcRect = new Rectangle(0, 0, texture.getTexture().Width, texture.getTexture().Height);
                     this.fancyButtons.Add(new Button(SongSpecifics.events.ElementAt(i), new Rectangle((int)placement2.X + 50, (int)placement2.Y + ((i % 6) * 100) + 100, 64, 64), texture, SongSpecifics.events.ElementAt(i), srcRect, scale, new Animation(srcRect), Color.White, Color.White, new ButtonFunctionality(null, null, null)));
                 }
@@ -489,7 +487,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                                     StardewSymphony.ModMonitor.Log("SPRING TEXTURE NULL!");
                                 return;
                             }
-                            float scale = 1.00f / ((float)springTexture.getTexture().Width / 64f);
+                            float scale = 1.00f / (springTexture.getTexture().Width / 64f);
                             Rectangle srcRect = new Rectangle(0, 0, springTexture.getTexture().Width, springTexture.getTexture().Height);
                             this.fancyButtons.Add(new Button("SeasonIcon", new Rectangle((int)seasonPlacement.X, (int)seasonPlacement.Y, 64, 64), springTexture, "Seasonal Music", srcRect, scale, new Animation(srcRect), Color.White, Color.White, new ButtonFunctionality(null, null, null)));
                         }
@@ -504,7 +502,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                                     StardewSymphony.ModMonitor.Log("SUMMER TEXTURE NULL!");
                                 return;
                             }
-                            float scale = 1.00f / ((float)summerTexture.getTexture().Width / 64f);
+                            float scale = 1.00f / (summerTexture.getTexture().Width / 64f);
                             Rectangle srcRect = new Rectangle(0, 0, summerTexture.getTexture().Width, summerTexture.getTexture().Height);
                             this.fancyButtons.Add(new Button("SeasonIcon", new Rectangle((int)seasonPlacement.X, (int)seasonPlacement.Y, 64, 64), summerTexture, "Seasonal Music", srcRect, scale, new Animation(srcRect), Color.White, Color.White, new ButtonFunctionality(null, null, null)));
                         }
@@ -519,7 +517,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                                     StardewSymphony.ModMonitor.Log("FALL TEXTURE NULL!");
                                 return;
                             }
-                            float scale = 1.00f / ((float)fallTexture.getTexture().Width / 64f);
+                            float scale = 1.00f / (fallTexture.getTexture().Width / 64f);
                             Rectangle srcRect = new Rectangle(0, 0, fallTexture.getTexture().Width, fallTexture.getTexture().Height);
                             this.fancyButtons.Add(new Button("SeasonIcon", new Rectangle((int)seasonPlacement.X, (int)seasonPlacement.Y, 64, 64), fallTexture, "Seasonal Music", srcRect, scale, new Animation(srcRect), Color.White, Color.White, new ButtonFunctionality(null, null, null)));
                         }
@@ -534,7 +532,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                                     StardewSymphony.ModMonitor.Log("WINTER TEXTURE NULL!");
                                 return;
                             }
-                            float scale = 1.00f / ((float)winterTexture.getTexture().Width / 64f);
+                            float scale = 1.00f / (winterTexture.getTexture().Width / 64f);
                             Rectangle srcRect = new Rectangle(0, 0, winterTexture.getTexture().Width, winterTexture.getTexture().Height);
                             this.fancyButtons.Add(new Button("SeasonIcon", new Rectangle((int)seasonPlacement.X, (int)seasonPlacement.Y, 64, 64), winterTexture, "Seasonal Music", srcRect, scale, new Animation(srcRect), Color.White, Color.White, new ButtonFunctionality(null, null, null)));
                         }
@@ -548,25 +546,25 @@ namespace StardewSymphonyRemastered.Framework.Menus
 
                 //Festival Icon placement.
                 Texture2DExtended festivalTexture = StardewSymphony.textureManager.getTexture("FestivalIcon");
-                float festivalScale = 1.00f / ((float)festivalTexture.getTexture().Width / 64f);
+                float festivalScale = 1.00f / (festivalTexture.getTexture().Width / 64f);
                 Rectangle festivalSrcRect = new Rectangle(0, 0, festivalTexture.getTexture().Width, festivalTexture.getTexture().Height);
                 this.fancyButtons.Add(new Button("FestivalIcon", new Rectangle((int)festivalPlacement.X, (int)festivalPlacement.Y, 64, 64), festivalTexture, "Festival Music", festivalSrcRect, festivalScale, new Animation(festivalSrcRect), Color.White, Color.White, new ButtonFunctionality(null, null, null)));
 
                 //Event Icon placement.
                 Texture2DExtended eventTexture = StardewSymphony.textureManager.getTexture("EventIcon");
-                float eventScale = 1.00f / ((float)eventTexture.getTexture().Width / 64f);
+                float eventScale = 1.00f / (eventTexture.getTexture().Width / 64f);
                 Rectangle eventSrcRectangle = new Rectangle(0, 0, eventTexture.getTexture().Width, eventTexture.getTexture().Height);
                 this.fancyButtons.Add(new Button("EventIcon", new Rectangle((int)eventPlacement.X, (int)eventPlacement.Y, 64, 64), eventTexture, "Event Music", eventSrcRectangle, eventScale, new Animation(eventSrcRectangle), Color.White, Color.White, new ButtonFunctionality(null, null, null)));
 
                 //Menu Icon placement.
                 Texture2DExtended menuTexture = StardewSymphony.textureManager.getTexture("MenuIcon");
-                float menuScale = 1.00f / ((float)menuTexture.getTexture().Width / 64f);
+                float menuScale = 1.00f / (menuTexture.getTexture().Width / 64f);
                 Rectangle menuSrcRectangle = new Rectangle(0, 0, menuTexture.getTexture().Width, menuTexture.getTexture().Height);
                 this.fancyButtons.Add(new Button("MenuIcon", new Rectangle((int)menuPlacement.X, (int)menuPlacement.Y, 64, 64), menuTexture, "Menu Music", menuSrcRectangle, menuScale, new Animation(menuSrcRectangle), Color.White, Color.White, new ButtonFunctionality(null, null, null)));
 
                 //Menu Icon placement.
                 Texture2DExtended locationTexture = StardewSymphony.textureManager.getTexture("HouseIcon");
-                float locationScale = 1.00f / ((float)locationTexture.getTexture().Width / 64f);
+                float locationScale = 1.00f / (locationTexture.getTexture().Width / 64f);
                 Rectangle locationRect = new Rectangle(0, 0, locationTexture.getTexture().Width, locationTexture.getTexture().Height);
                 this.fancyButtons.Add(new Button("LocationButton", new Rectangle((int)locationPlacement.X, (int)locationPlacement.Y, 64, 64), locationTexture, "Location Music", locationRect, locationScale, new Animation(locationRect), Color.White, Color.White, new ButtonFunctionality(null, null, null)));
             }
@@ -590,25 +588,25 @@ namespace StardewSymphonyRemastered.Framework.Menus
                         StardewSymphony.ModMonitor.Log("SPRING TEXTURE NULL!");
                     return;
                 }
-                float scale = 1.00f / ((float)springTexture.getTexture().Width / 64f);
+                float scale = 1.00f / (springTexture.getTexture().Width / 64f);
                 Rectangle srcRect = new Rectangle(0, 0, springTexture.getTexture().Width, springTexture.getTexture().Height);
                 this.fancyButtons.Add(new Button("SpringButton", new Rectangle((int)springPlacement.X, (int)springPlacement.Y, 64, 64), springTexture, "Spring Music", srcRect, scale, new Animation(srcRect), Color.White, Color.White, new ButtonFunctionality(null, null, null)));
 
                 //Festival Icon placement.
                 Texture2DExtended festivalTexture = StardewSymphony.textureManager.getTexture("SummerIcon");
-                float festivalScale = 1.00f / ((float)festivalTexture.getTexture().Width / 64f);
+                float festivalScale = 1.00f / (festivalTexture.getTexture().Width / 64f);
                 Rectangle festivalSrcRect = new Rectangle(0, 0, festivalTexture.getTexture().Width, festivalTexture.getTexture().Height);
                 this.fancyButtons.Add(new Button("SummerButton", new Rectangle((int)summerPlacement.X, (int)summerPlacement.Y, 64, 64), festivalTexture, "Summer Music", festivalSrcRect, festivalScale, new Animation(festivalSrcRect), Color.White, Color.White, new ButtonFunctionality(null, null, null)));
 
                 //Event Icon placement.
                 Texture2DExtended eventTexture = StardewSymphony.textureManager.getTexture("FallIcon");
-                float eventScale = 1.00f / ((float)eventTexture.getTexture().Width / 64f);
+                float eventScale = 1.00f / (eventTexture.getTexture().Width / 64f);
                 Rectangle eventSrcRectangle = new Rectangle(0, 0, eventTexture.getTexture().Width, eventTexture.getTexture().Height);
                 this.fancyButtons.Add(new Button("FallButton", new Rectangle((int)fallPlacement.X, (int)fallPlacement.Y, 64, 64), eventTexture, "Fall Music", eventSrcRectangle, eventScale, new Animation(eventSrcRectangle), Color.White, Color.White, new ButtonFunctionality(null, null, null)));
 
                 //Menu Icon placement.
                 Texture2DExtended menuTexture = StardewSymphony.textureManager.getTexture("WinterIcon");
-                float menuScale = 1.00f / ((float)menuTexture.getTexture().Width / 64f);
+                float menuScale = 1.00f / (menuTexture.getTexture().Width / 64f);
                 Rectangle menuSrcRectangle = new Rectangle(0, 0, menuTexture.getTexture().Width, menuTexture.getTexture().Height);
                 this.fancyButtons.Add(new Button("WinterButton", new Rectangle((int)winterPlacement.X, (int)winterPlacement.Y, 64, 64), menuTexture, "Winter Music", menuSrcRectangle, menuScale, new Animation(menuSrcRectangle), Color.White, Color.White, new ButtonFunctionality(null, null, null)));
             }
@@ -688,7 +686,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                         display = "Wedding Music";
                     }
 
-                    float scale = 1.00f / ((float)texture.getTexture().Width / 64f);
+                    float scale = 1.00f / (texture.getTexture().Width / 64f);
                     Rectangle srcRect = new Rectangle(0, 0, texture.getTexture().Width, texture.getTexture().Height);
                     this.fancyButtons.Add(new Button(name, new Rectangle((int)placement2.X + 50, (int)placement2.Y + ((i % 7) * 100), 64, 64), texture, display, srcRect, scale, new Animation(srcRect), Color.White, Color.White, new ButtonFunctionality(null, null, null)));
 
@@ -724,7 +722,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                     {
                         StardewSymphony.ModMonitor.Log("HMM A TEXTURE IS NULL: " + i.ToString());
                     }
-                    float scale = 1.00f / ((float)texture.getTexture().Width / 64f);
+                    float scale = 1.00f / (texture.getTexture().Width / 64f);
                     Rectangle srcRect = new Rectangle(0, 0, texture.getTexture().Width, texture.getTexture().Height);
                     this.fancyButtons.Add(new Button(name, new Rectangle((int)placement2.X + 50, (int)placement2.Y + ((i % 7) * 100), 64, 64), texture, display, srcRect, scale, new Animation(srcRect), Color.White, Color.White, new ButtonFunctionality(null, null, null)));
                 }
@@ -756,7 +754,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                                     numOfEmptyCabin++;
                                 }
                                 Texture2DExtended texture2 = StardewSymphony.textureManager.getTexture("HouseIcon");
-                                float scale2 = 1.00f / ((float)texture2.getTexture().Width / 64f);
+                                float scale2 = 1.00f / (texture2.getTexture().Width / 64f);
                                 Rectangle srcRect2 = new Rectangle(0, 0, texture2.getTexture().Width, texture2.getTexture().Height);
                                 this.fancyButtons.Add(new Button(locName, new Rectangle((int)placement2.X + 25, (int)placement2.Y + ((i % 6) * 100) + 100, 64, 64), texture2, displayName, srcRect2, scale2, new Animation(srcRect2), Color.White, Color.White, new ButtonFunctionality(null, null, null)));
 
@@ -767,7 +765,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                                 string displayName = "Empty Cabin " + (numOfEmptyCabin);
                                 numOfEmptyCabin++;
                                 Texture2DExtended texture2 = StardewSymphony.textureManager.getTexture("HouseIcon");
-                                float scale2 = 1.00f / ((float)texture2.getTexture().Width / 64f);
+                                float scale2 = 1.00f / (texture2.getTexture().Width / 64f);
                                 Rectangle srcRect2 = new Rectangle(0, 0, texture2.getTexture().Width, texture2.getTexture().Height);
                                 this.fancyButtons.Add(new Button(locName, new Rectangle((int)placement2.X + 25, (int)placement2.Y + ((i % 6) * 100) + 100, 64, 64), texture2, displayName, srcRect2, scale2, new Animation(srcRect2), Color.White, Color.White, new ButtonFunctionality(null, null, null)));
                                 continue;
@@ -778,7 +776,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
 
                     //Allow 8 songs to be displayed per page.
                     Texture2DExtended texture = StardewSymphony.textureManager.getTexture("HouseIcon");
-                    float scale = 1.00f / ((float)texture.getTexture().Width / 64f);
+                    float scale = 1.00f / (texture.getTexture().Width / 64f);
                     Rectangle srcRect = new Rectangle(0, 0, texture.getTexture().Width, texture.getTexture().Height);
                     this.fancyButtons.Add(new Button(locName, new Rectangle((int)placement2.X + 25, (int)placement2.Y + ((i % 6) * 100) + 100, 64, 64), texture, locName, srcRect, scale, new Animation(srcRect), Color.White, Color.White, new ButtonFunctionality(null, null, null)));
                 }
@@ -839,7 +837,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                         display = "Saturday Music";
                     }
 
-                    float scale = 1.00f / ((float)texture.getTexture().Width / 64f);
+                    float scale = 1.00f / (texture.getTexture().Width / 64f);
                     Rectangle srcRect = new Rectangle(0, 0, texture.getTexture().Width, texture.getTexture().Height);
                     this.fancyButtons.Add(new Button(name, new Rectangle((int)placement2.X + 50, (int)placement2.Y + ((i % 7) * 100), 64, 64), texture, display, srcRect, scale, new Animation(srcRect), Color.White, Color.White, new ButtonFunctionality(null, null, null)));
                 }
@@ -860,19 +858,6 @@ namespace StardewSymphonyRemastered.Framework.Menus
                         v.onRightClick();
                 }
             }
-
-            if (this.drawMode == DrawMode.AlbumFancySelection)
-            {
-                int count = 0;
-                foreach (var v in this.fancyButtons)
-                {
-                    count++;
-                    //if (v.containsPoint(x, y)) v.onRightClick();
-                    //this.currentAlbumIndex += count;
-                    //if (this.currentAlbumIndex >= this.musicAlbumButtons.Count) this.currentAlbumIndex -= this.musicAlbumButtons.Count;
-                    //this.updateFancyButtons();
-                }
-            }
         }
 
         /// <summary>Actions that occur when hovering over an icon.</summary>
@@ -885,7 +870,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                     if (v.containsPoint(x, y))
                     {
                         var pair = (KeyValuePair<string, MusicPack>)v.buttonFunctionality.hover.paramaters[0];
-                        v.hoverText = (string)pair.Key;
+                        v.hoverText = pair.Key;
                         v.onHover();
                         //StardewSymphony.ModMonitor.Log(pair.Key);
                     }
@@ -896,7 +881,6 @@ namespace StardewSymphonyRemastered.Framework.Menus
 
             if (this.drawMode == DrawMode.AlbumFancySelection)
             {
-                int count = 0;
                 foreach (var v in this.fancyButtons)
                 {
                     if (v.containsPoint(x, y))
@@ -905,13 +889,11 @@ namespace StardewSymphonyRemastered.Framework.Menus
                             continue;
 
                         var pair = (KeyValuePair<string, MusicPack>)v.buttonFunctionality.hover.paramaters[0];
-                        v.hoverText = (string)pair.Key;
+                        v.hoverText = pair.Key;
                         v.onHover();
                     }
                     else
                         v.hoverText = "";
-
-                    count++;
                 }
             }
         }
@@ -998,7 +980,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                 int amountToShow = 6;
                 this.updateFancyButtons();
 
-                int amount = 0;
+                int amount;
                 if (0 + ((this.currentSongPageIndex + 1) * amountToShow) >= this.fancyButtons.Count)
                 {
                     amount = (0 + ((this.currentSongPageIndex + 1) * (amountToShow)) - this.fancyButtons.Count);
@@ -1187,7 +1169,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                 int amountToShow = 6;
                 this.updateFancyButtons();
 
-                int amount = 0;
+                int amount;
                 if (0 + ((this.locationPageIndex + 1) * amountToShow) >= this.fancyButtons.Count)
                 {
                     amount = (0 + ((this.locationPageIndex + 1) * (amountToShow)) - this.fancyButtons.Count);
@@ -1233,7 +1215,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                 int amountToShow = 6;
                 this.updateFancyButtons();
 
-                int amount = 0;
+                int amount;
                 if (0 + ((this.festivalPageIndex + 1) * amountToShow) >= this.fancyButtons.Count)
                 {
                     amount = (0 + ((this.festivalPageIndex + 1) * (amountToShow)) - this.fancyButtons.Count);
@@ -1275,7 +1257,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                 int amountToShow = 6;
                 this.updateFancyButtons();
 
-                int amount = 0;
+                int amount;
                 if (0 + ((this.menuPageIndex + 1) * amountToShow) >= this.fancyButtons.Count)
                 {
                     amount = (0 + ((this.menuPageIndex + 1) * (amountToShow)) - this.fancyButtons.Count);
@@ -1317,7 +1299,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                 int amountToShow = 6;
                 this.updateFancyButtons();
 
-                int amount = 0;
+                int amount;
                 if (0 + ((this.eventPageIndex + 1) * amountToShow) >= this.fancyButtons.Count)
                 {
                     amount = (0 + ((this.eventPageIndex + 1) * (amountToShow)) - this.fancyButtons.Count);
@@ -1360,8 +1342,8 @@ namespace StardewSymphonyRemastered.Framework.Menus
                 {
                     if (button.containsPoint(x, y))
                     {
-                        if (button.name != "SundayIcon" || button.name != "MondayIcon" || button.name != "TuesdayIcon" || button.name != "WednesdayIcon" || button.name != "ThursdayIcon" || button.name != "FridayIcon" || button.name != "SaturdayIcon")
-                            if (button == null) continue;
+                        //if (button.name != "SundayIcon" || button.name != "MondayIcon" || button.name != "TuesdayIcon" || button.name != "WednesdayIcon" || button.name != "ThursdayIcon" || button.name != "FridayIcon" || button.name != "SaturdayIcon")
+                        //    if (button == null) continue;
                         Vector2 position = new Vector2(this.width * .1f + 64, this.height * .05f + 576);
                         //Get any valid location button.
                         this.currentlySelectedDay = button.clone(position);
@@ -1432,7 +1414,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                 int amountToShow = 6;
                 this.currentMusicPackAlbum.draw(b);
 
-                int amount = 0;
+                int amount;
                 if (0 + ((this.currentSongPageIndex + 1) * amountToShow) >= this.fancyButtons.Count)
                 {
                     amount = (0 + ((this.currentSongPageIndex + 1) * (amountToShow)) - this.fancyButtons.Count);
@@ -1541,7 +1523,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                 }
 
                 //Deals with logic regarding different pages.
-                int amount = 0;
+                int amount;
                 if (0 + ((this.locationPageIndex + 1) * amountToShow) >= this.fancyButtons.Count)
                 {
                     amount = (0 + ((this.locationPageIndex + 1) * (amountToShow)) - this.fancyButtons.Count);
@@ -1638,7 +1620,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                 this.stopButton.draw(b);
 
 
-                int amount = 0;
+                int amount;
                 if (0 + ((this.eventPageIndex + 1) * amountToShow) >= this.fancyButtons.Count)
                 {
                     amount = (0 + ((this.eventPageIndex + 1) * (amountToShow)) - this.fancyButtons.Count);
@@ -1685,7 +1667,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                 this.playButton.draw(b);
                 this.stopButton.draw(b);
 
-                int amount = 0;
+                int amount;
                 if (0 + ((this.menuPageIndex + 1) * amountToShow) >= this.fancyButtons.Count)
                 {
                     amount = (0 + ((this.menuPageIndex + 1) * (amountToShow)) - this.fancyButtons.Count);
@@ -1733,7 +1715,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
                 this.playButton.draw(b);
                 this.stopButton.draw(b);
 
-                int amount = 0;
+                int amount;
                 if (0 + ((this.festivalPageIndex + 1) * amountToShow) >= this.fancyButtons.Count)
                 {
                     amount = (0 + ((this.festivalPageIndex + 1) * (amountToShow)) - this.fancyButtons.Count);
@@ -1853,16 +1835,6 @@ namespace StardewSymphonyRemastered.Framework.Menus
             this.drawMouse(b);
         }
 
-
-        public void PlayRandomSongFromSelectedMusicPack(List<object> param)
-        {
-            var info = (KeyValuePair<string, MusicPack>)param[0];
-            //StardewSymphony.ModMonitor.Log(info.ToString());
-            StardewSymphony.musicManager.swapMusicPacks(info.Key);
-            StardewSymphony.musicManager.playRandomSongFromPack(info.Key);
-            //info.Value.playRandomSong();
-        }
-
         /// <summary>Select a album artwork and change the draw mode to go to the song selection screen.</summary>
         public void selectAlbum(Button b)
         {
@@ -1871,7 +1843,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
 
             this.currentMusicPackAlbum = b.clone(new Vector2(this.width * .1f + 64, this.height * .05f + 128));
             this.texturedStrings.Clear();
-            this.texturedStrings.Add(SpriteFonts.vanillaFont.ParseString("Name:" + (string)b.name, new Microsoft.Xna.Framework.Vector2(this.width * .1f, this.height * .05f + 256), b.textColor, false));
+            this.texturedStrings.Add(SpriteFonts.vanillaFont.ParseString("Name:" + b.name, new Vector2(this.width * .1f, this.height * .05f + 256), b.textColor, false));
             this.drawMode = DrawMode.SongSelectionMode;
         }
 
@@ -1936,7 +1908,7 @@ namespace StardewSymphonyRemastered.Framework.Menus
         public void deleteSong()
         {
             var info = (KeyValuePair<string, MusicPack>)this.currentMusicPackAlbum.buttonFunctionality.leftClick.paramaters[0];
-            
+
             if (this.drawMode == DrawMode.SelectedFestival)
             {
                 info.Value.songInformation.removeSongFromFestivalList(this.currentSelectedSong.label);
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicHexProcessor.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicHexProcessor.cs
index fd9e75b9..8f18452e 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicHexProcessor.cs
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicHexProcessor.cs
@@ -8,60 +8,16 @@ namespace StardewSymphonyRemastered.Framework
 {
     public class MusicHexProcessor
     {
-        /*********
-        ** Properties
-        *********/
-        /// <summary>All of the music/soundbanks and their locations.</summary>
-        private readonly XACTMusicPack MasterList;
-
-        /// <summary>The registered soundbanks.</summary>
-        private readonly List<string> SoundBanks = new List<string>();
-
-        /// <summary>The callback to reset the game audio.</summary>
-        private readonly Action Reset;
-
-
         /*********
         ** Public methods
         *********/
-        /// <summary>Construct an instance.</summary>
-        /// <param name="masterList">All of the music/soundbanks and their locations.</param>
-        /// <param name="reset">The callback to reset the game audio.</param>
-        public MusicHexProcessor(XACTMusicPack masterList, Action reset)
-        {
-            this.MasterList = masterList;
-            this.Reset = reset;
-        }
-
-        /// <summary>Add a file path to the list of soundbanks.</summary>
-        /// <param name="path">The soundbank file path.</param>
-        public void AddSoundBank(string path)
-        {
-            this.SoundBanks.Add(path);
-        }
-
         /// <summary>Process the soundbank.swb file's hex info and extract the song names from it.</summary>
         public static List<string> ProcessSongNamesFromHex(XACTMusicPack musicPack, Action reset, string FileName)
         {
-
             List<string> cleanCueNames = new List<string>();
             byte[] array = File.ReadAllBytes(FileName);
             string rawName = FileName.Substring(0, FileName.Length - 4);
-            string cueName = rawName + "CueList.txt";
 
-            //Not used as the music pack can change between loads
-            /*
-            if (File.Exists(cueName))
-            {
-                string[] arr = File.ReadAllLines(cueName);
-                List<string> names = new List<string>();
-                foreach(var v in arr)
-                {
-                    names.Add(v);
-                }
-                return names;
-            }
-            */
             string hexDumpContents = HexDump(array);
 
             string rawHexName = rawName + "HexDump.txt";
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicManager.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicManager.cs
index d9ab0e24..5afb4468 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicManager.cs
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicManager.cs
@@ -108,36 +108,12 @@ namespace StardewSymphonyRemastered.Framework
             this.currentMusicPack?.playSong(songName);
         }
 
-        /// <summary>Resumes the paused song from the current music pack.</summary>
-        public void pauseSongFromCurrentPack()
-        {
-            this.currentMusicPack?.pauseSong();
-        }
-
         /// <summary>Stops the song from the current music pack.</summary>
         public void stopSongFromCurrentMusicPack()
         {
             this.currentMusicPack?.stopSong();
         }
 
-        /// <summary>Resumes the song from the current music pack.</summary>
-        public void resumeSongFromCurrentMusicPack()
-        {
-            this.currentMusicPack?.resumeSong();
-        }
-
-        /// <summary>Returns the name of the currently playing song.</summary>
-        public string getNameOfCurrentlyPlayingSong()
-        {
-            return this.currentMusicPack?.getNameOfCurrentSong() ?? "";
-        }
-
-        /// <summary>Get the information associated with the current music pack.</summary>
-        public MusicPackMetaData getMusicPackInformation()
-        {
-            return this.currentMusicPack?.musicPackInformation;
-        }
-
         /// <summary>Checks to see if the music pack has been loaded into the Music Manager.</summary>
         public bool isMusicPackValid(string nameOfMusicPack)
         {
@@ -582,14 +558,5 @@ namespace StardewSymphonyRemastered.Framework
             foreach (var pack in this.musicPacks)
                 pack.Value.songInformation.initializeEventMusic();
         }
-
-        /// <summary>Play a random song from a given music pack.</summary>
-        public void playRandomSongFromPack(string musicPackName)
-        {
-            this.musicPacks.TryGetValue(musicPackName, out MusicPack musicPack);
-            this.currentMusicPack?.stopSong();
-            musicPack.playRandomSong();
-            this.currentMusicPack = musicPack;
-        }
     }
 }
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicPack.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicPack.cs
index ba36ec38..5cdba63b 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicPack.cs
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicPack.cs
@@ -12,25 +12,8 @@ namespace StardewSymphonyRemastered.Framework
 
         public virtual void playSong(string name) { }
 
-        public virtual void pauseSong() { }
-
         public virtual void stopSong() { }
 
-        public virtual void resumeSong() { }
-
-        public virtual void loadMusicFiles() { }
-
-        public virtual void swapSong(string songName) { }
-
-        public virtual string getNameOfCurrentSong()
-        {
-            return "";
-        }
-
-        public virtual void setModDirectoryFromFullDirectory() { }
-
-        public virtual void playRandomSong() { }
-
         public virtual bool isPlaying()
         {
             return false;
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicPackMetaData.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicPackMetaData.cs
index 2c0eb8bc..0c0a8d9b 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicPackMetaData.cs
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicPackMetaData.cs
@@ -37,16 +37,13 @@ namespace StardewSymphonyRemastered.Framework
             }
         }
 
-        /// <summary>Construct an instance.</summary>
-        public MusicPackMetaData() { }
-
         /// <summary>Loads the music pack information from a json file.</summary>
         public static MusicPackMetaData readFromJson(string path)
         {
             string json = Path.Combine(path, "MusicPackInformation.json");
             var meta = StardewSymphony.ModHelper.ReadJsonFile<MusicPackMetaData>(json);
 
-            string[] pathParse = path.Split(new string[] { StardewSymphony.ModHelper.DirectoryPath }, StringSplitOptions.None);
+            string[] pathParse = path.Split(new[] { StardewSymphony.ModHelper.DirectoryPath }, StringSplitOptions.None);
 
             try
             {
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/Song.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/Song.cs
index e1520e80..81d971f1 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/Song.cs
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/Song.cs
@@ -1,88 +1,15 @@
-using System.IO;
-
 namespace StardewSymphonyRemastered.Framework
 {
     /// <summary>The class to be used to manage individual songs.</summary>
     public class Song
     {
-        /// <summary>The path to the song. In the case of XACT songs this points to the .xwb file. For WAV files this points directly to the WAV file itself.</summary>
-        private readonly string pathToSong;
-
         /// <summary>The name of the song itself.</summary>
         public string name;
 
-        /// <summary>The relative path to the song.</summary>
-        private readonly string relativePath;
-
-        /// <summary>Blank Constructor;</summary>
-        public Song() { }
-
         /// <summary>Constructor to be used for WAV files.</summary>
-        public Song(string PathToSong)
+        public Song(string name)
         {
-            this.pathToSong = PathToSong;
-            this.name = this.getNameFromPath(this.pathToSong);
-            this.relativePath = this.getRelativePathFromFullPath();
-        }
-
-        /// <summary>Constructor to be used for XACT music packs.</summary>
-        public Song(string PathToSong, string Name)
-        {
-            this.pathToSong = PathToSong;
-            this.name = Name;
-            this.relativePath = this.getRelativePathFromFullPath();
-        }
-
-        /// <summary>Parse the name of the file from the path provided.</summary>
-        public string getNameFromPath(string path)
-        {
-            return Path.GetFileNameWithoutExtension(path);
-        }
-
-        /// <summary>Get the relative path to this song from the full path on disk provided.</summary>
-        public string getRelativePathFromFullPath()
-        {
-            string[] spliter = this.pathToSong.Split(Path.DirectorySeparatorChar);
-            string relative = "";
-            int index = 0;
-            foreach (string str in spliter) //iterate across all of the strings until Content is found.
-            {
-                if (str == "Content")
-                {
-                    //Once content is found add it to the relative string and append a newline character.
-                    for (int i = index; i < spliter.Length; i++)
-                    {
-                        relative += spliter[i];
-                        if (i != spliter.Length - 1)
-                            relative += Path.DirectorySeparatorChar;
-                    }
-                }
-                index++;
-            }
-            return relative; //Return the relative path string
-        }
-
-        /// <summary>Read the info from a .json file.</summary>
-        public static Song ReadFromJson(string path)
-        {
-            return StardewSymphony.ModHelper.ReadJsonFile<Song>(path);
-        }
-
-        /// <summary>Write the information of the instance to a .json file.</summary>
-        /// <param name="path">The path to which the json file is written to.</param>
-        public void writeToJson(string path)
-        {
-            StardewSymphony.ModHelper.WriteJsonFile<Song>(path, this);
-        }
-
-        public string getRelativePath()
-        {
-            return this.relativePath;
-        }
-
-        public string getPathToSong()
-        {
-            return this.pathToSong;
+            this.name = name;
         }
     }
 }
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongListNode.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongListNode.cs
index a231937f..134aab4f 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongListNode.cs
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongListNode.cs
@@ -11,12 +11,7 @@ namespace StardewSymphonyRemastered.Framework
         /// <summary>The list of songs associated with a trigger.</summary>
         public List<Song> songList;
 
-        /// <summary>Empty constructor.</summary>
-        public SongListNode() { }
-
         /// <summary>Construct an instance.</summary>
-        /// <param name="Trigger"></param>
-        /// <param name="SongList"></param>
         public SongListNode(string Trigger, List<Song> SongList)
         {
             this.trigger = Trigger;
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongSpecifics.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongSpecifics.cs
index 0e338dd8..b6f0376f 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongSpecifics.cs
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongSpecifics.cs
@@ -107,7 +107,7 @@ namespace StardewSymphonyRemastered.Framework
         /// <summary>Sum up some conditionals to parse the correct string key to access the songs list.</summary>
         public static string getCurrentConditionalString(bool getJustLocation = false)
         {
-            string key = "";
+            string key;
             //Event id's are the number found before the : for the event in Content/events/<location>.yaml file where location is the name of the stardew valley location.
 
             if (!getJustLocation)
@@ -117,7 +117,7 @@ namespace StardewSymphonyRemastered.Framework
                     //Get the event id an hijack it with some different music
                     //String key="Event_EventName";
 
-                    var reflected = StardewSymphony.ModHelper.Reflection.GetField<int>(Game1.CurrentEvent, "id", true);
+                    var reflected = StardewSymphony.ModHelper.Reflection.GetField<int>(Game1.CurrentEvent, "id");
 
                     int id = reflected.GetValue();
                     key = id.ToString(); //get the event id. Really really messy.
@@ -221,26 +221,6 @@ namespace StardewSymphonyRemastered.Framework
             festivals.Add(name);
         }
 
-        // TODO: Get a list of all of the vanilla events in the game. But how to determine what event is playing is the question.
-        public static void initializeEventsList()
-        {
-            //Do some logic here
-            //addEvent(12345.ToString());
-        }
-
-        /// <summary>Custom way to add in event to hijack music.</summary>
-        public static void addEvent(string id)
-        {
-            events.Add(id);
-            //Do some logic here
-        }
-
-        /// <summary>Add a location to the loctaion list.</summary>
-        public static void addLocation(string name)
-        {
-            locations.Add(name);
-        }
-
         /// <summary>Get the name of the day of the week from what game day it is.</summary>
         public static string getDayOfWeekString()
         {
@@ -340,10 +320,6 @@ namespace StardewSymphonyRemastered.Framework
             }
         }
 
-        public static string getCurrentMenuString()
-        {
-            return Game1.activeClickableMenu == null ? "" : Game1.activeClickableMenu.GetType().ToString();
-        }
         #endregion
 
         //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
@@ -352,13 +328,6 @@ namespace StardewSymphonyRemastered.Framework
 
 
         #region
-        /// <summary>Adds the song's reference to a music pack.</summary>
-        /// <param name="song">The FULL namespace of the menu. Example is StardewValley.Menus.TitleMenu</param>
-        public void addSongToMusicPack(Song song)
-        {
-            this.listOfSongsWithoutTriggers.Add(song);
-        }
-
         /// <summary>Initialize a basic list of menus supported.</summary>
         public static void initializeMenuList()
         {
@@ -390,20 +359,6 @@ namespace StardewSymphonyRemastered.Framework
 
         }
 
-        /// <summary>Add a menu to stardew symphony so that it may have unique music.</summary>
-        public static void addMenu(string name)
-        {
-            try
-            {
-                name = name.Replace('.', seperator); //Sanitize the name passed in to use my parsing conventions.
-                menus.Add(name);
-            }
-            catch (Exception err)
-            {
-                err.ToString();
-            }
-        }
-
         /// <summary>Add amenu to stardew symphony so that it may have unique music.</summary>
         /// <param name="menuType">The type of menu to add in. Typically this is typeof(MyMenuClass)</param>
         public static void addMenu(Type menuType)
@@ -452,7 +407,7 @@ namespace StardewSymphonyRemastered.Framework
                 catch { }
             }
         }
-        
+
         /// <summary>Checks if the song exists at all in this music pack.</summary>
         public bool isSongInList(string songName)
         {
@@ -501,7 +456,7 @@ namespace StardewSymphonyRemastered.Framework
                 if (pair.Key == key)
                     return pair;
             }
-            
+
             return new KeyValuePair<string, List<Song>>("", null);
         }
 
@@ -515,12 +470,6 @@ namespace StardewSymphonyRemastered.Framework
             return this.eventSongs;
         }
 
-        public List<Song> getMenuMusic()
-        {
-            return null;
-            //return this.menuSongs();
-        }
-
         /// <summary>Add a song name to a specific list of songs to play that will play under certain conditions.</summary>
         public void addSongToTriggerList(string songListKey, string songName)
         {
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/WavMusicPack.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/WavMusicPack.cs
index 2ca2c286..4400df09 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/WavMusicPack.cs
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/WavMusicPack.cs
@@ -20,70 +20,24 @@ namespace StardewSymphonyRemastered.Framework
         /// <summary>The currently playing sound.</summary>
         public SoundEffectInstance sound;
 
-        bool loop;
-
         /// <summary>The name of the music pack/</summary>
         public string Name => this.musicPackInformation.name;
 
         public Dictionary<string, SoundEffectInstance> sounds;
         /// <summary>Construct an instance.</summary>
         /// <param name="directoryToMusicPack"></param>
-        public WavMusicPack(string directoryToMusicPack, bool loop = false)
+        public WavMusicPack(string directoryToMusicPack)
         {
             this.directory = directoryToMusicPack;
-            this.setModDirectoryFromFullDirectory();
             this.songsDirectory = Path.Combine(this.directory, "Songs");
             this.songInformation = new SongSpecifics();
             this.musicPackInformation = MusicPackMetaData.readFromJson(directoryToMusicPack);
-            this.loop = loop;
             this.sounds = new Dictionary<string, SoundEffectInstance>();
-            /*
-            if (this.musicPackInformation == null)
-            {
-                //StardewSymphony.ModMonitor.Log("Error: MusicPackInformation.json not found at: " + directoryToMusicPack + ". Blank information will be put in place.", StardewModdingAPI.LogLevel.Warn);
-                //this.musicPackInformation = new MusicPackMetaData("???", "???", "", "0.0.0","");
-            }
-            */
-            //StardewSymphony.ModMonitor.Log(this.musicPackInformation.name.ToString());
             this.loadMusicFiles();
         }
 
-        /// <summary>A shortened directory name for display purposes.</summary>
-        public override void setModDirectoryFromFullDirectory()
-        {
-            string[] spliter = this.directory.Split(Path.DirectorySeparatorChar);
-            string directoryLocation = "";
-            for (int i = spliter.Length - 6; i < spliter.Length; i++)
-            {
-                directoryLocation += spliter[i];
-
-                if (i != spliter.Length - 1)
-                    directoryLocation += Path.DirectorySeparatorChar;
-            }
-        }
-
-        /*
-        /// <summary>Load a wav file into the stream to be played.</summary>
-        public void LoadWavFromFileToStream(string file)
-        {
-            // Create a new SpriteBatch, which can be used to draw textures.
-
-            System.IO.Stream waveFileStream = File.OpenRead(file); //TitleContainer.OpenStream(file);
-            this.effect = SoundEffect.FromStream(waveFileStream);
-            this.sound=this.effect.CreateInstance();
-            this.currentSong = new Song(file);
-            waveFileStream.Dispose();
-        }
-        */
-
-        /// <summary>Returns the name of the currently playing song.</summary>
-        public override string getNameOfCurrentSong()
-        {
-            return this.currentSong?.name ?? "";
-        }
-
         /// <summary>Load in the music files from the pack's respective Directory/Songs folder. Typically Content/Music/Wav/FolderName/Songs</summary>
-        public override void loadMusicFiles()
+        private void loadMusicFiles()
         {
             List<string> wavFiles = Directory.GetFiles(this.songsDirectory, "*.wav").ToList();
             wavFiles.AddRange(Directory.GetFiles(this.songsDirectory, "*.mp3"));
@@ -94,7 +48,6 @@ namespace StardewSymphonyRemastered.Framework
                 MemoryStream memoryStream = new MemoryStream();
                 AudioFileReader fileReader = new AudioFileReader(wav);
                 fileReader.CopyTo(memoryStream);
-                byte[] wavData = memoryStream.ToArray();
 
                 SoundEffect eff = null;
 
@@ -138,7 +91,7 @@ namespace StardewSymphonyRemastered.Framework
                 this.sounds.Add(name, instance);
 
                 //waveFileStream.Dispose();
-                Song song = new Song(wav);
+                Song song = new Song(name);
                 this.songInformation.listOfSongsWithoutTriggers.Add(song);
                 //listOfSongs.Add(song);
             }
@@ -146,12 +99,6 @@ namespace StardewSymphonyRemastered.Framework
                 StardewSymphony.ModMonitor.Log("Time to load WAV music pack: " + this.musicPackInformation.name + span.Subtract(DateTime.Now).ToString());
         }
 
-        /// <summary>Used to pause the current song.</summary>
-        public override void pauseSong()
-        {
-            this.sound?.Pause();
-        }
-
         /// <summary>Used to play a song.</summary>
         public override void playSong(string name)
         {
@@ -170,20 +117,6 @@ namespace StardewSymphonyRemastered.Framework
             }
         }
 
-        public override void playRandomSong()
-        {
-            Random r = Game1.random;
-            int value = r.Next(0, this.songInformation.listOfSongsWithoutTriggers.Count);
-            Song s = this.songInformation.listOfSongsWithoutTriggers.ElementAt(value);
-            this.swapSong(s.name);
-        }
-
-        /// <summary>Used to resume the currently playing song.</summary>
-        public override void resumeSong()
-        {
-            this.sound?.Resume();
-        }
-
         /// <summary>Used to stop the currently playing song.</summary>
         public override void stopSong()
         {
@@ -195,35 +128,6 @@ namespace StardewSymphonyRemastered.Framework
             this.currentSong = null;
         }
 
-        /// <summary>Used to change from one playing song to another;</summary>
-        public override void swapSong(string songName)
-        {
-            this.stopSong();
-            this.playSong(songName);
-        }
-
-        /// <summary>Get the son's name from the path.</summary>
-        public string getSongNameFromPath(string path)
-        {
-            foreach (var song in this.songInformation.listOfSongsWithoutTriggers)
-            {
-                if (song.getPathToSong() == path)
-                    return song.name;
-            }
-            return "";
-        }
-
-        /// <summary>Gets the song's path that shares the same name.</summary>
-        public string getSongPathFromName(string name)
-        {
-            foreach (var song in this.songInformation.listOfSongsWithoutTriggers)
-            {
-                if (song.name == name)
-                    return song.getPathToSong();
-            }
-            return "";
-        }
-
         public override bool isPlaying()
         {
             return this.sound?.State == SoundState.Playing;
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/XACTMusicPack.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/XACTMusicPack.cs
index d3f42c25..0cf62c9c 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/XACTMusicPack.cs
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/XACTMusicPack.cs
@@ -1,7 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using Microsoft.Xna.Framework.Audio;
 using StardewValley;
 
@@ -24,7 +21,6 @@ namespace StardewSymphonyRemastered.Framework
             this.directory = directoryToXwb;
             this.WaveBankPath = pathToWaveBank;
             this.SoundBankPath = pathToSoundBank;
-            this.setModDirectoryFromFullDirectory();
             this.songInformation = new SongSpecifics();
             this.currentCue = null;
             this.musicPackInformation = MusicPackMetaData.readFromJson(directoryToXwb);
@@ -41,28 +37,20 @@ namespace StardewSymphonyRemastered.Framework
         }
 
         /// <summary>Load all of the generic music file names into the music pack's information.</summary>
-        public override void loadMusicFiles()
+        private void loadMusicFiles()
         {
             var listOfSongStrings = MusicHexProcessor.ProcessSongNamesFromHex(this, StardewSymphony.Reset, this.SoundBankPath);
 
             List<Song> listofSongs = new List<Song>();
             foreach (string songname in listOfSongStrings)
             {
-                Song song = new Song(this.WaveBankPath, songname);
+                Song song = new Song(songname);
                 listofSongs.Add(song);
             }
 
             this.songInformation.listOfSongsWithoutTriggers = listofSongs;
         }
 
-        public override void playRandomSong()
-        {
-            Random r = new Random();
-            int value = r.Next(0, this.songInformation.listOfSongsWithoutTriggers.Count);
-            Song s = this.songInformation.listOfSongsWithoutTriggers.ElementAt(value);
-            this.swapSong(s.name);
-        }
-
         /// <summary>Get the cue from the list of songs.</summary>
         /// <param name="name">The name of the song to get.</param>
         private Cue getCue(string name)
@@ -93,30 +81,6 @@ namespace StardewSymphonyRemastered.Framework
             StardewSymphony.Reset();
         }
 
-        /// <summary>Pause the currently playing song.</summary>
-        public override void pauseSong()
-        {
-            if (this.currentCue != null)
-            {
-                Game1.waveBank = this.WaveBank;
-                Game1.soundBank = this.SoundBank;
-                this.currentCue.Pause();
-                StardewSymphony.Reset();
-            }
-        }
-
-        /// <summary>Resume playing the current set cue.</summary>
-        public override void resumeSong()
-        {
-            if (this.currentCue != null)
-            {
-                Game1.waveBank = this.WaveBank;
-                Game1.soundBank = this.SoundBank;
-                this.currentCue.Resume();
-                StardewSymphony.Reset();
-            }
-        }
-
         /// <summary>Stops the currently playing song and nulls the current song.</summary>
         public override void stopSong()
         {
@@ -131,34 +95,6 @@ namespace StardewSymphonyRemastered.Framework
             }
         }
 
-        /// <summary>Stops the currently playing song and starts playing a new song.</summary>
-        /// <param name="newSongName">The name of the new song to play.</param>
-        public override void swapSong(string newSongName)
-        {
-            this.stopSong();
-            this.playSong(newSongName);
-        }
-
-        /// <summary>Returns the name of the currently playing song.</summary>
-        public override string getNameOfCurrentSong()
-        {
-            return this.currentCue?.Name ?? "";
-        }
-
-        /// <summary>Returns a shortened directory name for display purposes.</summary>
-        public override void setModDirectoryFromFullDirectory()
-        {
-            string[] spliter = this.WaveBankPath.Split(Path.DirectorySeparatorChar);
-            string directoryLocation = "";
-            for (int i = spliter.Length - 5; i < spliter.Length; i++)
-            {
-                directoryLocation += spliter[i];
-
-                if (i != spliter.Length - 1)
-                    directoryLocation += Path.DirectorySeparatorChar;
-            }
-        }
-
         public override bool isPlaying()
         {
             if (this.currentCue == null) return false;
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs
index 104cbf77..1b5dfcbd 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs
@@ -41,9 +41,6 @@ namespace StardewSymphonyRemastered
 
         public bool musicPacksInitialized;
 
-        public static bool festivalStart;
-        public static bool eventStart;
-
         public static bool menuChangedMusic;
 
         public static Config Config;
@@ -94,7 +91,6 @@ namespace StardewSymphonyRemastered
 
             //Initialize all of the lists upon creation during entry.
             SongSpecifics.initializeMenuList();
-            SongSpecifics.initializeEventsList();
             SongSpecifics.initializeFestivalsList();
 
             this.initializeMusicPacks();

From 4a427b7f5e8b889053b6ab43d9d5a3c92e4db9e8 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sat, 5 Jan 2019 01:57:31 -0500
Subject: [PATCH 2/8] drop support for XACT music packs per discussion

---
 .../Templates/XACT/MusicPackInformation.json  |   8 -
 .../Content/Music/Templates/XACT/readme.txt   |   3 -
 .../Framework/Music/MusicHexProcessor.cs      | 152 ------------------
 .../Framework/Music/SongSpecifics.cs          |   7 -
 .../Framework/Music/XACTMusicPack.cs          | 104 ------------
 .../StardewSymphony.cs                        | 103 +-----------
 .../StardewSymphonyRemastered.csproj          |   8 -
 7 files changed, 6 insertions(+), 379 deletions(-)
 delete mode 100644 GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Music/Templates/XACT/MusicPackInformation.json
 delete mode 100644 GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Music/Templates/XACT/readme.txt
 delete mode 100644 GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicHexProcessor.cs
 delete mode 100644 GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/XACTMusicPack.cs

diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Music/Templates/XACT/MusicPackInformation.json b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Music/Templates/XACT/MusicPackInformation.json
deleted file mode 100644
index d18bc584..00000000
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Music/Templates/XACT/MusicPackInformation.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "Omegas's Music Data Example",
-  "author": "Omegasis",
-  "description": "Just a simple example of how metadata is formated for music packs. Feel free to copy and edit this one!",
-  "versionInfo": "1.0.0 CoolExample",
-  "pathToMusicPackIcon": "Icon.png",
-  "Icon": null
-}
\ No newline at end of file
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Music/Templates/XACT/readme.txt b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Music/Templates/XACT/readme.txt
deleted file mode 100644
index 3942c582..00000000
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Music/Templates/XACT/readme.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Place the Wave Bank.xwb file and Sound Bank.xsb file you created in XACT in a similar directory in Content/Music/XACT/SoundPackName.
-Modify MusicPackInformation.json as desire!
-Run the mod!
\ No newline at end of file
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicHexProcessor.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicHexProcessor.cs
deleted file mode 100644
index 8f18452e..00000000
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicHexProcessor.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using StardewValley;
-
-namespace StardewSymphonyRemastered.Framework
-{
-    public class MusicHexProcessor
-    {
-        /*********
-        ** Public methods
-        *********/
-        /// <summary>Process the soundbank.swb file's hex info and extract the song names from it.</summary>
-        public static List<string> ProcessSongNamesFromHex(XACTMusicPack musicPack, Action reset, string FileName)
-        {
-            List<string> cleanCueNames = new List<string>();
-            byte[] array = File.ReadAllBytes(FileName);
-            string rawName = FileName.Substring(0, FileName.Length - 4);
-
-            string hexDumpContents = HexDump(array);
-
-            string rawHexName = rawName + "HexDump.txt";
-            File.WriteAllText(rawHexName, hexDumpContents);
-
-            string[] readText = File.ReadAllLines(rawHexName);
-            string largeString = "";
-            foreach (string line in readText)
-            {
-                try
-                {
-                    string newString = "";
-                    for (int i = 62; i <= 77; i++)
-                        newString += line[i];
-                    largeString += newString;
-                }
-                catch { }
-            }
-            string[] splits = largeString.Split('ÿ');
-            string fix = "";
-            foreach (string s in splits)
-            {
-                if (s == "")
-                    continue;
-                fix += s;
-            }
-            splits = fix.Split('.');
-
-            foreach (string split in splits)
-            {
-                if (split == "")
-                    continue;
-                try
-                {
-                    Game1.waveBank = musicPack.WaveBank;
-                    Game1.soundBank = musicPack.SoundBank;
-
-                    if (Game1.soundBank.GetCue(split) != null)
-                        cleanCueNames.Add(split);
-
-                    reset.Invoke();
-                }
-                catch
-                {
-                    reset.Invoke();
-                }
-            }
-            
-            return cleanCueNames;
-        }
-
-
-        /*********
-        ** Private methods
-        *********/
-        private static string HexDump(byte[] bytes, int bytesPerLine = 16)
-        {
-            if (bytes == null)
-                return "<null>";
-
-            int bytesLength = bytes.Length;
-
-            char[] hexChars = "0123456789ABCDEF".ToCharArray();
-
-            int firstHexColumn =
-                  8                   // 8 characters for the address
-                + 3;                  // 3 spaces
-
-            int firstCharColumn = firstHexColumn
-                + bytesPerLine * 3       // - 2 digit for the hexadecimal value and 1 space
-                + (bytesPerLine - 1) / 8 // - 1 extra space every 8 characters from the 9th
-                + 2;                  // 2 spaces 
-
-            int lineLength = firstCharColumn
-                + bytesPerLine           // - characters to show the ascii value
-                + Environment.NewLine.Length; // Carriage return and line feed (should normally be 2)
-
-            char[] line = (new string(' ', lineLength - 2) + Environment.NewLine).ToCharArray();
-            int expectedLines = (bytesLength + bytesPerLine - 1) / bytesPerLine;
-            StringBuilder result = new StringBuilder(expectedLines * lineLength);
-
-            for (int i = 0; i < bytesLength; i += bytesPerLine)
-            {
-                line[0] = hexChars[(i >> 28) & 0xF];
-                line[1] = hexChars[(i >> 24) & 0xF];
-                line[2] = hexChars[(i >> 20) & 0xF];
-                line[3] = hexChars[(i >> 16) & 0xF];
-                line[4] = hexChars[(i >> 12) & 0xF];
-                line[5] = hexChars[(i >> 8) & 0xF];
-                line[6] = hexChars[(i >> 4) & 0xF];
-                line[7] = hexChars[(i >> 0) & 0xF];
-
-                int hexColumn = firstHexColumn;
-                int charColumn = firstCharColumn;
-
-                for (int j = 0; j < bytesPerLine; j++)
-                {
-                    if (j > 0 && (j & 7) == 0) hexColumn++;
-                    if (i + j >= bytesLength)
-                    {
-                        line[hexColumn] = ' ';
-                        line[hexColumn + 1] = ' ';
-                        line[charColumn] = ' ';
-                    }
-                    else
-                    {
-                        byte b = bytes[i + j];
-                        line[hexColumn] = hexChars[(b >> 4) & 0xF];
-                        line[hexColumn + 1] = hexChars[b & 0xF];
-                        line[charColumn] = GetAsciiSymbol(b);
-                    }
-                    hexColumn += 3;
-                    charColumn++;
-                }
-                result.Append(line);
-            }
-            return result.ToString();
-        }
-
-        public static char GetAsciiSymbol(byte ch)
-        {
-            if (ch < 32) return '.';  // Non-printable ASCII
-            if (ch < 127) return (char)ch;   // Normal ASCII
-            // Handle the hole in Latin-1
-            if (ch == 127) return '.';
-            if (ch < 0x90) return "€.‚ƒ„…†‡ˆ‰Š‹Œ.Ž."[ch & 0xF];
-            if (ch < 0xA0) return ".‘’“”•–—˜™š›œ.žŸ"[ch & 0xF];
-            if (ch == 0xAD) return '.';   // Soft hyphen: this symbol is zero-width even in monospace fonts
-            return (char)ch;   // Normal Latin-1
-        }
-    }
-}
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongSpecifics.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongSpecifics.cs
index b6f0376f..8b7bf27c 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongSpecifics.cs
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongSpecifics.cs
@@ -408,13 +408,6 @@ namespace StardewSymphonyRemastered.Framework
             }
         }
 
-        /// <summary>Checks if the song exists at all in this music pack.</summary>
-        public bool isSongInList(string songName)
-        {
-            Song song = this.getSongFromList(this.listOfSongsWithoutTriggers, songName);
-            return song != null && this.listOfSongsWithoutTriggers.Contains(song);
-        }
-
         /// <summary>A pretty big function to add in all of the specific songs that play at certain locations_seasons_weather_dayOfWeek_times. </summary>
         public void initializeSeasonalMusic()
         {
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/XACTMusicPack.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/XACTMusicPack.cs
deleted file mode 100644
index 0cf62c9c..00000000
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/XACTMusicPack.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-using System.Collections.Generic;
-using Microsoft.Xna.Framework.Audio;
-using StardewValley;
-
-namespace StardewSymphonyRemastered.Framework
-{
-    /// <summary>TODO: Make this work and add in overrided functions.</summary>
-    public class XACTMusicPack : MusicPack
-    {
-        public WaveBank WaveBank;
-        public ISoundBank SoundBank;
-
-        public Cue currentCue;
-
-        public string WaveBankPath;
-        public string SoundBankPath;
-
-        /// <summary>Construct an instance.</summary>
-        public XACTMusicPack(string directoryToXwb, string pathToWaveBank, string pathToSoundBank)
-        {
-            this.directory = directoryToXwb;
-            this.WaveBankPath = pathToWaveBank;
-            this.SoundBankPath = pathToSoundBank;
-            this.songInformation = new SongSpecifics();
-            this.currentCue = null;
-            this.musicPackInformation = MusicPackMetaData.readFromJson(directoryToXwb);
-            if (this.musicPackInformation == null)
-            {
-                if (StardewSymphony.Config.EnableDebugLog)
-                    StardewSymphony.ModMonitor.Log("Error: MusicPackInformation.json not found at: " + directoryToXwb + ". Blank information will be put in place.", StardewModdingAPI.LogLevel.Warn);
-                this.musicPackInformation = new MusicPackMetaData("???", "???", "", "0.0.0", "");
-            }
-
-            this.WaveBank = new WaveBank(Game1.audioEngine, this.WaveBankPath);
-            this.SoundBank = new SoundBankWrapper(new SoundBank(Game1.audioEngine, this.SoundBankPath));
-            this.loadMusicFiles();
-        }
-
-        /// <summary>Load all of the generic music file names into the music pack's information.</summary>
-        private void loadMusicFiles()
-        {
-            var listOfSongStrings = MusicHexProcessor.ProcessSongNamesFromHex(this, StardewSymphony.Reset, this.SoundBankPath);
-
-            List<Song> listofSongs = new List<Song>();
-            foreach (string songname in listOfSongStrings)
-            {
-                Song song = new Song(songname);
-                listofSongs.Add(song);
-            }
-
-            this.songInformation.listOfSongsWithoutTriggers = listofSongs;
-        }
-
-        /// <summary>Get the cue from the list of songs.</summary>
-        /// <param name="name">The name of the song to get.</param>
-        private Cue getCue(string name)
-        {
-            if (!this.songInformation.isSongInList(name))
-            {
-                if (StardewSymphony.Config.EnableDebugLog)
-                    StardewSymphony.ModMonitor.Log("Error! The song " + name + " could not be found in music pack " + this.musicPackInformation.name + ". Please ensure that this song is part of this music pack located at: " + this.WaveBankPath + " or contact the music pack author: " + this.musicPackInformation.author, StardewModdingAPI.LogLevel.Error);
-                return null;
-            }
-            else
-            {
-                return this.SoundBank.GetCue(name);
-            }
-        }
-
-        /// <summary>Play a song.</summary>
-        /// <param name="name">The name of the song to play.</param>
-        public override void playSong(string name)
-        {
-            this.currentCue = this.getCue(name);
-            if (this.currentCue == null)
-                return; //getCue will throw the error message.
-
-            Game1.waveBank = this.WaveBank;
-            Game1.soundBank = this.SoundBank;
-            this.currentCue.Play();
-            StardewSymphony.Reset();
-        }
-
-        /// <summary>Stops the currently playing song and nulls the current song.</summary>
-        public override void stopSong()
-        {
-            Game1.currentSong?.Stop(AudioStopOptions.Immediate);
-            if (this.currentCue != null)
-            {
-                Game1.waveBank = this.WaveBank;
-                Game1.soundBank = this.SoundBank;
-                this.currentCue.Stop(AudioStopOptions.Immediate);
-                StardewSymphony.Reset();
-                this.currentCue = null;
-            }
-        }
-
-        public override bool isPlaying()
-        {
-            if (this.currentCue == null) return false;
-            return this.currentCue.IsPlaying;
-        }
-    }
-}
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs
index 1b5dfcbd..8e426a86 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs
@@ -36,7 +36,6 @@ namespace StardewSymphonyRemastered
 
         private string MusicPath;
         public static string WavMusicDirectory;
-        public static string XACTMusicDirectory;
         public static string TemplateMusicDirectory;
 
         public bool musicPacksInitialized;
@@ -76,13 +75,11 @@ namespace StardewSymphonyRemastered
 
             this.MusicPath = Path.Combine(ModHelper.DirectoryPath, "Content", "Music");
             WavMusicDirectory = Path.Combine(this.MusicPath, "Wav");
-            XACTMusicDirectory = Path.Combine(this.MusicPath, "XACT");
             TemplateMusicDirectory = Path.Combine(this.MusicPath, "Templates");
 
 
             textureManager = new TextureManager();
             this.createDirectories();
-            this.createBlankXACTTemplate();
             this.createBlankWAVTemplate();
 
             this.musicPacksInitialized = false;
@@ -219,7 +216,6 @@ namespace StardewSymphonyRemastered
         public void initializeMusicPacks()
         {
             //load in all packs here.
-            this.loadXACTMusicPacks();
             this.loadWAVMusicPacks();
         }
 
@@ -324,32 +320,9 @@ namespace StardewSymphonyRemastered
             textureManager.addTexture("BackButton", new Texture2DExtended(ModHelper, Manifest.UniqueID, backButton));
 
 
-            if (!Directory.Exists(this.MusicPath))
-                Directory.CreateDirectory(this.MusicPath);
-            if (!Directory.Exists(WavMusicDirectory))
-                Directory.CreateDirectory(WavMusicDirectory);
-            if (!Directory.Exists(XACTMusicDirectory))
-                Directory.CreateDirectory(XACTMusicDirectory);
-            if (!Directory.Exists(TemplateMusicDirectory))
-                Directory.CreateDirectory(TemplateMusicDirectory);
-        }
-
-        /// <summary>Used to create a blank XACT music pack example.</summary>
-        public void createBlankXACTTemplate()
-        {
-            string path = Path.Combine(TemplateMusicDirectory, "XACT");
-            if (!Directory.Exists(path))
-                Directory.CreateDirectory(path);
-            if (!File.Exists(Path.Combine(path, "MusicPackInformation.json")))
-            {
-                MusicPackMetaData blankMetaData = new MusicPackMetaData("Omegas's Music Data Example", "Omegasis", "Just a simple example of how metadata is formated for music packs. Feel free to copy and edit this one!", "1.0.0 CoolExample", "Icon.png");
-                blankMetaData.writeToJson(Path.Combine(path, "MusicPackInformation.json"));
-            }
-            if (!File.Exists(Path.Combine(path, "readme.txt")))
-            {
-                string info = "Place the Wave Bank.xwb file and Sound Bank.xsb file you created in XACT in a similar directory in Content/Music/XACT/SoundPackName.\nModify MusicPackInformation.json as desire!\nRun the mod!";
-                File.WriteAllText(Path.Combine(path, "readme.txt"), info);
-            }
+            Directory.CreateDirectory(this.MusicPath);
+            Directory.CreateDirectory(WavMusicDirectory);
+            Directory.CreateDirectory(TemplateMusicDirectory);
         }
 
         /// <summary>USed to create a blank WAV music pack example.</summary>
@@ -357,10 +330,8 @@ namespace StardewSymphonyRemastered
         {
             string path = Path.Combine(TemplateMusicDirectory, "WAV");
             string pathSongs = Path.Combine(path, "Songs");
-            if (!Directory.Exists(path))
-                Directory.CreateDirectory(path);
-            if (!Directory.Exists(pathSongs))
-                Directory.CreateDirectory(pathSongs);
+            Directory.CreateDirectory(path);
+            Directory.CreateDirectory(pathSongs);
             if (!File.Exists(Path.Combine(path, "MusicPackInformation.json")))
             {
                 MusicPackMetaData blankMetaData = new MusicPackMetaData("Omegas's Music Data Example", "Omegasis", "Just a simple example of how metadata is formated for music packs. Feel free to copy and edit this one!", "1.0.0 CoolExample", "Icon");
@@ -373,61 +344,6 @@ namespace StardewSymphonyRemastered
             }
         }
 
-        /// <summary>Load in the XACT music packs.</summary>
-        public void loadXACTMusicPacks()
-        {
-            string[] listOfDirectories = Directory.GetDirectories(XACTMusicDirectory);
-            foreach (string folder in listOfDirectories)
-            {
-                //This chunk essentially allows people to name .xwb and .xsb files whatever they want.
-                string[] xwb = Directory.GetFiles(folder, "*.xwb");
-                string[] xsb = Directory.GetFiles(folder, "*.xsb");
-
-                //string[] debug = Directory.GetFiles(folder);
-                if (xwb.Length == 0)
-                {
-                    if (Config.EnableDebugLog)
-                        ModMonitor.Log("Error loading in attempting to load music pack from: " + folder + ". There is no wave bank music file: .xwb located in this directory. AKA there is no valid music here.", LogLevel.Error);
-                    return;
-                }
-                if (xwb.Length >= 2)
-                {
-                    if (Config.EnableDebugLog)
-                        ModMonitor.Log("Error loading in attempting to load music pack from: " + folder + ". There are too many wave bank music files or .xwbs located in this directory. Please ensure that there is only one music pack in this folder. You can make another music pack but putting a wave bank file in a different folder.", LogLevel.Error);
-                    return;
-                }
-
-                if (xsb.Length == 0)
-                {
-                    if (Config.EnableDebugLog)
-                        ModMonitor.Log("Error loading in attempting to load music pack from: " + folder + ". There is no sound bank music file: .xsb located in this directory. AKA there is no valid music here.", LogLevel.Error);
-                    return;
-                }
-                if (xsb.Length >= 2)
-                {
-                    if (Config.EnableDebugLog)
-                        ModMonitor.Log("Error loading in attempting to load music pack from: " + folder + ". There are too many sound bank music files or .xsbs located in this directory. Please ensure that there is only one sound reference file in this folder. You can make another music pack but putting a sound file in a different folder.", LogLevel.Error);
-                    return;
-                }
-
-                string waveBank = xwb[0];
-                string soundBank = xsb[0];
-                string metaData = Path.Combine(folder, "MusicPackInformation.json");
-
-                if (!File.Exists(metaData))
-                {
-                    if (Config.EnableDebugLog)
-                        ModMonitor.Log("WARNING! Loading in a music pack from: " + folder + ". There is no MusicPackInformation.json associated with this music pack meaning that while songs can be played from this pack, no information about it will be displayed.", LogLevel.Error);
-                }
-                XACTMusicPack musicPack = new XACTMusicPack(folder, waveBank, soundBank);
-
-                musicPack.songInformation.initializeMenuMusic();
-                musicPack.readFromJson();
-
-                musicManager.addMusicPack(musicPack, true, true);
-            }
-        }
-
         /// <summary>Load in WAV music packs.</summary>
         public void loadWAVMusicPacks()
         {
@@ -450,14 +366,7 @@ namespace StardewSymphonyRemastered
                 musicManager.addMusicPack(musicPack, true, true);
             }
         }
-        
-        /// <summary>Reset the music files for the game.</summary>
-        public static void Reset()
-        {
-            Game1.waveBank = DefaultWaveBank;
-            Game1.soundBank = DefaultSoundBank;
-        }
-        
+
         public static void DebugLog(string s)
         {
             if (Config.EnableDebugLog)
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj
index d9fef139..67ed028a 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj
@@ -86,12 +86,10 @@
     <Compile Include="Framework\Music\Song.cs" />
     <Compile Include="Framework\Music\SongListNode.cs" />
     <Compile Include="StardewSymphony.cs" />
-    <Compile Include="Framework\Music\MusicHexProcessor.cs" />
     <Compile Include="Framework\Music\MusicManager.cs" />
     <Compile Include="Framework\Music\MusicPack.cs" />
     <Compile Include="Framework\Music\SongSpecifics.cs" />
     <Compile Include="Framework\Music\WavMusicPack.cs" />
-    <Compile Include="Framework\Music\XACTMusicPack.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -209,9 +207,6 @@
     <Content Include="Content\Music\Templates\WAV\Songs\SongsGoHere.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Music\Templates\XACT\MusicPackInformation.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <None Include="manifest.json" />
   </ItemGroup>
   <ItemGroup>
@@ -224,9 +219,6 @@
     <Content Include="Content\Music\Templates\WAV\readme.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Music\Templates\XACT\readme.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Content\Music\Wav\" />

From d0f485fe5ef1baa05ccc6208d7c45681825fc928 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sat, 5 Jan 2019 02:46:37 -0500
Subject: [PATCH 3/8] add readme with proposed content pack format

---
 .../StardewSymphonyRemastered/Config.cs       |  16 +--
 .../Framework/Music/MusicManager.cs           |   2 +-
 .../Framework/Music/MusicPack.cs              |   2 +-
 .../StardewSymphonyRemastered/README.md       | 101 ++++++++++++++++++
 .../StardewSymphony.cs                        |   2 +-
 .../StardewSymphonyRemastered.csproj          |   1 +
 6 files changed, 113 insertions(+), 11 deletions(-)
 create mode 100644 GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/README.md

diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Config.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Config.cs
index 96b93350..7342582c 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Config.cs
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Config.cs
@@ -3,22 +3,22 @@ namespace StardewSymphonyRemastered
     /// <summary>A class that handles all of the config files for this mod.</summary>
     public class Config
     {
-        /// <summary>Whether or not to display debug log information on the SMAPI console for this mod.</summary>
+        /// <summary>Whether to show debug logs in the SMAPI console.</summary>
         public bool EnableDebugLog { get; set; } = false;
 
-        /// <summary>The minimum delay between songs in terms of milliseconds.</summary>
+        /// <summary>The minimum delay between songs in milliseconds.</summary>
         public int MinimumDelayBetweenSongsInMilliseconds { get; set; } = 5000;
 
-        /// <summary>The maximum delay between songs in terms of milliseconds.</summary>
+        /// <summary>The maximum delay between songs in milliseconds.</summary>
         public int MaximumDelayBetweenSongsInMilliseconds { get; set; } = 60000;
 
-        /// <summary>The key binding to open up the menu music.</summary>
+        /// <summary>The key binding to open the menu music.</summary>
         public string KeyBinding { get; set; } = "L";
 
-        /// <summary>Used to write a .json file for every possible option for a music pack. Use at your own risk!</summary>
-        public bool writeAllConfigMusicOptions { get; set; } = false;
+        /// <summary>Whether to write a JSON file for every possible option for a music pack. Use at your own risk!</summary>
+        public bool WriteAllConfigMusicOptions { get; set; } = false;
 
-        /// <summary>Used to completely disable the Stardew Valley OST.</summary>
-        public bool disableStardewMusic { get; set; } = false;
+        /// <summary>Whether to completely disable the Stardew Valley OST.</summary>
+        public bool DisableStardewMusic { get; set; } = false;
     }
 }
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicManager.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicManager.cs
index 5afb4468..c6c02bb7 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicManager.cs
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicManager.cs
@@ -48,7 +48,7 @@ namespace StardewSymphonyRemastered.Framework
         {
 
             if (this.currentMusicPack == null) return;
-            if (StardewSymphony.Config.disableStardewMusic)
+            if (StardewSymphony.Config.DisableStardewMusic)
             {
                 if (this.currentMusicPack.isPlaying())
                     return;
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicPack.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicPack.cs
index 5cdba63b..e90f9903 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicPack.cs
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicPack.cs
@@ -29,7 +29,7 @@ namespace StardewSymphonyRemastered.Framework
                 Directory.CreateDirectory(data);
             foreach (var list in this.songInformation.listOfSongsWithTriggers)
             {
-                if (!StardewSymphony.Config.writeAllConfigMusicOptions)
+                if (!StardewSymphony.Config.WriteAllConfigMusicOptions)
                 {
                     if (list.Value.Count == 0)
                         continue;
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/README.md b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/README.md
new file mode 100644
index 00000000..2592d86f
--- /dev/null
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/README.md
@@ -0,0 +1,101 @@
+**Stardew Symphony Remastered** is a [Stardew Valley](http://stardewvalley.net/) mod that lets you
+add music packs to Stardew Valley and play them without editing the game's default sound files. 
+
+## Contents
+* [For players](#for-players)
+  * [Install](#install)
+  * [Use](#use)
+  * [Configure](#configure)
+  * [Compatibility](#compatibility)
+* [For content pack creators](#for-content-pack-creators)
+* [For SMAPI mod creators](#for-smapi-mod-creators)
+* [See also](#see-also)
+
+## For players
+### Install
+1. [Install the latest version of SMAPI](https://smapi.io/).
+2. [Install Stardust Core](https://www.nexusmods.com/stardewvalley/mods/2341).
+2. [Install this mod from Nexus mods](http://www.nexusmods.com/stardewvalley/mods/1100).
+3. Run the game using SMAPI.
+
+### Use
+1. Unzip any content packs you want to use into `Mods`.
+2. Press `L` in-game to open the music menu, which will show icons representing the loaded music
+   albums. (You can click the left/right arrows to scroll if you have more than seven albums loaded.)
+3. Choose an album icon to see a list of available songs on the right.
+4. Click a song to select it. You can click the play/stop button to preview the song.
+5. Next configure when the music will play by choosing options on the right. You can play it during
+   a specified season, festival, event, date, weather, time of day, location, or menu. The
+   conditions can be very broad (like 'play in winter') or very specific (like 'play during snowy
+   winter nights at the Saloon on Wednesdays'). Note that when two songs can be applied, the one
+  with the more specific conditions will be played.
+6. **Make sure you click 'Add' when you're done!**
+
+Your music options are saved when the game saves, so they'll be lost if you exit without saving.
+
+### Configure
+The mod creates a `config.json` file in its mod folder the first time you run it. You can open that
+file in a text editor to configure the mod.
+
+These are the available settings:
+
+setting    | what it affects
+---------- | -------------------
+`EnableDebugLog` | Default false. Whether to show debug logs in the SMAPI console.
+`MinimumDelayBetweenSongsInMilliseconds` | Default 5000. The minimum delay between songs in milliseconds.
+`MaximumDelayBetweenSongsInMilliseconds` | Default 60000. The maximum delay between songs in milliseconds.
+`KeyBinding`                 | Default `L`. The key binding to open the menu music.
+`WriteAllConfigMusicOptions` | Default false. Whether to write a JSON file for every possible option for a music pack. Use at your own risk!
+`DisableStardewMusic`        | Default false. Whether to completely disable the Stardew Valley OST.
+
+### Compatibility
+Stardew Symphony Remastered is compatible with Stardew Valley 1.3+ on Linux/Mac/Windows, both
+single-player and multiplayer. There are no known issues in multiplayer (even if other players
+don't have it installed), but it will only affect you.
+
+## For content pack creators
+To create a content pack:
+
+1. [Create a standard content pack](https://stardewvalleywiki.com/Modding:Content_packs), using `Omegasis.StardewSymphonyRemastered` as the 'content pack for' ID.
+2. Add an `icon.png` image, which is the album logo to show in-game.
+2. Create a `songs` subfolder containing the `.wav` files to include. The file names (without
+   extension) will be shown in-game as the song names.
+
+## For SMAPI mod creators
+You can reference Stardew Symphony in your own SMAPI mods in order to add new events, festivals,
+locations, and menus for music selection.
+
+1. Reference the Stardew Symphony DLL directly (see [how to reference a DLL](https://stackoverflow.com/questions/12992286/how-to-add-a-dll-reference-to-a-project-in-visual-studio)).
+2. Add `Omegasis.StardewSymphonyRemastered` as a dependency (see [manifest dependencies](https://stardewvalleywiki.com/Modding:Modder_Guide/APIs/Manifest#Dependencies)).
+3. Now you can access the Stardew Symphony API to add music contexts:
+
+    ```cs
+    using System;
+    using Microsoft.Xna.Framework;
+    using StardewModdingAPI;
+    using StardewModdingAPI.Events;
+    using StardewModdingAPI.Utilities;
+    using StardewValley;
+    using StardewSymphonyRemastered;
+
+    namespace YourProjectName
+    {
+        /// <summary>The mod entry point.</summary>
+        public class ModEntry : Mod
+        {
+            public override void Entry(IModHelper helper)
+            {
+                StardewSymphonyRemaster.SongSpecifics.addLocation(“NameOfLocation”);
+                StardewSymphonyRemaster.SongSpecifics.addEvent(“UniqueEventID”);
+                StardewSymphonyRemaster.SongSpecifics.addFestival(“FestivalName”);
+                StardewSymphonyRemaster.SongSpecifics.addMenu(typeOf(MyMenu));
+            }
+        }
+    }
+    ```
+
+Happy modding!
+
+## See also
+* [Nexus mod](http://www.nexusmods.com/stardewvalley/mods/425)
+* [Discussion thread](https://community.playstarbound.com/threads/stardew-symphony-add-music-packs-to-stardew-valley.115686/)
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs
index 8e426a86..f2461f73 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs
@@ -190,7 +190,7 @@ namespace StardewSymphonyRemastered
         {
             if (musicManager == null) return;
 
-            if (Config.disableStardewMusic)
+            if (Config.DisableStardewMusic)
             {
                 if (Game1.currentSong != null)
                 {
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj
index 67ed028a..49cb4ef9 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj
@@ -208,6 +208,7 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <None Include="manifest.json" />
+    <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Content\Graphics\MusicMenu\MusicDisk.png">

From 6ced146e15d131d6a57718211bc9f45ee04f0919 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sat, 5 Jan 2019 02:58:04 -0500
Subject: [PATCH 4/8] remove wav pack template (replaced by content pack
 format)

---
 .../Templates/WAV/MusicPackInformation.json   |  8 -------
 .../Music/Templates/WAV/Songs/SongsGoHere.txt |  0
 .../Content/Music/Templates/WAV/readme.txt    |  1 -
 .../StardewSymphony.cs                        | 24 -------------------
 .../StardewSymphonyRemastered.csproj          | 13 ----------
 5 files changed, 46 deletions(-)
 delete mode 100644 GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Music/Templates/WAV/MusicPackInformation.json
 delete mode 100644 GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Music/Templates/WAV/Songs/SongsGoHere.txt
 delete mode 100644 GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Music/Templates/WAV/readme.txt

diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Music/Templates/WAV/MusicPackInformation.json b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Music/Templates/WAV/MusicPackInformation.json
deleted file mode 100644
index c82b910e..00000000
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Music/Templates/WAV/MusicPackInformation.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "Omegas's Music Data Example",
-  "author": "Omegasis",
-  "description": "Just a simple example of how metadata is formated for music packs. Feel free to copy and edit this one!",
-  "versionInfo": "1.0.0 CoolExample",
-  "pathToMusicPackIcon": "Icon",
-  "Icon": null
-}
\ No newline at end of file
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Music/Templates/WAV/Songs/SongsGoHere.txt b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Music/Templates/WAV/Songs/SongsGoHere.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Music/Templates/WAV/readme.txt b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Music/Templates/WAV/readme.txt
deleted file mode 100644
index 4d4fbb8f..00000000
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Music/Templates/WAV/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-Place the .wav song files in the Songs folder, modify the MusicPackInformation.json as desired, and then run!
\ No newline at end of file
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs
index f2461f73..9d7dfe3c 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs
@@ -36,7 +36,6 @@ namespace StardewSymphonyRemastered
 
         private string MusicPath;
         public static string WavMusicDirectory;
-        public static string TemplateMusicDirectory;
 
         public bool musicPacksInitialized;
 
@@ -75,12 +74,9 @@ namespace StardewSymphonyRemastered
 
             this.MusicPath = Path.Combine(ModHelper.DirectoryPath, "Content", "Music");
             WavMusicDirectory = Path.Combine(this.MusicPath, "Wav");
-            TemplateMusicDirectory = Path.Combine(this.MusicPath, "Templates");
-
 
             textureManager = new TextureManager();
             this.createDirectories();
-            this.createBlankWAVTemplate();
 
             this.musicPacksInitialized = false;
             menuChangedMusic = false;
@@ -322,26 +318,6 @@ namespace StardewSymphonyRemastered
 
             Directory.CreateDirectory(this.MusicPath);
             Directory.CreateDirectory(WavMusicDirectory);
-            Directory.CreateDirectory(TemplateMusicDirectory);
-        }
-
-        /// <summary>USed to create a blank WAV music pack example.</summary>
-        public void createBlankWAVTemplate()
-        {
-            string path = Path.Combine(TemplateMusicDirectory, "WAV");
-            string pathSongs = Path.Combine(path, "Songs");
-            Directory.CreateDirectory(path);
-            Directory.CreateDirectory(pathSongs);
-            if (!File.Exists(Path.Combine(path, "MusicPackInformation.json")))
-            {
-                MusicPackMetaData blankMetaData = new MusicPackMetaData("Omegas's Music Data Example", "Omegasis", "Just a simple example of how metadata is formated for music packs. Feel free to copy and edit this one!", "1.0.0 CoolExample", "Icon");
-                blankMetaData.writeToJson(Path.Combine(path, "MusicPackInformation.json"));
-            }
-            if (!File.Exists(Path.Combine(path, "readme.txt")))
-            {
-                string info = "Place the .wav song files in the Songs folder, modify the MusicPackInformation.json as desired, and then run!";
-                File.WriteAllText(Path.Combine(path, "readme.txt"), info);
-            }
         }
 
         /// <summary>Load in WAV music packs.</summary>
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj
index 49cb4ef9..d8edcdcb 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj
@@ -201,12 +201,6 @@
     <Content Include="Content\Graphics\MusicMenu\WeatherIcon_WeddingLetter.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Music\Templates\WAV\MusicPackInformation.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\Music\Templates\WAV\Songs\SongsGoHere.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <None Include="manifest.json" />
     <None Include="README.md" />
   </ItemGroup>
@@ -217,13 +211,6 @@
     <Content Include="Content\Graphics\MusicMenu\MusicNote.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Music\Templates\WAV\readme.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Content\Music\Wav\" />
-    <Folder Include="Content\Music\XACT\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\StardustCore\StardustCore.csproj">

From 0a86f2693bbf12c204e8c3674696976c45455986 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sat, 5 Jan 2019 02:58:24 -0500
Subject: [PATCH 5/8] standardise assets folder

---
 .../StardewSymphony.cs                        |   5 +-
 .../StardewSymphonyRemastered.csproj          |  76 +++++++++---------
 .../MusicMenu => assets}/AddButton.png        | Bin
 .../MusicMenu => assets}/BackButton.png       | Bin
 .../MusicMenu => assets}/DayIcons_Friday.png  | Bin
 .../MusicMenu => assets}/DayIcons_Monday.png  | Bin
 .../DayIcons_Saturday.png                     | Bin
 .../MusicMenu => assets}/DayIcons_Sunday.png  | Bin
 .../DayIcons_Thursday.png                     | Bin
 .../MusicMenu => assets}/DayIcons_Tuesday.png | Bin
 .../DayIcons_Wednesday.png                    | Bin
 .../MusicMenu => assets}/DeleteButton.png     | Bin
 .../MusicMenu => assets}/EventIcon.png        | Bin
 .../MusicMenu => assets}/FestivalIcon.png     | Bin
 .../MusicMenu => assets}/GreenBallon.png      | Bin
 .../MusicMenu => assets}/HouseIcon.png        | Bin
 .../MusicMenu => assets}/MenuIcon.png         | Bin
 .../MusicMenu => assets}/MusicDisk.png        | Bin
 .../MusicMenu => assets}/MusicNote.png        | Bin
 .../MusicMenu => assets}/OutlineBox.png       | Bin
 .../MusicMenu => assets}/PlayButton.png       | Bin
 .../MusicMenu => assets}/RedBallon.png        | Bin
 .../MusicMenu => assets}/SeasonIcon_Fall.png  | Bin
 .../SeasonIcon_Spring.png                     | Bin
 .../SeasonIcon_Summer.png                     | Bin
 .../SeasonIcon_Winter.png                     | Bin
 .../MusicMenu => assets}/StarIcon.png         | Bin
 .../MusicMenu => assets}/StopButton.png       | Bin
 .../MusicMenu => assets}/TimeIcon_Day.png     | Bin
 .../MusicMenu => assets}/TimeIcon_Night.png   | Bin
 .../WeatherIcon_DebrisFall.png                | Bin
 .../WeatherIcon_DebrisSpring.png              | Bin
 .../WeatherIcon_DebrisSummer.png              | Bin
 .../WeatherIcon_Festival.png                  | Bin
 .../WeatherIcon_Rainy.png                     | Bin
 .../WeatherIcon_Snowing.png                   | Bin
 .../WeatherIcon_Stormy.png                    | Bin
 .../WeatherIcon_Sunny.png                     | Bin
 .../WeatherIcon_WeddingHeart.png              | Bin
 .../WeatherIcon_WeddingLetter.png             | Bin
 40 files changed, 40 insertions(+), 41 deletions(-)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/AddButton.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/BackButton.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/DayIcons_Friday.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/DayIcons_Monday.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/DayIcons_Saturday.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/DayIcons_Sunday.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/DayIcons_Thursday.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/DayIcons_Tuesday.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/DayIcons_Wednesday.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/DeleteButton.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/EventIcon.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/FestivalIcon.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/GreenBallon.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/HouseIcon.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/MenuIcon.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/MusicDisk.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/MusicNote.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/OutlineBox.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/PlayButton.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/RedBallon.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/SeasonIcon_Fall.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/SeasonIcon_Spring.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/SeasonIcon_Summer.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/SeasonIcon_Winter.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/StarIcon.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/StopButton.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/TimeIcon_Day.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/TimeIcon_Night.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/WeatherIcon_DebrisFall.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/WeatherIcon_DebrisSpring.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/WeatherIcon_DebrisSummer.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/WeatherIcon_Festival.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/WeatherIcon_Rainy.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/WeatherIcon_Snowing.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/WeatherIcon_Stormy.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/WeatherIcon_Sunny.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/WeatherIcon_WeddingHeart.png (100%)
 rename GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/{Content/Graphics/MusicMenu => assets}/WeatherIcon_WeddingLetter.png (100%)

diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs
index 9d7dfe3c..8ffd7a86 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs
@@ -218,9 +218,8 @@ namespace StardewSymphonyRemastered
         /// <summary>Create the core directories needed by the mod.</summary>
         public void createDirectories()
         {
-            string path = Path.Combine(ModHelper.DirectoryPath, "Content", "Graphics", "MusicMenu");
-            if (!Directory.Exists(path)) Directory.CreateDirectory(path);
-            path = Path.Combine("Content", "Graphics", "MusicMenu");
+            string path = Path.Combine("assets");
+
             //Generic Icons
             string musicNote = Path.Combine(path, "MusicNote.png");
             string musicCD = Path.Combine(path, "MusicDisk.png");
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj
index d8edcdcb..0403f0bb 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj
@@ -93,122 +93,122 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Content\Graphics\MusicMenu\AddButton.png">
+    <Content Include="assets\AddButton.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\BackButton.png">
+    <Content Include="assets\BackButton.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\DayIcons_Friday.png">
+    <Content Include="assets\DayIcons_Friday.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\DayIcons_Monday.png">
+    <Content Include="assets\DayIcons_Monday.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\DayIcons_Saturday.png">
+    <Content Include="assets\DayIcons_Saturday.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\DayIcons_Sunday.png">
+    <Content Include="assets\DayIcons_Sunday.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\DayIcons_Thursday.png">
+    <Content Include="assets\DayIcons_Thursday.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\DayIcons_Tuesday.png">
+    <Content Include="assets\DayIcons_Tuesday.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\DayIcons_Wednesday.png">
+    <Content Include="assets\DayIcons_Wednesday.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\DeleteButton.png">
+    <Content Include="assets\DeleteButton.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\EventIcon.png">
+    <Content Include="assets\EventIcon.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\FestivalIcon.png">
+    <Content Include="assets\FestivalIcon.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\GreenBallon.png">
+    <Content Include="assets\GreenBallon.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\HouseIcon.png">
+    <Content Include="assets\HouseIcon.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\MenuIcon.png">
+    <Content Include="assets\MenuIcon.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\OutlineBox.png">
+    <Content Include="assets\OutlineBox.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\PlayButton.png">
+    <Content Include="assets\PlayButton.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\RedBallon.png">
+    <Content Include="assets\RedBallon.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\SeasonIcon_Fall.png">
+    <Content Include="assets\SeasonIcon_Fall.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\SeasonIcon_Spring.png">
+    <Content Include="assets\SeasonIcon_Spring.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\SeasonIcon_Summer.png">
+    <Content Include="assets\SeasonIcon_Summer.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\SeasonIcon_Winter.png">
+    <Content Include="assets\SeasonIcon_Winter.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\StarIcon.png">
+    <Content Include="assets\StarIcon.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\StopButton.png">
+    <Content Include="assets\StopButton.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\TimeIcon_Day.png">
+    <Content Include="assets\TimeIcon_Day.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\TimeIcon_Night.png">
+    <Content Include="assets\TimeIcon_Night.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\WeatherIcon_DebrisFall.png">
+    <Content Include="assets\WeatherIcon_DebrisFall.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\WeatherIcon_DebrisSpring.png">
+    <Content Include="assets\WeatherIcon_DebrisSpring.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\WeatherIcon_DebrisSummer.png">
+    <Content Include="assets\WeatherIcon_DebrisSummer.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\WeatherIcon_Festival.png">
+    <Content Include="assets\WeatherIcon_Festival.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\WeatherIcon_Rainy.png">
+    <Content Include="assets\WeatherIcon_Rainy.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\WeatherIcon_Snowing.png">
+    <Content Include="assets\WeatherIcon_Snowing.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\WeatherIcon_Stormy.png">
+    <Content Include="assets\WeatherIcon_Stormy.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\WeatherIcon_Sunny.png">
+    <Content Include="assets\WeatherIcon_Sunny.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\WeatherIcon_WeddingHeart.png">
+    <Content Include="assets\WeatherIcon_WeddingHeart.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\WeatherIcon_WeddingLetter.png">
+    <Content Include="assets\WeatherIcon_WeddingLetter.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <None Include="manifest.json" />
     <None Include="README.md" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Content\Graphics\MusicMenu\MusicDisk.png">
+    <Content Include="assets\MusicDisk.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\Graphics\MusicMenu\MusicNote.png">
+    <Content Include="assets\MusicNote.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/AddButton.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/AddButton.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/AddButton.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/AddButton.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/BackButton.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/BackButton.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/BackButton.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/BackButton.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/DayIcons_Friday.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/DayIcons_Friday.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/DayIcons_Friday.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/DayIcons_Friday.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/DayIcons_Monday.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/DayIcons_Monday.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/DayIcons_Monday.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/DayIcons_Monday.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/DayIcons_Saturday.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/DayIcons_Saturday.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/DayIcons_Saturday.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/DayIcons_Saturday.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/DayIcons_Sunday.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/DayIcons_Sunday.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/DayIcons_Sunday.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/DayIcons_Sunday.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/DayIcons_Thursday.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/DayIcons_Thursday.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/DayIcons_Thursday.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/DayIcons_Thursday.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/DayIcons_Tuesday.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/DayIcons_Tuesday.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/DayIcons_Tuesday.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/DayIcons_Tuesday.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/DayIcons_Wednesday.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/DayIcons_Wednesday.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/DayIcons_Wednesday.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/DayIcons_Wednesday.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/DeleteButton.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/DeleteButton.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/DeleteButton.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/DeleteButton.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/EventIcon.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/EventIcon.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/EventIcon.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/EventIcon.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/FestivalIcon.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/FestivalIcon.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/FestivalIcon.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/FestivalIcon.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/GreenBallon.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/GreenBallon.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/GreenBallon.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/GreenBallon.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/HouseIcon.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/HouseIcon.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/HouseIcon.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/HouseIcon.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/MenuIcon.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/MenuIcon.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/MenuIcon.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/MenuIcon.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/MusicDisk.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/MusicDisk.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/MusicDisk.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/MusicDisk.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/MusicNote.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/MusicNote.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/MusicNote.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/MusicNote.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/OutlineBox.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/OutlineBox.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/OutlineBox.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/OutlineBox.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/PlayButton.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/PlayButton.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/PlayButton.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/PlayButton.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/RedBallon.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/RedBallon.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/RedBallon.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/RedBallon.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/SeasonIcon_Fall.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/SeasonIcon_Fall.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/SeasonIcon_Fall.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/SeasonIcon_Fall.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/SeasonIcon_Spring.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/SeasonIcon_Spring.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/SeasonIcon_Spring.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/SeasonIcon_Spring.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/SeasonIcon_Summer.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/SeasonIcon_Summer.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/SeasonIcon_Summer.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/SeasonIcon_Summer.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/SeasonIcon_Winter.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/SeasonIcon_Winter.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/SeasonIcon_Winter.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/SeasonIcon_Winter.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/StarIcon.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/StarIcon.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/StarIcon.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/StarIcon.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/StopButton.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/StopButton.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/StopButton.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/StopButton.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/TimeIcon_Day.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/TimeIcon_Day.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/TimeIcon_Day.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/TimeIcon_Day.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/TimeIcon_Night.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/TimeIcon_Night.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/TimeIcon_Night.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/TimeIcon_Night.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/WeatherIcon_DebrisFall.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/WeatherIcon_DebrisFall.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/WeatherIcon_DebrisFall.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/WeatherIcon_DebrisFall.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/WeatherIcon_DebrisSpring.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/WeatherIcon_DebrisSpring.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/WeatherIcon_DebrisSpring.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/WeatherIcon_DebrisSpring.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/WeatherIcon_DebrisSummer.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/WeatherIcon_DebrisSummer.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/WeatherIcon_DebrisSummer.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/WeatherIcon_DebrisSummer.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/WeatherIcon_Festival.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/WeatherIcon_Festival.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/WeatherIcon_Festival.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/WeatherIcon_Festival.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/WeatherIcon_Rainy.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/WeatherIcon_Rainy.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/WeatherIcon_Rainy.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/WeatherIcon_Rainy.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/WeatherIcon_Snowing.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/WeatherIcon_Snowing.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/WeatherIcon_Snowing.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/WeatherIcon_Snowing.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/WeatherIcon_Stormy.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/WeatherIcon_Stormy.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/WeatherIcon_Stormy.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/WeatherIcon_Stormy.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/WeatherIcon_Sunny.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/WeatherIcon_Sunny.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/WeatherIcon_Sunny.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/WeatherIcon_Sunny.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/WeatherIcon_WeddingHeart.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/WeatherIcon_WeddingHeart.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/WeatherIcon_WeddingHeart.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/WeatherIcon_WeddingHeart.png
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/WeatherIcon_WeddingLetter.png b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/WeatherIcon_WeddingLetter.png
similarity index 100%
rename from GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Content/Graphics/MusicMenu/WeatherIcon_WeddingLetter.png
rename to GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/assets/WeatherIcon_WeddingLetter.png

From bb2b633af9e5c633bdb321c52798b989d45d84f4 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sat, 5 Jan 2019 04:50:48 -0500
Subject: [PATCH 6/8] rewrite to use content packs

---
 .../Framework/Menus/MusicManagerMenu.cs       | 265 ++++++-------
 .../Framework/Music/MusicManager.cs           | 373 +++++++-----------
 .../Framework/Music/MusicPack.cs              | 217 ++++++++--
 .../Framework/Music/MusicPackMetaData.cs      |  78 ----
 .../Framework/Music/Song.cs                   |  15 -
 .../Framework/Music/SongListNode.cs           |  34 +-
 .../Framework/Music/SongSpecifics.cs          |  72 ++--
 .../Framework/Music/WavMusicPack.cs           | 136 -------
 .../StardewSymphonyRemastered/README.md       |   4 +-
 .../StardewSymphony.cs                        | 223 ++++-------
 .../StardewSymphonyRemastered.csproj          |   5 +-
 GeneralMods/StardustCore/ModCore.cs           |   6 +-
 .../UIUtilities/Texture2DExtended.cs          |  64 ++-
 13 files changed, 609 insertions(+), 883 deletions(-)
 delete mode 100644 GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicPackMetaData.cs
 delete mode 100644 GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/Song.cs
 delete mode 100644 GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/WavMusicPack.cs

diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Menus/MusicManagerMenu.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Menus/MusicManagerMenu.cs
index e21498e1..23f70ec6 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Menus/MusicManagerMenu.cs
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Menus/MusicManagerMenu.cs
@@ -92,35 +92,21 @@ namespace StardewSymphonyRemastered.Framework.Menus
             //Initialize music album icons.
             int numOfButtons = 0;
             int rows = 0;
-            foreach (var v in StardewSymphony.musicManager.musicPacks)
+            foreach (MusicPack musicPack in StardewSymphony.musicManager.MusicPacks.Values)
             {
-                var sortedQuery = v.Value.songInformation.listOfSongsWithoutTriggers.OrderBy(x => x.name);
-                v.Value.songInformation.listOfSongsWithoutTriggers = sortedQuery.ToList(); //Alphabetize.
-                if (v.Value.musicPackInformation.getTexture() == null)
+                var sortedQuery = musicPack.SongInformation.listOfSongsWithoutTriggers.OrderBy(name => name);
+                musicPack.SongInformation.listOfSongsWithoutTriggers = sortedQuery.ToList(); //Alphabetize.
+                if (musicPack.Icon == null)
                 {
                     Texture2DExtended texture = StardewSymphony.textureManager.getTexture("MusicDisk");
-                    float scale = 1.00f / (texture.getTexture().Width / 64f);
+                    float scale = 1.00f / (texture.Width / 64f);
 
-                    this.musicAlbumButtons.Add(new Button(v.Key, new Rectangle(100 + (numOfButtons * 100), 125 + (rows * 100), 64, 64), texture, "", new Rectangle(0, 0, 16, 16), scale, new Animation(new Rectangle(0, 0, 16, 16)), StardustCore.IlluminateFramework.Colors.randomColor(), Color.White, new ButtonFunctionality(new DelegatePairing(null, new List<object>
-                    {
-                        v
-                    }
-                    ), null, new DelegatePairing(null, new List<object>(){
-                    v
-                    }
-                    )), false));
+                    this.musicAlbumButtons.Add(new Button(musicPack.Name, new Rectangle(100 + (numOfButtons * 100), 125 + (rows * 100), 64, 64), texture, "", new Rectangle(0, 0, 16, 16), scale, new Animation(new Rectangle(0, 0, 16, 16)), StardustCore.IlluminateFramework.Colors.randomColor(), Color.White, new ButtonFunctionality(new DelegatePairing(null, new List<object> { musicPack }), null, new DelegatePairing(null, new List<object> { musicPack })), false));
                 }
                 else
                 {
-                    float scale = 1.00f / (v.Value.musicPackInformation.getTexture().getTexture().Width / 64f);
-                    this.musicAlbumButtons.Add(new Button(v.Key, new Rectangle(100 + (numOfButtons * 100), 125 + (rows * 100), 64, 64), v.Value.musicPackInformation.getTexture(), "", new Rectangle(0, 0, v.Value.musicPackInformation.getTexture().getTexture().Width, v.Value.musicPackInformation.getTexture().getTexture().Height), scale, new Animation(new Rectangle(0, 0, 16, 16)), StardustCore.IlluminateFramework.LightColorsList.Black, StardustCore.IlluminateFramework.LightColorsList.Black, new ButtonFunctionality(new DelegatePairing(null, new List<object>
-                    {
-                        v
-                    }
-                    ), null, new DelegatePairing(null, new List<object>(){
-                    v
-                    }
-                    )), false));
+                    float scale = 1.00f / (musicPack.Icon.Width / 64f);
+                    this.musicAlbumButtons.Add(new Button(musicPack.Name, new Rectangle(100 + (numOfButtons * 100), 125 + (rows * 100), 64, 64), musicPack.Icon, "", new Rectangle(0, 0, musicPack.Icon.Width, musicPack.Icon.Height), scale, new Animation(new Rectangle(0, 0, 16, 16)), StardustCore.IlluminateFramework.LightColorsList.Black, StardustCore.IlluminateFramework.LightColorsList.Black, new ButtonFunctionality(new DelegatePairing(null, new List<object> { musicPack }), null, new DelegatePairing(null, new List<object> { musicPack })), false));
                 }
 
                 numOfButtons++;
@@ -378,17 +364,15 @@ namespace StardewSymphonyRemastered.Framework.Menus
                     }
                     this.fancyButtons.Add(new Button("Outline", new Rectangle((int)placement.X + offsetX - 16, (int)placement.Y - 16, 64, 64), StardewSymphony.textureManager.getTexture("OutlineBox"), "", new Rectangle(0, 0, 16, 16), 6f, new Animation(new Rectangle(0, 0, 16, 16)), Color.White, Color.White, new ButtonFunctionality(null, null, new DelegatePairing(null, new List<object>())), false));
                     int count = 0;
-                    foreach (var v in this.fancyButtons)
+                    foreach (var button in this.fancyButtons)
                     {
 
                         if (count == 3)
                         {
-                            var pair = (KeyValuePair<string, MusicPack>)this.fancyButtons.ElementAt(count).buttonFunctionality.hover.paramaters[0];
-                            //v.hoverText = (string)pair.Key;
-                            //Do something like current album name =
+                            MusicPack musicPack = (MusicPack)this.fancyButtons.ElementAt(count).buttonFunctionality.hover.paramaters[0];
                             this.texturedStrings.Clear();
-                            this.texturedStrings.Add(SpriteFonts.vanillaFont.ParseString("Current Album Name:" + pair.Key, new Vector2(v.bounds.X / 2, v.bounds.Y + 128), v.textColor));
-                            v.hoverText = "";
+                            this.texturedStrings.Add(SpriteFonts.vanillaFont.ParseString($"Current Album Name: {musicPack.Name}", new Vector2(button.bounds.X / 2, button.bounds.Y + 128), button.textColor));
+                            button.hoverText = "";
                         }
                         count++;
                     }
@@ -400,8 +384,8 @@ namespace StardewSymphonyRemastered.Framework.Menus
             {
                 this.fancyButtons.Clear();
                 //Vector4 placement = new Vector4((Game1.viewport.Width / 3), (Game1.viewport.Height / 4) + 128, this.width, this.height / 2);
-                var info = (KeyValuePair<string, MusicPack>)this.currentMusicPackAlbum.buttonFunctionality.leftClick.paramaters[0];
-                var musicPackSongList = info.Value.songInformation.listOfSongsWithoutTriggers;
+                MusicPack musicPack = (MusicPack)this.currentMusicPackAlbum.buttonFunctionality.leftClick.paramaters[0];
+                List<string> musicPackSongList = musicPack.SongInformation.listOfSongsWithoutTriggers;
 
                 Vector4 placement2 = new Vector4(this.width * .2f + 400, this.height * .05f, 5 * 100, this.height * .9f);
                 for (int i = 0; i < musicPackSongList.Count; i++)
@@ -409,9 +393,9 @@ namespace StardewSymphonyRemastered.Framework.Menus
                     //Allow 8 songs to be displayed per page.
                     Texture2DExtended texture = StardewSymphony.textureManager.getTexture("MusicNote");
                     float scale = 1.00f / (texture.getTexture().Width / 64f);
-                    Song s = musicPackSongList.ElementAt(i);
+                    string songName = musicPackSongList.ElementAt(i);
                     Rectangle srcRect = new Rectangle(0, 0, texture.getTexture().Width, texture.getTexture().Height);
-                    this.fancyButtons.Add(new Button(s.name, new Rectangle((int)placement2.X + 25, (int)placement2.Y + ((i % 6) * 100) + 100, 64, 64), texture, s.name, srcRect, scale, new Animation(srcRect), Color.White, Color.White, new ButtonFunctionality(null, null, null)));
+                    this.fancyButtons.Add(new Button(songName, new Rectangle((int)placement2.X + 25, (int)placement2.Y + ((i % 6) * 100) + 100, 64, 64), texture, songName, srcRect, scale, new Animation(srcRect), Color.White, Color.White, new ButtonFunctionality(null, null, null)));
                 }
             }
 
@@ -852,10 +836,10 @@ namespace StardewSymphonyRemastered.Framework.Menus
         {
             if (this.drawMode == DrawMode.AlbumSelection)
             {
-                foreach (var v in this.musicAlbumButtons)
+                foreach (var button in this.musicAlbumButtons)
                 {
-                    if (v.containsPoint(x, y))
-                        v.onRightClick();
+                    if (button.containsPoint(x, y))
+                        button.onRightClick();
                 }
             }
         }
@@ -865,35 +849,34 @@ namespace StardewSymphonyRemastered.Framework.Menus
         {
             if (this.drawMode == DrawMode.AlbumSelection)
             {
-                foreach (var v in this.musicAlbumButtons)
+                foreach (var button in this.musicAlbumButtons)
                 {
-                    if (v.containsPoint(x, y))
+                    if (button.containsPoint(x, y))
                     {
-                        var pair = (KeyValuePair<string, MusicPack>)v.buttonFunctionality.hover.paramaters[0];
-                        v.hoverText = pair.Key;
-                        v.onHover();
-                        //StardewSymphony.ModMonitor.Log(pair.Key);
+                        MusicPack musicPack = (MusicPack)button.buttonFunctionality.hover.paramaters[0];
+                        button.hoverText = musicPack.Name;
+                        button.onHover();
                     }
                     else
-                        v.hoverText = "";
+                        button.hoverText = "";
                 }
             }
 
             if (this.drawMode == DrawMode.AlbumFancySelection)
             {
-                foreach (var v in this.fancyButtons)
+                foreach (var button in this.fancyButtons)
                 {
-                    if (v.containsPoint(x, y))
+                    if (button.containsPoint(x, y))
                     {
-                        if (v.buttonFunctionality?.hover?.paramaters == null || v.buttonFunctionality.hover.paramaters.Count == 0)
+                        if (button.buttonFunctionality?.hover?.paramaters == null || button.buttonFunctionality.hover.paramaters.Count == 0)
                             continue;
 
-                        var pair = (KeyValuePair<string, MusicPack>)v.buttonFunctionality.hover.paramaters[0];
-                        v.hoverText = pair.Key;
-                        v.onHover();
+                        MusicPack musicPack = (MusicPack)button.buttonFunctionality.hover.paramaters[0];
+                        button.hoverText = musicPack.Name;
+                        button.onHover();
                     }
                     else
-                        v.hoverText = "";
+                        button.hoverText = "";
                 }
             }
         }
@@ -940,13 +923,13 @@ namespace StardewSymphonyRemastered.Framework.Menus
 
             if (this.drawMode == DrawMode.AlbumSelection)
             {
-                foreach (var v in this.musicAlbumButtons)
+                foreach (var button in this.musicAlbumButtons)
                 {
-                    if (v.containsPoint(x, y))
+                    if (button.containsPoint(x, y))
                     {
                         Game1.playSound("coin");
-                        this.selectAlbum(v);
-                        v.onLeftClick();
+                        this.selectAlbum(button);
+                        button.onLeftClick();
                     }
                 }
                 return;
@@ -956,18 +939,18 @@ namespace StardewSymphonyRemastered.Framework.Menus
             {
                 int count = 0;
                 Button ok = Button.Empty();
-                foreach (var v in this.fancyButtons)
+                foreach (var button in this.fancyButtons)
                 {
-                    if (v.containsPoint(x, y) && v.buttonFunctionality.leftClick != null)
+                    if (button.containsPoint(x, y) && button.buttonFunctionality.leftClick != null)
                     {
                         Game1.playSound("coin");
-                        v.onLeftClick();
+                        button.onLeftClick();
                         this.currentAlbumIndex += count - 3;
                         while (this.currentAlbumIndex < 0)
                             this.currentAlbumIndex = (this.musicAlbumButtons.Count - (this.currentAlbumIndex * -1));
-                        ok = v;
+                        ok = button;
                     }
-                    if (v.buttonFunctionality.leftClick != null)
+                    if (button.buttonFunctionality.leftClick != null)
                         count++;
                 }
                 this.selectAlbum(ok);
@@ -999,12 +982,12 @@ namespace StardewSymphonyRemastered.Framework.Menus
 
                 bool songSelected = false;
                 //Get a list of components to draw. And if I click one select the song.
-                foreach (var v in drawList)
+                foreach (var component in drawList)
                 {
-                    if (v.containsPoint(x, y))
+                    if (component.containsPoint(x, y))
                     {
                         Game1.playSound("coin");
-                        this.selectSong(v);
+                        this.selectSong(component);
                         songSelected = true;
                     }
                 }
@@ -1189,12 +1172,12 @@ namespace StardewSymphonyRemastered.Framework.Menus
 
                 bool songSelected = false;
                 //Get a list of components to draw. And if I click one select the song.
-                foreach (var v in drawList)
+                foreach (var component in drawList)
                 {
-                    if (v.containsPoint(x, y))
+                    if (component.containsPoint(x, y))
                     {
                         Vector2 position = new Vector2(this.width * .1f + 64, this.height * .05f + 512);
-                        this.currentlySelectedLocation = v.clone(position);
+                        this.currentlySelectedLocation = component.clone(position);
                         songSelected = true;
                         this.drawMode = !this.selectedJustLocation
                             ? DrawMode.DaySelection
@@ -1234,12 +1217,12 @@ namespace StardewSymphonyRemastered.Framework.Menus
 
                 bool songSelected = false;
                 //Get a list of components to draw. And if I click one select the song.
-                foreach (var v in drawList)
+                foreach (var component in drawList)
                 {
-                    if (v.containsPoint(x, y))
+                    if (component.containsPoint(x, y))
                     {
                         Vector2 position = new Vector2(this.width * .1f + 64, this.height * .05f + 384);
-                        this.currentlySelectedFestival = v.clone(position);
+                        this.currentlySelectedFestival = component.clone(position);
                         songSelected = true;
                         this.drawMode = DrawMode.SelectedFestival;
                     }
@@ -1276,12 +1259,12 @@ namespace StardewSymphonyRemastered.Framework.Menus
 
                 bool songSelected = false;
                 //Get a list of components to draw. And if I click one select the song.
-                foreach (var v in drawList)
+                foreach (var component in drawList)
                 {
-                    if (v.containsPoint(x, y))
+                    if (component.containsPoint(x, y))
                     {
                         Vector2 position = new Vector2(this.width * .1f + 64, this.height * .05f + 384);
-                        this.currentlySelectedMenu = v.clone(position);
+                        this.currentlySelectedMenu = component.clone(position);
                         songSelected = true;
                         this.drawMode = DrawMode.SelectedMenu;
                     }
@@ -1318,12 +1301,12 @@ namespace StardewSymphonyRemastered.Framework.Menus
 
                 bool songSelected = false;
                 //Get a list of components to draw. And if I click one select the song.
-                foreach (var v in drawList)
+                foreach (var component in drawList)
                 {
-                    if (v.containsPoint(x, y))
+                    if (component.containsPoint(x, y))
                     {
                         Vector2 position = new Vector2(this.width * .1f + 64, this.height * .05f + 384);
-                        this.currentlySelectedEvent = v.clone(position);
+                        this.currentlySelectedEvent = component.clone(position);
                         songSelected = true;
                         this.drawMode = DrawMode.SelectedEvent;
                     }
@@ -1364,22 +1347,22 @@ namespace StardewSymphonyRemastered.Framework.Menus
         public bool doesPackContainMusic()
         {
             if (this.currentMusicPackAlbum == null || this.currentSelectedSong == null) return false;
-            var info = (KeyValuePair<string, MusicPack>)this.currentMusicPackAlbum.buttonFunctionality.leftClick.paramaters[0];
+            MusicPack musicPack = (MusicPack)this.currentMusicPackAlbum.buttonFunctionality.leftClick.paramaters[0];
             //Check for generic festival music.
             if (this.drawMode == DrawMode.SelectedFestival)
             {
-                var festivalSonglist = info.Value.songInformation.festivalSongs;
-                return festivalSonglist != null && festivalSonglist.Contains(info.Value.songInformation.getSongFromList(festivalSonglist, this.currentSelectedSong.name));
+                var festivalSonglist = musicPack.SongInformation.festivalSongs;
+                return festivalSonglist != null && festivalSonglist.Contains(musicPack.SongInformation.getSongFromList(festivalSonglist, this.currentSelectedSong.name));
             }
             //Check for generic event music.
             if (this.drawMode == DrawMode.SelectedEvent)
             {
-                var eventSonglist = info.Value.songInformation.eventSongs;
-                return eventSonglist != null && eventSonglist.Contains(info.Value.songInformation.getSongFromList(eventSonglist, this.currentSelectedSong.name));
+                var eventSonglist = musicPack.SongInformation.eventSongs;
+                return eventSonglist != null && eventSonglist.Contains(musicPack.SongInformation.getSongFromList(eventSonglist, this.currentSelectedSong.name));
             }
             //Check for seasonal music triggers.
-            var songList = info.Value.songInformation.getSongList(this.generateSongTriggerKeyFromSelection());
-            return songList.Value != null && songList.Value.Contains(info.Value.songInformation.getSongFromList(songList.Value, this.currentSelectedSong.name));
+            var songList = musicPack.SongInformation.getSongList(this.generateSongTriggerKeyFromSelection());
+            return songList.Value != null && songList.Value.Contains(musicPack.SongInformation.getSongFromList(songList.Value, this.currentSelectedSong.name));
         }
 
         /// <summary>Draws the menu and it's respective components depending on the drawmode that is currently set.</summary>
@@ -1391,8 +1374,8 @@ namespace StardewSymphonyRemastered.Framework.Menus
             if (this.drawMode == DrawMode.AlbumSelection)
             {
                 this.drawDialogueBoxBackground();
-                foreach (var v in this.musicAlbumButtons)
-                    v.draw(b);
+                foreach (var button in this.musicAlbumButtons)
+                    button.draw(b);
             }
 
             if (this.drawMode == DrawMode.AlbumFancySelection)
@@ -1400,10 +1383,10 @@ namespace StardewSymphonyRemastered.Framework.Menus
                 Vector4 placement3 = new Vector4(Game1.viewport.Width / 4 - 50, Game1.viewport.Height / 4, 8 * 100, 128 * 2);
                 this.drawDialogueBoxBackground((int)placement3.X, (int)placement3.Y, (int)placement3.Z, (int)placement3.W, new Color(new Vector4(this.dialogueBoxBackgroundColor.ToVector3(), 0)));
 
-                foreach (var v in this.fancyButtons)
-                    v.draw(b);
-                foreach (var v in this.texturedStrings)
-                    v.draw(b);
+                foreach (var button in this.fancyButtons)
+                    button.draw(b);
+                foreach (var str in this.texturedStrings)
+                    str.draw(b);
             }
 
             if (this.drawMode == DrawMode.SongSelectionMode)
@@ -1431,11 +1414,11 @@ namespace StardewSymphonyRemastered.Framework.Menus
 
                 var drawList = this.fancyButtons.GetRange(0 + (this.currentSongPageIndex * (amountToShow)), amount);
 
-                foreach (var v in drawList)
-                    v.draw(b);
+                foreach (var button in drawList)
+                    button.draw(b);
 
-                foreach (var v in this.texturedStrings)
-                    v.draw(b);
+                foreach (var str in this.texturedStrings)
+                    str.draw(b);
             }
 
             if (this.drawMode == DrawMode.DifferentSelectionTypesMode)
@@ -1449,8 +1432,8 @@ namespace StardewSymphonyRemastered.Framework.Menus
                 foreach (Button button in this.fancyButtons)
                     button.draw(b);
 
-                foreach (var v in this.texturedStrings)
-                    v.draw(b);
+                foreach (var str in this.texturedStrings)
+                    str.draw(b);
             }
 
             if (this.drawMode == DrawMode.SeasonSelection)
@@ -1465,8 +1448,8 @@ namespace StardewSymphonyRemastered.Framework.Menus
                 foreach (Button button in this.fancyButtons)
                     button.draw(b);
 
-                foreach (var v in this.texturedStrings)
-                    v.draw(b);
+                foreach (var str in this.texturedStrings)
+                    str.draw(b);
             }
 
             if (this.drawMode == DrawMode.WeatherSelection)
@@ -1482,9 +1465,9 @@ namespace StardewSymphonyRemastered.Framework.Menus
                 foreach (Button button in this.fancyButtons)
                     button.draw(b);
 
-                foreach (var v in this.texturedStrings)
+                foreach (var str in this.texturedStrings)
                 {
-                    v.draw(b);
+                    str.draw(b);
                 }
             }
 
@@ -1503,8 +1486,8 @@ namespace StardewSymphonyRemastered.Framework.Menus
                 foreach (Button button in this.fancyButtons)
                     button.draw(b);
 
-                foreach (var v in this.texturedStrings)
-                    v.draw(b);
+                foreach (var str in this.texturedStrings)
+                    str.draw(b);
             }
 
             if (this.drawMode == DrawMode.LocationSelection)
@@ -1540,11 +1523,11 @@ namespace StardewSymphonyRemastered.Framework.Menus
 
                 var drawList = this.fancyButtons.GetRange(0 + (this.locationPageIndex * (amountToShow)), amount);
 
-                foreach (var v in drawList)
-                    v.draw(b);
+                foreach (var button in drawList)
+                    button.draw(b);
 
-                foreach (var v in this.texturedStrings)
-                    v.draw(b);
+                foreach (var str in this.texturedStrings)
+                    str.draw(b);
             }
 
             if (this.drawMode == DrawMode.DaySelection)
@@ -1563,8 +1546,8 @@ namespace StardewSymphonyRemastered.Framework.Menus
                 foreach (Button button in this.fancyButtons)
                     button.draw(b);
 
-                foreach (var v in this.texturedStrings)
-                    v.draw(b);
+                foreach (var str in this.texturedStrings)
+                    str.draw(b);
             }
 
             if (this.drawMode == DrawMode.NothingElseToDisplay)
@@ -1592,8 +1575,8 @@ namespace StardewSymphonyRemastered.Framework.Menus
                 foreach (Button button in this.fancyButtons)
                     button.draw(b);
 
-                foreach (var v in this.texturedStrings)
-                    v.draw(b);
+                foreach (var str in this.texturedStrings)
+                    str.draw(b);
             }
 
             if (this.drawMode == DrawMode.EventSelection)
@@ -1637,11 +1620,11 @@ namespace StardewSymphonyRemastered.Framework.Menus
 
                 var drawList = this.fancyButtons.GetRange(0 + (this.eventPageIndex * (amountToShow)), amount);
 
-                foreach (var v in drawList)
-                    v.draw(b);
+                foreach (var button in drawList)
+                    button.draw(b);
 
-                foreach (var v in this.texturedStrings)
-                    v.draw(b);
+                foreach (var str in this.texturedStrings)
+                    str.draw(b);
             }
 
             if (this.drawMode == DrawMode.MenuSelection)
@@ -1684,11 +1667,11 @@ namespace StardewSymphonyRemastered.Framework.Menus
 
                 var drawList = this.fancyButtons.GetRange(0 + (this.menuPageIndex * (amountToShow)), amount);
 
-                foreach (var v in drawList)
-                    v.draw(b);
+                foreach (var button in drawList)
+                    button.draw(b);
 
-                foreach (var v in this.texturedStrings)
-                    v.draw(b);
+                foreach (var str in this.texturedStrings)
+                    str.draw(b);
             }
 
 
@@ -1732,11 +1715,11 @@ namespace StardewSymphonyRemastered.Framework.Menus
 
                 var drawList = this.fancyButtons.GetRange(0 + (this.festivalPageIndex * (amountToShow)), amount);
 
-                foreach (var v in drawList)
-                    v.draw(b);
+                foreach (var button in drawList)
+                    button.draw(b);
 
-                foreach (var v in this.texturedStrings)
-                    v.draw(b);
+                foreach (var str in this.texturedStrings)
+                    str.draw(b);
             }
 
             if (this.drawMode == DrawMode.SelectedEvent)
@@ -1759,8 +1742,8 @@ namespace StardewSymphonyRemastered.Framework.Menus
                 foreach (Button button in this.fancyButtons)
                     button.draw(b);
 
-                foreach (var v in this.texturedStrings)
-                    v.draw(b);
+                foreach (var str in this.texturedStrings)
+                    str.draw(b);
             }
 
 
@@ -1783,8 +1766,8 @@ namespace StardewSymphonyRemastered.Framework.Menus
                 foreach (Button button in this.fancyButtons)
                     button.draw(b);
 
-                foreach (var v in this.texturedStrings)
-                    v.draw(b);
+                foreach (var str in this.texturedStrings)
+                    str.draw(b);
             }
 
 
@@ -1808,8 +1791,8 @@ namespace StardewSymphonyRemastered.Framework.Menus
                 foreach (Button button in this.fancyButtons)
                     button.draw(b);
 
-                foreach (var v in this.texturedStrings)
-                    v.draw(b);
+                foreach (var str in this.texturedStrings)
+                    str.draw(b);
             }
 
 
@@ -1861,68 +1844,68 @@ namespace StardewSymphonyRemastered.Framework.Menus
         public void playSong()
         {
             if (StardewSymphony.Config.EnableDebugLog)
-                StardewSymphony.ModMonitor.Log("Song Selected!" + this.currentSelectedSong.name);
-            var info = (KeyValuePair<string, MusicPack>)this.currentMusicPackAlbum.buttonFunctionality.leftClick.paramaters[0];
+                StardewSymphony.ModMonitor.Log($"Song Selected! {this.currentSelectedSong.name}");
+            MusicPack musicPack = (MusicPack)this.currentMusicPackAlbum.buttonFunctionality.leftClick.paramaters[0];
             if (StardewSymphony.Config.EnableDebugLog)
-                StardewSymphony.ModMonitor.Log("Select Pack:" + info.Key);
-            StardewSymphony.musicManager.swapMusicPacks(info.Key);
-            StardewSymphony.musicManager.playSongFromCurrentPack(this.currentSelectedSong.name);
+                StardewSymphony.ModMonitor.Log($"Select Pack: {musicPack.Name}");
+            StardewSymphony.musicManager.SwapMusicPacks(musicPack.Name);
+            StardewSymphony.musicManager.PlaySongFromCurrentPack(this.currentSelectedSong.name);
         }
 
         /// <summary>Stops the currently playing song.</summary>
         public void stopSong()
         {
             if (StardewSymphony.Config.EnableDebugLog)
-                StardewSymphony.ModMonitor.Log("Song Selected!" + this.currentSelectedSong.name);
-            var info = (KeyValuePair<string, MusicPack>)this.currentMusicPackAlbum.buttonFunctionality.leftClick.paramaters[0];
+                StardewSymphony.ModMonitor.Log($"Song Selected! {this.currentSelectedSong.name}");
+            MusicPack musicPack = (MusicPack)this.currentMusicPackAlbum.buttonFunctionality.leftClick.paramaters[0];
             if (StardewSymphony.Config.EnableDebugLog)
-                StardewSymphony.ModMonitor.Log("Select Pack:" + info.Key);
-            StardewSymphony.musicManager.swapMusicPacks(info.Key);
+                StardewSymphony.ModMonitor.Log($"Select Pack: {musicPack.Name}");
+            StardewSymphony.musicManager.SwapMusicPacks(musicPack.Name);
             StardewSymphony.musicManager.stopSongFromCurrentMusicPack();
         }
 
         /// <summary>Adds a song to the trigger list so that music will play at the appropriate time.</summary>
         public void addSong()
         {
-            var info = (KeyValuePair<string, MusicPack>)this.currentMusicPackAlbum.buttonFunctionality.leftClick.paramaters[0];
+            MusicPack musicPack = (MusicPack)this.currentMusicPackAlbum.buttonFunctionality.leftClick.paramaters[0];
             //StardewSymphony.ModMonitor.Log(generateSongTriggerKeyFromSelection());
             //Add generic festival music.
             if (this.drawMode == DrawMode.SelectedFestival)
             {
-                info.Value.songInformation.addSongToFestivalList(this.currentSelectedSong.label);
+                musicPack.SongInformation.addSongToFestivalList(this.currentSelectedSong.label);
                 return;
             }
 
             //Add generic event music.
             if (this.drawMode == DrawMode.SelectedEvent)
             {
-                info.Value.songInformation.addSongToEventList(this.currentSelectedSong.label);
+                musicPack.SongInformation.addSongToEventList(this.currentSelectedSong.label);
                 return;
             }
 
             if (this.currentSelectedSong?.label != null)
-                info.Value.songInformation.addSongToTriggerList(this.generateSongTriggerKeyFromSelection(), this.currentSelectedSong.label);
+                musicPack.SongInformation.addSongToTriggerList(this.generateSongTriggerKeyFromSelection(), this.currentSelectedSong.label);
         }
 
         /// <summary>Delete the song from the list of triggers.</summary>
         public void deleteSong()
         {
-            var info = (KeyValuePair<string, MusicPack>)this.currentMusicPackAlbum.buttonFunctionality.leftClick.paramaters[0];
+            MusicPack musicPack = (MusicPack)this.currentMusicPackAlbum.buttonFunctionality.leftClick.paramaters[0];
 
             if (this.drawMode == DrawMode.SelectedFestival)
             {
-                info.Value.songInformation.removeSongFromFestivalList(this.currentSelectedSong.label);
+                musicPack.SongInformation.removeSongFromFestivalList(this.currentSelectedSong.label);
                 return;
             }
 
             //Add generic event music.
             if (this.drawMode == DrawMode.SelectedEvent)
             {
-                info.Value.songInformation.removeSongFromEventList(this.currentSelectedSong.label);
+                musicPack.SongInformation.removeSongFromEventList(this.currentSelectedSong.label);
                 return;
             }
 
-            info.Value.songInformation.removeSongFromTriggerList(this.generateSongTriggerKeyFromSelection(), this.currentSelectedSong.label);
+            musicPack.SongInformation.removeSongFromTriggerList(this.generateSongTriggerKeyFromSelection(), this.currentSelectedSong.label);
         }
 
         /// <summary>Generate the trigger key based on used selection.</summary>
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicManager.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicManager.cs
index c6c02bb7..849b4db2 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicManager.cs
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicManager.cs
@@ -9,145 +9,103 @@ namespace StardewSymphonyRemastered.Framework
     /// <summary>Manages all music for the mod.</summary>
     public class MusicManager
     {
-        /// <summary>A dictionary containing all of the music packs loaded in.</summary>
-        public Dictionary<string, MusicPack> musicPacks;
+        /*********
+        ** Fields
+        *********/
+        /// <summary>The RNG used to select music packs and songs.</summary>
+        private readonly Random Random = new Random();
 
-        public MusicPack currentMusicPack;
+        /// <summary>The delay timer between songs.</summary>
+        private readonly Timer Timer = new Timer();
 
-        private readonly Random packSelector;
-        private readonly Random songSelector;
+        private bool lastSongWasLocationSpecific;
 
-        Timer timer;
 
-        bool lastSongWasLocationSpecific;
+        /*********
+        ** Accessors
+        *********/
+        /// <summary>The loaded music packs.</summary>
+        public IDictionary<string, MusicPack> MusicPacks { get; } = new Dictionary<string, MusicPack>();
+
+        /// <summary>The current music pack playing music, if any.</summary>
+        public MusicPack CurrentMusicPack { get; private set; }
+
+
+        /*********
+        ** Public methods
+        *********/
         /// <summary>Construct an instance.</summary>
         public MusicManager()
         {
-            this.musicPacks = new Dictionary<string, MusicPack>();
-            this.currentMusicPack = null;
-            this.packSelector = new Random(Game1.random.Next(1, 1000000));
-            this.songSelector = new Random(Game1.player.deepestMineLevel + Game1.player.facingDirection + this.packSelector.Next(0, 10000));
-            this.lastSongWasLocationSpecific = false;
+            this.Timer.Elapsed += this.OnTimerFinished;
         }
 
-        /// <summary>Swaps between referenced music packs and stops the last playing song.</summary>
-        /// <param name="nameOfNewMusicPack"></param>
-        public void swapMusicPacks(string nameOfNewMusicPack)
+        /// <summary>Swap between referenced music packs and stop the current song.</summary>
+        /// <param name="nameOfNewMusicPack">The name of the new music pack to select.</param>
+        public void SwapMusicPacks(string nameOfNewMusicPack)
         {
-            if (this.isMusicPackValid(nameOfNewMusicPack))
-            {
-                this.currentMusicPack?.stopSong();
-                this.currentMusicPack = this.getMusicPack(nameOfNewMusicPack);
-            }
-            else if (StardewSymphony.Config.EnableDebugLog)
-                StardewSymphony.ModMonitor.Log("ERROR: Music Pack " + nameOfNewMusicPack + " isn't valid for some reason.", StardewModdingAPI.LogLevel.Alert);
-        }
-
-        /// <summary>Updtes the timer every second to check if a song is playing or not.</summary>
-        public void updateTimer()
-        {
-
-            if (this.currentMusicPack == null) return;
-            if (StardewSymphony.Config.DisableStardewMusic)
-            {
-                if (this.currentMusicPack.isPlaying())
-                    return;
-            }
-            else
-            {
-                try
-                {
-                    string songName = Game1.currentSong.Name.ToLower();
-
-                    if (this.currentMusicPack.isPlaying() || (Game1.currentSong.IsPlaying && !songName.Contains("ambient")))
-                        return;
-                }
-                catch
-                {
-                    if (this.currentMusicPack.isPlaying())
-                        return;
-                }
-            }
-            if (this.timer == null)
-            {
-                Random r = new Random(Game1.random.Next());
-                int val = r.Next(StardewSymphony.Config.MinimumDelayBetweenSongsInMilliseconds, StardewSymphony.Config.MaximumDelayBetweenSongsInMilliseconds + 1);
-                //StardewSymphony.ModMonitor.Log("Music Pack is not playing! Generate a new timer! Delay: "+val.ToString());
-                this.timer = new Timer(val);
-                this.timer.Elapsed += this.onTimerFinished;
-                this.timer.Enabled = true;
-            }
-            else
-            {
-                this.timer.Enabled = true;
-                this.timer.Elapsed += this.onTimerFinished;
-            }
-        }
-
-        /// <summary>Selects a new song when the timer delay runs out.</summary>
-        public void onTimerFinished(object source, ElapsedEventArgs e)
-        {
-            if (this.currentMusicPack.isPlaying())
-            {
-                this.timer.Enabled = false;
-                this.timer = null;
-                return;
-            }
-            //StardewSymphony.ModMonitor.Log("AHH THE TIMER FINISHED!");
-            this.timer.Enabled = false;
-            this.timer.Elapsed -= this.onTimerFinished;
-
-            this.selectMusic(SongSpecifics.getCurrentConditionalString());
-            this.timer = null;
-        }
-
-        /// <summary>Plays the song from the currently loaded music pack.</summary>
-        /// <param name="songName"></param>
-        public void playSongFromCurrentPack(string songName)
-        {
-            this.currentMusicPack?.playSong(songName);
-        }
-
-        /// <summary>Stops the song from the current music pack.</summary>
-        public void stopSongFromCurrentMusicPack()
-        {
-            this.currentMusicPack?.stopSong();
-        }
-
-        /// <summary>Checks to see if the music pack has been loaded into the Music Manager.</summary>
-        public bool isMusicPackValid(string nameOfMusicPack)
-        {
-            return this.musicPacks.ContainsKey(nameOfMusicPack);
-        }
-
-        /// <summary>Gets the music pack from the</summary>
-        public MusicPack getMusicPack(string name)
-        {
-            if (!this.isMusicPackValid(name))
+            if (!this.MusicPacks.TryGetValue(nameOfNewMusicPack, out MusicPack musicPack))
             {
                 if (StardewSymphony.Config.EnableDebugLog)
-                    StardewSymphony.ModMonitor.Log("Error, the music pack: " + name + " is not found. Please make sure it is loaded in and try again.");
-                return null;
+                    StardewSymphony.ModMonitor.Log($"ERROR: Music Pack '{nameOfNewMusicPack}' isn't valid for some reason.", StardewModdingAPI.LogLevel.Alert);
+                return;
             }
 
-            foreach (var pair in this.musicPacks)
-            {
-                if (name == pair.Key)
-                    return pair.Value;
-            }
-
-            return null; //Needed I suppose to ensure this function compiles.
+            this.CurrentMusicPack?.StopSong();
+            this.CurrentMusicPack = musicPack;
         }
 
-        /// <summary>Iterates across all music packs and determines which music packs contain songs that can be played right now.</summary>
-        public Dictionary<MusicPack, List<Song>> getListOfApplicableMusicPacks(string songListKey)
+        /// <summary>Updates the timer every second to check whether a song is playing.</summary>
+        public void UpdateTimer()
         {
-            Dictionary<MusicPack, List<Song>> listOfValidDictionaries = new Dictionary<MusicPack, List<Song>>();
-            foreach (var v in this.musicPacks)
+            if (this.CurrentMusicPack == null)
+                return;
+
+            if (StardewSymphony.Config.DisableStardewMusic)
+            {
+                if (this.CurrentMusicPack.IsPlaying())
+                    return;
+            }
+            else if (this.CurrentMusicPack.IsPlaying() || (Game1.currentSong?.IsPlaying == true && !Game1.currentSong.Name.ToLower().Contains("ambient")))
+                return;
+
+            if (!this.Timer.Enabled)
+            {
+                this.Timer.Interval = this.Random.Next(StardewSymphony.Config.MinimumDelayBetweenSongsInMilliseconds, StardewSymphony.Config.MaximumDelayBetweenSongsInMilliseconds + 1);
+                this.Timer.Enabled = true;
+            }
+        }
+
+        /// <summary>Choose a new song when a delay runs out.</summary>
+        private void OnTimerFinished(object source, ElapsedEventArgs e)
+        {
+            this.Timer.Enabled = false;
+            if (!this.CurrentMusicPack.IsPlaying())
+                this.selectMusic(SongSpecifics.getCurrentConditionalString());
+        }
+
+        /// <summary>Play a song from the current music pack.</summary>
+        /// <param name="songName">The song to play.</param>
+        public void PlaySongFromCurrentPack(string songName)
+        {
+            this.CurrentMusicPack?.PlaySong(songName);
+        }
+
+        /// <summary>Stop the current song being played.</summary>
+        public void stopSongFromCurrentMusicPack()
+        {
+            this.CurrentMusicPack?.StopSong();
+        }
+
+        /// <summary>Get all music packs which contain songs that can be played right now.</summary>
+        public Dictionary<MusicPack, List<string>> GetApplicableMusicPacks(string songListKey)
+        {
+            Dictionary<MusicPack, List<string>> listOfValidDictionaries = new Dictionary<MusicPack, List<string>>();
+            foreach (var v in this.MusicPacks)
             {
                 try
                 {
-                    var songList = v.Value.songInformation.getSongList(songListKey).Value;
+                    var songList = v.Value.SongInformation.getSongList(songListKey).Value;
                     if (songList.Count > 0)
                         listOfValidDictionaries.Add(v.Value, songList);
                 }
@@ -156,14 +114,14 @@ namespace StardewSymphonyRemastered.Framework
             return listOfValidDictionaries;
         }
 
-        public Dictionary<MusicPack, List<Song>> getListOfApplicableMusicPacksForFestivals()
+        public Dictionary<MusicPack, List<string>> GetListOfApplicableMusicPacksForFestivals()
         {
-            Dictionary<MusicPack, List<Song>> listOfValidDictionaries = new Dictionary<MusicPack, List<Song>>();
-            foreach (var v in this.musicPacks)
+            Dictionary<MusicPack, List<string>> listOfValidDictionaries = new Dictionary<MusicPack, List<string>>();
+            foreach (var v in this.MusicPacks)
             {
                 try
                 {
-                    var songList = v.Value.songInformation.getFestivalMusic();
+                    var songList = v.Value.SongInformation.getFestivalMusic();
                     if (songList.Count > 0)
                         listOfValidDictionaries.Add(v.Value, songList);
                 }
@@ -172,14 +130,14 @@ namespace StardewSymphonyRemastered.Framework
             return listOfValidDictionaries;
         }
 
-        public Dictionary<MusicPack, List<Song>> getListOfApplicableMusicPacksForEvents()
+        public Dictionary<MusicPack, List<string>> GetListOfApplicableMusicPacksForEvents()
         {
-            Dictionary<MusicPack, List<Song>> listOfValidDictionaries = new Dictionary<MusicPack, List<Song>>();
-            foreach (var v in this.musicPacks)
+            Dictionary<MusicPack, List<string>> listOfValidDictionaries = new Dictionary<MusicPack, List<string>>();
+            foreach (var v in this.MusicPacks)
             {
                 try
                 {
-                    var songList = v.Value.songInformation.getEventMusic();
+                    var songList = v.Value.SongInformation.getEventMusic();
                     if (songList.Count > 0)
                         listOfValidDictionaries.Add(v.Value, songList);
                 }
@@ -188,47 +146,34 @@ namespace StardewSymphonyRemastered.Framework
             return listOfValidDictionaries;
         }
 
-        public void selectMenuMusic(string songListKey)
+        public void SelectMenuMusic(string songListKey)
         {
-            //Nullify the timer when new music is selected.
-            this.timer = null;
+            // stop timer when new music is selected
+            this.Timer.Enabled = false;
 
-            var listOfValidMusicPacks = this.getListOfApplicableMusicPacks(songListKey);
+            // get applicable music packs
+            var listOfValidMusicPacks = this.GetApplicableMusicPacks(songListKey);
+            if (listOfValidMusicPacks.Count == 0)
+                return;
 
-            if (listOfValidMusicPacks.Count == 0) return;
-
-
-            int randInt = this.packSelector.Next(0, listOfValidMusicPacks.Count - 1);
-
-            var musicPackPair = listOfValidMusicPacks.ElementAt(randInt);
-
-
-            //used to swap the music packs and stop the last playing song.
-            this.swapMusicPacks(musicPackPair.Key.musicPackInformation.name);
-
-            int randInt2 = this.songSelector.Next(0, musicPackPair.Value.Count);
-
-
-            var songName = musicPackPair.Value.ElementAt(randInt2);
-
-            this.currentMusicPack.playSong(songName.name);
+            // swap to new music pack
+            var pair = listOfValidMusicPacks.ElementAt(this.Random.Next(0, listOfValidMusicPacks.Count - 1));
+            this.SwapMusicPacks(pair.Key.Name);
+            string songName = pair.Value.ElementAt(this.Random.Next(0, pair.Value.Count));
+            this.CurrentMusicPack.PlaySong(songName);
 
             StardewSymphony.menuChangedMusic = true;
 
         }
-        /// <summary>Selects the actual song to be played right now based off of the selector key. The selector key should be called when the player's location changes.</summary>
-        /// <param name="songListKey"></param>
+        /// <summary>Select the actual song to be played right now based on the selector key. The selector key should be called when the player's location changes.</summary>
         public void selectMusic(string songListKey)
         {
-            //Nullify the timer when new music is selected.
-            this.timer = null;
-
-            var listOfValidMusicPacks = this.getListOfApplicableMusicPacks(songListKey);
+            // stop timer timer when music is selected
+            this.Timer.Enabled = false;
 
+            // get applicable music packs
+            var listOfValidMusicPacks = this.GetApplicableMusicPacks(songListKey);
             string subKey = songListKey;
-            //Try to get more specific.
-
-
 
             //This chunk is to determine song specifics for location.
             while (listOfValidMusicPacks.Count == 0)
@@ -252,7 +197,7 @@ namespace StardewSymphonyRemastered.Framework
 
                 if (StardewSymphony.Config.EnableDebugLog)
                     StardewSymphony.ModMonitor.Log(subKey, StardewModdingAPI.LogLevel.Alert);
-                listOfValidMusicPacks = this.getListOfApplicableMusicPacks(subKey);
+                listOfValidMusicPacks = this.GetApplicableMusicPacks(subKey);
                 if (listOfValidMusicPacks.Count == 0)
                 {
                     //No valid songs to play at this time.
@@ -286,7 +231,7 @@ namespace StardewSymphonyRemastered.Framework
                 }
                 if (StardewSymphony.Config.EnableDebugLog)
                     StardewSymphony.ModMonitor.Log(subKey, StardewModdingAPI.LogLevel.Alert);
-                listOfValidMusicPacks = this.getListOfApplicableMusicPacks(subKey);
+                listOfValidMusicPacks = this.GetApplicableMusicPacks(subKey);
                 if (listOfValidMusicPacks.Count == 0)
                 {
                     //No valid songs to play at this time.
@@ -315,7 +260,7 @@ namespace StardewSymphonyRemastered.Framework
 
                     if (StardewSymphony.Config.EnableDebugLog)
                         StardewSymphony.ModMonitor.Log(subKey, StardewModdingAPI.LogLevel.Alert);
-                    listOfValidMusicPacks = this.getListOfApplicableMusicPacks(subKey);
+                    listOfValidMusicPacks = this.GetApplicableMusicPacks(subKey);
                     if (listOfValidMusicPacks.Count == 0)
                     {
                         //No valid songs to play at this time.
@@ -341,11 +286,11 @@ namespace StardewSymphonyRemastered.Framework
 
             string[] sizeList = subKey.Split(SongSpecifics.seperator);
 
-            if (this.currentMusicPack != null)
+            if (this.CurrentMusicPack != null)
             {
                 //If I am trying to play a generic song and a generic song is playing don't change the music.
                 //If I am trying to play a generic song and a non-generic song is playing, then play my generic song since I don't want to play the specific music anymore.
-                if (sizeList.Length < 3 && (this.currentMusicPack.isPlaying() && !this.lastSongWasLocationSpecific))
+                if (sizeList.Length < 3 && (this.CurrentMusicPack.IsPlaying() && !this.lastSongWasLocationSpecific))
                 {
                     if (StardewSymphony.Config.EnableDebugLog)
                         StardewSymphony.ModMonitor.Log("Non specific music change detected. Not going to change the music this time");
@@ -357,33 +302,28 @@ namespace StardewSymphonyRemastered.Framework
 
             //If there is a valid key for the place/time/event/festival I am at, play it!
 
-            int randInt = this.packSelector.Next(0, listOfValidMusicPacks.Count - 1);
+            int randInt = this.Random.Next(0, listOfValidMusicPacks.Count - 1);
 
             var musicPackPair = listOfValidMusicPacks.ElementAt(randInt);
 
 
             //used to swap the music packs and stop the last playing song.
-            this.swapMusicPacks(musicPackPair.Key.musicPackInformation.name);
-
-            int randInt2 = this.songSelector.Next(0, musicPackPair.Value.Count);
-
-
-            var songName = musicPackPair.Value.ElementAt(randInt2);
-
-            this.currentMusicPack.playSong(songName.name);
+            this.SwapMusicPacks(musicPackPair.Key.Name);
+            string songName = musicPackPair.Value.ElementAt(this.Random.Next(0, musicPackPair.Value.Count));
+            this.CurrentMusicPack.PlaySong(songName);
         }
 
 
-        public Dictionary<MusicPack, List<Song>> getLocationSpecificMusic()
+        public Dictionary<MusicPack, List<string>> getLocationSpecificMusic()
         {
-            Dictionary<MusicPack, List<Song>> listOfValidDictionaries = new Dictionary<MusicPack, List<Song>>();
+            Dictionary<MusicPack, List<string>> listOfValidDictionaries = new Dictionary<MusicPack, List<string>>();
             //StardewSymphony.ModMonitor.Log(SongSpecifics.getCurrentConditionalString(true));
 
-            foreach (var v in this.musicPacks)
+            foreach (var v in this.MusicPacks)
             {
                 try
                 {
-                    var songList = v.Value.songInformation.getSongList(SongSpecifics.getCurrentConditionalString(true)).Value;
+                    var songList = v.Value.SongInformation.getSongList(SongSpecifics.getCurrentConditionalString(true)).Value;
                     if (songList == null) return null;
                     if (songList.Count > 0)
                     {
@@ -402,21 +342,17 @@ namespace StardewSymphonyRemastered.Framework
                 if (Game1.CurrentEvent.isFestival)
                 {
                     //Try to play a generalized festival song.
-                    var listOfFestivalPacks = this.getListOfApplicableMusicPacksForFestivals();
+                    var listOfFestivalPacks = this.GetListOfApplicableMusicPacksForFestivals();
                     if (listOfFestivalPacks.Count > 0)
                     {
-                        int randFestivalPack = this.packSelector.Next(0, listOfFestivalPacks.Count - 1);
+                        int randFestivalPack = this.Random.Next(0, listOfFestivalPacks.Count - 1);
 
                         var festivalMusicPackPair = listOfFestivalPacks.ElementAt(randFestivalPack);
 
                         //used to swap the music packs and stop the last playing song.
-                        this.swapMusicPacks(festivalMusicPackPair.Key.musicPackInformation.name);
-
-                        int randFestivalPack2 = this.songSelector.Next(0, festivalMusicPackPair.Value.Count);
-
-                        var festivalSongName = festivalMusicPackPair.Value.ElementAt(randFestivalPack2);
-
-                        this.currentMusicPack.playSong(festivalSongName.name);
+                        this.SwapMusicPacks(festivalMusicPackPair.Key.Name);
+                        string festivalSongName = festivalMusicPackPair.Value.ElementAt(this.Random.Next(0, festivalMusicPackPair.Value.Count));
+                        this.CurrentMusicPack.PlaySong(festivalSongName);
                         StardewSymphony.menuChangedMusic = false;
                         return true;
                     }
@@ -434,21 +370,17 @@ namespace StardewSymphonyRemastered.Framework
                 else
                 {
                     //Try to play a generalized event song.
-                    var listOfEventPacks = this.getListOfApplicableMusicPacksForEvents();
+                    var listOfEventPacks = this.GetListOfApplicableMusicPacksForEvents();
                     if (listOfEventPacks.Count > 0)
                     {
-                        int randEventPack = this.packSelector.Next(0, listOfEventPacks.Count - 1);
+                        int randEventPack = this.Random.Next(0, listOfEventPacks.Count - 1);
 
                         var eventMusicPackPair = listOfEventPacks.ElementAt(randEventPack);
 
                         //used to swap the music packs and stop the last playing song.
-                        this.swapMusicPacks(eventMusicPackPair.Key.musicPackInformation.name);
-
-                        int randEventPack2 = this.songSelector.Next(0, eventMusicPackPair.Value.Count);
-
-                        var eventSongName = eventMusicPackPair.Value.ElementAt(randEventPack2);
-
-                        this.currentMusicPack.playSong(eventSongName.name);
+                        this.SwapMusicPacks(eventMusicPackPair.Key.Name);
+                        string eventSongName = eventMusicPackPair.Value.ElementAt(this.Random.Next(0, eventMusicPackPair.Value.Count));
+                        this.CurrentMusicPack.PlaySong(eventSongName);
                         StardewSymphony.menuChangedMusic = false;
                         return true;
                     }
@@ -470,18 +402,14 @@ namespace StardewSymphonyRemastered.Framework
                 var listOfLocationPacks = this.getLocationSpecificMusic();
                 if (listOfLocationPacks.Count > 0)
                 {
-                    int randFestivalPack = this.packSelector.Next(0, listOfLocationPacks.Count - 1);
+                    int randFestivalPack = this.Random.Next(0, listOfLocationPacks.Count - 1);
 
                     var locationMusicPackPair = listOfLocationPacks.ElementAt(randFestivalPack);
 
                     //used to swap the music packs and stop the last playing song.
-                    this.swapMusicPacks(locationMusicPackPair.Key.musicPackInformation.name);
-
-                    int randLocPack2 = this.songSelector.Next(0, locationMusicPackPair.Value.Count);
-
-                    var songName = locationMusicPackPair.Value.ElementAt(randLocPack2);
-
-                    this.currentMusicPack.playSong(songName.name);
+                    this.SwapMusicPacks(locationMusicPackPair.Key.Name);
+                    string songName = locationMusicPackPair.Value.ElementAt(this.Random.Next(0, locationMusicPackPair.Value.Count));
+                    this.CurrentMusicPack.PlaySong(songName);
                     StardewSymphony.menuChangedMusic = false;
                     return true;
                 }
@@ -507,56 +435,49 @@ namespace StardewSymphonyRemastered.Framework
             {
                 if (StardewSymphony.Config.EnableDebugLog)
                 {
-                    StardewSymphony.ModMonitor.Log("Adding a new music pack!");
-
-
-                    //StardewSymphony.ModMonitor.Log("    Location:" + musicPack.shortenedDirectory);
-                    StardewSymphony.ModMonitor.Log("    Name:" + musicPack.musicPackInformation.name);
-                    StardewSymphony.ModMonitor.Log("    Author:" + musicPack.musicPackInformation.author);
-                    StardewSymphony.ModMonitor.Log("    Description:" + musicPack.musicPackInformation.description);
-                    StardewSymphony.ModMonitor.Log("    Version Info:" + musicPack.musicPackInformation.versionInfo);
-                    StardewSymphony.ModMonitor.Log("    Song List:");
+                    StardewSymphony.ModMonitor.Log("Adding music pack:");
+                    StardewSymphony.ModMonitor.Log($"   Name: {musicPack.Name}");
+                    StardewSymphony.ModMonitor.Log($"   Author: {musicPack.Manifest.Author}");
+                    StardewSymphony.ModMonitor.Log($"   Description: {musicPack.Manifest.Description}");
+                    StardewSymphony.ModMonitor.Log($"   Version Info: {musicPack.Manifest.Version}");
                 }
-
-                if (displaySongs)
+                if (displaySongs && StardewSymphony.Config.EnableDebugLog)
                 {
-                    foreach (var song in musicPack.songInformation.listOfSongsWithoutTriggers)
-                    {
-                        if (StardewSymphony.Config.EnableDebugLog)
-                            StardewSymphony.ModMonitor.Log("        " + song.name);
-                    }
+                    StardewSymphony.ModMonitor.Log("    Song List:");
+                    foreach (string song in musicPack.SongInformation.listOfSongsWithoutTriggers)
+                        StardewSymphony.ModMonitor.Log($"        {song}");
                 }
             }
 
-            this.musicPacks.Add(musicPack.musicPackInformation.name, musicPack);
+            this.MusicPacks.Add(musicPack.Name, musicPack);
         }
 
         /// <summary>Initializes all of the potential key triggers for playing songs.</summary>
         public void initializeSeasonalMusic()
         {
-            foreach (var pack in this.musicPacks)
-                pack.Value.songInformation.initializeSeasonalMusic();
+            foreach (var pack in this.MusicPacks)
+                pack.Value.SongInformation.initializeSeasonalMusic();
         }
 
         /// <summary>Initializes all of the potential key triggers for playing songs.</summary>
         public void initializeMenuMusic()
         {
-            foreach (var pack in this.musicPacks)
-                pack.Value.songInformation.initializeMenuMusic();
+            foreach (var pack in this.MusicPacks)
+                pack.Value.SongInformation.initializeMenuMusic();
         }
 
         /// <summary>Initializes all of the potential key triggers for playing songs.</summary>
         public void initializeFestivalMusic()
         {
-            foreach (var pack in this.musicPacks)
-                pack.Value.songInformation.initializeFestivalMusic();
+            foreach (var pack in this.MusicPacks)
+                pack.Value.SongInformation.initializeFestivalMusic();
         }
 
         /// <summary>Initializes all of the potential key triggers for playing songs.</summary>
         public void initializeEventMusic()
         {
-            foreach (var pack in this.musicPacks)
-                pack.Value.songInformation.initializeEventMusic();
+            foreach (var pack in this.MusicPacks)
+                pack.Value.SongInformation.initializeEventMusic();
         }
     }
 }
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicPack.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicPack.cs
index e90f9903..d60a0943 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicPack.cs
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicPack.cs
@@ -1,33 +1,106 @@
+using System;
+using System.Collections.Generic;
 using System.IO;
+using Microsoft.Xna.Framework.Audio;
+using Microsoft.Xna.Framework.Graphics;
+using NAudio.Wave;
+using StardewModdingAPI;
+using StardewValley;
+using StardustCore.UIUtilities;
 
 namespace StardewSymphonyRemastered.Framework
 {
-    /// <summary>A base class that xnb and wav packs will derive commonalities from.</summary>
+    /// <summary>A content pack which can provide music and sounds.</summary>
     public class MusicPack
     {
-        public string directory;
-        public SongSpecifics songInformation;
-        public MusicPackMetaData musicPackInformation;
+        /*********
+        ** Fields
+        *********/
+        /// <summary>The name of the folder which contains the saved player settings.</summary>
+        private readonly string DataFolderName = "data";
+
+        /// <summary>The name of the folder which contains available music.</summary>
+        private readonly string MusicFolderName = "music";
 
 
-        public virtual void playSong(string name) { }
+        /*********
+        ** Accessors
+        *********/
+        /// <summary>The underlying content pack.</summary>
+        public IContentPack ContentPack { get; }
 
-        public virtual void stopSong() { }
+        /// <summary>The songs to play when.</summary>
+        public SongSpecifics SongInformation { get; }
 
-        public virtual bool isPlaying()
+        /// <summary>The music pack icon.</summary>
+        public Texture2DExtended Icon { get; }
+
+        /// <summary>The current song name being played, if any.</summary>
+        public string CurrentSongName { get; private set; }
+
+        /// <summary>The currently sound being played, if any.</summary>
+        public SoundEffectInstance CurrentSound { get; private set; }
+
+        /// <summary>The manifest info.</summary>
+        public IManifest Manifest => this.ContentPack.Manifest;
+
+        /// <summary>The name of the music pack.</summary>
+        public string Name => this.ContentPack.Manifest.Name;
+
+        /// <summary>The available sounds.</summary>
+        public Dictionary<string, SoundEffectInstance> Sounds { get; } = new Dictionary<string, SoundEffectInstance>();
+
+
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Construct an instance.</summary>
+        /// <param name="contentPack">The underlying content pack.</param>
+        public MusicPack(IContentPack contentPack)
         {
-            return false;
+            this.ContentPack = contentPack;
+            this.SongInformation = new SongSpecifics();
+            this.Icon = this.LoadIcon();
+            this.LoadMusicFiles();
         }
 
-        /// <summary>Save functionality.</summary>
-        public virtual void writeToJson()
+        /// <summary>Play a song.</summary>
+        /// <param name="name">The song name to play.</param>
+        public void PlaySong(string name)
+        {
+            // get sound
+            if (!this.Sounds.TryGetValue(name, out SoundEffectInstance sound))
+            {
+                StardewSymphony.ModMonitor.Log("An error occured where we can't find the song anymore. Weird. Please contact Omegasis with a SMAPI Log and describe when/how the event occured.");
+                return;
+            }
+
+            // play sound
+            this.CurrentSongName = name;
+            this.CurrentSound = sound;
+            this.CurrentSound.Play();
+        }
+
+        /// <summary>Stop the currently playing song.</summary>
+        public void StopSong()
+        {
+            Game1.currentSong?.Stop(AudioStopOptions.Immediate);
+            this.CurrentSound?.Stop(true);
+            this.CurrentSongName = null;
+        }
+
+        /// <summary>Get whether the content pack is currently playing a song.</summary>
+        public bool IsPlaying()
+        {
+            return this.CurrentSound?.State == SoundState.Playing;
+        }
+
+        /// <summary>Write the song conditions to disk.</summary>
+        public virtual void SaveSettings()
         {
             if (StardewSymphony.Config.EnableDebugLog)
-                StardewSymphony.ModMonitor.Log("Saving music for this pack:" + this.musicPackInformation.name + ". Please wait.");
-            string data = Path.Combine(this.directory, "data");
-            if (!Directory.Exists(data))
-                Directory.CreateDirectory(data);
-            foreach (var list in this.songInformation.listOfSongsWithTriggers)
+                StardewSymphony.ModMonitor.Log($"Saving music for {this.Name}...");
+            foreach (var list in this.SongInformation.listOfSongsWithTriggers)
             {
                 if (!StardewSymphony.Config.WriteAllConfigMusicOptions)
                 {
@@ -35,34 +108,114 @@ namespace StardewSymphonyRemastered.Framework
                         continue;
                 }
                 if (StardewSymphony.Config.EnableDebugLog)
-                    StardewSymphony.ModMonitor.Log("Saving music: " + list.Key + ". Please wait.");
+                    StardewSymphony.ModMonitor.Log($"   Saving song: {list.Key}...");
                 SongListNode node = new SongListNode(list.Key, list.Value);
-                node.WriteToJson(Path.Combine(data, node.trigger + ".json"));
+                this.ContentPack.WriteJsonFile($"{this.DataFolderName}/{node.Trigger}.json", node);
             }
         }
 
-        /// <summary>Load functionality.</summary>
-        public virtual void readFromJson()
+        /// <summary>Read the song conditions from disk.</summary>
+        public virtual void LoadSettings()
         {
-            if (StardewSymphony.Config.EnableDebugLog)
-                StardewSymphony.ModMonitor.Log("Loading music for this pack:" + this.musicPackInformation.name + ". Please wait as this will take quite some time.");
-            string data = Path.Combine(this.directory, "data");
-            if (!Directory.Exists(data))
-                Directory.CreateDirectory(data);
-            string[] files = Directory.GetFiles(data);
-            foreach (string file in files)
+            DirectoryInfo dataFolder = new DirectoryInfo(Path.Combine(this.ContentPack.DirectoryPath, this.DataFolderName));
+            if (dataFolder.Exists)
             {
-                SongListNode node = SongListNode.ReadFromJson(Path.Combine(data, file));
-                //var pair = this.songInformation.getSongList(node.trigger + ".json");
-                foreach (var v in node.songList)
+                if (StardewSymphony.Config.EnableDebugLog)
+                    StardewSymphony.ModMonitor.Log($"Loading music for {this.Name}. This may take quite some time.");
+
+                foreach (FileInfo file in dataFolder.GetFiles())
                 {
-                    try
+                    SongListNode node = this.ContentPack.ReadJsonFile<SongListNode>($"{this.DataFolderName}/{file.Name}");
+                    foreach (string song in node.SongList)
                     {
-                        this.songInformation.addSongToTriggerList(node.trigger, v.name);
+                        try
+                        {
+                            this.SongInformation.addSongToTriggerList(node.Trigger, song);
+                        }
+                        catch { }
                     }
-                    catch { }
                 }
             }
         }
+
+
+        /*********
+        ** Private methods
+        *********/
+        /// <summary>Load the icon from the content pack.</summary>
+        private Texture2DExtended LoadIcon()
+        {
+            try
+            {
+                Texture2D texture = this.ContentPack.LoadAsset<Texture2D>("icon.png");
+                return new Texture2DExtended(texture);
+            }
+            catch (Exception err)
+            {
+                if (StardewSymphony.Config.EnableDebugLog)
+                    StardewSymphony.ModMonitor.Log(err.ToString());
+                return null;
+            }
+        }
+
+        /// <summary>Load in the music files from the pack's respective Directory/Songs folder. Typically Content/Music/Wav/FolderName/Songs</summary>
+        private void LoadMusicFiles()
+        {
+            DateTime startTime = DateTime.Now;
+
+            DirectoryInfo songFolder = new DirectoryInfo(Path.Combine(this.ContentPack.DirectoryPath, this.MusicFolderName));
+            foreach (FileInfo file in songFolder.GetFiles())
+            {
+                //MemoryStream memoryStream = new MemoryStream();
+                //AudioFileReader fileReader = new AudioFileReader(file.FullName);
+                //fileReader.CopyTo(memoryStream);
+
+                // get name
+                string name = Path.GetFileNameWithoutExtension(file.Name);
+                if (this.Sounds.ContainsKey(name))
+                    continue;
+
+                // load data
+                SoundEffect effect = null;
+                using (Stream waveFileStream = File.OpenRead(file.FullName))
+                {
+                    switch (file.Extension)
+                    {
+                        case ".wav":
+                            effect = SoundEffect.FromStream(waveFileStream);
+                            break;
+
+                        case ".mp3":
+                            using (Mp3FileReader reader = new Mp3FileReader(waveFileStream))
+                            using (WaveStream pcmStream = WaveFormatConversionStream.CreatePcmStream(reader))
+                            {
+                                string tempPath = Path.Combine(songFolder.FullName, $"{name}.wav");
+                                StardewSymphony.ModMonitor.Log($"MP3 CONVERT! {tempPath}");
+
+                                WaveFileWriter.CreateWaveFile(tempPath, pcmStream);
+                                using (Stream tempStream = File.OpenRead(tempPath))
+                                    effect = SoundEffect.FromStream(tempStream);
+                                File.Delete(tempPath);
+                            }
+                            break;
+
+                        default:
+                            StardewSymphony.ModMonitor.Log($"Unsupported file extension {file.Extension}.", LogLevel.Warn);
+                            break;
+                    }
+                }
+                if (effect == null)
+                    continue;
+
+                // add sound
+                SoundEffectInstance instance = effect.CreateInstance();
+                this.Sounds.Add(name, instance);
+                this.SongInformation.listOfSongsWithoutTriggers.Add(name);
+            }
+
+            // log loading time
+            if (StardewSymphony.Config.EnableDebugLog)
+                StardewSymphony.ModMonitor.Log($"Time to load WAV music pack {this.Name}: {startTime.Subtract(DateTime.Now)}");
+        }
     }
 }
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicPackMetaData.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicPackMetaData.cs
deleted file mode 100644
index 0c0a8d9b..00000000
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/MusicPackMetaData.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using System;
-using System.IO;
-using StardustCore.UIUtilities;
-
-namespace StardewSymphonyRemastered.Framework
-{
-    /// <summary>Holds information regarding information relating to music packs such as name, description, author, and version.</summary>
-    public class MusicPackMetaData
-    {
-        public string name;
-        public string author;
-        public string description;
-        public string versionInfo;
-        public string pathToMusicPackIcon;
-        private Texture2DExtended Icon;
-
-        /// <summary>Construct an instance.</summary>
-        /// <param name="name">The name to be displayed for the music pack.</param>
-        /// <param name="author">The author who compiled ths music pack.</param>
-        /// <param name="description">The description of</param>
-        public MusicPackMetaData(string name, string author, string description, string versionInfo, string pathToMusicPackIcon)
-        {
-            this.name = name;
-            this.author = author;
-            this.description = description;
-            this.versionInfo = versionInfo;
-            this.pathToMusicPackIcon = pathToMusicPackIcon;
-            try
-            {
-                this.Icon = new Texture2DExtended(StardewSymphony.ModHelper, StardewSymphony.Manifest, this.pathToMusicPackIcon + ".png");
-            }
-            catch (Exception err)
-            {
-                this.Icon = null;
-                if (StardewSymphony.Config.EnableDebugLog)
-                    StardewSymphony.ModMonitor.Log(err.ToString());
-            }
-        }
-
-        /// <summary>Loads the music pack information from a json file.</summary>
-        public static MusicPackMetaData readFromJson(string path)
-        {
-            string json = Path.Combine(path, "MusicPackInformation.json");
-            var meta = StardewSymphony.ModHelper.ReadJsonFile<MusicPackMetaData>(json);
-
-            string[] pathParse = path.Split(new[] { StardewSymphony.ModHelper.DirectoryPath }, StringSplitOptions.None);
-
-            try
-            {
-                try
-                {
-                    meta.Icon = new Texture2DExtended(StardewSymphony.ModHelper, StardewSymphony.Manifest, Path.Combine(pathParse[1].Remove(0, 1), meta.pathToMusicPackIcon + ".png"));
-                }
-                catch
-                {
-                    meta.Icon = new Texture2DExtended(StardewSymphony.ModHelper, StardewSymphony.Manifest, Path.Combine(pathParse[1].Remove(0, 1), meta.pathToMusicPackIcon));
-                }
-            }
-            catch (Exception err)
-            {
-                if (StardewSymphony.Config.EnableDebugLog)
-                    StardewSymphony.ModMonitor.Log(err.ToString());
-            }
-            return meta;
-        }
-
-        /// <summary>Writes the music pack information to a json file.</summary>
-        public void writeToJson(string path)
-        {
-            StardewSymphony.ModHelper.WriteJsonFile<MusicPackMetaData>(path, this);
-        }
-
-        public Texture2DExtended getTexture()
-        {
-            return this.Icon;
-        }
-    }
-}
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/Song.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/Song.cs
deleted file mode 100644
index 81d971f1..00000000
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/Song.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace StardewSymphonyRemastered.Framework
-{
-    /// <summary>The class to be used to manage individual songs.</summary>
-    public class Song
-    {
-        /// <summary>The name of the song itself.</summary>
-        public string name;
-
-        /// <summary>Constructor to be used for WAV files.</summary>
-        public Song(string name)
-        {
-            this.name = name;
-        }
-    }
-}
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongListNode.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongListNode.cs
index 134aab4f..8d4ec5fd 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongListNode.cs
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongListNode.cs
@@ -1,33 +1,31 @@
 using System.Collections.Generic;
+using System.Linq;
 
 namespace StardewSymphonyRemastered.Framework
 {
     /// <summary>A class that keeps track of the trigger and the list of songs associated with that trigger.</summary>
-    class SongListNode
+    internal class SongListNode
     {
+        /*********
+        ** Accessors
+        *********/
         /// <summary>The trigger name for the list of songs.</summary>
-        public string trigger;
+        public string Trigger { get; }
 
         /// <summary>The list of songs associated with a trigger.</summary>
-        public List<Song> songList;
+        public string[] SongList { get; }
 
+
+        /*********
+        ** Public methods
+        *********/
         /// <summary>Construct an instance.</summary>
-        public SongListNode(string Trigger, List<Song> SongList)
+        /// <param name="trigger">The trigger name for the list of songs.</param>
+        /// <param name="songList">The list of songs associated with a trigger.</param>
+        public SongListNode(string trigger, IEnumerable<string> songList)
         {
-            this.trigger = Trigger;
-            this.songList = SongList;
-        }
-
-        /// <summary>Save functionality.</summary>
-        public void WriteToJson(string path)
-        {
-            StardewSymphony.ModHelper.WriteJsonFile(path, this);
-        }
-
-        /// <summary>Load functionality.</summary>
-        public static SongListNode ReadFromJson(string path)
-        {
-            return StardewSymphony.ModHelper.ReadJsonFile<SongListNode>(path);
+            this.Trigger = trigger;
+            this.SongList = songList.ToArray();
         }
     }
 }
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongSpecifics.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongSpecifics.cs
index 8b7bf27c..00af587f 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongSpecifics.cs
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongSpecifics.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using StardewValley;
 using static System.String;
 
@@ -8,12 +9,12 @@ namespace StardewSymphonyRemastered.Framework
     /// <summary>Stores information about what songs play when.</summary>
     public class SongSpecifics
     {
-        public SortedDictionary<string, List<Song>> listOfSongsWithTriggers; //triggerName, <songs>. Seasonal music
+        public SortedDictionary<string, List<string>> listOfSongsWithTriggers; //triggerName, <songs>. Seasonal music
 
-        public List<Song> listOfSongsWithoutTriggers;
+        public List<string> listOfSongsWithoutTriggers;
 
-        public List<Song> festivalSongs;
-        public List<Song> eventSongs;
+        public List<string> festivalSongs;
+        public List<string> eventSongs;
 
         public static List<string> locations = new List<string>();
         public static List<string> festivals = new List<string>();
@@ -90,10 +91,10 @@ namespace StardewSymphonyRemastered.Framework
             };
 
 
-            this.listOfSongsWithTriggers = new SortedDictionary<string, List<Song>>();
-            this.listOfSongsWithoutTriggers = new List<Song>();
-            this.eventSongs = new List<Song>();
-            this.festivalSongs = new List<Song>();
+            this.listOfSongsWithTriggers = new SortedDictionary<string, List<string>>();
+            this.listOfSongsWithoutTriggers = new List<string>();
+            this.eventSongs = new List<string>();
+            this.festivalSongs = new List<string>();
 
         }
 
@@ -151,7 +152,7 @@ namespace StardewSymphonyRemastered.Framework
                 {
                     key = getSeasonNameString() + seperator + getWeatherString() + seperator + getTimeOfDayString(true) + seperator + getLocationString() + seperator + getDayOfWeekString();
 
-                    if (StardewSymphony.musicManager.getListOfApplicableMusicPacks(key).Count == 0)
+                    if (StardewSymphony.musicManager.GetApplicableMusicPacks(key).Count == 0)
                     {
                         key = getSeasonNameString() + seperator + getWeatherString() + seperator + getTimeOfDayString(false) + seperator + getLocationString() + seperator + getDayOfWeekString();
                     }
@@ -378,7 +379,7 @@ namespace StardewSymphonyRemastered.Framework
             {
                 try
                 {
-                    this.listOfSongsWithTriggers.Add(v, new List<Song>());
+                    this.listOfSongsWithTriggers.Add(v, new List<string>());
                 }
                 catch { }
             }
@@ -390,7 +391,7 @@ namespace StardewSymphonyRemastered.Framework
             {
                 try
                 {
-                    this.listOfSongsWithTriggers.Add(v, new List<Song>());
+                    this.listOfSongsWithTriggers.Add(v, new List<string>());
                 }
                 catch { }
             }
@@ -402,7 +403,7 @@ namespace StardewSymphonyRemastered.Framework
             {
                 try
                 {
-                    this.listOfSongsWithTriggers.Add(v, new List<Song>());
+                    this.listOfSongsWithTriggers.Add(v, new List<string>());
                 }
                 catch { }
             }
@@ -412,23 +413,23 @@ namespace StardewSymphonyRemastered.Framework
         public void initializeSeasonalMusic()
         {
             foreach (string loc in locations)
-                this.listOfSongsWithTriggers.Add(loc, new List<Song>());
+                this.listOfSongsWithTriggers.Add(loc, new List<string>());
 
             foreach (string season in this.seasons)
             {
-                this.listOfSongsWithTriggers.Add(season, new List<Song>());
+                this.listOfSongsWithTriggers.Add(season, new List<string>());
                 foreach (string weather in this.weather)
                 {
-                    this.listOfSongsWithTriggers.Add(season + seperator + weather, new List<Song>());
+                    this.listOfSongsWithTriggers.Add(season + seperator + weather, new List<string>());
                     foreach (string time in this.timesOfDay)
                     {
-                        this.listOfSongsWithTriggers.Add(season + seperator + weather + seperator + time, new List<Song>());
+                        this.listOfSongsWithTriggers.Add(season + seperator + weather + seperator + time, new List<string>());
                         foreach (string loc in locations)
                         {
-                            this.listOfSongsWithTriggers.Add(season + seperator + weather + seperator + time + seperator + loc, new List<Song>());
+                            this.listOfSongsWithTriggers.Add(season + seperator + weather + seperator + time + seperator + loc, new List<string>());
                             foreach (string day in this.daysOfWeek)
                             {
-                                this.listOfSongsWithTriggers.Add(season + seperator + weather + seperator + time + seperator + loc + seperator + day, new List<Song>());
+                                this.listOfSongsWithTriggers.Add(season + seperator + weather + seperator + time + seperator + loc + seperator + day, new List<string>());
                             }
                         }
                     }
@@ -437,28 +438,28 @@ namespace StardewSymphonyRemastered.Framework
         }
 
         /// <summary>Used to access the master list of songs this music pack contains.</summary>
-        public KeyValuePair<string, List<Song>> getSongList(string key)
+        public KeyValuePair<string, List<string>> getSongList(string key)
         {
             if (!this.listOfSongsWithTriggers.ContainsKey(key))
-                return new KeyValuePair<string, List<Song>>("", null);
+                return new KeyValuePair<string, List<string>>("", null);
 
             //This is just the plain song name with no extra info.
-            foreach (KeyValuePair<string, List<Song>> pair in this.listOfSongsWithTriggers)
+            foreach (KeyValuePair<string, List<string>> pair in this.listOfSongsWithTriggers)
             {
                 //StardewSymphony.ModMonitor.Log(pair.Key);
                 if (pair.Key == key)
                     return pair;
             }
 
-            return new KeyValuePair<string, List<Song>>("", null);
+            return new KeyValuePair<string, List<string>>("", null);
         }
 
-        public List<Song> getFestivalMusic()
+        public List<string> getFestivalMusic()
         {
             return this.festivalSongs;
         }
 
-        public List<Song> getEventMusic()
+        public List<string> getEventMusic()
         {
             return this.eventSongs;
         }
@@ -476,7 +477,7 @@ namespace StardewSymphonyRemastered.Framework
                     StardewSymphony.ModMonitor.Log("For some reason you are trying to add a song to a list that is null. The name of the song list is " + songListKey);
                 return;
             }
-            var song = this.getSongFromList(this.listOfSongsWithoutTriggers, songName); //Get the song from the master song pool
+            string song = this.getSongFromList(this.listOfSongsWithoutTriggers, songName); //Get the song from the master song pool
             if (song == null)
             {
                 if (StardewSymphony.Config.EnableDebugLog)
@@ -488,7 +489,7 @@ namespace StardewSymphonyRemastered.Framework
 
         public void addSongToFestivalList(string songName)
         {
-            var song = this.getSongFromList(this.listOfSongsWithoutTriggers, songName); //Get the song from the master song pool
+            string song = this.getSongFromList(this.listOfSongsWithoutTriggers, songName); //Get the song from the master song pool
             if (song == null)
             {
                 if (StardewSymphony.Config.EnableDebugLog)
@@ -502,7 +503,7 @@ namespace StardewSymphonyRemastered.Framework
         {
             var songKeyPair = this.eventSongs;
 
-            var song = this.getSongFromList(this.listOfSongsWithoutTriggers, songName); //Get the song from the master song pool
+            string song = this.getSongFromList(this.listOfSongsWithoutTriggers, songName); //Get the song from the master song pool
             if (song == null)
             {
                 if (StardewSymphony.Config.EnableDebugLog)
@@ -516,35 +517,28 @@ namespace StardewSymphonyRemastered.Framework
         public void removeSongFromTriggerList(string songListKey, string songName)
         {
             var songKeyPair = this.getSongList(songListKey);
-            var song = this.getSongFromList(songKeyPair.Value, songName);
+            string song = this.getSongFromList(songKeyPair.Value, songName);
             songKeyPair.Value.Remove(song);
         }
 
         /// <summary>Remove a song from the event list.</summary>
         public void removeSongFromEventList(string songName)
         {
-            var song = this.getSongFromList(this.eventSongs, songName);
+            string song = this.getSongFromList(this.eventSongs, songName);
             this.eventSongs.Remove(song);
         }
 
         /// <summary>Remove a song from the festival list.</summary>
         public void removeSongFromFestivalList(string songName)
         {
-            var song = this.getSongFromList(this.festivalSongs, songName);
+            string song = this.getSongFromList(this.festivalSongs, songName);
             this.festivalSongs.Remove(song);
         }
 
         /// <summary>Get the Song instance that is referenced with the song's name.</summary>
-        public Song getSongFromList(List<Song> songList, string songName)
+        public string getSongFromList(List<string> songList, string songName)
         {
-            //StardewSymphony.ModMonitor.Log("Get the song: " + songName);
-            foreach (var song in songList)
-            {
-                //StardewSymphony.ModMonitor.Log("Looking at song: " + song.name);
-                if (song.name == songName)
-                    return song;
-            }
-            return null;
+            return songList.FirstOrDefault(p => p == songName);
         }
         #endregion
     }
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/WavMusicPack.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/WavMusicPack.cs
deleted file mode 100644
index 4400df09..00000000
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/WavMusicPack.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using Microsoft.Xna.Framework.Audio;
-using NAudio.Wave;
-using StardewValley;
-
-namespace StardewSymphonyRemastered.Framework
-{
-    /// <summary>TODO: Make this class</summary>
-    public class WavMusicPack : MusicPack
-    {
-        /// <summary>The refererence to the information for the current song.</summary>
-        public Song currentSong;
-
-        /// <summary>The directory where all of the songs are stored.</summary>
-        public string songsDirectory;
-
-        /// <summary>The currently playing sound.</summary>
-        public SoundEffectInstance sound;
-
-        /// <summary>The name of the music pack/</summary>
-        public string Name => this.musicPackInformation.name;
-
-        public Dictionary<string, SoundEffectInstance> sounds;
-        /// <summary>Construct an instance.</summary>
-        /// <param name="directoryToMusicPack"></param>
-        public WavMusicPack(string directoryToMusicPack)
-        {
-            this.directory = directoryToMusicPack;
-            this.songsDirectory = Path.Combine(this.directory, "Songs");
-            this.songInformation = new SongSpecifics();
-            this.musicPackInformation = MusicPackMetaData.readFromJson(directoryToMusicPack);
-            this.sounds = new Dictionary<string, SoundEffectInstance>();
-            this.loadMusicFiles();
-        }
-
-        /// <summary>Load in the music files from the pack's respective Directory/Songs folder. Typically Content/Music/Wav/FolderName/Songs</summary>
-        private void loadMusicFiles()
-        {
-            List<string> wavFiles = Directory.GetFiles(this.songsDirectory, "*.wav").ToList();
-            wavFiles.AddRange(Directory.GetFiles(this.songsDirectory, "*.mp3"));
-
-            DateTime span = DateTime.Now;
-            foreach (string wav in wavFiles)
-            {
-                MemoryStream memoryStream = new MemoryStream();
-                AudioFileReader fileReader = new AudioFileReader(wav);
-                fileReader.CopyTo(memoryStream);
-
-                SoundEffect eff = null;
-
-                Stream waveFileStream = File.OpenRead(wav); //TitleContainer.OpenStream(file);
-
-                if (wav.Contains(".wav"))
-                    eff = SoundEffect.FromStream(waveFileStream);
-                else if (wav.Contains(".mp3"))
-                {
-                    using (Mp3FileReader reader = new Mp3FileReader(waveFileStream))
-                    {
-                        using (WaveStream pcmStream = WaveFormatConversionStream.CreatePcmStream(reader))
-                        {
-                            StardewSymphony.ModMonitor.Log("MP3 CONVERT! " + Path.GetFileNameWithoutExtension(wav) + ".wav");
-                            WaveFileWriter.CreateWaveFile(Path.Combine(this.songsDirectory, (Path.GetFileNameWithoutExtension(wav) + ".wav")), pcmStream);
-
-                            waveFileStream = File.OpenRead((Path.GetFileNameWithoutExtension(wav) + ".wav")); //TitleContainer.OpenStream(file);
-                            eff = SoundEffect.FromStream(waveFileStream);
-
-                            File.Delete(Path.Combine(this.songsDirectory, (Path.GetFileNameWithoutExtension(wav) + ".wav")));
-                        }
-                    }
-                }
-                else if (wav.Contains(".ogg"))
-                {
-                    StardewSymphony.ModMonitor.Log("Sorry, but .ogg files are currently not supported. Keep bugging the mod author (me) for this if you want it!", StardewModdingAPI.LogLevel.Alert);
-                    continue;
-                }
-
-
-                //SoundEffect eff = new SoundEffect(wavData, 48000 , AudioChannels.Mono);
-
-                if (eff == null)
-                    continue;
-                SoundEffectInstance instance = eff.CreateInstance();
-
-
-                string name = Path.GetFileNameWithoutExtension(wav);
-                if (this.sounds.ContainsKey(name))
-                    continue;
-                this.sounds.Add(name, instance);
-
-                //waveFileStream.Dispose();
-                Song song = new Song(name);
-                this.songInformation.listOfSongsWithoutTriggers.Add(song);
-                //listOfSongs.Add(song);
-            }
-            if (StardewSymphony.Config.EnableDebugLog)
-                StardewSymphony.ModMonitor.Log("Time to load WAV music pack: " + this.musicPackInformation.name + span.Subtract(DateTime.Now).ToString());
-        }
-
-        /// <summary>Used to play a song.</summary>
-        public override void playSong(string name)
-        {
-            //string pathToSong = this.getSongPathFromName(name);
-
-            bool exists = this.sounds.TryGetValue(name, out this.sound);
-
-            if (exists)
-            {
-                this.currentSong = new Song(name);
-                this.sound.Play();
-            }
-            else
-            {
-                StardewSymphony.ModMonitor.Log("An error occured where we can't find the song anymore. Weird. Please contact Omegasis with a SMAPI Log and describe when/how the event occured.");
-            }
-        }
-
-        /// <summary>Used to stop the currently playing song.</summary>
-        public override void stopSong()
-        {
-            Game1.currentSong?.Stop(AudioStopOptions.Immediate);
-            if (this.currentSong == null)
-                return;
-
-            this.sound?.Stop(true);
-            this.currentSong = null;
-        }
-
-        public override bool isPlaying()
-        {
-            return this.sound?.State == SoundState.Playing;
-        }
-    }
-}
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/README.md b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/README.md
index 2592d86f..07eacc8c 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/README.md
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/README.md
@@ -58,8 +58,8 @@ To create a content pack:
 
 1. [Create a standard content pack](https://stardewvalleywiki.com/Modding:Content_packs), using `Omegasis.StardewSymphonyRemastered` as the 'content pack for' ID.
 2. Add an `icon.png` image, which is the album logo to show in-game.
-2. Create a `songs` subfolder containing the `.wav` files to include. The file names (without
-   extension) will be shown in-game as the song names.
+2. Create a `songs` subfolder containing the `.mp3` or `.wav` files to include. The file names
+   (without extensions) will be shown in-game as the song names.
 
 ## For SMAPI mod creators
 You can reference Stardew Symphony in your own SMAPI mods in order to add new events, festivals,
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs
index 8ffd7a86..5ea907d9 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphony.cs
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using Microsoft.Xna.Framework.Audio;
+using Microsoft.Xna.Framework.Graphics;
 using StardewModdingAPI;
 using StardewModdingAPI.Events;
 using StardewSymphonyRemastered.Framework;
@@ -25,35 +26,26 @@ namespace StardewSymphonyRemastered
     // All mods must add events/locations/festivals/menu information to this mod during the Entry function of their mod because once the player is loaded that's when all of the packs are initialized with all of their music.
     public class StardewSymphony : Mod
     {
-        public static WaveBank DefaultWaveBank;
-        public static ISoundBank DefaultSoundBank;
-
+        /*********
+        ** Accessors
+        *********/
         public static IModHelper ModHelper;
         public static IMonitor ModMonitor;
-        public static IManifest Manifest;
-
         public static MusicManager musicManager;
-
-        private string MusicPath;
-        public static string WavMusicDirectory;
-
-        public bool musicPacksInitialized;
-
         public static bool menuChangedMusic;
-
         public static Config Config;
-
         public static TextureManager textureManager;
 
+
+        /*********
+        ** Public methods
+        *********/
         /// <summary>The mod entry point, called after the mod is first loaded.</summary>
         /// <param name="helper">Provides simplified APIs for writing mods.</param>
         public override void Entry(IModHelper helper)
         {
-            DefaultSoundBank = Game1.soundBank;
-            DefaultWaveBank = Game1.waveBank;
             ModHelper = helper;
             ModMonitor = this.Monitor;
-            Manifest = this.ModManifest;
             Config = helper.ReadConfig<Config>();
             SaveEvents.AfterLoad += this.SaveEvents_AfterLoad;
             // EventArgsLocationsChanged += LocationEvents_CurrentLocationChanged;
@@ -71,14 +63,9 @@ namespace StardewSymphonyRemastered
 
 
             musicManager = new MusicManager();
-
-            this.MusicPath = Path.Combine(ModHelper.DirectoryPath, "Content", "Music");
-            WavMusicDirectory = Path.Combine(this.MusicPath, "Wav");
-
             textureManager = new TextureManager();
-            this.createDirectories();
+            this.LoadTextures();
 
-            this.musicPacksInitialized = false;
             menuChangedMusic = false;
 
 
@@ -86,12 +73,12 @@ namespace StardewSymphonyRemastered
             SongSpecifics.initializeMenuList();
             SongSpecifics.initializeFestivalsList();
 
-            this.initializeMusicPacks();
+            this.LoadMusicPacks();
         }
 
         private void GameEvents_OneSecondTick(object sender, EventArgs e)
         {
-            musicManager?.updateTimer();
+            musicManager?.UpdateTimer();
         }
 
         /// <summary>Raised when the player changes locations. This should determine the next song to play.</summary>
@@ -108,13 +95,9 @@ namespace StardewSymphonyRemastered
         /// <param name="e">The event arguments.</param>
         private void GameEvents_FirstUpdateTick(object sender, EventArgs e)
         {
-            if (!this.musicPacksInitialized)
-            {
-                musicManager.initializeMenuMusic(); //Initialize menu music that has been added to SongSpecifics.menus from all other mods during their Entry function.
-                musicManager.initializeFestivalMusic();//Initialize festival music that has been added to SongSpecifics.menus from all other mods during their Entry function.
-                musicManager.initializeEventMusic();//Initialize event music that has been added to SongSpecifics.menus from all other mods during their Entry function.
-                this.musicPacksInitialized = true;
-            }
+            musicManager.initializeMenuMusic(); //Initialize menu music that has been added to SongSpecifics.menus from all other mods during their Entry function.
+            musicManager.initializeFestivalMusic(); //Initialize festival music that has been added to SongSpecifics.menus from all other mods during their Entry function.
+            musicManager.initializeEventMusic(); //Initialize event music that has been added to SongSpecifics.menus from all other mods during their Entry function.
         }
 
         /// <summary>Events to occur after the game has loaded in.</summary>
@@ -129,8 +112,8 @@ namespace StardewSymphonyRemastered
             musicManager.initializeFestivalMusic();
             musicManager.initializeEventMusic();
 
-            foreach (var musicPack in musicManager.musicPacks)
-                musicPack.Value.readFromJson();
+            foreach (var musicPack in musicManager.MusicPacks)
+                musicPack.Value.LoadSettings();
 
             SongSpecifics.menus.Sort();
             SongSpecifics.locations.Sort();
@@ -138,7 +121,6 @@ namespace StardewSymphonyRemastered
             SongSpecifics.events.Sort();
 
             musicManager.selectMusic(SongSpecifics.getCurrentConditionalString());
-
         }
 
 
@@ -157,16 +139,14 @@ namespace StardewSymphonyRemastered
         private void MenuEvents_MenuChanged(object sender, EventArgsClickableMenuChanged e)
         {
             //var ok = musicManager.currentMusicPack.getNameOfCurrentSong();
-            musicManager.selectMenuMusic(SongSpecifics.getCurrentConditionalString());
+            musicManager.SelectMenuMusic(SongSpecifics.getCurrentConditionalString());
         }
 
         private void SaveEvents_BeforeSave(object sender, EventArgs e)
         {
             // THIS IS WAY TO LONG to run. Better make it save individual lists when I am editing songs.
-            foreach (var musicPack in musicManager.musicPacks)
-            {
-                musicPack.Value.writeToJson();
-            }
+            foreach (var musicPack in musicManager.MusicPacks)
+                musicPack.Value.SaveSettings();
         }
 
         /// <summary>Fires when a key is pressed to open the music selection menu.</summary>
@@ -197,8 +177,8 @@ namespace StardewSymphonyRemastered
             }
             else
             {
-                if (musicManager.currentMusicPack == null) return;
-                if (Game1.currentSong != null && musicManager.currentMusicPack.isPlaying())
+                if (musicManager.CurrentMusicPack == null) return;
+                if (Game1.currentSong != null && musicManager.CurrentMusicPack.IsPlaying())
                 {
                     //ModMonitor.Log("STOP THE MUSIC!!!");
                     Game1.currentSong.Stop(AudioStopOptions.Immediate); //stop the normal songs from playing over the new songs
@@ -208,136 +188,75 @@ namespace StardewSymphonyRemastered
             }
         }
 
-        /// <summary>Load in the music packs to the music manager.</summary>
-        public void initializeMusicPacks()
+        /// <summary>Load the textures needed by the mod.</summary>
+        public void LoadTextures()
         {
-            //load in all packs here.
-            this.loadWAVMusicPacks();
-        }
-
-        /// <summary>Create the core directories needed by the mod.</summary>
-        public void createDirectories()
-        {
-            string path = Path.Combine("assets");
+            Texture2DExtended LoadTexture(string name)
+            {
+                return new Texture2DExtended(this.Helper.Content.Load<Texture2D>($"assets/{name}"));
+            }
 
             //Generic Icons
-            string musicNote = Path.Combine(path, "MusicNote.png");
-            string musicCD = Path.Combine(path, "MusicDisk.png");
-            string outlineBox = Path.Combine(path, "OutlineBox.png");
-
-            string addIcon = Path.Combine(path, "AddButton.png");
-            string deleteButton = Path.Combine(path, "DeleteButton.png");
-
-            string greenBallon = Path.Combine(path, "GreenBallon.png");
-            string redBallon = Path.Combine(path, "RedBallon.png");
-            string starIcon = Path.Combine(path, "StarIcon.png");
-
-            string menuIcon = Path.Combine(path, "MenuIcon.png");
+            textureManager.addTexture("MusicNote", LoadTexture("MusicNote.png"));
+            textureManager.addTexture("MusicDisk", LoadTexture("MusicDisk.png"));
+            textureManager.addTexture("MusicCD", LoadTexture("MusicDisk.png"));
+            textureManager.addTexture("OutlineBox", LoadTexture("OutlineBox.png"));
+            textureManager.addTexture("AddIcon", LoadTexture("AddButton.png"));
+            textureManager.addTexture("DeleteIcon", LoadTexture("DeleteButton.png"));
+            textureManager.addTexture("GreenBallon", LoadTexture("GreenBallon.png"));
+            textureManager.addTexture("RedBallon", LoadTexture("RedBallon.png"));
+            textureManager.addTexture("StarIcon", LoadTexture("StarIcon.png"));
+            textureManager.addTexture("MenuIcon", LoadTexture("MenuIcon.png"));
 
             //Time Icons
-            string dayIcon = Path.Combine(path, "TimeIcon_Day.png");
-            string nightIcon = Path.Combine(path, "TimeIcon_Night.png");
+            textureManager.addTexture("DayIcon", LoadTexture("TimeIcon_Day.png"));
+            textureManager.addTexture("NightIcon", LoadTexture("TimeIcon_Night.png"));
 
             //Fun Icons
-            string eventIcon = Path.Combine(path, "EventIcon.png");
-            string festivalIcon = Path.Combine(path, "FestivalIcon.png");
+            textureManager.addTexture("EventIcon", LoadTexture("EventIcon.png"));
+            textureManager.addTexture("FestivalIcon", LoadTexture("FestivalIcon.png"));
 
             //WeatherIcons
-            string sunnyIcon = Path.Combine(path, "WeatherIcon_Sunny.png");
-            string rainyIcon = Path.Combine(path, "WeatherIcon_Rainy.png");
-            string debrisIconSpring = Path.Combine(path, "WeatherIcon_DebrisSpring.png");
-            string debrisIconSummer = Path.Combine(path, "WeatherIcon_DebrisSummer.png");
-            string debrisIconFall = Path.Combine(path, "WeatherIcon_DebrisFall.png");
-            string weatherFestivalIcon = Path.Combine(path, "WeatherIcon_Festival.png");
-            string snowIcon = Path.Combine(path, "WeatherIcon_Snowing.png");
-            string stormIcon = Path.Combine(path, "WeatherIcon_Stormy.png");
-            string weddingIcon = Path.Combine(path, "WeatherIcon_WeddingHeart.png");
+            textureManager.addTexture("SunnyIcon", LoadTexture("WeatherIcon_Sunny.png"));
+            textureManager.addTexture("RainyIcon", LoadTexture("WeatherIcon_Rainy.png"));
+            textureManager.addTexture("DebrisSpringIcon", LoadTexture("WeatherIcon_DebrisSpring.png"));
+            textureManager.addTexture("DebrisSummerIcon", LoadTexture("WeatherIcon_DebrisSummer.png"));
+            textureManager.addTexture("DebrisFallIcon", LoadTexture("WeatherIcon_DebrisFall.png"));
+            textureManager.addTexture("WeatherFestivalIcon", LoadTexture("WeatherIcon_Festival.png"));
+            textureManager.addTexture("SnowIcon", LoadTexture("WeatherIcon_Snowing.png"));
+            textureManager.addTexture("StormIcon", LoadTexture("WeatherIcon_Stormy.png"));
+            textureManager.addTexture("WeddingIcon", LoadTexture("WeatherIcon_WeddingHeart.png"));
 
             //Season Icons
-            string springIcon = Path.Combine(path, "SeasonIcon_Spring.png");
-            string summerIcon = Path.Combine(path, "SeasonIcon_Summer.png");
-            string fallIcon = Path.Combine(path, "SeasonIcon_Fall.png");
-            string winterIcon = Path.Combine(path, "SeasonIcon_Winter.png");
+            textureManager.addTexture("SpringIcon", LoadTexture("SeasonIcon_Spring.png"));
+            textureManager.addTexture("SummerIcon", LoadTexture("SeasonIcon_Summer.png"));
+            textureManager.addTexture("FallIcon", LoadTexture("SeasonIcon_Fall.png"));
+            textureManager.addTexture("WinterIcon", LoadTexture("SeasonIcon_Winter.png"));
 
             //Day Icons
-            string mondayIcon = Path.Combine(path, "DayIcons_Monday.png");
-            string tuesdayIcon = Path.Combine(path, "DayIcons_Tuesday.png");
-            string wednesdayIcon = Path.Combine(path, "DayIcons_Wednesday.png");
-            string thursdayIcon = Path.Combine(path, "DayIcons_Thursday.png");
-            string fridayIcon = Path.Combine(path, "DayIcons_Friday.png");
-            string saturdayIcon = Path.Combine(path, "DayIcons_Saturday.png");
-            string sundayIcon = Path.Combine(path, "DayIcons_Sunday.png");
+            textureManager.addTexture("MondayIcon", LoadTexture("DayIcons_Monday.png"));
+            textureManager.addTexture("TuesdayIcon", LoadTexture("DayIcons_Tuesday.png"));
+            textureManager.addTexture("WednesdayIcon", LoadTexture("DayIcons_Wednesday.png"));
+            textureManager.addTexture("ThursdayIcon", LoadTexture("DayIcons_Thursday.png"));
+            textureManager.addTexture("FridayIcon", LoadTexture("DayIcons_Friday.png"));
+            textureManager.addTexture("SaturdayIcon", LoadTexture("DayIcons_Saturday.png"));
+            textureManager.addTexture("SundayIcon", LoadTexture("DayIcons_Sunday.png"));
 
-            string houseIcon = Path.Combine(path, "HouseIcon.png");
-            string playButton = Path.Combine(path, "PlayButton.png");
-            string stopButton = Path.Combine(path, "StopButton.png");
-            string backButton = Path.Combine(path, "BackButton.png");
+            textureManager.addTexture("HouseIcon", LoadTexture("HouseIcon.png"));
 
-            textureManager.addTexture("MusicNote", new Texture2DExtended(ModHelper, Manifest.UniqueID, musicNote));
-            textureManager.addTexture("MusicDisk", new Texture2DExtended(ModHelper, Manifest.UniqueID, musicCD));
-            textureManager.addTexture("MusicCD", new Texture2DExtended(ModHelper, Manifest.UniqueID, musicCD));
-            textureManager.addTexture("OutlineBox", new Texture2DExtended(ModHelper, Manifest.UniqueID, outlineBox));
-            textureManager.addTexture("AddIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, addIcon));
-            textureManager.addTexture("DeleteIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, deleteButton));
-            textureManager.addTexture("GreenBallon", new Texture2DExtended(ModHelper, Manifest.UniqueID, greenBallon));
-            textureManager.addTexture("RedBallon", new Texture2DExtended(ModHelper, Manifest.UniqueID, redBallon));
-            textureManager.addTexture("StarIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, starIcon));
-            textureManager.addTexture("MenuIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, menuIcon));
-            textureManager.addTexture("DayIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, dayIcon));
-            textureManager.addTexture("NightIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, nightIcon));
-            textureManager.addTexture("EventIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, eventIcon));
-            textureManager.addTexture("FestivalIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, festivalIcon));
-            textureManager.addTexture("SunnyIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, sunnyIcon));
-            textureManager.addTexture("RainyIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, rainyIcon));
-            textureManager.addTexture("DebrisSpringIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, debrisIconSpring));
-            textureManager.addTexture("DebrisSummerIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, debrisIconSummer));
-            textureManager.addTexture("DebrisFallIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, debrisIconFall));
-            textureManager.addTexture("WeatherFestivalIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, weatherFestivalIcon));
-            textureManager.addTexture("SnowIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, snowIcon));
-            textureManager.addTexture("StormIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, stormIcon));
-            textureManager.addTexture("WeddingIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, weddingIcon));
-            textureManager.addTexture("SpringIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, springIcon));
-            textureManager.addTexture("SummerIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, summerIcon));
-            textureManager.addTexture("FallIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, fallIcon));
-            textureManager.addTexture("WinterIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, winterIcon));
-            textureManager.addTexture("MondayIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, mondayIcon));
-            textureManager.addTexture("TuesdayIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, tuesdayIcon));
-            textureManager.addTexture("WednesdayIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, wednesdayIcon));
-            textureManager.addTexture("ThursdayIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, thursdayIcon));
-            textureManager.addTexture("FridayIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, fridayIcon));
-            textureManager.addTexture("SaturdayIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, saturdayIcon));
-            textureManager.addTexture("SundayIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, sundayIcon));
-
-            textureManager.addTexture("HouseIcon", new Texture2DExtended(ModHelper, Manifest.UniqueID, houseIcon));
-
-            textureManager.addTexture("PlayButton", new Texture2DExtended(ModHelper, Manifest.UniqueID, playButton));
-            textureManager.addTexture("StopButton", new Texture2DExtended(ModHelper, Manifest.UniqueID, stopButton));
-            textureManager.addTexture("BackButton", new Texture2DExtended(ModHelper, Manifest.UniqueID, backButton));
-
-
-            Directory.CreateDirectory(this.MusicPath);
-            Directory.CreateDirectory(WavMusicDirectory);
+            textureManager.addTexture("PlayButton", LoadTexture("PlayButton.png"));
+            textureManager.addTexture("StopButton", LoadTexture("StopButton.png"));
+            textureManager.addTexture("BackButton", LoadTexture("BackButton.png"));
         }
 
-        /// <summary>Load in WAV music packs.</summary>
-        public void loadWAVMusicPacks()
+        /// <summary>Load the available music packs.</summary>
+        public void LoadMusicPacks()
         {
-            string[] listOfDirectories = Directory.GetDirectories(WavMusicDirectory);
-            foreach (string folder in listOfDirectories)
+            foreach (IContentPack contentPack in this.Helper.ContentPacks.GetOwned())
             {
-                string metaData = Path.Combine(folder, "MusicPackInformation.json");
-
-                if (!File.Exists(metaData))
-                {
-                    if (Config.EnableDebugLog)
-                        ModMonitor.Log("WARNING! Loading in a music pack from: " + folder + ". There is no MusicPackInformation.json associated with this music pack meaning that while songs can be played from this pack, no information about it will be displayed.", LogLevel.Error);
-                }
-
-                WavMusicPack musicPack = new WavMusicPack(folder);
-
-                musicPack.songInformation.initializeMenuMusic();
-                musicPack.readFromJson();
-
+                MusicPack musicPack = new MusicPack(contentPack);
+                musicPack.SongInformation.initializeMenuMusic();
+                musicPack.LoadSettings();
                 musicManager.addMusicPack(musicPack, true, true);
             }
         }
diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj
index 0403f0bb..5038df1a 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/StardewSymphonyRemastered.csproj
@@ -82,14 +82,11 @@
   <ItemGroup>
     <Compile Include="Config.cs" />
     <Compile Include="Framework\Menus\MusicManagerMenu.cs" />
-    <Compile Include="Framework\Music\MusicPackMetaData.cs" />
-    <Compile Include="Framework\Music\Song.cs" />
     <Compile Include="Framework\Music\SongListNode.cs" />
     <Compile Include="StardewSymphony.cs" />
     <Compile Include="Framework\Music\MusicManager.cs" />
-    <Compile Include="Framework\Music\MusicPack.cs" />
     <Compile Include="Framework\Music\SongSpecifics.cs" />
-    <Compile Include="Framework\Music\WavMusicPack.cs" />
+    <Compile Include="Framework\Music\MusicPack.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/GeneralMods/StardustCore/ModCore.cs b/GeneralMods/StardustCore/ModCore.cs
index 5d3bb02c..a0598504 100644
--- a/GeneralMods/StardustCore/ModCore.cs
+++ b/GeneralMods/StardustCore/ModCore.cs
@@ -33,9 +33,9 @@ namespace StardustCore
 
             TextureManagers = new Dictionary<string, TextureManager>();
             TextureManager = new TextureManager();
-            TextureManager.addTexture("Test1", new Texture2DExtended(ModCore.ModHelper, Manifest, Path.Combine("Content", "Graphics", "MultiTest", "Test1.png")));
-            TextureManager.addTexture("Test2", new Texture2DExtended(ModCore.ModHelper, Manifest, Path.Combine("Content", "Graphics", "MultiTest", "Test2.png")));
-            TextureManager.addTexture("Test3", new Texture2DExtended(ModCore.ModHelper, Manifest, Path.Combine("Content", "Graphics", "MultiTest", "Test3.png")));
+            TextureManager.addTexture("Test1", new Texture2DExtended(ModCore.ModHelper, Path.Combine("Content", "Graphics", "MultiTest", "Test1.png")));
+            TextureManager.addTexture("Test2", new Texture2DExtended(ModCore.ModHelper, Path.Combine("Content", "Graphics", "MultiTest", "Test2.png")));
+            TextureManager.addTexture("Test3", new Texture2DExtended(ModCore.ModHelper, Path.Combine("Content", "Graphics", "MultiTest", "Test3.png")));
             TextureManagers.Add(this.ModManifest.UniqueID, TextureManager);
 
             this.config = ModHelper.ReadConfig<ModConfig>();
diff --git a/GeneralMods/StardustCore/UIUtilities/Texture2DExtended.cs b/GeneralMods/StardustCore/UIUtilities/Texture2DExtended.cs
index 146da20b..4e63a612 100644
--- a/GeneralMods/StardustCore/UIUtilities/Texture2DExtended.cs
+++ b/GeneralMods/StardustCore/UIUtilities/Texture2DExtended.cs
@@ -1,4 +1,5 @@
 using System.IO;
+using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using StardewModdingAPI;
 
@@ -6,64 +7,53 @@ namespace StardustCore.UIUtilities
 {
     public class Texture2DExtended
     {
-        public string Name;
-        public Texture2D texture;
-        public string path;
-        readonly IModHelper helper;
-        public string modID;
-        public ContentSource source;
+        /*********
+        ** Accessors
+        *********/
+        /// <summary>The underlying texture.</summary>
+        public Texture2D Texture { get; }
 
+        /// <summary>The texture width.</summary>
+        public int Width => this.Texture.Width;
+
+        /// <summary>The texture height.</summary>
+        public int Height => this.Texture.Height;
+
+
+        /*********
+        ** Public methods
+        *********/
         /// <summary>Empty/null constructor.</summary>
         public Texture2DExtended()
         {
-            this.Name = "";
-            this.texture = null;
-            this.path = "";
-            this.helper = null;
-            this.modID = "";
+            this.Texture = null;
         }
 
         /// <summary>Construct an instance.</summary>
-        /// <param name="path">The relative path to file on disk. See StardustCore.Utilities.getRelativePath(modname,path);
-        public Texture2DExtended(IModHelper helper, IManifest manifest, string path, ContentSource contentSource = ContentSource.ModFolder)
+        public Texture2DExtended(Texture2D texture)
         {
-            this.Name = Path.GetFileNameWithoutExtension(path);
-            this.path = path;
-            this.texture = helper.Content.Load<Texture2D>(path, contentSource);
-            this.helper = helper;
-            this.modID = manifest.UniqueID;
-            this.source = contentSource;
+            this.Texture = texture;
         }
 
-        public Texture2DExtended(IModHelper helper, string modID, string path, ContentSource contentSource = ContentSource.ModFolder)
+        public Texture2DExtended(IModHelper helper, string path, ContentSource contentSource = ContentSource.ModFolder)
         {
-            this.Name = Path.GetFileNameWithoutExtension(path);
-            this.path = path;
-            this.texture = helper.Content.Load<Texture2D>(path, contentSource);
-            this.helper = helper;
-            this.modID = modID;
-            this.source = contentSource;
+            this.Texture = helper.Content.Load<Texture2D>(path, contentSource);
         }
 
         public Texture2DExtended Copy()
         {
-            return new Texture2DExtended(this.helper, this.modID, this.path);
-        }
+            Texture2D clone = new Texture2D(this.Texture.GraphicsDevice, this.Texture.Width, this.Texture.Height);
+            Color[] data = new Color[clone.Width * clone.Height];
+            this.Texture.GetData(data);
+            clone.SetData(data);
 
-        public IModHelper getHelper()
-        {
-            return this.helper;
+            return new Texture2DExtended(clone);
         }
 
         /// <summary>Returns the actual 2D texture held by this wrapper class.</summary>
         public Texture2D getTexture()
         {
-            return this.texture;
-        }
-
-        public void setTexure(Texture2D text)
-        {
-            this.texture = text;
+            return this.Texture;
         }
     }
 }

From 5c238c5040ede588666f9f66bed50a7b6c77c4a7 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sat, 5 Jan 2019 05:06:26 -0500
Subject: [PATCH 7/8] restore API methods intended for other mods

---
 .../Framework/Music/SongSpecifics.cs                | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongSpecifics.cs b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongSpecifics.cs
index 00af587f..6754232b 100644
--- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongSpecifics.cs
+++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/Framework/Music/SongSpecifics.cs
@@ -222,6 +222,19 @@ namespace StardewSymphonyRemastered.Framework
             festivals.Add(name);
         }
 
+        /// <summary>Custom way to add in event to hijack music.</summary>
+        public static void addEvent(string id)
+        {
+            events.Add(id);
+            //Do some logic here
+        }
+
+        /// <summary>Add a location to the loctaion list.</summary>
+        public static void addLocation(string name)
+        {
+            locations.Add(name);
+        }
+
         /// <summary>Get the name of the day of the week from what game day it is.</summary>
         public static string getDayOfWeekString()
         {

From df87a2647e275e90152ec6a08443967aa5a7cfca Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sat, 5 Jan 2019 17:42:21 -0500
Subject: [PATCH 8/8] update references to Texture2DExtended

---
 .../Framework/Menus/VocalizationMenu.cs        | 18 +++++++++---------
 .../Vocalization/Vocalization/Vocalization.cs  |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/GeneralMods/Vocalization/Vocalization/Framework/Menus/VocalizationMenu.cs b/GeneralMods/Vocalization/Vocalization/Framework/Menus/VocalizationMenu.cs
index 985e9424..38fb7ee2 100644
--- a/GeneralMods/Vocalization/Vocalization/Framework/Menus/VocalizationMenu.cs
+++ b/GeneralMods/Vocalization/Vocalization/Framework/Menus/VocalizationMenu.cs
@@ -33,19 +33,19 @@ namespace Vocalization.Framework.Menus
 
         public void setUpButtons()
         {
-            Texture2DExtended buttonTexture = new Texture2DExtended(Vocalization.ModHelper, Vocalization.Manifest, Path.Combine("Content", "Graphics", "SliderButton.png"));
-            Button bar = new Button(new Rectangle(this.xPositionOnScreen + 100, this.yPositionOnScreen + 220, 200, 40), new Texture2DExtended(Vocalization.ModHelper, Vocalization.Manifest, Path.Combine("Content", "Graphics", "SliderBar.png")), new Rectangle(0, 0, 100, 10), 2f);
+            Texture2DExtended buttonTexture = new Texture2DExtended(Vocalization.ModHelper, Path.Combine("Content", "Graphics", "SliderButton.png"));
+            Button bar = new Button(new Rectangle(this.xPositionOnScreen + 100, this.yPositionOnScreen + 220, 200, 40), new Texture2DExtended(Vocalization.ModHelper, Path.Combine("Content", "Graphics", "SliderBar.png")), new Rectangle(0, 0, 100, 10), 2f);
             //Texture2DExtended barTexture = new Texture2DExtended(Vocalization.ModHelper, Vocalization.Manifest, Path.Combine("Content", "Graphics", "SliderBar.png"));
             Rectangle sourceRect = new Rectangle(0, 0, 4, 16);
             this.sliderButton = new SliderButton("Slider", "Volume", new Rectangle(this.xPositionOnScreen + 100, this.yPositionOnScreen + 220, 4, 16), buttonTexture, bar, sourceRect, 2f, new SliderInformation(SliderStyle.Horizontal, (int)(Vocalization.config.voiceVolume * 100), 1), new StardustCore.Animations.Animation(sourceRect), Color.White, Color.Black, new StardustCore.UIUtilities.MenuComponents.Delegates.Functionality.ButtonFunctionality(null, null, null), false, null, true);
 
-            Button english = new Button("EnglishButton", "English", new Rectangle(0, 0, 174, 39), new Texture2DExtended(Vocalization.ModHelper, Vocalization.Manifest, Path.Combine("LooseSprites", "LanguageButtons.xnb"), StardewModdingAPI.ContentSource.GameContent), new Rectangle(0, 0, 174, 39), 1f);
-            Button spanish = new Button("SpanishButton", "Spanish", new Rectangle(0, 0, 174, 39), new Texture2DExtended(Vocalization.ModHelper, Vocalization.Manifest, Path.Combine("LooseSprites", "LanguageButtons.xnb"), StardewModdingAPI.ContentSource.GameContent), new Rectangle(0, 39 * 2, 174, 39), 1f);
-            Button portuguese = new Button("PortugueseButton", "Brazillian Portuguese", new Rectangle(0, 0, 174, 39), new Texture2DExtended(Vocalization.ModHelper, Vocalization.Manifest, Path.Combine("LooseSprites", "LanguageButtons.xnb"), StardewModdingAPI.ContentSource.GameContent), new Rectangle(0, 39 * 4, 174, 39), 1f);
-            Button russian = new Button("RussianButton", "Russian", new Rectangle(0, 0, 174, 39), new Texture2DExtended(Vocalization.ModHelper, Vocalization.Manifest, Path.Combine("LooseSprites", "LanguageButtons.xnb"), StardewModdingAPI.ContentSource.GameContent), new Rectangle(0, 39 * 6, 174, 39), 1f);
-            Button chinese = new Button("ChineseButton", "Chinese", new Rectangle(0, 0, 174, 39), new Texture2DExtended(Vocalization.ModHelper, Vocalization.Manifest, Path.Combine("LooseSprites", "LanguageButtons.xnb"), StardewModdingAPI.ContentSource.GameContent), new Rectangle(0, 39 * 8, 174, 39), 1f);
-            Button japanese = new Button("JapaneseButton", "Japanese", new Rectangle(0, 0, 174, 39), new Texture2DExtended(Vocalization.ModHelper, Vocalization.Manifest, Path.Combine("LooseSprites", "LanguageButtons.xnb"), StardewModdingAPI.ContentSource.GameContent), new Rectangle(0, 39 * 10, 174, 39), 1f);
-            Button german = new Button("GermanButton", "German", new Rectangle(0, 0, 174, 39), new Texture2DExtended(Vocalization.ModHelper, Vocalization.Manifest, Path.Combine("LooseSprites", "LanguageButtons.xnb"), StardewModdingAPI.ContentSource.GameContent), new Rectangle(0, 39 * 12, 174, 39), 1f);
+            Button english = new Button("EnglishButton", "English", new Rectangle(0, 0, 174, 39), new Texture2DExtended(Vocalization.ModHelper, Path.Combine("LooseSprites", "LanguageButtons.xnb"), StardewModdingAPI.ContentSource.GameContent), new Rectangle(0, 0, 174, 39), 1f);
+            Button spanish = new Button("SpanishButton", "Spanish", new Rectangle(0, 0, 174, 39), new Texture2DExtended(Vocalization.ModHelper, Path.Combine("LooseSprites", "LanguageButtons.xnb"), StardewModdingAPI.ContentSource.GameContent), new Rectangle(0, 39 * 2, 174, 39), 1f);
+            Button portuguese = new Button("PortugueseButton", "Brazillian Portuguese", new Rectangle(0, 0, 174, 39), new Texture2DExtended(Vocalization.ModHelper, Path.Combine("LooseSprites", "LanguageButtons.xnb"), StardewModdingAPI.ContentSource.GameContent), new Rectangle(0, 39 * 4, 174, 39), 1f);
+            Button russian = new Button("RussianButton", "Russian", new Rectangle(0, 0, 174, 39), new Texture2DExtended(Vocalization.ModHelper, Path.Combine("LooseSprites", "LanguageButtons.xnb"), StardewModdingAPI.ContentSource.GameContent), new Rectangle(0, 39 * 6, 174, 39), 1f);
+            Button chinese = new Button("ChineseButton", "Chinese", new Rectangle(0, 0, 174, 39), new Texture2DExtended(Vocalization.ModHelper, Path.Combine("LooseSprites", "LanguageButtons.xnb"), StardewModdingAPI.ContentSource.GameContent), new Rectangle(0, 39 * 8, 174, 39), 1f);
+            Button japanese = new Button("JapaneseButton", "Japanese", new Rectangle(0, 0, 174, 39), new Texture2DExtended(Vocalization.ModHelper, Path.Combine("LooseSprites", "LanguageButtons.xnb"), StardewModdingAPI.ContentSource.GameContent), new Rectangle(0, 39 * 10, 174, 39), 1f);
+            Button german = new Button("GermanButton", "German", new Rectangle(0, 0, 174, 39), new Texture2DExtended(Vocalization.ModHelper, Path.Combine("LooseSprites", "LanguageButtons.xnb"), StardewModdingAPI.ContentSource.GameContent), new Rectangle(0, 39 * 12, 174, 39), 1f);
             List<Button> buttons = new List<Button>
             {
                 english,
diff --git a/GeneralMods/Vocalization/Vocalization/Vocalization.cs b/GeneralMods/Vocalization/Vocalization/Vocalization.cs
index 1ed3cc60..496ded25 100644
--- a/GeneralMods/Vocalization/Vocalization/Vocalization.cs
+++ b/GeneralMods/Vocalization/Vocalization/Vocalization.cs
@@ -270,7 +270,7 @@ namespace Vocalization
                 new KeyValuePair<ClickableTextureComponent, ExtraTextureDrawOrder>(speech, ExtraTextureDrawOrder.after)
             };
 
-            Button menuTab = new Button("", new Rectangle(0, 0, 32, 32), new Texture2DExtended(ModHelper, this.ModManifest, Path.Combine("Content", "Graphics", "MenuTab.png")), "", new Rectangle(0, 0, 32, 32), 2f, new StardustCore.Animations.Animation(new Rectangle(0, 0, 32, 32)), Color.White, Color.White, new StardustCore.UIUtilities.MenuComponents.Delegates.Functionality.ButtonFunctionality(new StardustCore.UIUtilities.MenuComponents.Delegates.DelegatePairing(null, null), new StardustCore.UIUtilities.MenuComponents.Delegates.DelegatePairing(null, null), new StardustCore.UIUtilities.MenuComponents.Delegates.DelegatePairing(null, null)), false, components);
+            Button menuTab = new Button("", new Rectangle(0, 0, 32, 32), new Texture2DExtended(ModHelper, Path.Combine("Content", "Graphics", "MenuTab.png")), "", new Rectangle(0, 0, 32, 32), 2f, new StardustCore.Animations.Animation(new Rectangle(0, 0, 32, 32)), Color.White, Color.White, new StardustCore.UIUtilities.MenuComponents.Delegates.Functionality.ButtonFunctionality(new StardustCore.UIUtilities.MenuComponents.Delegates.DelegatePairing(null, null), new StardustCore.UIUtilities.MenuComponents.Delegates.DelegatePairing(null, null), new StardustCore.UIUtilities.MenuComponents.Delegates.DelegatePairing(null, null)), false, components);
 
             //Change this to take the vocalization menu instead
             var modTabs = new List<KeyValuePair<Button, IClickableMenuExtended>>
@@ -308,7 +308,7 @@ namespace Vocalization
             components.Add(new KeyValuePair<ClickableTextureComponent, ExtraTextureDrawOrder>(c, ExtraTextureDrawOrder.after));
             components.Add(new KeyValuePair<ClickableTextureComponent, ExtraTextureDrawOrder>(speech, ExtraTextureDrawOrder.after));
 
-            Button menuTab = new Button("", new Rectangle(0, 0, 32, 32), new Texture2DExtended(ModHelper, this.ModManifest, Path.Combine("Content", "Graphics", "MenuTab.png")), "", new Rectangle(0, 0, 32, 32), 2f, new StardustCore.Animations.Animation(new Rectangle(0, 0, 32, 32)), Color.White, Color.White, new StardustCore.UIUtilities.MenuComponents.Delegates.Functionality.ButtonFunctionality(null, null, null), false, components);
+            Button menuTab = new Button("", new Rectangle(0, 0, 32, 32), new Texture2DExtended(ModHelper, Path.Combine("Content", "Graphics", "MenuTab.png")), "", new Rectangle(0, 0, 32, 32), 2f, new StardustCore.Animations.Animation(new Rectangle(0, 0, 32, 32)), Color.White, Color.White, new StardustCore.UIUtilities.MenuComponents.Delegates.Functionality.ButtonFunctionality(null, null, null), false, components);
 
             //Change this to take the vocalization menu instead
             List<KeyValuePair<Button, IClickableMenuExtended>> modTabs = new List<KeyValuePair<Button, IClickableMenuExtended>>();